puppet 2.7.21 → 2.7.22

data/spec/unit/network/formats_spec.rb

@@ -55,16 +55,29 @@ describe "Puppet Network Format" do
       @yaml.render_multiple(instances).should == "foo"
     end
 
-    it "should safely load YAML when interning" do
-      text = "foo"
-      YAML.expects(:safely_load).with("foo").returns "bar"
-      @yaml.intern(String, text).should == "bar"
+    it "should deserialize YAML" do
+      @yaml.intern(String, YAML.dump("foo")).should == "foo"
     end
 
-    it "should safely load YAML when interning multiples" do
-      text = "foo"
-      YAML.expects(:safely_load).with("foo").returns "bar"
-      @yaml.intern_multiple(String, text).should == "bar"
+    it "should deserialize symbols as strings" do
+      @yaml.intern(String, YAML.dump(:foo)).should == "foo"
+    end
+
+    it "should fail when type does not match deserialized form and has no from_pson" do
+      expect do
+        @yaml.intern(Hash, YAML.dump("foo"))
+      end.to raise_error(NoMethodError)
+    end
+
+    it "should load from yaml when deserializing an array" do
+      text = YAML.dump(["foo"])
+      @yaml.intern_multiple(String, text).should == ["foo"]
+    end
+
+    it "should fail when one element does not have a from_pson" do
+      expect do
+        @yaml.intern_multiple(Hash, YAML.dump(["foo"]))
+      end.to raise_error(NoMethodError)
     end
   end
 
@@ -108,29 +121,25 @@ describe "Puppet Network Format" do
       @yaml.render(instances).should == "bar"
     end
 
-    it "should intern by calling decode" do
-      text = "foo"
-      @yaml.expects(:decode).with("foo").returns "bar"
-      @yaml.intern(String, text).should == "bar"
+    it "should round trip data" do
+      @yaml.intern(String, @yaml.encode("foo")).should == "foo"
     end
 
-    it "should intern multiples by calling 'decode'" do
-      text = "foo"
-      @yaml.expects(:decode).with("foo").returns "bar"
-      @yaml.intern_multiple(String, text).should == "bar"
+    it "should round trip multiple data elements" do
+      data = @yaml.render_multiple(["foo", "bar"])
+      @yaml.intern_multiple(String, data).should == ["foo", "bar"]
     end
 
-    it "should decode by base64 decoding, uncompressing and safely Yaml loading" do
-      Base64.expects(:decode64).with("zorg").returns "foo"
-      Zlib::Inflate.expects(:inflate).with("foo").returns "baz"
-      YAML.expects(:safely_load).with("baz").returns "bar"
-      @yaml.decode("zorg").should == "bar"
+    it "should intern by base64 decoding, uncompressing and safely Yaml loading" do
+      input = Base64.encode64(Zlib::Deflate.deflate(YAML.dump("data in")))
+
+      @yaml.intern(String, input).should == "data in"
     end
 
-    it "should encode by compressing and base64 encoding" do
-      Zlib::Deflate.expects(:deflate).with("foo", Zlib::BEST_COMPRESSION).returns "bar"
-      Base64.expects(:encode64).with("bar").returns "baz"
-      @yaml.encode("foo").should == "baz"
+    it "should render by compressing and base64 encoding" do
+      output = @yaml.render("foo")
+
+      YAML.load(Zlib::Inflate.inflate(Base64.decode64(output))).should == "foo"
     end
 
     describe "when zlib is disabled" do
@@ -143,11 +152,11 @@ describe "Puppet Network Format" do
       end
 
       it "should refuse to encode" do
-        lambda{ @yaml.encode("foo") }.should raise_error
+        expect { @yaml.render("foo") }.to raise_error(Puppet::Error, /zlib library is not installed/)
       end
 
       it "should refuse to decode" do
-        lambda{ @yaml.decode("foo") }.should raise_error
+        expect { @yaml.intern(String, "foo") }.to raise_error(Puppet::Error, /zlib library is not installed/)
       end
     end
 

data/spec/unit/network/http/handler_spec.rb

@@ -133,21 +133,12 @@ describe Puppet::Network::HTTP::Handler do
       decoded_params.should == {:my_param => [1,2,3]}
     end
 
-    it "should accept YAML parameters with !ruby/hash tags on Ruby 1.8", :if => RUBY_VERSION =~ /^1\.8/ do
-      params = {'my_param' => "--- !ruby/hash:Array {}"}
+    it "should ignore tags on YAML parameters" do
+      params = {'my_param' => "--- !ruby/object:Array {}"}
 
       decoded_params = @handler.send(:decode_params, params)
 
-      decoded_params[:my_param].should be_an(Array)
-    end
-
-    # These are only dangerous with Psych, which is Ruby 1.9-only. Since
-    # there's no real way to change the yamler in Puppet, assume that 1.9 means
-    # Psych, especially in tests.
-    it "should fail if YAML parameters have !ruby/hash tags on Ruby 1.9", :unless => RUBY_VERSION =~ /^1\.8/ do
-      params = {'my_param' => "--- !ruby/hash:Array {}"}
-
-      expect { @handler.send(:decode_params, params) }.to raise_error(ArgumentError, /Illegal YAML mapping found/)
+      decoded_params[:my_param].should be_a(Hash)
     end
 
     describe "when finding a model instance" do

data/spec/unit/node_spec.rb

@@ -36,6 +36,87 @@ describe Puppet::Node do
       node.environment.name.should == :bar
     end
   end
