puppet 6.7.0 → 6.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6739b00b930cc1e7e8f361e958769b3c3f02ab6ee88e96bdf018a98b847cfb09
-  data.tar.gz: 5b7812551d0fb9dcfc0c2793b5cb3ef36997efde0c878567b09f520808e41bd2
+  metadata.gz: 5d3d59e208683953e4535c887504a78de65dfb0db03f7624a98dc5701b600000
+  data.tar.gz: c2b552ea7c474edf40c19a84a6d03b6590278af5ee606a823d44e17acca27ebd
 SHA512:
-  metadata.gz: 526dcbc10b75e92ca4028824567e2e83bb2c80938be0796e6574b0cb5efffb8dc1ad235763aa41e75946315c218aafd771d388e5cadeaaffae51cb338325eb6f
-  data.tar.gz: c800fbda4bfae645c209742ff25ed10ef07368da5920b241c81f6c6bcd54e4b113e32c08aa52be4a717b22da77cd6ab6e0ffeef5d5620abd9f83426d69bb6d3f
+  metadata.gz: 37fb316f8507f6f8c3f58ea63daa55a24e34b7dcbf9a2e7ba9261d28e4cd653b61fdad67ae99277402c8b05edeba6240f6cbcdfde5fc3e6560b461203052c2d9
+  data.tar.gz: b0f55d9966b43f82ab4bc32ae5c377a9edecf9253d031fab005da79e336b2537b22d999bc709276a7db9d03265db7c68b6ff433d609b004e670b3406af13ffe6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    puppet (6.7.0)
+    puppet (6.7.2)
       CFPropertyList (~> 2.2)
       facter (>= 2.4.0, < 4)
       fast_gettext (~> 1.1)
@@ -62,14 +62,14 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.1.1)
-    puppet-resource_api (1.8.4)
+    puppet-resource_api (1.8.6)
       hocon (>= 1.0)
     puppetserver-ca (1.3.2)
       facter (>= 2.0.1, < 4)
     racc (1.4.9)
     rainbow (2.2.2)
       rake
-    rake (12.3.2)
+    rake (12.3.3)
     rdiscount (2.2.0.1)
     rdoc (6.1.1)
     ronn (0.7.3)

data/lib/puppet/transaction/report.rb

@@ -256,11 +256,11 @@ class Puppet::Transaction::Report
     @time = data['time']
     @corrective_change = data['corrective_change']
 
-    if data['master_used'] 
+    if data['master_used']
       @master_used = data['master_used']
     end
 
-    if data['catalog_uuid'] 
+    if data['catalog_uuid']
       @catalog_uuid = data['catalog_uuid']
     end
 

data/lib/puppet/type.rb

@@ -2187,7 +2187,7 @@ end
       # Retrieve the list of names from the block.
       list = self.instance_eval(&block)
       next unless list
-      list = Array(list)
+      list = [list] unless list.is_a?(Array)
 
       # Collect the current prereqs
       list.each { |dep|
@@ -2207,7 +2207,6 @@ end
         end
       }
     }
-
     reqs
   end
 

data/lib/puppet/type/exec.rb

@@ -573,7 +573,7 @@ module Puppet
     autorequire(:user) do
       # Autorequire users if they are specified by name
       user = self[:user]
-      if user !~ /^\d+$/
+      if user && user !~ /^\d+$/
         user
       end
     end

data/lib/puppet/util/fileparsing.rb

@@ -201,7 +201,7 @@ module Puppet::Util::FileParsing
       else
         ret = {}
         sep = record.separator
-  
+
         # String "helpfully" replaces ' ' with /\s+/ in splitting, so we
         # have to work around it.
         if sep == " "
@@ -216,20 +216,20 @@ module Puppet::Util::FileParsing
             ret[param] = :absent
           end
         end
-  
+
         if record.rollup and ! line_fields.empty?
           last_field = record.fields[-1]
           val = ([ret[last_field]] + line_fields).join(record.joiner)
           ret[last_field] = val
         end
       end
