bin/hiera in hiera-1.1.0 vs bin/hiera in hiera-1.1.1.rc1

@@ -9,12 +9,18 @@
 # If the node yaml had a location fact the default would match that
 # else you can supply scope values on the command line
 #
 # $ 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'