+
+  it "can survive a round-trip through YAML" do
+    facts = Puppet::Node::Facts.new("hello", "one" => "c", "two" => "b")
+    node = Puppet::Node.new("hello",
+                            :environment => 'kjhgrg',
+                            :classes => ['erth', 'aiu'],
+                            :parameters => {"hostname"=>"food"}
+                           )
+    new_node = Puppet::Node.convert_from('yaml', node.render('yaml'))
+    new_node.environment.should == node.environment
+    new_node.parameters.should == node.parameters
+    new_node.classes.should == node.classes
+    new_node.name.should == node.name
+  end
+
+  describe "when converting to json" do
+    before do
+      @node = Puppet::Node.new("mynode")
+    end
+
+    it "should provide its name" do
+      @node.should set_json_attribute('name').to("mynode")
+    end
+
+    it "should produce a hash with the document_type set to 'Node'" do
+      @node.should set_json_document_type_to("Node")
+    end
+
+    it "should include the classes if set" do
+      @node.classes = %w{a b c}
+      @node.should set_json_attribute("classes").to(%w{a b c})
+    end
+
+    it "should not include the classes if there are none" do
+      @node.should_not set_json_attribute('classes')
+    end
+
+    it "should include parameters if set" do
+      @node.parameters = {"a" => "b", "c" => "d"}
+      @node.should set_json_attribute('parameters').to({"a" => "b", "c" => "d"})
+    end
+
+    it "should not include the parameters if there are none" do
+      @node.should_not set_json_attribute('parameters')
+    end
+
+    it "should include the environment" do
+      @node.environment = "production"
+      @node.should set_json_attribute('environment').to('production')
+    end
+  end
+
+  describe "when converting from json" do
+    before do
+      @node = Puppet::Node.new("mynode")
+      @format = Puppet::Network::FormatHandler.format('pson')
+    end
+
+    def from_json(json)
+      @format.intern(Puppet::Node, json)
+    end
+
+    it "should set its name" do
+      Puppet::Node.should read_json_attribute('name').from(@node.to_pson).as("mynode")
+    end
+
+    it "should include the classes if set" do
+      @node.classes = %w{a b c}
+      Puppet::Node.should read_json_attribute('classes').from(@node.to_pson).as(%w{a b c})
+    end
+
+    it "should include parameters if set" do
+      @node.parameters = {"a" => "b", "c" => "d"}
+      Puppet::Node.should read_json_attribute('parameters').from(@node.to_pson).as({"a" => "b", "c" => "d"})
+    end
+
+    it "should include the environment" do
+      @node.environment = "production"
+      Puppet::Node.should read_json_attribute('environment').from(@node.to_pson).as(Puppet::Node::Environment.new(:production))
+    end
+  end
 end
 
 describe Puppet::Node, "when initializing" do

data/spec/unit/resource_spec.rb

@@ -444,41 +444,11 @@ describe Puppet::Resource do
       @resource["two"] = "other"
     end
 
-    it "should be able to be dumped to yaml" do
-      expect { YAML.dump(@resource) }.to_not raise_error
-    end
-
     it "should produce an equivalent yaml object" do
-      text = YAML.dump(@resource)
-
-      newresource = YAML.load(text)
-      newresource.title.should == @resource.title
-      newresource.type.should == @resource.type
-      %w{one two}.each do |param|
-        newresource[param].should == @resource[param]
-      end
-    end
-  end
-
-  describe "when loading 0.25.x storedconfigs YAML" do
-    before :each do
-      @old_storedconfig_yaml = %q{--- !ruby/object:Puppet::Resource::Reference
-builtin_type:
-title: /tmp/bar
-type: File
-}
-    end
-
-    it "should deserialize a Puppet::Resource::Reference without exceptions" do
-      expect { YAML.load(@old_storedconfig_yaml) }.to_not raise_error
-    end
-
-    it "should deserialize as a Puppet::Resource::Reference as a Puppet::Resource" do
-      YAML.load(@old_storedconfig_yaml).class.should == Puppet::Resource
-    end
+      text = @resource.render('yaml')
 
-    it "should to_hash properly" do
-      YAML.load(@old_storedconfig_yaml).to_hash.should == { :path => "/tmp/bar" }
+      newresource = Puppet::Resource.convert_from('yaml', text)
+      newresource.should equal_attributes_of @resource
     end
   end
 
@@ -653,13 +623,13 @@ type: File
       resource = Puppet::Resource.new("File", "/foo")
       resource.exported = true
 
-      Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported.should be_true
+      Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported?.should be_true
     end
 
     it "should set 'exported' to false if no value is set" do
       resource = Puppet::Resource.new("File", "/foo")
 
-      Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported.should be_false
+      Puppet::Resource.from_pson(PSON.parse(resource.to_pson)).exported?.should be_false
     end
 
     it "should set all of its parameters as the 'parameters' entry" do

data/spec/unit/run_spec.rb

@@ -116,21 +116,35 @@ describe Puppet::Run do
   end
 
   describe ".from_pson" do
-    it "should accept a hash of options, and pass them with symbolified keys to new" do
+    it "should read from a hash that represents the 'options' to initialize" do
       options = {
         "tags" => "whatever",
         "background" => true,
+        "ignoreschedules" => false,
       }
+      run = Puppet::Run.from_pson(options)
 
-
-            Puppet::Run.expects(:new).with(
-        {
+      run.options.should == {
         :tags => "whatever",
-        :background => true,
-        
-      })
+        :ignoreschedules => false,
+      }
+      run.background.should be_true
+    end
 
-      Puppet::Run.from_pson(options)
+    it "should read from a hash that follows the actual object structure" do
+      hash = {"background" => true,
+              "options" => {
+                "tags" => [],
+                "ignoreschedules" => false},
+              "status" => "success"}
+      run = Puppet::Run.from_pson(hash)
+
+      run.options.should == {
+        :tags => [],
+        :ignoreschedules => false
+      }
+      run.background.should be_true
+      run.status.should == 'success'
     end
   end
 end

data/spec/unit/status_spec.rb

@@ -31,4 +31,10 @@ describe Puppet::Status do
   it "should allow a name to be set" do
     Puppet::Status.new.name = "status"
   end
+
+  it "can do a round-trip serialization via YAML" do
+    status = Puppet::Status.new
+    new_status = Puppet::Status.convert_from('yaml', status.render('yaml'))
+    new_status.should equal_attributes_of(status)
+  end
 end

data/test/network/handler/report.rb

@@ -31,42 +31,6 @@ class TestReportServer < Test::Unit::TestCase
     client
   end
 
-  def test_process
-    server = Puppet::Network::Handler.report.new
-
-    # We have to run multiple reports to make sure there's no conflict
-    reports = []
-    $run = []
-    2.times do |i|
-      name = "processtest#{i}"
-      reports << name
-
-      Report.newreport(name) do
-        def process
-          $run << self.report_name
-        end
-      end
-    end
-    Puppet[:reports] = reports.collect { |r| r.to_s }.join(",")
-
-    report = fakereport
-
-    retval = nil
-    assert_nothing_raised {
-      retval = server.send(:process, YAML.dump(report))
-    }
-
-    reports.each do |name|
-      assert($run.include?(name.intern), "Did not run #{name}")
-    end
-
-    # Now make sure our server doesn't die on missing reports
-    Puppet[:reports] = "fakereport"
-    assert_nothing_raised {
-      retval = server.send(:process, YAML.dump(report))
-    }
-  end
-
   def test_reports
     Puppet[:reports] = "myreport"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 2.7.21
+  version: 2.7.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -48,17 +48,19 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- Rakefile
 - README.md
 - README_DEVELOPER.md
+- Rakefile
 - install.rb
 - bin/filebucket
 - bin/pi
 - bin/puppet
 - bin/puppetdoc
 - bin/ralsh
-- lib/puppet/agent/locker.rb
+- lib/puppet.rb
 - lib/puppet/agent.rb
+- lib/puppet/agent/locker.rb
+- lib/puppet/application.rb
 - lib/puppet/application/agent.rb
 - lib/puppet/application/apply.rb
 - lib/puppet/application/ca.rb
