puppet 3.8.3 → 3.8.4

data/ext/build_defaults.yaml

@@ -9,7 +9,7 @@ gpg_name: 'info@puppetlabs.com'
 gpg_key: '4BD6EC30'
 sign_tar: FALSE
 # a space separated list of mock configs
-final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64 pl-fedora-20-i386'
+final_mocks: 'pl-el-5-i386 pl-el-6-i386 pl-el-7-x86_64'
 yum_host: 'yum.puppetlabs.com'
 yum_repo_path: '/opt/repository/yum/'
 build_gem: TRUE
@@ -26,8 +26,8 @@ build_msi:
     repo: 'git://github.com/puppetlabs/hiera.git'
   sys:
     ref:
-      x86: 'refs/tags/1.9.3-p551.5'
-      x64: 'refs/tags/2.0.0.8-x64'
+      x86: 'refs/tags/1.9.3-p551.6'
+      x64: 'refs/tags/2.0.0.9-x64'
     repo: 'git://github.com/puppetlabs/puppet-win32-ruby.git'
 apt_host: 'apt.puppetlabs.com'
 apt_repo_url: 'http://apt.puppetlabs.com'

data/lib/puppet.rb

@@ -82,6 +82,8 @@ module Puppet
   # setting access and stuff
   def self.[]=(param,value)
     @@settings[param] = value
+    # Ensure that all environment caches are cleared if we're changing the parser
+    lookup(:environments).clear_all if param == :parser
   end
 
   def self.clear
@@ -242,6 +244,8 @@ module Puppet
   # @api private
   def self.override(bindings, description = "", &block)
     @context.override(bindings, description, &block)
+  ensure
+    lookup(:root_environment).instance_variable_set(:@future_parser, nil)
   end
 
   # @api private
@@ -264,14 +268,7 @@ module Puppet
   #
   def self.future_parser?(in_environment = nil)
     env = in_environment || Puppet.lookup(:current_environment) { return Puppet[:parser] == 'future' }
-    env_conf = Puppet.lookup(:environments).get_conf(env.name)
-
-    if env_conf.nil?
-      # Case for non-directory environments
-      Puppet[:parser] == 'future'
-    else
-      env_conf.parser == 'future'
-    end
+    env.future_parser?
   end
 end
 

data/lib/puppet/defaults.rb