-  
-      if ret
-        ret[:record_type] = record.name
-        return ret
-      else
-        return nil
-      end
+    end
+
+    if ret
+      ret[:record_type] = record.name
+      return ret
+    else
+      return nil
     end
   end
 
@@ -373,7 +373,7 @@ module Puppet::Util::FileParsing
 
   def valid_attr?(type, attr)
     type = type.intern
-    record = record_type(type) 
+    record = record_type(type)
     if record && record.fields.include?(attr.intern)
       return true
     else

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 = '6.7.0'
+  PUPPETVERSION = '6.7.2'
 
   ##
   # version is a public API method intended to always provide a fast and

data/spec/fixtures/unit/provider/parsedfile/aliases.txt

@@ -0,0 +1,2 @@
+manager:  root
+dumper:   postmaster

data/spec/unit/provider/parsedfile_spec.rb

@@ -224,4 +224,30 @@ describe "A very basic provider based on ParsedFile" do
       end
     end
   end
+
+  context 'parsing a record type' do
+    let(:input_text) { File.read(my_fixture('aliases.txt')) }
+    let(:target) { tmpfile('parsedfile_spec') }
+    let(:provider) do
+      example_provider_class = Class.new(Puppet::Provider::ParsedFile)
+      example_provider_class.default_target = target
+      # Setup some record rules
+      example_provider_class.instance_eval do
+        record_line :aliases, :fields =>  %w{manager alias}, :separator => ':'
+      end
+      example_provider_class.initvars
+      example_provider_class.prefetch
+      example_provider_class
+    end
+    let(:expected_result) do
+      [
+        {:manager=>"manager", :alias=>"  root", :record_type=>:aliases},
+        {:manager=>"dumper", :alias=>"   postmaster", :record_type=>:aliases}
+      ]
+    end
+
+    subject { provider.parse(input_text) }
+
+    it { is_expected.to  match_array(expected_result) }
+  end
 end

data/spec/unit/type_spec.rb

@@ -408,6 +408,24 @@ describe Puppet::Type, :unless => Puppet::Util::Platform.windows? do
     end
 
     describe "when building autorelations" do
+      it "should be able to autorequire puppet resources" do
+        Puppet::Type.newtype(:autorelation_two) do
+          newparam(:name) { isnamevar }
+          autorequire(:autorelation_one) { Puppet::Type.type(:notify).new(name: 'test') }
+        end
+
+        relationship_graph = compile_to_relationship_graph(<<-MANIFEST)
+          autorelation_one { 'Notify[test]': }
+          autorelation_two { 'bar': }
+        MANIFEST
+
+        src = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Notify[test]' }.first
+        dst = relationship_graph.vertices.select{ |x| x.ref.to_s == 'Autorelation_two[bar]' }.first
+
+        expect(relationship_graph.edge?(src,dst)).to be_truthy
+        expect(relationship_graph.edges_between(src,dst).first.event).to eq(:NONE)
+      end
+
       it "should be able to autorequire resources" do
         Puppet::Type.newtype(:autorelation_two) do
           newparam(:name) { isnamevar }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 6.7.0
+  version: 6.7.2
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-19 00:00:00.000000000 Z
+date: 2019-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter
@@ -1696,6 +1696,7 @@ files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
+- spec/fixtures/unit/provider/parsedfile/aliases.txt
 - spec/fixtures/unit/provider/parsedfile/simple.txt
 - spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding
 - spec/fixtures/unit/provider/service/gentoo/rc_update_show
@@ -2939,6 +2940,7 @@ test_files:
 - spec/fixtures/unit/provider/package/yum/yum-check-update-simple.txt
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-SLES11sp1.out
 - spec/fixtures/unit/provider/package/zypper/zypper-list-updates-empty.out
+- spec/fixtures/unit/provider/parsedfile/aliases.txt
 - spec/fixtures/unit/provider/parsedfile/simple.txt
 - spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding
 - spec/fixtures/unit/provider/service/gentoo/rc_update_show