@@ -95,51 +97,52 @@ files:
 - lib/puppet/application/resource_type.rb
 - lib/puppet/application/secret_agent.rb
 - lib/puppet/application/status.rb
-- lib/puppet/application.rb
+- lib/puppet/configurer.rb
 - lib/puppet/configurer/downloader.rb
 - lib/puppet/configurer/fact_handler.rb
 - lib/puppet/configurer/plugin_handler.rb
-- lib/puppet/configurer.rb
 - lib/puppet/daemon.rb
 - lib/puppet/defaults.rb
+- lib/puppet/dsl.rb
 - lib/puppet/dsl/resource_api.rb
 - lib/puppet/dsl/resource_type_api.rb
-- lib/puppet/dsl.rb
 - lib/puppet/error.rb
 - lib/puppet/external/base64.rb
 - lib/puppet/external/dot.rb
 - lib/puppet/external/lock.rb
+- lib/puppet/external/nagios.rb
 - lib/puppet/external/nagios/base.rb
 - lib/puppet/external/nagios/grammar.ry
 - lib/puppet/external/nagios/makefile
 - lib/puppet/external/nagios/parser.rb
-- lib/puppet/external/nagios.rb
 - lib/puppet/external/pson/common.rb
+- lib/puppet/external/pson/pure.rb
 - lib/puppet/external/pson/pure/generator.rb
 - lib/puppet/external/pson/pure/parser.rb
-- lib/puppet/external/pson/pure.rb
 - lib/puppet/external/pson/version.rb
+- lib/puppet/face.rb
 - lib/puppet/face/ca.rb
-- lib/puppet/face/catalog/select.rb
 - lib/puppet/face/catalog.rb
+- lib/puppet/face/catalog/select.rb
 - lib/puppet/face/certificate.rb
 - lib/puppet/face/certificate_request.rb
 - lib/puppet/face/certificate_revocation_list.rb
 - lib/puppet/face/config.rb
 - lib/puppet/face/facts.rb
+- lib/puppet/face/file.rb
 - lib/puppet/face/file/download.rb
 - lib/puppet/face/file/store.rb
-- lib/puppet/face/file.rb
+- lib/puppet/face/help.rb
 - lib/puppet/face/help/action.erb
 - lib/puppet/face/help/face.erb
 - lib/puppet/face/help/global.erb
 - lib/puppet/face/help/man.erb
-- lib/puppet/face/help.rb
 - lib/puppet/face/instrumentation_data.rb
 - lib/puppet/face/instrumentation_listener.rb
 - lib/puppet/face/instrumentation_probe.rb
 - lib/puppet/face/key.rb
 - lib/puppet/face/man.rb
+- lib/puppet/face/module.rb
 - lib/puppet/face/module/build.rb
 - lib/puppet/face/module/changes.rb
 - lib/puppet/face/module/generate.rb
@@ -148,9 +151,8 @@ files:
 - lib/puppet/face/module/search.rb
 - lib/puppet/face/module/uninstall.rb
 - lib/puppet/face/module/upgrade.rb
-- lib/puppet/face/module.rb
-- lib/puppet/face/node/clean.rb
 - lib/puppet/face/node.rb
+- lib/puppet/face/node/clean.rb
 - lib/puppet/face/parser.rb
 - lib/puppet/face/plugin.rb
 - lib/puppet/face/report.rb
@@ -158,7 +160,6 @@ files:
 - lib/puppet/face/resource_type.rb
 - lib/puppet/face/secret_agent.rb
 - lib/puppet/face/status.rb
-- lib/puppet/face.rb
 - lib/puppet/feature/base.rb
 - lib/puppet/feature/eventlog.rb
 - lib/puppet/feature/pson.rb
@@ -169,27 +170,28 @@ files:
 - lib/puppet/feature/ssh.rb
 - lib/puppet/feature/stomp.rb
 - lib/puppet/feature/zlib.rb
+- lib/puppet/file_bucket.rb
 - lib/puppet/file_bucket/dipper.rb
 - lib/puppet/file_bucket/file.rb
-- lib/puppet/file_bucket.rb
-- lib/puppet/file_collection/lookup.rb
 - lib/puppet/file_collection.rb
+- lib/puppet/file_collection/lookup.rb
+- lib/puppet/file_serving.rb
 - lib/puppet/file_serving/base.rb
-- lib/puppet/file_serving/configuration/parser.rb
 - lib/puppet/file_serving/configuration.rb
+- lib/puppet/file_serving/configuration/parser.rb
 - lib/puppet/file_serving/content.rb
 - lib/puppet/file_serving/fileset.rb
 - lib/puppet/file_serving/metadata.rb
+- lib/puppet/file_serving/mount.rb
 - lib/puppet/file_serving/mount/file.rb
 - lib/puppet/file_serving/mount/modules.rb
 - lib/puppet/file_serving/mount/plugins.rb
-- lib/puppet/file_serving/mount.rb
 - lib/puppet/file_serving/terminus_helper.rb
 - lib/puppet/file_serving/terminus_selector.rb
-- lib/puppet/file_serving.rb
+- lib/puppet/forge.rb
 - lib/puppet/forge/cache.rb
 - lib/puppet/forge/repository.rb
-- lib/puppet/forge.rb
+- lib/puppet/indirector.rb
 - lib/puppet/indirector/active_record.rb
 - lib/puppet/indirector/catalog/active_record.rb
 - lib/puppet/indirector/catalog/compiler.rb
@@ -210,9 +212,9 @@ files:
 - lib/puppet/indirector/certificate_revocation_list/disabled_ca.rb
 - lib/puppet/indirector/certificate_revocation_list/file.rb
 - lib/puppet/indirector/certificate_revocation_list/rest.rb
+- lib/puppet/indirector/certificate_status.rb
 - lib/puppet/indirector/certificate_status/file.rb
 - lib/puppet/indirector/certificate_status/rest.rb
-- lib/puppet/indirector/certificate_status.rb
 - lib/puppet/indirector/code.rb
 - lib/puppet/indirector/couch.rb
 - lib/puppet/indirector/direct_file_server.rb
@@ -233,27 +235,27 @@ files:
 - lib/puppet/indirector/file_bucket_file/file.rb
 - lib/puppet/indirector/file_bucket_file/rest.rb
 - lib/puppet/indirector/file_bucket_file/selector.rb
+- lib/puppet/indirector/file_content.rb
 - lib/puppet/indirector/file_content/file.rb
 - lib/puppet/indirector/file_content/file_server.rb
 - lib/puppet/indirector/file_content/rest.rb
 - lib/puppet/indirector/file_content/selector.rb
-- lib/puppet/indirector/file_content.rb
+- lib/puppet/indirector/file_metadata.rb
 - lib/puppet/indirector/file_metadata/file.rb
 - lib/puppet/indirector/file_metadata/file_server.rb
 - lib/puppet/indirector/file_metadata/rest.rb
 - lib/puppet/indirector/file_metadata/selector.rb
