hiera 1.1.0 → 1.1.1.rc1

data/bin/hiera

@@ -11,9 +11,15 @@
 #
 # $ 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'

data/lib/hiera.rb

@@ -1,11 +1,7 @@
-begin
-  require 'rubygems'
-rescue LoadError
-end
 require 'yaml'
 
 class Hiera
-  VERSION = "1.1.0"
+  VERSION = "1.1.1-rc1"
 
   autoload :Config,         "hiera/config"
   autoload :Util,           "hiera/util"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hiera
 version: !ruby/object:Gem::Version
-  version: 1.1.0
-  prerelease: 
+  version: 1.1.1.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -70,9 +70,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24