[DRE-commits] [SCM] gem2deb.git branch, master, updated. 0.2.12-5-g03e5074

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 9bb13cbbc7b10e9f8e5eb956a49d5899bc35e47a
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Dec 26 10:13:33 2011 -0200

    Centralize the Rubygems/YAML hack in one place

diff --git a/lib/gem2deb/dh_make_ruby.rb b/lib/gem2deb/dh_make_ruby.rb
index 0606095..4f3c35b 100644
--- a/lib/gem2deb/dh_make_ruby.rb
+++ b/lib/gem2deb/dh_make_ruby.rb
@@ -16,14 +16,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'gem2deb'
+require 'gem2deb/yaml'
 require 'gem2deb/metadata'
 require 'rubygems'
 require 'fileutils'
 require 'erb'
 require 'date'
 
-Gem.load_yaml
-
 module Gem2Deb
 
   class DhMakeRuby
diff --git a/lib/gem2deb/extension_builder.rb b/lib/gem2deb/extension_builder.rb
index 5a9c0a1..94abfc3 100644
--- a/lib/gem2deb/extension_builder.rb
+++ b/lib/gem2deb/extension_builder.rb
@@ -14,11 +14,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 require 'gem2deb'
+require 'gem2deb/yaml'
 require 'rubygems/ext'
 require 'gem2deb/metadata'
 
-Gem.load_yaml
-
 module Gem2Deb
   class ExtensionBuilder
 
diff --git a/lib/gem2deb/metadata.rb b/lib/gem2deb/metadata.rb
index c3f1db2..6a5d2bd 100644
--- a/lib/gem2deb/metadata.rb
+++ b/lib/gem2deb/metadata.rb
@@ -15,8 +15,7 @@
 
 require 'rubygems'
 require 'rubygems/specification'
-
-Gem.load_yaml
+require 'gem2deb/yaml'
 
 module Gem2Deb
   class Metadata
diff --git a/lib/gem2deb/yaml.rb b/lib/gem2deb/yaml.rb
new file mode 100644
index 0000000..b6b3d80
--- /dev/null
+++ b/lib/gem2deb/yaml.rb
@@ -0,0 +1,2 @@
+require 'rubygems'
+Gem.load_yaml

-- 
gem2deb.git