-- lib/puppet/indirector/file_metadata.rb
 - lib/puppet/indirector/file_server.rb
 - lib/puppet/indirector/indirection.rb
+- lib/puppet/indirector/instrumentation_data.rb
 - lib/puppet/indirector/instrumentation_data/local.rb
 - lib/puppet/indirector/instrumentation_data/rest.rb
-- lib/puppet/indirector/instrumentation_data.rb
+- lib/puppet/indirector/instrumentation_listener.rb
 - lib/puppet/indirector/instrumentation_listener/local.rb
 - lib/puppet/indirector/instrumentation_listener/rest.rb
-- lib/puppet/indirector/instrumentation_listener.rb
+- lib/puppet/indirector/instrumentation_probe.rb
 - lib/puppet/indirector/instrumentation_probe/local.rb
 - lib/puppet/indirector/instrumentation_probe/rest.rb
-- lib/puppet/indirector/instrumentation_probe.rb
 - lib/puppet/indirector/inventory/yaml.rb
 - lib/puppet/indirector/key/ca.rb
 - lib/puppet/indirector/key/disabled_ca.rb
@@ -279,20 +281,20 @@ files:
 - lib/puppet/indirector/resource/rest.rb
 - lib/puppet/indirector/resource/store_configs.rb
 - lib/puppet/indirector/resource/validator.rb
+- lib/puppet/indirector/resource_type.rb
 - lib/puppet/indirector/resource_type/parser.rb
 - lib/puppet/indirector/resource_type/rest.rb
-- lib/puppet/indirector/resource_type.rb
 - lib/puppet/indirector/rest.rb
 - lib/puppet/indirector/run/local.rb
 - lib/puppet/indirector/run/rest.rb
 - lib/puppet/indirector/ssl_file.rb
+- lib/puppet/indirector/status.rb
 - lib/puppet/indirector/status/local.rb
 - lib/puppet/indirector/status/rest.rb
-- lib/puppet/indirector/status.rb
 - lib/puppet/indirector/store_configs.rb
 - lib/puppet/indirector/terminus.rb
 - lib/puppet/indirector/yaml.rb
-- lib/puppet/indirector.rb
+- lib/puppet/interface.rb
 - lib/puppet/interface/action.rb
 - lib/puppet/interface/action_builder.rb
 - lib/puppet/interface/action_manager.rb
@@ -301,9 +303,10 @@ files:
 - lib/puppet/interface/option.rb
 - lib/puppet/interface/option_builder.rb
 - lib/puppet/interface/option_manager.rb
-- lib/puppet/interface.rb
 - lib/puppet/metatype/manager.rb
 - lib/puppet/module.rb
+- lib/puppet/module_tool.rb
+- lib/puppet/module_tool/applications.rb
 - lib/puppet/module_tool/applications/application.rb
 - lib/puppet/module_tool/applications/builder.rb
 - lib/puppet/module_tool/applications/checksummer.rb
@@ -313,26 +316,25 @@ files:
 - lib/puppet/module_tool/applications/uninstaller.rb
 - lib/puppet/module_tool/applications/unpacker.rb
 - lib/puppet/module_tool/applications/upgrader.rb
-- lib/puppet/module_tool/applications.rb
 - lib/puppet/module_tool/checksums.rb
 - lib/puppet/module_tool/contents_description.rb
 - lib/puppet/module_tool/dependency.rb
+- lib/puppet/module_tool/errors.rb
 - lib/puppet/module_tool/errors/base.rb
 - lib/puppet/module_tool/errors/installer.rb
 - lib/puppet/module_tool/errors/shared.rb
 - lib/puppet/module_tool/errors/uninstaller.rb
 - lib/puppet/module_tool/errors/upgrader.rb
-- lib/puppet/module_tool/errors.rb
 - lib/puppet/module_tool/metadata.rb
 - lib/puppet/module_tool/modulefile.rb
 - lib/puppet/module_tool/shared_behaviors.rb
-- lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
+- lib/puppet/module_tool/skeleton.rb
 - lib/puppet/module_tool/skeleton/templates/generator/Modulefile.erb
 - lib/puppet/module_tool/skeleton/templates/generator/README.erb
+- lib/puppet/module_tool/skeleton/templates/generator/manifests/init.pp.erb
 - lib/puppet/module_tool/skeleton/templates/generator/spec/spec_helper.rb
 - lib/puppet/module_tool/skeleton/templates/generator/tests/init.pp.erb
-- lib/puppet/module_tool/skeleton.rb
-- lib/puppet/module_tool.rb
+- lib/puppet/network.rb
 - lib/puppet/network/authconfig.rb
 - lib/puppet/network/authorization.rb
 - lib/puppet/network/authstore.rb
@@ -340,6 +342,7 @@ files:
 - lib/puppet/network/format.rb
 - lib/puppet/network/format_handler.rb
 - lib/puppet/network/formats.rb
+- lib/puppet/network/handler.rb
 - lib/puppet/network/handler/ca.rb
 - lib/puppet/network/handler/filebucket.rb
 - lib/puppet/network/handler/fileserver.rb
@@ -347,23 +350,22 @@ files:
 - lib/puppet/network/handler/report.rb
 - lib/puppet/network/handler/runner.rb
 - lib/puppet/network/handler/status.rb
-- lib/puppet/network/handler.rb
-- lib/puppet/network/http/api/v1.rb
+- lib/puppet/network/http.rb
 - lib/puppet/network/http/api.rb
+- lib/puppet/network/http/api/v1.rb
 - lib/puppet/network/http/compression.rb
 - lib/puppet/network/http/handler.rb
-- lib/puppet/network/http/mongrel/rest.rb
 - lib/puppet/network/http/mongrel.rb
+- lib/puppet/network/http/mongrel/rest.rb
+- lib/puppet/network/http/rack.rb
 - lib/puppet/network/http/rack/httphandler.rb
 - lib/puppet/network/http/rack/rest.rb
 - lib/puppet/network/http/rack/xmlrpc.rb
-- lib/puppet/network/http/rack.rb
-- lib/puppet/network/http/webrick/rest.rb
 - lib/puppet/network/http/webrick.rb
-- lib/puppet/network/http.rb
+- lib/puppet/network/http/webrick/rest.rb
 - lib/puppet/network/http_pool.rb
-- lib/puppet/network/http_server/mongrel.rb
 - lib/puppet/network/http_server.rb
+- lib/puppet/network/http_server/mongrel.rb
 - lib/puppet/network/rest_authconfig.rb
 - lib/puppet/network/rest_authorization.rb
 - lib/puppet/network/rest_controller.rb
