From 1279fe68cb39711820f6599179a93c8255cd2cca Mon Sep 17 00:00:00 2001
From: jc00ke <jesse@jc00ke.com>
Date: Sun, 18 Mar 2012 19:53:26 -0700
Subject: [PATCH 1/2] Use ENV var for coverage

This will lessen the chance of mistakenly committing with that branch
set to true.
---
 .gitignore     | 1 +
 test/helper.rb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 248513af..3bec8332 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ Gemfile.lock
 *.swp
 dump.rdb
 .rbx
+coverage/
diff --git a/test/helper.rb b/test/helper.rb
index 8d2d3d87..5f8a9ebf 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,5 +1,5 @@
 $TESTING = true
-if false
+if ENV.has_key?("SIMPLECOV")
   require 'simplecov'
   SimpleCov.start
 end

From 230a5a5c5354e1dd85ecaba3f15770b6027975b5 Mon Sep 17 00:00:00 2001
From: jc00ke <jesse@jc00ke.com>
Date: Sun, 18 Mar 2012 20:03:46 -0700
Subject: [PATCH 2/2] Removing old Celluloid hack

---
 test/helper.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/helper.rb b/test/helper.rb
index 5f8a9ebf..90d7b60d 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,4 +1,3 @@
-$TESTING = true
 if ENV.has_key?("SIMPLECOV")
   require 'simplecov'
   SimpleCov.start