@@ -2052,6 +2052,10 @@ EOT
     },
     :parser => {
       :default => "current",
+      :hook    => proc do |value|
+        envs = Puppet.lookup(:environments) { nil }
+        envs.clear_all unless envs.nil?
+      end,
       :desc => <<-'EOT'
         Selects the parser to use for parsing puppet manifests (in puppet DSL
         language/'.pp' files). Available choices are `current` (the default)

data/lib/puppet/environments.rb

@@ -38,6 +38,11 @@ module Puppet::Environments
         raise EnvironmentNotFound, name
       end
     end
+
+    def clear_all
+      root = Puppet.lookup(:root_environment) { nil }
+      root.instance_variable_set(:@future_parser, nil) unless root.nil?
+    end
   end
 
   # @!macro [new] loader_search_paths
@@ -247,12 +252,14 @@ module Puppet::Environments
     def create_environment(name, setting_values = nil)
       env_symbol = name.intern
       setting_values = Puppet.settings.values(env_symbol, Puppet.settings.preferred_run_mode)
-      Puppet::Node::Environment.create(
+      env = Puppet::Node::Environment.create(
         env_symbol,
         Puppet::Node::Environment.split_path(setting_values.interpolate(:modulepath)),
         setting_values.interpolate(:manifest),
         setting_values.interpolate(:config_version)
       )
+      env.watching = false
+      env
     end
 
     def valid_directory?(envdir)
@@ -311,6 +318,9 @@ module Puppet::Environments
       nil
     end
 
+    def clear_all
+      @loaders.each {|loader| loader.clear_all}
+    end
   end
 
   class Cached
@@ -412,6 +422,7 @@ module Puppet::Environments
     # Clears all cached environments.
     # (The intention is that this could be used from a MANUAL cache eviction command (TBD)
     def clear_all()
+      super
       @cache = {}
       @expirations.clear
       @next_expiration = END_OF_TIME

data/lib/puppet/functions/filter.rb

@@ -57,14 +57,14 @@ Puppet::Functions.create_function(:filter) do
   end
 
   def filter_Hash_1(hash)
-    result = hash.select {|x, y| yield([x, y]) }
+    result = hash.select {|x, y| yield([x, y]) == true }
     # Ruby 1.8.7 returns Array
     result = Hash[result] unless result.is_a? Hash
     result
   end
 
   def filter_Hash_2(hash)
-    result = hash.select {|x, y| yield(x, y) }
+    result = hash.select {|x, y| yield(x, y) == true }
     # Ruby 1.8.7 returns Array
     result = Hash[result] unless result.is_a? Hash
     result

data/lib/puppet/node/environment.rb

@@ -258,6 +258,15 @@ class Puppet::Node::Environment
     !original_manifest.nil? && !original_manifest.empty? && original_manifest != Puppet[:default_manifest]
   end
 
+  # @api private
+  def future_parser?
+    if @future_parser.nil?
+      environment_conf = Puppet.lookup(:environments).get_conf(name)
+      @future_parser = 'future' == (environment_conf.nil? ? Puppet[:parser] : environment_conf.parser)
+    end
+    @future_parser
+  end
+
   # Return an environment-specific Puppet setting.
   #
   # @api public

data/lib/puppet/settings/file_setting.rb

@@ -219,15 +219,16 @@ class Puppet::Settings::FileSetting < Puppet::Settings::StringSetting
     Puppet::Util::SUIDManager.asuser(*chown) do
       # Update the umask to make non-executable files
       Puppet::Util.withumask(File.umask ^ 0111) do
-        mode = case mode.class
-                 when String
-                   mode.to_i(8)
-                 when NilClass
-                   0640
-                 else
-                   mode
-                 end
-        yield mode
+        yielded_value = case self.mode
+                        when String
+                          self.mode.to_i(8)
+                        when NilClass
+                          0640
+                        else
+                          self.mode
+                        end
+
+        yield yielded_value
       end
     end
   end

data/lib/puppet/transaction.rb

@@ -350,11 +350,8 @@ class Puppet::Transaction
     resource.appliable_to_host? && resource.appliable_to_device?
   end
 
-  def handle_qualified_tags( qualified )
-    # The default behavior of Puppet::Util::Tagging is
-    # to split qualified tags into parts. That would cause
-    # qualified tags to match too broadly here.
-    return
+  def split_qualified_tags?
+    false
   end
 
   # Is this resource tagged appropriately?
@@ -364,6 +361,7 @@ class Puppet::Transaction
 
     not resource.tagged?(*tags)
   end
+
 end
 
 require 'puppet/transaction/report'

data/lib/puppet/util/tagging.rb

@@ -14,8 +14,10 @@ module Puppet::Util::Tagging
       name = tag.to_s.downcase
       if name =~ ValidTagRegex
         @tags << name
-        name.split("::").each do |section|
-          @tags << section
+        if split_qualified_tags?
+          name.split("::").each do |section|
+            @tags << section
+          end
         end
       else
         fail(Puppet::ParseError, "Invalid tag '#{name}'")
@@ -69,6 +71,10 @@ module Puppet::Util::Tagging
     tag.is_a?(String) and tag =~ ValidTagRegex
   end
 
+  def split_qualified_tags?
+    true
+  end
+
   def new_tags
     Puppet::Util::TagSet.new
   end

data/lib/puppet/util/windows/adsi.rb

@@ -188,8 +188,11 @@ module Puppet::Util::Windows::ADSI
     end
 
     def password=(password)
-      native_user.SetPassword(password)
-      commit
+      if !password.nil?
+        native_user.SetPassword(password)
+        commit
+      end
+
       fADS_UF_DONT_EXPIRE_PASSWD = 0x10000
       add_flag("UserFlags", fADS_UF_DONT_EXPIRE_PASSWD)
     end

data/lib/puppet/version.rb

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

data/spec/unit/functions/filter_spec.rb

@@ -126,6 +126,24 @@ describe 'the filter method' do
     expect(catalog).to have_resource("File[/file_blueb]").with_parameter(:ensure, 'present')
   end
 
+  it 'filters on an array will not include elements for which the block returns truthy but not true' do
+    catalog = compile_to_catalog(<<-MANIFEST)
+      $r = [1, 2, 3].filter |$v| { $v } == []
+      notify { "eval_${$r}": }
+    MANIFEST
+
+    expect(catalog).to have_resource('Notify[eval_true]')
+  end
+
+  it 'filters on a hash will not include elements for which the block returns truthy but not true' do
+    catalog = compile_to_catalog(<<-MANIFEST)
+      $r = {a => 1, b => 2, c => 3}.filter |$k, $v| { $v } == {}
+      notify { "eval_${$r}": }
+    MANIFEST
+
+    expect(catalog).to have_resource('Notify[eval_true]')
+  end
+
   it_should_behave_like 'all iterative functions argument checks', 'filter'
   it_should_behave_like 'all iterative functions hash handling', 'filter'
 end

data/spec/unit/provider/user/windows_adsi_spec.rb

@@ -124,7 +124,8 @@ describe Puppet::Type.type(:user).provider(:windows_adsi), :if => Puppet.feature
       resource[:name] = 'DOMAIN\testdomainuser'
       Puppet::Util::Windows::ADSI::Group.expects(:exists?).with(resource[:name]).returns(false)
       connection.expects(:Create)
-      connection.expects(:SetPassword)
+      connection.expects(:Get).with('UserFlags')
+      connection.expects(:Put).with('UserFlags', true)
       connection.expects(:SetInfo).raises( WIN32OLERuntimeError.new("(in OLE method `SetInfo': )\n    OLE error code:8007089A in Active Directory\n      The specified username is invalid.\r\n\n    HRESULT error code:0x80020009\n      Exception occurred."))
 
       expect{ provider.create }.to raise_error(

data/spec/unit/settings/file_setting_spec.rb

@@ -295,4 +295,35 @@ describe Puppet::Settings::FileSetting do
       filesetting.munge(':memory:').should == ':memory:'
     end
   end
+
+  context "when opening", :unless => Puppet.features.microsoft_windows? do
+    let(:path) do
+      tmpfile('file_setting_spec')
+    end
+
+    let(:setting) do
+      settings = mock("settings", :value => path)
+      FileSetting.new(:name => :mysetting, :desc => "creates a file", :settings => settings)
+    end
+
+    it "creates a file with mode 0640" do
+      setting.mode = '0640'
+
+      expect(File).to_not be_exist(path)
+      setting.open('w')
+
+      expect(File).to be_exist(path)
+      expect(Puppet::FileSystem.stat(path).mode & 0777).to eq(0640)
+    end
+
+    it "preserves the mode of an existing file" do
+      setting.mode = '0640'
+
+      Puppet::FileSystem.touch(path)
+      Puppet::FileSystem.chmod(0644, path)
+      setting.open('w')
+
+      expect(Puppet::FileSystem.stat(path).mode & 0777).to eq(0644)
+    end
+  end
 end

data/spec/unit/transaction_spec.rb

@@ -707,6 +707,13 @@ describe Puppet::Transaction, " when determining tags" do
     @transaction.should be_tagged("one::two")
   end
 
+  it "should tag one::two only as 'one::two' and not 'one', 'two', and 'one::two'" do
+    @transaction.tags = "one::two"
+    @transaction.should be_tagged("one::two")
+    @transaction.should_not be_tagged("one")
+    @transaction.should_not be_tagged("two")
+  end
+
   it "should accept a comma-delimited string" do
     @transaction.tags = "one, two"
     @transaction.should be_tagged("one")

data/spec/unit/util/windows/adsi_spec.rb

@@ -203,6 +203,19 @@ describe Puppet::Util::Windows::ADSI, :if => Puppet.features.microsoft_windows?
         user.password = 'pwd'
       end
 
+       it "should be able manage a user without a password" do
+        adsi_user.expects(:SetPassword).with('pwd').never
+        adsi_user.expects(:SetInfo).at_least_once
+
+        flagname = "UserFlags"
+        fADS_UF_DONT_EXPIRE_PASSWD = 0x10000
+
+        adsi_user.expects(:Get).with(flagname).returns(0)
+        adsi_user.expects(:Put).with(flagname, fADS_UF_DONT_EXPIRE_PASSWD)
+
+        user.password = nil
+      end
+
       it "should generate the correct URI" do
         Puppet::Util::Windows::SID.stubs(:octet_string_to_sid_object).returns(sid)
         user.uri.should == "WinNT://testcomputername/#{username},user"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet
 version: !ruby/object:Gem::Version
-  version: 3.8.3
+  version: 3.8.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facter