@@ -372,15 +374,16 @@ files:
 - lib/puppet/network/xmlrpc/processor.rb
 - lib/puppet/network/xmlrpc/server.rb
 - lib/puppet/network/xmlrpc/webrick_servlet.rb
-- lib/puppet/network.rb
+- lib/puppet/node.rb
 - lib/puppet/node/environment.rb
 - lib/puppet/node/facts.rb
 - lib/puppet/node/inventory.rb
-- lib/puppet/node.rb
+- lib/puppet/parameter.rb
 - lib/puppet/parameter/path.rb
 - lib/puppet/parameter/value.rb
 - lib/puppet/parameter/value_collection.rb
-- lib/puppet/parameter.rb
+- lib/puppet/parser.rb
+- lib/puppet/parser/ast.rb
 - lib/puppet/parser/ast/arithmetic_operator.rb
 - lib/puppet/parser/ast/astarray.rb
 - lib/puppet/parser/ast/asthash.rb
@@ -414,10 +417,10 @@ files:
 - lib/puppet/parser/ast/tag.rb
 - lib/puppet/parser/ast/top_level_construct.rb
 - lib/puppet/parser/ast/vardef.rb
-- lib/puppet/parser/ast.rb
 - lib/puppet/parser/collector.rb
 - lib/puppet/parser/compiler.rb
 - lib/puppet/parser/files.rb
+- lib/puppet/parser/functions.rb
 - lib/puppet/parser/functions/create_resources.rb
 - lib/puppet/parser/functions/defined.rb
 - lib/puppet/parser/functions/extlookup.rb
@@ -440,42 +443,41 @@ files:
 - lib/puppet/parser/functions/tagged.rb
 - lib/puppet/parser/functions/template.rb
 - lib/puppet/parser/functions/versioncmp.rb
-- lib/puppet/parser/functions.rb
 - lib/puppet/parser/grammar.ra
 - lib/puppet/parser/lexer.rb
 - lib/puppet/parser/makefile
 - lib/puppet/parser/parser.rb
 - lib/puppet/parser/parser_support.rb
 - lib/puppet/parser/relationship.rb
-- lib/puppet/parser/resource/param.rb
 - lib/puppet/parser/resource.rb
+- lib/puppet/parser/resource/param.rb
 - lib/puppet/parser/scope.rb
 - lib/puppet/parser/templatewrapper.rb
 - lib/puppet/parser/type_loader.rb
 - lib/puppet/parser/yaml_trimmer.rb
-- lib/puppet/parser.rb
+- lib/puppet/property.rb
 - lib/puppet/property/ensure.rb
 - lib/puppet/property/keyvalue.rb
 - lib/puppet/property/list.rb
 - lib/puppet/property/ordered_list.rb
-- lib/puppet/property.rb
+- lib/puppet/provider.rb
 - lib/puppet/provider/aixobject.rb
 - lib/puppet/provider/augeas/augeas.rb
 - lib/puppet/provider/cisco.rb
 - lib/puppet/provider/computer/computer.rb
+- lib/puppet/provider/confine.rb
 - lib/puppet/provider/confine/exists.rb
 - lib/puppet/provider/confine/false.rb
 - lib/puppet/provider/confine/feature.rb
 - lib/puppet/provider/confine/true.rb
 - lib/puppet/provider/confine/variable.rb
-- lib/puppet/provider/confine.rb
 - lib/puppet/provider/confine_collection.rb
 - lib/puppet/provider/confiner.rb
 - lib/puppet/provider/cron/crontab.rb
+- lib/puppet/provider/exec.rb
 - lib/puppet/provider/exec/posix.rb
 - lib/puppet/provider/exec/shell.rb
 - lib/puppet/provider/exec/windows.rb
-- lib/puppet/provider/exec.rb
 - lib/puppet/provider/file/posix.rb
 - lib/puppet/provider/file/windows.rb
 - lib/puppet/provider/group/aix.rb
@@ -492,14 +494,15 @@ files:
 - lib/puppet/provider/mailalias/aliases.rb
 - lib/puppet/provider/maillist/mailman.rb
 - lib/puppet/provider/mcx/mcxcontent.rb
-- lib/puppet/provider/mount/parsed.rb
 - lib/puppet/provider/mount.rb
+- lib/puppet/provider/mount/parsed.rb
 - lib/puppet/provider/naginator.rb
+- lib/puppet/provider/nameservice.rb
 - lib/puppet/provider/nameservice/directoryservice.rb
 - lib/puppet/provider/nameservice/objectadd.rb
 - lib/puppet/provider/nameservice/pw.rb
-- lib/puppet/provider/nameservice.rb
 - lib/puppet/provider/network_device.rb
+- lib/puppet/provider/package.rb
 - lib/puppet/provider/package/aix.rb
 - lib/puppet/provider/package/appdmg.rb
 - lib/puppet/provider/package/apple.rb
@@ -533,7 +536,6 @@ files:
 - lib/puppet/provider/package/yum.rb
 - lib/puppet/provider/package/yumhelper.py
 - lib/puppet/provider/package/zypper.rb
-- lib/puppet/provider/package.rb
 - lib/puppet/provider/parsedfile.rb
 - lib/puppet/provider/port/parsed.rb
 - lib/puppet/provider/scheduled_task/win32_taskscheduler.rb
@@ -570,7 +572,7 @@ files:
 - lib/puppet/provider/zfs/solaris.rb
 - lib/puppet/provider/zone/solaris.rb
 - lib/puppet/provider/zpool/solaris.rb
-- lib/puppet/provider.rb
+- lib/puppet/rails.rb
 - lib/puppet/rails/benchmark.rb
 - lib/puppet/rails/database/001_add_created_at_to_all_tables.rb
 - lib/puppet/rails/database/002_remove_duplicated_index_on_all_tables.rb
@@ -588,7 +590,6 @@ files:
 - lib/puppet/rails/resource.rb
 - lib/puppet/rails/resource_tag.rb
 - lib/puppet/rails/source_file.rb
-- lib/puppet/rails.rb
 - lib/puppet/rb_tree_map.rb
 - lib/puppet/reference/configuration.rb
 - lib/puppet/reference/function.rb
@@ -599,44 +600,46 @@ files:
 - lib/puppet/reference/report.rb
 - lib/puppet/reference/type.rb
 - lib/puppet/relationship.rb
+- lib/puppet/reports.rb
 - lib/puppet/reports/http.rb
 - lib/puppet/reports/log.rb
 - lib/puppet/reports/rrdgraph.rb
 - lib/puppet/reports/store.rb
 - lib/puppet/reports/tagmail.rb
-- lib/puppet/reports.rb
+- lib/puppet/resource.rb
 - lib/puppet/resource/catalog.rb
 - lib/puppet/resource/status.rb
 - lib/puppet/resource/type.rb
 - lib/puppet/resource/type_collection.rb
 - lib/puppet/resource/type_collection_helper.rb
