[DRE-commits] [SCM] cucumber.git branch, master, updated. debian/1.0.2-2-12-gbddf4a3

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit b28339d36ed9b697488787c05a00d29b89218d15
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Tue Jun 19 05:52:40 2012 +0200

    Unapply patches

diff --git a/lib/cucumber/cli/main.rb b/lib/cucumber/cli/main.rb
index ccf26e2..9764817 100644
--- a/lib/cucumber/cli/main.rb
+++ b/lib/cucumber/cli/main.rb
@@ -1,4 +1,9 @@
-require 'gherkin'
+begin
+  require 'gherkin'
+rescue LoadError
+  require 'rubygems'
+  require 'gherkin'
+end
 require 'optparse'
 require 'cucumber'
 require 'logger'
diff --git a/lib/cucumber/formatter/ansicolor.rb b/lib/cucumber/formatter/ansicolor.rb
index 647c678..5cf8af7 100644
--- a/lib/cucumber/formatter/ansicolor.rb
+++ b/lib/cucumber/formatter/ansicolor.rb
@@ -1,4 +1,9 @@
-require 'term/ansicolor'
+begin
+  require 'term/ansicolor'
+rescue LoadError
+  require 'rubygems'
+  require 'term/ansicolor'
+end
 require 'cucumber/platform'
 
 if Cucumber::IRONRUBY
diff --git a/lib/cucumber/formatter/pdf.rb b/lib/cucumber/formatter/pdf.rb
index e842ece..752c354 100644
--- a/lib/cucumber/formatter/pdf.rb
+++ b/lib/cucumber/formatter/pdf.rb
@@ -3,10 +3,11 @@ require 'cucumber/formatter/io'
 require 'fileutils'
 
 begin
+  require 'rubygems'
   require 'prawn/core'
   require "prawn/layout"
 rescue LoadError => e
-  e.message << "\nYou need the prawn library. Please install ruby-prawn"
+  e.message << "\nYou need the prawn gem. Please do 'gem install prawn'"
   raise e
 end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index bd52a01..8b25fdf 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -8,6 +8,10 @@ if defined? Encoding
   Encoding.default_internal = 'utf-8'
 end
 
+require 'rubygems'
+require 'bundler'
+Bundler.setup
+
 require 'cucumber'
 $KCODE='u' unless Cucumber::RUBY_1_9
 

-- 
cucumber.git