puppet 3.0.0.rc4 → 3.0.0.rc5

data/CHANGELOG

@@ -1,3 +1,15 @@
+3.0.0rc5
+===
+88171aa Maint: Use pending block
+33bf085 Maint: Make paths absolute on Windows
+54acfba (#16137) Delay evaluation of config and var directories
+b53e600 (#16137) Tilde expansion should only occur for normal users
+43590bd (Maint) Remove trailing whitespace
+c0ff98d (#16137) Ensure HOME is set before attempting ~ expansion
+224d380 Move singleton require to puppet/util/storage.rb
+605e34d (#15739) Bump report_version since #10064 change its format
+d834e76 (#6143) ensure that destroy works for zpools
+
 3.0.0rc4
 ===
 adcab02 (#15966) Update gem.rake task for correct facter version dependency

data/conf/redhat/puppet.spec

@@ -13,16 +13,16 @@
 
 Name:           puppet
 Version:        3.0.0
-Release:        0.1rc4%{?dist}
+Release:        0.1rc5%{?dist}
 #Release:        1%{?dist}
 Vendor:         %{?_host_vendor}
 Summary:        A network tool for managing many disparate systems
 License:        ASL 2.0
 URL:            http://puppetlabs.com
-Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
-#Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc3.tar.gz
-Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
-#Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc3.tar.gz.asc
+#Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc5.tar.gz
+#Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}.tar.gz.asc
+Source1:        http://puppetlabs.com/downloads/%{name}/%{name}-%{version}rc5.tar.gz.asc
 
 Group:          System Environment/Base
 
@@ -76,8 +76,8 @@ Provides the central puppet server daemon which provides manifests to clients.
 The server can also function as a certificate authority and file server.
 
 %prep
-%setup -q -n %{name}-%{version}
-#%setup -q -n %{name}-%{version}rc3
+#%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}rc5
 patch -s -p1 < conf/redhat/rundir-perms.patch
 
 
@@ -279,6 +279,9 @@ fi
 rm -rf %{buildroot}
 
 %changelog
+* Wed Aug 29 2012 Moses Mendoza <moses@puppetlabs.com> - 3.0.0-0.1rc5
+- Update for 3.0.0 rc5
+
 * Fri Aug 24 2012 Eric Sorenson <eric0@puppetlabs.com> - 3.0.0-0.1rc4
 - Facter requirement is 1.6.11, not 2.0
 - Update for 3.0.0 rc4

data/lib/puppet.rb

@@ -7,7 +7,6 @@ rescue LoadError
 end
 
 # see the bottom of the file for further inclusions
-require 'singleton'
 require 'facter'
 require 'puppet/error'
 require 'puppet/util'

data/lib/puppet/provider/zpool/zpool.rb

@@ -97,7 +97,7 @@ Puppet::Type.type(:zpool).provide(:zpool) do
     zpool(*([:create, @resource[:pool]] + build_vdevs + build_named("spare") + build_named("log")))
   end
 
-  def delete
+  def destroy
     zpool :destroy, @resource[:pool]
   end
 

data/lib/puppet/settings.rb

@@ -37,8 +37,8 @@ class Puppet::Settings
         :logdir   => run_mode.log_dir,
     }
   end
-  
-  def self.default_certname() 
+
+  def self.default_certname()
     hostname = hostname_fact
     domain = domain_fact
     if domain and domain != ""
@@ -47,31 +47,14 @@ class Puppet::Settings
       fqdn = hostname
     end
     fqdn.gsub(/\.$/, '')
-  end 
+  end
 
   def self.hostname_fact()
-    Facter["hostname"].value 
-  end 
+    Facter["hostname"].value
+  end
 
   def self.domain_fact()
     Facter["domain"].value
-  end 
-
-
-  def self.default_global_config_dir
-    Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc") : "/etc/puppet"
-  end
-
-  def self.default_user_config_dir
-    File.expand_path("~/.puppet")
-  end
-
-  def self.default_global_var_dir
-    Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : "/var/lib/puppet"
-  end
-
-  def self.default_user_var_dir
-    File.expand_path("~/.puppet/var")
   end
 
   def self.default_config_file_name
@@ -519,13 +502,13 @@ class Puppet::Settings
     if explicit_config_file?
       return self[:config]
     else
-      return File.join(self.class.default_global_config_dir, config_file_name)
+      return File.join(Puppet::Util::RunMode[:master].conf_dir, config_file_name)
     end
   end
   private :main_config_file
 
   def user_config_file
-    return File.join(self.class.default_user_config_dir, config_file_name)
+    return File.join(Puppet::Util::RunMode[:user].conf_dir, config_file_name)
   end
   private :user_config_file
 

data/lib/puppet/transaction/report.rb

@@ -76,7 +76,7 @@ class Puppet::Transaction::Report
     @host = Puppet[:node_name_value]
     @time = Time.now
     @kind = kind
-    @report_format = 2
+    @report_format = 3
     @puppet_version = Puppet.version
     @configuration_version = configuration_version
     @environment = environment

data/lib/puppet/util/run_mode.rb

@@ -7,12 +7,15 @@ module Puppet
         @name = name.to_sym
       end
 
-      @@run_modes = Hash.new {|h, k| h[k] = RunMode.new(k)}
-
       attr :name
 
       def self.[](name)
-        @@run_modes[name]
+        @run_modes ||= {}
+        if Puppet.features.microsoft_windows?
+          @run_modes[name] ||= WindowsRunMode.new(name)
+        else
+          @run_modes[name] ||= UnixRunMode.new(name)
+        end
       end
 
       def master?
@@ -27,21 +30,6 @@ module Puppet
         name == :user
       end
 
-
-      def conf_dir
-        which_dir(
-            Puppet::Settings.default_global_config_dir,
-            Puppet::Settings.default_user_config_dir
-        )
-      end
-
-      def var_dir
-        which_dir(
-            Puppet::Settings.default_global_var_dir,
-            Puppet::Settings.default_user_var_dir
-        )
-      end
-
       def run_dir
         "$vardir/run"
       end
@@ -50,24 +38,48 @@ module Puppet
         "$vardir/log"
       end
 
-      private
+    private
 
       def which_dir( global, user )
         #FIXME: we should test if we're user "puppet"
         #       there's a comment that suggests that we do that
         #       and we currently don't.
-        expand_path case
-          when name == :master; global
-          when Puppet.features.root?; global
-          else user
-        end
+        File.expand_path(if in_global_context? then global else user end)
+      end
+
+      def in_global_context?
+        name == :master || Puppet.features.root?
+      end
+    end
+
+    class UnixRunMode < RunMode
+      def conf_dir
+        which_dir("/etc/puppet", "~/.puppet")
+      end
+
+      def var_dir
+        which_dir("/var/lib/puppet", "~/.puppet/var")
+      end
+    end
+
+    class WindowsRunMode < RunMode
+      def conf_dir
+        which_dir(File.join(windows_common_base("etc")), File.join(*windows_local_base))
       end
 
-      def expand_path( dir )
-        ENV["HOME"] ||= Etc.getpwuid(Process.uid).dir
-        File.expand_path(dir)
+      def var_dir
+        which_dir(File.join(windows_common_base("var")), File.join(*windows_local_base("var")))
       end
 
+    private
+
+      def windows_common_base(*extra)
+        [Dir::COMMON_APPDATA, "PuppetLabs", "puppet"] + extra
+      end
+
+      def windows_local_base(*extra)
+        [Dir::LOCAL_APPDATA, "PuppetLabs", "puppet"] + extra
+      end
     end
   end
 end

data/lib/puppet/util/storage.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'sync'
+require 'singleton'
 
 # a class for storing state
 class Puppet::Util::Storage

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 #
 module Puppet
-  PUPPETVERSION = '3.0.0-rc4'
+  PUPPETVERSION = '3.0.0-rc5'
 
   def self.version
     @puppet_version || PUPPETVERSION

data/spec/unit/indirector/hiera_spec.rb

@@ -100,19 +100,21 @@ describe Puppet::Indirector::Hiera do
     end
 
     context "when the Hiera configuration file does not exist" do
+      let(:path) { File.expand_path('/doesnotexist') }
+
       before do
-        Puppet.settings[:hiera_config] = '/doesnotexists'
+        Puppet.settings[:hiera_config] = path
       end
 
       it "should log a warning" do
         Puppet.expects(:warning).with(
-          "Config file /doesnotexists not found, using Hiera defaults")
+         "Config file #{path} not found, using Hiera defaults")
         @hiera_class.hiera_config
       end
 
       it "should only configure the logger and set it to puppet" do
         Puppet.expects(:warning).with(
-          "Config file /doesnotexists not found, using Hiera defaults")
+         "Config file #{path} not found, using Hiera defaults")
         @hiera_class.hiera_config.should == { :logger => 'puppet' }
       end
     end

data/spec/unit/module_tool/applications/searcher_spec.rb

@@ -2,17 +2,21 @@ require 'spec_helper'
 require 'puppet/module_tool/applications'
 require 'puppet_spec/modules'
 
-describe Puppet::ModuleTool::Applications::Searcher, :fails_on_windows => true do
+describe Puppet::ModuleTool::Applications::Searcher do
   include PuppetSpec::Files
 
   describe "when searching" do
     let(:forge) { mock 'forge' }
+    let(:searcher) do
+      pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
+        described_class.new('search_term', forge)
+      end
+    end
 
     it "should return results from a forge query when successful" do
       results = 'mock results'
       forge.expects(:search).with('search_term').returns(results)
 
-      searcher = Puppet::ModuleTool::Applications::Searcher.new('search_term', forge)
       search_result = searcher.run
       search_result.should == {
         :result => :success,
@@ -22,8 +26,7 @@ describe Puppet::ModuleTool::Applications::Searcher, :fails_on_windows => true d
 
     it "should return an error when the forge query throws an exception" do
       forge.expects(:search).with('search_term').raises Puppet::Forge::Errors::ForgeError.new("something went wrong")
-      
-      searcher = Puppet::ModuleTool::Applications::Searcher.new('search_term', forge)
+
       search_result = searcher.run
       search_result.should == {
         :result => :failure,

data/spec/unit/module_tool/applications/unpacker_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 require 'puppet/module_tool/applications'
 require 'puppet_spec/modules'
 
-describe Puppet::ModuleTool::Applications::Unpacker, :fails_on_windows => true do
+describe Puppet::ModuleTool::Applications::Unpacker do
   include PuppetSpec::Files
 
   let(:target) { tmpdir("unpacker") }
 
   context "initialization" do
     it "should support filename and basic options" do
-      Puppet::ModuleTool::Applications::Unpacker.new("myusername-mytarball-1.0.0.tar.gz", :target_dir => target)
+      pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
+        Puppet::ModuleTool::Applications::Unpacker.new("myusername-mytarball-1.0.0.tar.gz", :target_dir => target)
+      end
     end
 
     it "should raise ArgumentError when filename is invalid" do
@@ -22,7 +24,9 @@ describe Puppet::ModuleTool::Applications::Unpacker, :fails_on_windows => true d
     let(:filename) { tmpdir("module") + "/myusername-mytarball-1.0.0.tar.gz" }
     let(:build_dir) { Pathname.new(tmpdir("build_dir")) }
     let(:unpacker) do
-      Puppet::ModuleTool::Applications::Unpacker.new(filename, :target_dir => target)
+      pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
+        Puppet::ModuleTool::Applications::Unpacker.new(filename, :target_dir => target)
+      end
     end
 
     before :each do
@@ -35,8 +39,10 @@ describe Puppet::ModuleTool::Applications::Unpacker, :fails_on_windows => true d
 
     context "on linux" do
       it "should attempt to untar file to temporary location using system tar" do
-        Puppet::Util::Execution.expects(:execute).with("tar xzf #{filename} -C #{build_dir}").returns(true)
-        unpacker.run
+        pending("porting to Windows", :if => Puppet.features.microsoft_windows?) do
+          Puppet::Util::Execution.expects(:execute).with("tar xzf #{filename} -C #{build_dir}").returns(true)
+          unpacker.run
+        end
       end
     end
 

data/spec/unit/provider/zpool/zpool_spec.rb

@@ -190,7 +190,7 @@ describe Puppet::Type.type(:zpool).provider(:zpool) do
   context '#delete' do
     it "should call zpool with destroy and the pool name" do
       provider.expects(:zpool).with(:destroy, name)
-      provider.delete
+      provider.destroy
     end
   end
 

data/spec/unit/settings_spec.rb

@@ -6,20 +6,12 @@ require 'puppet/settings/errors'
 describe Puppet::Settings do
   include PuppetSpec::Files
 
-  MAIN_CONFIG_FILE_DEFAULT_LOCATION = File.join(Puppet::Settings.default_global_config_dir, "puppet.conf")
-  USER_CONFIG_FILE_DEFAULT_LOCATION = File.join(Puppet::Settings.default_user_config_dir, "puppet.conf")
+  let(:main_config_file_default_location) do
+    File.join(Puppet::Util::RunMode[:master].conf_dir, "puppet.conf")
+  end
 
-  describe "when dealing with user default directories" do
-    context "user config dir" do
-      it "should expand the value to an absolute path" do
-        Pathname.new(Puppet::Settings.default_user_config_dir).absolute?.should be_true
-      end
-    end
-    context "user var dir" do
-      it "should expand the value to an absolute path" do
-        Pathname.new(Puppet::Settings.default_user_var_dir).absolute?.should be_true
-      end
-    end
+  let(:user_config_file_default_location) do
+    File.join(Puppet::Util::RunMode[:user].conf_dir, "puppet.conf")
   end
 
   describe "when specifying defaults" do
@@ -661,21 +653,21 @@ describe Puppet::Settings do
     end
 
     describe "when root" do
-      it "should look for #{MAIN_CONFIG_FILE_DEFAULT_LOCATION} if config settings haven't been overridden'" do
+      it "should look for the main config file default location config settings haven't been overridden'" do
         Puppet.features.stubs(:root?).returns(true)
-        FileTest.expects(:exist?).with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).returns(false)
-        FileTest.expects(:exist?).with(USER_CONFIG_FILE_DEFAULT_LOCATION).never
+        FileTest.expects(:exist?).with(main_config_file_default_location).returns(false)
+        FileTest.expects(:exist?).with(user_config_file_default_location).never
 
         @settings.send(:parse_config_files)
       end
     end
 
     describe "when not root" do
-      it "should look for #{USER_CONFIG_FILE_DEFAULT_LOCATION} if config settings haven't been overridden'" do
+      it "should look for user config file default location if config settings haven't been overridden'" do
         Puppet.features.stubs(:root?).returns(false)
 
         seq = sequence "load config files"
-        FileTest.expects(:exist?).with(USER_CONFIG_FILE_DEFAULT_LOCATION).returns(false).in_sequence(seq)
+        FileTest.expects(:exist?).with(user_config_file_default_location).returns(false).in_sequence(seq)
 
         @settings.send(:parse_config_files)
       end
@@ -895,10 +887,10 @@ describe Puppet::Settings do
       before :each do
         Puppet.features.stubs(:root?).returns(false)
         FileTest.expects(:exist?).
-          with(USER_CONFIG_FILE_DEFAULT_LOCATION).
+          with(user_config_file_default_location).
           returns(true).in_sequence(seq)
         @settings.expects(:read_file).
-          with(USER_CONFIG_FILE_DEFAULT_LOCATION).
+          with(user_config_file_default_location).
           returns(user_config_text).in_sequence(seq)
       end
 
@@ -917,10 +909,10 @@ describe Puppet::Settings do
       before :each do
         Puppet.features.stubs(:root?).returns(true)
         FileTest.expects(:exist?).
-          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          with(main_config_file_default_location).
           returns(true).in_sequence(seq)
         @settings.expects(:read_file).
-          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          with(main_config_file_default_location).
           returns(main_config_text).in_sequence(seq)
       end
 
@@ -938,12 +930,12 @@ describe Puppet::Settings do
     context "running with an explicit config file as a user (e.g. Apache + Passenger)" do
       before :each do
         Puppet.features.stubs(:root?).returns(false)
-        @settings[:confdir] = File.dirname(MAIN_CONFIG_FILE_DEFAULT_LOCATION)
+        @settings[:confdir] = File.dirname(main_config_file_default_location)
         FileTest.expects(:exist?).
-          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          with(main_config_file_default_location).
           returns(true).in_sequence(seq)
         @settings.expects(:read_file).
-          with(MAIN_CONFIG_FILE_DEFAULT_LOCATION).
+          with(main_config_file_default_location).
           returns(main_config_text).in_sequence(seq)
       end
 

data/spec/unit/util/run_mode_spec.rb

@@ -6,44 +6,105 @@ describe Puppet::Util::RunMode do
     @run_mode = Puppet::Util::RunMode.new('fake')
   end
 
-  it "should have confdir /etc/puppet when run as root" do
-    Puppet.features.stubs(:root?).returns(true)
-    etcdir = Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc") : '/etc/puppet'
-    # REMIND: issue with windows backslashes
-    @run_mode.conf_dir.should == File.expand_path(etcdir)
+  it "has rundir depend on vardir" do
+    @run_mode.run_dir.should == '$vardir/run'
   end
 
-  it "should have confdir ~/.puppet when run as non-root" do
-    Puppet.features.stubs(:root?).returns(false)
-    @run_mode.conf_dir.should == File.expand_path("~/.puppet")
-  end
+  describe Puppet::Util::UnixRunMode do
+    before do
+      @run_mode = Puppet::Util::UnixRunMode.new('fake')
+    end
 
-  it "should have vardir /var/lib/puppet when run as root" do
-    Puppet.features.stubs(:root?).returns(true)
-    vardir = Puppet.features.microsoft_windows? ? File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var") : '/var/lib/puppet'
-    # REMIND: issue with windows backslashes
-    @run_mode.var_dir.should == File.expand_path(vardir)
-  end
+    describe "#conf_dir" do
+      it "has confdir /etc/puppet when run as root" do
+        as_root { @run_mode.conf_dir.should == File.expand_path('/etc/puppet') }
+      end
 
-  it "should have vardir ~/.puppet/var when run as non-root" do
-    Puppet.features.stubs(:root?).returns(false)
-    @run_mode.var_dir.should == File.expand_path("~/.puppet/var")
+      it "has confdir ~/.puppet when run as non-root" do
+        as_non_root { @run_mode.conf_dir.should == File.expand_path('~/.puppet') }
+      end
+
+      it "fails when asking for the conf_dir as non-root and there is no $HOME" do
+        as_non_root do
+          without_home do
+            expect { @run_mode.conf_dir }.to raise_error ArgumentError, /couldn't find HOME/
+          end
+        end
+      end
+    end
+
+    describe "#var_dir" do
+      it "has vardir /var/lib/puppet when run as root" do
+        as_root { @run_mode.var_dir.should == File.expand_path('/var/lib/puppet') }
+      end
+
+      it "has vardir ~/.puppet/var when run as non-root" do
+        as_non_root { @run_mode.var_dir.should == File.expand_path('~/.puppet/var') }
+      end
+
+      it "fails when asking for the var_dir as non-root and there is no $HOME" do
+        as_non_root do
+          without_home do
+            expect { @run_mode.var_dir }.to raise_error ArgumentError, /couldn't find HOME/
+          end
+        end
+      end
+    end
+
+    def without_home
+      saved_home = ENV["HOME"]
+      ENV.delete "HOME"
+      yield
+    ensure
+      ENV["HOME"] = saved_home
+    end
   end
 
-  it "should have rundir depend on vardir" do
-    @run_mode.run_dir.should == '$vardir/run'
+  describe Puppet::Util::WindowsRunMode do
+    before do
+      if not Dir.const_defined? :COMMON_APPDATA
+        Dir.const_set :COMMON_APPDATA, "/CommonFakeBase"
+        Dir.const_set :LOCAL_APPDATA, "/LocalFakeBase"
+        @remove_const = true
+      end
+      @run_mode = Puppet::Util::WindowsRunMode.new('fake')
+    end
+
+    after do
+      if @remove_const
+        Dir.send :remove_const, :COMMON_APPDATA
+        Dir.send :remove_const, :LOCAL_APPDATA
+      end
+    end
+
+    describe "#conf_dir" do
+      it "has confdir /etc/puppet when run as root" do
+        as_root { @run_mode.conf_dir.should == File.expand_path(File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "etc")) }
+      end
+
+      it "has confdir in the local appdata when run as non-root" do
+        as_non_root { @run_mode.conf_dir.should == File.expand_path(File.join(Dir::LOCAL_APPDATA, "PuppetLabs", "puppet")) }
+      end
+    end
+
+    describe "#var_dir" do
+      it "has vardir /var/lib/puppet when run as root" do
+        as_root { @run_mode.var_dir.should == File.expand_path(File.join(Dir::COMMON_APPDATA, "PuppetLabs", "puppet", "var")) }
+      end
+
+      it "has vardir local appdata when run as non-root" do
+        as_non_root { @run_mode.var_dir.should == File.expand_path(File.join(Dir::LOCAL_APPDATA, "PuppetLabs", "puppet", "var")) }
+      end
+    end
   end
 
+  def as_root
+    Puppet.features.stubs(:root?).returns(true)
+    yield
+  end
 
-  it "should have logopts return a hash with $vardir/log and other metadata if runmode is master" do
-    pending("runmode.logopts functionality is being moved")
-    @run_mode.expects(:master?).returns true
-    @run_mode.logopts.should == {
-      :default => "$vardir/log",
-      :mode    => 0750,
-      :owner   => "service",
-      :group   => "service",
-      :desc    => "The Puppet log directory.",
-    }
+  def as_non_root
+    Puppet.features.stubs(:root?).returns(false)
+    yield
   end
 end

metadata

@@ -1,83 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: puppet
-version: !ruby/object:Gem::Version 
-  hash: 2904133441
+version: !ruby/object:Gem::Version
+  version: 3.0.0.rc5
   prerelease: 6
-  segments: 
-  - 3
-  - 0
-  - 0
-  - rc
-  - 4
-  version: 3.0.0.rc4
 platform: ruby
-authors: 
+authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-08-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: facter
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 6
-        - 11
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.6.11
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hiera
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.6.11
+- !ruby/object:Gem::Dependency
+  name: hiera
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1452066708
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0rc
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hiera-puppet
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 1452066708
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0rc
+- !ruby/object:Gem::Dependency
+  name: hiera-puppet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0rc
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0rc
 description: Puppet, an automated configuration management tool
 email: puppet@puppetlabs.com
-executables: 
+executables:
 - puppet
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG
 - CONTRIBUTING.md
 - Gemfile
@@ -1746,42 +1734,31 @@ files:
 - spec/watchr.rb
 homepage: http://puppetlabs.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - Puppet - Configuration Management
 - --main
 - README
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: puppet
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Puppet, an automated configuration management tool
 test_files: []
-