-- lib/puppet/resource.rb
 - lib/puppet/run.rb
 - lib/puppet/simple_graph.rb
+- lib/puppet/ssl.rb
 - lib/puppet/ssl/base.rb
 - lib/puppet/ssl/certificate.rb
-- lib/puppet/ssl/certificate_authority/interface.rb
 - lib/puppet/ssl/certificate_authority.rb
+- lib/puppet/ssl/certificate_authority/interface.rb
 - lib/puppet/ssl/certificate_factory.rb
 - lib/puppet/ssl/certificate_request.rb
 - lib/puppet/ssl/certificate_revocation_list.rb
 - lib/puppet/ssl/host.rb
 - lib/puppet/ssl/inventory.rb
 - lib/puppet/ssl/key.rb
-- lib/puppet/ssl.rb
 - lib/puppet/status.rb
 - lib/puppet/test/test_helper.rb
+- lib/puppet/transaction.rb
 - lib/puppet/transaction/event.rb
 - lib/puppet/transaction/event_manager.rb
 - lib/puppet/transaction/report.rb
 - lib/puppet/transaction/resource_harness.rb
-- lib/puppet/transaction.rb
 - lib/puppet/transportable.rb
+- lib/puppet/type.rb
 - lib/puppet/type/augeas.rb
 - lib/puppet/type/component.rb
 - lib/puppet/type/computer.rb
 - lib/puppet/type/cron.rb
 - lib/puppet/type/exec.rb
+- lib/puppet/type/file.rb
 - lib/puppet/type/file/checksum.rb
 - lib/puppet/type/file/content.rb
 - lib/puppet/type/file/ctime.rb
@@ -649,7 +652,6 @@ files:
 - lib/puppet/type/file/source.rb
 - lib/puppet/type/file/target.rb
 - lib/puppet/type/file/type.rb
-- lib/puppet/type/file.rb
 - lib/puppet/type/filebucket.rb
 - lib/puppet/type/group.rb
 - lib/puppet/type/host.rb
@@ -695,10 +697,10 @@ files:
 - lib/puppet/type/zfs.rb
 - lib/puppet/type/zone.rb
 - lib/puppet/type/zpool.rb
-- lib/puppet/type.rb
+- lib/puppet/util.rb
 - lib/puppet/util/adsi.rb
-- lib/puppet/util/autoload/file_cache.rb
 - lib/puppet/util/autoload.rb
+- lib/puppet/util/autoload/file_cache.rb
 - lib/puppet/util/backups.rb
 - lib/puppet/util/cacher.rb
 - lib/puppet/util/checksums.rb
@@ -719,21 +721,21 @@ files:
 - lib/puppet/util/inifile.rb
 - lib/puppet/util/inline_docs.rb
 - lib/puppet/util/instance_loader.rb
+- lib/puppet/util/instrumentation.rb
 - lib/puppet/util/instrumentation/data.rb
 - lib/puppet/util/instrumentation/indirection_probe.rb
 - lib/puppet/util/instrumentation/instrumentable.rb
 - lib/puppet/util/instrumentation/listener.rb
 - lib/puppet/util/instrumentation/listeners/log.rb
 - lib/puppet/util/instrumentation/listeners/performance.rb
-- lib/puppet/util/instrumentation.rb
+- lib/puppet/util/ldap.rb
 - lib/puppet/util/ldap/connection.rb
 - lib/puppet/util/ldap/generator.rb
 - lib/puppet/util/ldap/manager.rb
-- lib/puppet/util/ldap.rb
 - lib/puppet/util/loadedfile.rb
+- lib/puppet/util/log.rb
 - lib/puppet/util/log/destination.rb
 - lib/puppet/util/log/destinations.rb
-- lib/puppet/util/log.rb
 - lib/puppet/util/log_paths.rb
 - lib/puppet/util/logging.rb
 - lib/puppet/util/metaid.rb
@@ -741,18 +743,18 @@ files:
 - lib/puppet/util/metric.rb
 - lib/puppet/util/monkey_patches.rb
 - lib/puppet/util/nagios_maker.rb
+- lib/puppet/util/network_device.rb
 - lib/puppet/util/network_device/base.rb
+- lib/puppet/util/network_device/cisco.rb
 - lib/puppet/util/network_device/cisco/device.rb
 - lib/puppet/util/network_device/cisco/facts.rb
 - lib/puppet/util/network_device/cisco/interface.rb
-- lib/puppet/util/network_device/cisco.rb
 - lib/puppet/util/network_device/config.rb
 - lib/puppet/util/network_device/ipcalc.rb
+- lib/puppet/util/network_device/transport.rb
 - lib/puppet/util/network_device/transport/base.rb
 - lib/puppet/util/network_device/transport/ssh.rb
 - lib/puppet/util/network_device/transport/telnet.rb
-- lib/puppet/util/network_device/transport.rb
-- lib/puppet/util/network_device.rb
 - lib/puppet/util/package.rb
 - lib/puppet/util/pidlock.rb
 - lib/puppet/util/platform.rb
@@ -760,25 +762,25 @@ files:
 - lib/puppet/util/posix.rb
 - lib/puppet/util/provider_features.rb
 - lib/puppet/util/pson.rb
-- lib/puppet/util/queue/stomp.rb
 - lib/puppet/util/queue.rb
+- lib/puppet/util/queue/stomp.rb
 - lib/puppet/util/rails/cache_accumulator.rb
 - lib/puppet/util/rails/collection_merger.rb
 - lib/puppet/util/rails/reference_serializer.rb
+- lib/puppet/util/rdoc.rb
 - lib/puppet/util/rdoc/code_objects.rb
 - lib/puppet/util/rdoc/generators/puppet_generator.rb
 - lib/puppet/util/rdoc/generators/template/puppet/puppet.rb
 - lib/puppet/util/rdoc/parser.rb
-- lib/puppet/util/rdoc.rb
 - lib/puppet/util/reference.rb
 - lib/puppet/util/resource_template.rb
 - lib/puppet/util/retryaction.rb
 - lib/puppet/util/run_mode.rb
 - lib/puppet/util/selinux.rb
+- lib/puppet/util/settings.rb
 - lib/puppet/util/settings/boolean_setting.rb
 - lib/puppet/util/settings/file_setting.rb
 - lib/puppet/util/settings/setting.rb
-- lib/puppet/util/settings.rb
 - lib/puppet/util/storage.rb
 - lib/puppet/util/subclass_loader.rb
 - lib/puppet/util/suidmanager.rb
@@ -787,17 +789,59 @@ files:
 - lib/puppet/util/terminal.rb
 - lib/puppet/util/user_attr.rb
 - lib/puppet/util/warnings.rb
