[DRE-commits] [SCM] ruby-hiera.git branch, master, updated. debian/1.0.0_rc3-1-5-gccb33a5

[Stig Sandbeck Mathisen]

The following commit has been merged in the master branch:
commit 687c121bb9c836680a8106cb6c574d0ebb6c51d6
Author: Stig Sandbeck Mathisen <ssm at debian.org>
Date:   Tue Feb 5 11:56:34 2013 +0100

    Refresh rubygems patch

diff --git a/debian/patches/dont-require-rubygems b/debian/patches/dont-require-rubygems
index dc5ff5b..6400958 100644
--- a/debian/patches/dont-require-rubygems
+++ b/debian/patches/dont-require-rubygems
@@ -4,35 +4,39 @@ Forwarded: not-needed
 Origin: vendor
 Author: Patrick Ringl <patrick_ at freenet.de>
 
---- ruby-hiera-1.0.0rc3.orig/bin/hiera
-+++ ruby-hiera-1.0.0rc3/bin/hiera
-@@ -11,10 +11,6 @@
+--- a/bin/hiera
++++ b/bin/hiera
+@@ -11,16 +11,6 @@
  #
  # $ hiera release 'rel/%{location}' location=dc2 --yaml some.node.yaml
  
--begin
--  require 'rubygems'
--rescue LoadError
+-# Bundler and rubygems maintain a set of directories from which to
+-# load gems. If Bundler is loaded, let it determine what can be
+-# loaded. If it's not loaded, then use rubygems. But do this before
+-# loading any hiera code, so that our gem loading system is sane.
+-if not defined? ::Bundler
+-  begin
+-    require 'rubygems'
+-  rescue LoadError
+-  end
 -end
  require 'hiera'
+ require 'hiera/util'
  require 'optparse'
- 
---- ruby-hiera-1.0.0rc3.orig/lib/hiera.rb
-+++ ruby-hiera-1.0.0rc3/lib/hiera.rb
-@@ -1,7 +1,3 @@
--begin
--  require 'rubygems'
--rescue LoadError
--end
- require 'yaml'
- 
- class Hiera
---- ruby-hiera-1.0.0rc3.orig/spec/spec_helper.rb
-+++ ruby-hiera-1.0.0rc3/spec/spec_helper.rb
+--- a/spec/spec_helper.rb
++++ b/spec/spec_helper.rb
 @@ -1,6 +1,5 @@
  $:.insert(0, File.join([File.dirname(__FILE__), "..", "lib"]))
  
 -require 'rubygems'
  require 'rspec'
+ require 'mocha'
  require 'hiera'
- require 'rspec/mocks'
+--- a/Rakefile
++++ b/Rakefile
+@@ -1,5 +1,4 @@
+ begin
+-  require 'rubygems'
+   require 'rspec/core/rake_task'
+ rescue LoadError
+ end

-- 
ruby-hiera.git