puppet 3.3.1.rc3 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0efbe0e0e21b0391a01f1f2faab2d1b0226a26e7
-  data.tar.gz: 3ec5f8c802c8be9915e9442e3f4c2ee9d0b512ec
+  metadata.gz: ee9d3b6d97827d31437f89eddf9f9ebe7bdba1c8
+  data.tar.gz: aa84cc4a207e01010674f784720f9dba747dd7d6
 SHA512:
-  metadata.gz: 343e12a8a203d0c1eca34bc7f850d3e456717e09961b0fb62d5a826f635c911f4578619f3c4f4c8d201378cb0f0080526a341af514b61b51ea4ea9d779358c98
-  data.tar.gz: 51b63bad22e5ab099b2233fbef0b88e10f609432d74de59b2def5de71e6e8c9ad7a30b75f15bc89116b3ece9fed520eb0483a951dbe6f604338a70f7658e0f72
+  metadata.gz: d43b4ec3e3857c62ce765f57d12508ff11a4a9728f06449d4abb231b80fa7c142e36f913e7ddf439956212388e459d083e23f2ea68c7e82bfe600c1aa1b30a7e
+  data.tar.gz: 8e12c44a4422f68e9c06b814d88f29c199668d40db3f8a9e366a5de1142a908e27699d01159847fa7dde52b3abe8879b18c2aad0a0b9c188701476db2ab32dd5

data/lib/puppet/network/formats.rb

@@ -3,18 +3,28 @@ require 'puppet/network/format_handler'
 Puppet::Network::FormatHandler.create_serialized_formats(:yaml) do
   def intern(klass, text)
     data = YAML.load(text, :safe => true, :deserialize_symbols => true)
-    return data if data.is_a?(klass)
-    klass.from_pson(data)
+    data_to_instance(klass, data)
   end
 
   def intern_multiple(klass, text)
-    YAML.load(text, :safe => true, :deserialize_symbols => true).collect do |data|
-      if data.is_a?(klass)
-        data
-      else
-        klass.from_pson(data)
-      end
+    data = YAML.load(text, :safe => true, :deserialize_symbols => true)
+    unless data.respond_to?(:collect)
+      raise Puppet::Network::FormatHandler::FormatError, "Serialized YAML did not contain a collection of instances when calling intern_multiple"
+    end
+
+    data.collect do |datum|
+      data_to_instance(klass, datum)
+    end
+  end
+
+  def data_to_instance(klass, data)
+    return data if data.is_a?(klass)
+
+    unless data.is_a? Hash
+      raise Puppet::Network::FormatHandler::FormatError, "Serialized YAML did not contain a valid instance of #{klass}"
     end
+
+    klass.from_pson(data)
   end
 
   def render(instance)

data/lib/puppet/network/http/handler.rb

@@ -255,7 +255,6 @@ module Puppet::Network::HTTP::Handler
 
   def read_body_into_model(model_class, request)
     data = body(request).to_s
-    raise ArgumentError, "No data to save" if !data or data.empty?
 
     format = request_format(request)
     model_class.convert_from(format, data)

data/lib/puppet/parser/functions/create_resources.rb

@@ -7,11 +7,11 @@ Puppet::Parser::Functions::newfunction(:create_resources, :arity => -3, :doc =>
         # A hash of user resources:
         $myusers = {
           'nick' => { uid    => '1330',
-                      group  => allstaff,
-                      groups => ['developers', 'operations', 'release'], }
+                      gid    => allstaff,
+                      groups => ['developers', 'operations', 'release'], },
           'dan'  => { uid    => '1308',
-                      group  => allstaff,
-                      groups => ['developers', 'prosvc', 'release'], }
+                      gid    => allstaff,
+                      groups => ['developers', 'prosvc', 'release'], },
         }
 
         create_resources(user, $myusers)

data/lib/puppet/version.rb

@@ -7,7 +7,7 @@
 
 
 module Puppet
-  PUPPETVERSION = '3.3.1-rc3'
+  PUPPETVERSION = '3.3.1'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/integration/type/file_spec.rb

@@ -1004,8 +1004,8 @@ describe Puppet::Type.type(:file) do
         catalog.add_resource file
         catalog.apply
 
-        get_owner(path).should == 'S-1-5-32-544'
-        get_group(path).should == 'S-1-0-0'
+        get_owner(path).should =~ /^S\-1\-5\-.*$/
+        get_group(path).should =~ /^S\-1\-0\-0.*$/
         get_mode(path).should == 0644
       end
     end

data/spec/unit/indirector/rest_spec.rb

@@ -4,6 +4,8 @@ require 'puppet/indirector'
 require 'puppet/indirector/errors'
 require 'puppet/indirector/rest'
 
+HTTP_ERROR_CODES = [300, 400, 500]
+
 # Just one from each category since the code makes no real distinctions
 shared_examples_for "a REST terminus method" do |terminus_method|
   describe "when talking to an older master" do
@@ -26,7 +28,6 @@ shared_examples_for "a REST terminus method" do |terminus_method|
     end
   end
 
-  HTTP_ERROR_CODES = [300, 400, 500]
   HTTP_ERROR_CODES.each do |code|
     describe "when the response code is #{code}" do
       let(:response) { mock_response(code, 'error messaged!!!') }

data/spec/unit/network/formats_spec.rb