+- lib/puppet/util/windows.rb
 - lib/puppet/util/windows/error.rb
 - lib/puppet/util/windows/file.rb
 - lib/puppet/util/windows/process.rb
 - lib/puppet/util/windows/security.rb
 - lib/puppet/util/windows/sid.rb
 - lib/puppet/util/windows/user.rb
-- lib/puppet/util/windows.rb
 - lib/puppet/util/zaml.rb
-- lib/puppet/util.rb
+- lib/puppet/vendor.rb
+- lib/puppet/vendor/load_safe_yaml.rb
+- lib/puppet/vendor/require_vendored.rb
+- lib/puppet/vendor/safe_yaml/CHANGES.md
+- lib/puppet/vendor/safe_yaml/Gemfile
+- lib/puppet/vendor/safe_yaml/LICENSE.txt
+- lib/puppet/vendor/safe_yaml/README.md
+- lib/puppet/vendor/safe_yaml/Rakefile
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/deep.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/date.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/hexadecimal.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/parse/sexagesimal.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_handler.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/psych_resolver.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/resolver.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/safe_to_ruby_visitor.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_hack.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_node_monkeypatch.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/syck_resolver.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_boolean.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_date.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_float.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_integer.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_nil.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/to_symbol.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/transform/transformation_map.rb
+- lib/puppet/vendor/safe_yaml/lib/safe_yaml/version.rb
+- lib/puppet/vendor/safe_yaml/run_specs_all_ruby_versions.sh
+- lib/puppet/vendor/safe_yaml/safe_yaml.gemspec
+- lib/puppet/vendor/safe_yaml/spec/exploit.1.9.2.yaml
+- lib/puppet/vendor/safe_yaml/spec/exploit.1.9.3.yaml
+- lib/puppet/vendor/safe_yaml/spec/psych_resolver_spec.rb
+- lib/puppet/vendor/safe_yaml/spec/resolver_specs.rb
+- lib/puppet/vendor/safe_yaml/spec/safe_yaml_spec.rb
+- lib/puppet/vendor/safe_yaml/spec/spec_helper.rb
+- lib/puppet/vendor/safe_yaml/spec/support/exploitable_back_door.rb
+- lib/puppet/vendor/safe_yaml/spec/syck_resolver_spec.rb
+- lib/puppet/vendor/safe_yaml/spec/transform/base64_spec.rb
+- lib/puppet/vendor/safe_yaml/spec/transform/to_date_spec.rb
+- lib/puppet/vendor/safe_yaml/spec/transform/to_float_spec.rb
+- lib/puppet/vendor/safe_yaml/spec/transform/to_integer_spec.rb
+- lib/puppet/vendor/safe_yaml/spec/transform/to_symbol_spec.rb
 - lib/puppet/version.rb
-- lib/puppet.rb
 - lib/semver.rb
 - conf/auth.conf
 - conf/epm.list
@@ -830,9 +874,9 @@ files:
 - conf/suse/puppet.conf
 - conf/suse/puppet.spec
 - conf/suse/server.init
+- conf/windows/eventlog/Rakefile
 - conf/windows/eventlog/puppetres.dll
 - conf/windows/eventlog/puppetres.mc
-- conf/windows/eventlog/Rakefile
 - man/man5/puppet.conf.5
 - man/man8/filebucket.8
 - man/man8/pi.8
@@ -906,23 +950,26 @@ files:
 - examples/mcx_dock_invalid.pp
 - examples/mcx_nogroup.pp
 - examples/mcx_notexists_absent.pp
+- examples/modules/sample-module.pp
+- examples/modules/sample-module/README.txt
 - examples/modules/sample-module/lib/puppet/parser/functions/hostname_to_dn.rb
 - examples/modules/sample-module/manifests/init.pp
-- examples/modules/sample-module/README.txt
 - examples/modules/sample-module/templates/sample.erb
-- examples/modules/sample-module.pp
 - examples/nodes
 - examples/one
 - examples/relationships
 - examples/selectors
 - examples/simpletests
 - examples/svncommit
-- ext/autotest/config
 - ext/autotest/Rakefile
+- ext/autotest/config
 - ext/autotest/readme.rst
 - ext/build_defaults.yaml
 - ext/cert_inspector
 - ext/dbfix.sql
+- ext/debian/README.Debian
+- ext/debian/README.source
+- ext/debian/TODO.Debian
 - ext/debian/changelog.erb
 - ext/debian/compat
 - ext/debian/control
@@ -942,6 +989,7 @@ files:
 - ext/debian/puppet-el.install
 - ext/debian/puppet-testsuite.install
 - ext/debian/puppet-testsuite.lintian-overrides
+- ext/debian/puppet.NEWS
 - ext/debian/puppet.conf
 - ext/debian/puppet.default
 - ext/debian/puppet.dirs
@@ -950,7 +998,6 @@ files:
 - ext/debian/puppet.lintian-overrides
 - ext/debian/puppet.logrotate
 - ext/debian/puppet.manpages
-- ext/debian/puppet.NEWS
 - ext/debian/puppet.postinst
 - ext/debian/puppet.postrm
 - ext/debian/puppet.preinst
@@ -961,25 +1008,22 @@ files:
 - ext/debian/puppetmaster-passenger.dirs
 - ext/debian/puppetmaster-passenger.postinst
 - ext/debian/puppetmaster-passenger.postrm
+- ext/debian/puppetmaster.NEWS
+- ext/debian/puppetmaster.README.debian
 - ext/debian/puppetmaster.default
 - ext/debian/puppetmaster.dirs
 - ext/debian/puppetmaster.init
 - ext/debian/puppetmaster.install
 - ext/debian/puppetmaster.lintian-overrides
 - ext/debian/puppetmaster.manpages
-- ext/debian/puppetmaster.NEWS
 - ext/debian/puppetmaster.postinst
 - ext/debian/puppetmaster.postrm
 - ext/debian/puppetmaster.preinst
-- ext/debian/puppetmaster.README.debian
-- ext/debian/README.Debian
-- ext/debian/README.source
 - ext/debian/rules
 - ext/debian/source/format
 - ext/debian/source/options
-- ext/debian/TODO.Debian
-- ext/debian/vim-puppet.dirs
 - ext/debian/vim-puppet.README.Debian
+- ext/debian/vim-puppet.dirs
 - ext/debian/vim-puppet.yaml
 - ext/debian/watch
 - ext/emacs/puppet-mode-init.el
@@ -990,9 +1034,9 @@ files:
 - ext/logcheck/puppet
 - ext/nagios/check_puppet.rb
 - ext/nagios/naggen
+- ext/osx/PackageInfo.plist
 - ext/osx/createpackage.sh
 - ext/osx/file_mapping.yaml
-- ext/osx/PackageInfo.plist
 - ext/osx/preflight.erb
 - ext/osx/prototype.plist.erb
 - ext/packaging/README-Solaris.md
