[DRE-commits] [SCM] ruby-activerecord-2.3.git branch, master, updated. debian/2.3.14-1

[Ondřej Surý]

The following commit has been merged in the master branch:
commit b9ace99c6d79288438151b733b46a46dcb560bc5
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sat May 28 23:42:49 2011 +0200

    Remove require 'rubygems', use Debian packages not gems

diff --git a/debian/patches/0001-remove_require_rubygems.patch b/debian/patches/0001-remove_require_rubygems.patch
new file mode 100644
index 0000000..1f64692
--- /dev/null
+++ b/debian/patches/0001-remove_require_rubygems.patch
@@ -0,0 +1,48 @@
+diff --git a/examples/performance.rb b/examples/performance.rb
+index 893d32b..623fe50 100755
+--- a/examples/performance.rb
++++ b/examples/performance.rb
+@@ -2,10 +2,6 @@
+ 
+ TIMES = (ENV['N'] || 10000).to_i
+ 
+-require 'rubygems'
+-gem 'addressable',  '~>2.0'
+-gem 'faker',        '~>0.3.1'
+-gem 'rbench',       '~>0.2.3'
+ require 'addressable/uri'
+ require 'faker'
+ require 'rbench'
+diff --git a/lib/active_record/connection_adapters/abstract/connection_specification.rb b/lib/active_record/connection_adapters/abstract/connection_specification.rb
+index 535498f..396bcf8 100644
+--- a/lib/active_record/connection_adapters/abstract/connection_specification.rb
++++ b/lib/active_record/connection_adapters/abstract/connection_specification.rb
+@@ -66,15 +66,9 @@ module ActiveRecord
+           unless spec.key?(:adapter) then raise AdapterNotSpecified, "database configuration does not specify adapter" end
+ 
+           begin
+-            require 'rubygems'
+-            gem "activerecord-#{spec[:adapter]}-adapter"
+             require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
+           rescue LoadError
+-            begin
+-              require "active_record/connection_adapters/#{spec[:adapter]}_adapter"
+-            rescue LoadError
+-              raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{$!})"
+-            end
++            raise "Please install the #{spec[:adapter]} adapter: `gem install activerecord-#{spec[:adapter]}-adapter` (#{$!})"
+           end
+ 
+           adapter_method = "#{spec[:adapter]}_connection"
+diff --git a/test/cases/helper.rb b/test/cases/helper.rb
+index 1ef38c9..3b7d332 100644
+--- a/test/cases/helper.rb
++++ b/test/cases/helper.rb
+@@ -3,7 +3,6 @@ $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+ 
+ require 'config'
+ 
+-require 'rubygems'
+ require 'test/unit'
+ require 'stringio'
+ 
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

-- 
ruby-activerecord-2.3.git