@@ -63,27 +63,31 @@ describe "Puppet Network Format" 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
+    it "fails intelligibly instead of calling to_pson with something other than a hash" do
+      expect do
+        @yaml.intern(Puppet::Node, '')
+      end.to raise_error(Puppet::Network::FormatHandler::FormatError, /did not contain a valid instance/)
+    end
+
+    it "fails intelligibly when intern_multiple is called and yaml doesn't decode to an array" do
       expect do
-        @yaml.intern_multiple(Hash, YAML.dump(["foo"]))
-      end.to raise_error(NoMethodError)
+        @yaml.intern_multiple(Puppet::Node, '')
+      end.to raise_error(Puppet::Network::FormatHandler::FormatError, /did not contain a collection/)
+    end
+
+    it "fails intelligibly instead of calling to_pson with something other than a hash when interning multiple" do
+      expect do
+        @yaml.intern_multiple(Puppet::Node, YAML.dump(["hello"]))
+      end.to raise_error(Puppet::Network::FormatHandler::FormatError, /did not contain a valid instance/)
     end
   end
 
   describe "base64 compressed yaml", :if => Puppet.features.zlib? do
-    yaml = Puppet::Network::FormatHandler.format(:b64_zlib_yaml)
-
     before do
       @yaml = Puppet::Network::FormatHandler.format(:b64_zlib_yaml)
     end
@@ -294,6 +298,12 @@ describe "Puppet Network Format" do
         PsonTest.expects(:from_pson).with("baz").returns "BAZ"
         @pson.intern_multiple(PsonTest, text).should == %w{BAR BAZ}
       end
+
+      it "fails intelligibly when given invalid data" do
+        expect do
+          @pson.intern(Puppet::Node, '')
+        end.to raise_error(PSON::ParserError, /source did not contain any PSON/)
+      end
     end
   end
 

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

@@ -17,6 +17,10 @@ describe Puppet::Network::HTTP::Handler do
         @data = data
       end
 
+      def self.from_raw(raw)
+        new(nil, raw)
+      end
+
       def self.from_pson(pson)
         new(pson["name"], pson["data"])
       end
@@ -33,7 +37,6 @@ describe Puppet::Network::HTTP::Handler do
       end
     end
 
-    # The subclass must not be all caps even though the superclass is
     class Puppet::TestModel::Memory < Puppet::Indirector::Memory
     end
 
@@ -443,12 +446,23 @@ describe Puppet::Network::HTTP::Handler do
     end
 
     describe "when saving a model instance" do
-      it "should fail to save model if data is not specified" do
-        data = Puppet::TestModel.new("my data", "some data")
+      it "allows an empty body when the format supports it" do
+        class Puppet::TestModel::Nonvalidatingmemory < Puppet::TestModel::Memory
+          def validate_key(_)
+            # nothing
+          end
+        end
+
+        indirection.terminus_class = :nonvalidatingmemory
+
+        data = Puppet::TestModel.new("test", '')
         request = a_request_that_submits(data)
+        request[:content_type_header] = "application/x-raw"
         request[:body] = ''
 
-        expect { handler.do_save("my_handler", "my_result", {}, request, response) }.to raise_error(ArgumentError)
+        handler.do_save(indirection.name, "test", {}, request, response)
+
+        Puppet::TestModel.indirection.find("test").data.should == ''
       end
 
       it "saves the data sent in the request" do

data/spec/unit/node/environment_spec.rb

@@ -143,7 +143,7 @@ describe Puppet::Node::Environment do
       it "should use the current working directory to fully-qualify unqualified paths" do
         FileTest.stubs(:directory?).returns true
   
-        two = File.expand_path(File.join(Dir.getwd, "two"))
+        two = File.expand_path("two")
         env.validate_dirs([@path_one, 'two']).should == [@path_one, two]
       end
     end

data/spec/unit/parser/files_spec.rb

@@ -70,9 +70,8 @@ describe Puppet::Parser::Files do
     it "should accept relative templatedirs" do
       FileTest.stubs(:exist?).returns true
       Puppet[:templatedir] = "my/templates"
-      # We expand_path to normalize backslashes and slashes on Windows
-      File.expects(:directory?).with(File.expand_path(File.join(Dir.getwd,"my/templates"))).returns(true)
-      Puppet::Parser::Files.find_template("mytemplate").should == File.expand_path(File.join(Dir.getwd,"my/templates/mytemplate"))
+      File.expects(:directory?).with(File.expand_path("my/templates")).returns(true)
+      Puppet::Parser::Files.find_template("mytemplate").should == File.expand_path("my/templates/mytemplate")
     end
 
     it "should use the environment templatedir if no module is found and an environment is specified" do

data/spec/unit/settings/file_setting_spec.rb

@@ -170,9 +170,7 @@ describe Puppet::Settings::FileSetting do
 
     it "should fully qualified returned files if necessary (#795)" do
       @settings.stubs(:value).with(:myfile).returns "myfile"
-      path = File.join(Dir.getwd, "myfile")
-      # Dir.getwd can return windows paths with backslashes, so we normalize them using expand_path
-      path = File.expand_path(path) if Puppet.features.microsoft_windows?
+      path = File.expand_path('myfile')
       @file.to_resource.title.should == path
     end
 

data/spec/unit/util_spec.rb

@@ -59,6 +59,7 @@ describe Puppet::Util do
 
     it "should remove any new environment variables after the block ends" do
       @new_env[:FOO] = "bar"
+      ENV["FOO"] = nil
       Puppet::Util.withenv @new_env do
         ENV["FOO"].should == "bar"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.3.1.rc3
+  version: 3.3.1
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-02 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -2172,9 +2172,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: puppet
 rubygems_version: 2.0.3