@@ -1022,6 +1066,7 @@ files:
 - ext/packaging/tasks/pe_sign.rake
 - ext/packaging/tasks/pe_sles.rake
 - ext/packaging/tasks/pe_tar.rake
+- ext/packaging/tasks/pre_tasks.rake
 - ext/packaging/tasks/release.rake
 - ext/packaging/tasks/remote_build.rake
 - ext/packaging/tasks/retrieve.rake
@@ -1033,6 +1078,7 @@ files:
 - ext/packaging/tasks/tar.rake
 - ext/packaging/tasks/template.rake
 - ext/packaging/tasks/update.rake
+- ext/packaging/tasks/vendor_gems.rake
 - ext/packaging/tasks/version.rake
 - ext/packaging/tasks/z_data_dump.rake
 - ext/project_data.yaml
@@ -1041,10 +1087,10 @@ files:
 - ext/puppetlisten/puppetlisten.rb
 - ext/puppetlisten/puppetrun.rb
 - ext/pure_ruby_dsl/dsl_test.rb
+- ext/rack/README
 - ext/rack/files/apache2.conf
 - ext/rack/files/config.ru
 - ext/rack/manifest.pp
-- ext/rack/README
 - ext/redhat/puppet.spec.erb
 - ext/regexp_nodes/classes/databases
 - ext/regexp_nodes/classes/webservers
@@ -1052,10 +1098,10 @@ files:
 - ext/regexp_nodes/parameters/environment/qa
 - ext/regexp_nodes/regexp_nodes.rb
 - ext/upload_facts.rb
+- ext/vim/README
 - ext/vim/ftdetect/puppet.vim
 - ext/vim/ftplugin/puppet.vim
 - ext/vim/indent/puppet.vim
-- ext/vim/README
 - ext/vim/syntax/puppet.vim
 - ext/yaml_nodes.rb
 - tasks/rake/changelog.rake
@@ -1068,6 +1114,8 @@ files:
 - tasks/rake/sign.rake
 - tasks/rake/testbranch.rake
 - tasks/rake/yard.rake
+- test/README
+- test/Rakefile
 - test/data/failers/badclassnoparam
 - test/data/failers/badclassparam
 - test/data/failers/badcompnoparam
@@ -1155,13 +1203,14 @@ files:
 - test/data/types/sshkey/1
 - test/data/types/yumrepos/fedora-devel.repo
 - test/data/types/yumrepos/fedora.repo
-- test/language/ast/variable.rb
 - test/language/ast.rb
+- test/language/ast/variable.rb
 - test/language/functions.rb
 - test/language/parser.rb
 - test/language/scope.rb
 - test/language/snippets.rb
 - test/language/transportable.rb
+- test/lib/puppettest.rb
 - test/lib/puppettest/certificates.rb
 - test/lib/puppettest/exetest.rb
 - test/lib/puppettest/fakes.rb
@@ -1173,13 +1222,12 @@ files:
 - test/lib/puppettest/resourcetesting.rb
 - test/lib/puppettest/runnable_test.rb
 - test/lib/puppettest/servertest.rb
+- test/lib/puppettest/support.rb
 - test/lib/puppettest/support/assertions.rb
 - test/lib/puppettest/support/helpers.rb
 - test/lib/puppettest/support/resources.rb
 - test/lib/puppettest/support/utils.rb
-- test/lib/puppettest/support.rb
 - test/lib/puppettest/testcase.rb
-- test/lib/puppettest.rb
 - test/lib/rake/puppet_test_loader.rb
 - test/lib/rake/puppet_testtask.rb
 - test/lib/stubba.rb
@@ -1203,7 +1251,6 @@ files:
 - test/puppet/defaults.rb
 - test/rails/rails.rb
 - test/rails/railsparameter.rb
-- test/Rakefile
 - test/ral/manager/attributes.rb
 - test/ral/manager/instances.rb
 - test/ral/manager/manager.rb
@@ -1214,20 +1261,20 @@ files:
 - test/ral/providers/host/parsed.rb
 - test/ral/providers/mailalias/aliases.rb
 - test/ral/providers/nameservice.rb
+- test/ral/providers/package.rb
 - test/ral/providers/package/aptitude.rb
 - test/ral/providers/package/aptrpm.rb
-- test/ral/providers/package.rb
 - test/ral/providers/parsedfile.rb
 - test/ral/providers/port/parsed.rb
 - test/ral/providers/provider.rb
 - test/ral/providers/service/base.rb
 - test/ral/providers/sshkey/parsed.rb
-- test/ral/providers/user/useradd.rb
 - test/ral/providers/user.rb
+- test/ral/providers/user/useradd.rb
 - test/ral/type/cron.rb
 - test/ral/type/exec.rb
-- test/ral/type/file/target.rb
 - test/ral/type/file.rb
+- test/ral/type/file/target.rb
 - test/ral/type/fileignoresource.rb
 - test/ral/type/filesources.rb
 - test/ral/type/host.rb
@@ -1239,7 +1286,6 @@ files:
 - test/ral/type/user.rb
 - test/ral/type/yumrepo.rb
 - test/ral/type/zone.rb
-- test/README
 - test/test
 - test/util/classgen.rb
 - test/util/execution.rb
@@ -1256,6 +1302,7 @@ files:
 - test/util/utiltest.rb
 - spec/fixtures/faulty_face/puppet/face/syntax.rb
 - spec/fixtures/integration/provider/mailalias/aliases/test1
+- spec/fixtures/releases/jamtur01-apache/Modulefile
 - spec/fixtures/releases/jamtur01-apache/files/httpd
 - spec/fixtures/releases/jamtur01-apache/files/test.vhost
 - spec/fixtures/releases/jamtur01-apache/lib/puppet/provider/a2mod/debian.rb
@@ -1267,7 +1314,6 @@ files:
 - spec/fixtures/releases/jamtur01-apache/manifests/ssl.pp
 - spec/fixtures/releases/jamtur01-apache/manifests/vhost.pp
 - spec/fixtures/releases/jamtur01-apache/metadata.json
-- spec/fixtures/releases/jamtur01-apache/Modulefile
 - spec/fixtures/releases/jamtur01-apache/templates/vhost-default.conf.erb
 - spec/fixtures/releases/jamtur01-apache/tests/apache.pp
 - spec/fixtures/releases/jamtur01-apache/tests/dev.pp
@@ -1427,8 +1473,8 @@ files:
 - spec/lib/matchers/json.rb
 - spec/lib/puppet/face/1.0.0/huzzah.rb
 - spec/lib/puppet/face/basetest.rb
-- spec/lib/puppet/face/huzzah/obsolete.rb
 - spec/lib/puppet/face/huzzah.rb
+- spec/lib/puppet/face/huzzah/obsolete.rb
 - spec/lib/puppet/face/version_matching.rb
 - spec/lib/puppet_spec/compiler.rb
 - spec/lib/puppet_spec/database.rb