[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 e06b78ef41ae2b90c0624ad006c4e7f83e07c775
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Jun 20 21:08:23 2012 +0200

    Refresh 0002-Remove-require-rubygems-statements.patch

diff --git a/debian/patches/0002-Remove-require-rubygems-statements.patch b/debian/patches/0002-Remove-require-rubygems-statements.patch
index a366c2c..d03f2f3 100644
--- a/debian/patches/0002-Remove-require-rubygems-statements.patch
+++ b/debian/patches/0002-Remove-require-rubygems-statements.patch
@@ -9,8 +9,6 @@ Subject: [PATCH 2/2] Remove `require 'rubygems'` statements
  lib/cucumber/formatter/pdf.rb       |    3 +--
  3 files changed, 3 insertions(+), 14 deletions(-)
 
-diff --git a/lib/cucumber/cli/main.rb b/lib/cucumber/cli/main.rb
-index 9764817..ccf26e2 100644
 --- a/lib/cucumber/cli/main.rb
 +++ b/lib/cucumber/cli/main.rb
 @@ -1,9 +1,4 @@
@@ -24,38 +22,3 @@ index 9764817..ccf26e2 100644
  require 'optparse'
  require 'cucumber'
  require 'logger'
-diff --git a/lib/cucumber/formatter/ansicolor.rb b/lib/cucumber/formatter/ansicolor.rb
-index 5cf8af7..647c678 100644
---- a/lib/cucumber/formatter/ansicolor.rb
-+++ b/lib/cucumber/formatter/ansicolor.rb
-@@ -1,9 +1,4 @@
--begin
--  require 'term/ansicolor'
--rescue LoadError
--  require 'rubygems'
--  require 'term/ansicolor'
--end
-+require 'term/ansicolor'
- require 'cucumber/platform'
- 
- if Cucumber::IRONRUBY
-diff --git a/lib/cucumber/formatter/pdf.rb b/lib/cucumber/formatter/pdf.rb
-index 752c354..e842ece 100644
---- a/lib/cucumber/formatter/pdf.rb
-+++ b/lib/cucumber/formatter/pdf.rb
-@@ -3,11 +3,10 @@ require 'cucumber/formatter/io'
- require 'fileutils'
- 
- begin
--  require 'rubygems'
-   require 'prawn/core'
-   require "prawn/layout"
- rescue LoadError => e
--  e.message << "\nYou need the prawn gem. Please do 'gem install prawn'"
-+  e.message << "\nYou need the prawn library. Please install ruby-prawn"
-   raise e
- end
- 
--- 
-1.7.5.4
-

-- 
cucumber.git