Avoid gherkin and gherkin-ruby conflicts.

Latest spinach uses gherkin-ruby, and latest cucumber uses gherkin. Both
gems have a gherkin.rb that defines Gherkin, but they're not compatible
enough to be completely interchangeable. So, when running the spinach
acceptance tests, run them with their own bundle.

Rakefile

@@ -105,8 +105,11 @@ task :generate_output do
     ruby "-Ilib #{opts} -S #{@spec_bin} --require ci/reporter/rake/rspec_loader --format CI::Reporter::RSpec acceptance/rspec_example_spec.rb", &result_proc
     ruby "-Ilib #{opts} -rci/reporter/rake/cucumber_loader -S cucumber --format CI::Reporter::Cucumber acceptance/cucumber", &result_proc
     Dir.chdir 'acceptance/spinach' do
-      ENV['CI_REPORTS'] = "../reports"
-      ruby "-I../../lib #{opts} -rci/reporter/rake/spinach_loader -S spinach", &result_proc
+      Bundler.with_clean_env do
+        ENV['CI_REPORTS'] = "../reports"
+        ruby "-S bundle"
+        ruby "-I../../lib #{opts} -rci/reporter/rake/spinach_loader -S spinach", &result_proc
+      end
     end
   ensure
     ENV['RUBYOPT'] = opts if opts != "-rubygems"

acceptance/spinach/Gemfile

@@ -0,0 +1,4 @@
+source :rubygems
+gem 'ci_reporter', :path => '../..'
+gem 'spinach'
+gem 'rspec'

acceptance/spinach/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: ../..
+  specs:
+    ci_reporter (1.7.0)
+      builder (>= 2.1.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    colorize (0.5.8)
+    diff-lcs (1.1.3)
+    gherkin-ruby (0.2.1)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.8.0)
+    spinach (0.5.2)
+      colorize
+      gherkin-ruby (~> 0.2.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ci_reporter!
+  rspec
+  spinach