[DRE-commits] [SCM] rails-2.3.git branch, debian-sid, updated. 0288d3496b551d2b35d0233f10713cb4d65bf2d6

[Ondřej Surý]

The following commit has been merged in the debian-sid branch:
commit b0b5ead5d876114611858b2beb04d856f5b6c0d8
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jun 3 13:37:54 2011 +0200

    Remove some require 'rubygems'

diff --git a/debian/patches/0001-remove_require_rubygems.patch b/debian/patches/0001-remove_require_rubygems.patch
new file mode 100644
index 0000000..a05f555
--- /dev/null
+++ b/debian/patches/0001-remove_require_rubygems.patch
@@ -0,0 +1,24 @@
+--- a/lib/rails_generator.rb
++++ b/lib/rails_generator.rb
+@@ -27,13 +27,7 @@ $:.unshift(railties) unless $:.include?(
+ activesupport = File.expand_path("../../../activesupport/lib", __FILE__)
+ $:.unshift(activesupport) unless $:.include?(activesupport)
+ 
+-begin
+-  require 'active_support'  
+-rescue LoadError
+-  require 'rubygems'
+-  gem 'activesupport'
+-end
+-
++require 'active_support'  
+ require 'rails_generator/base'
+ require 'rails_generator/lookup'
+ require 'rails_generator/commands'
+--- a/lib/rails_generator/generators/components/plugin/templates/test_helper.rb
++++ b/lib/rails_generator/generators/components/plugin/templates/test_helper.rb
+@@ -1,4 +1,3 @@
+-require 'rubygems'
+ require 'test/unit'
+ require 'active_support'
+ require 'active_support/test_case'
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b9406ab
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-remove_require_rubygems.patch

-- 
rails-2.3.git