chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/lib/chef/provider/package/rubygems.rb

@@ -72,7 +72,7 @@ class Chef
             raise NotImplementedError
           end
 
-          ## 
+          ##
           # A rubygems specification object containing the list of gemspecs for all
           # available gems in the gem installation.
           # Implemented by subclasses

data/lib/chef/provider/package/smartos.rb

@@ -64,14 +64,14 @@ class Chef
           pkg = shell_out!("/opt/local/bin/pkgin se #{new_resource.package_name}", :env => nil, :returns => [0,1])
           pkg.stdout.each_line do |line|
             case line
-            when /^#{name}/
+            when /^#{new_resource.package_name}/
               name, version = line.split[0].split(/-([^-]+)$/)
             end
           end
           @candidate_version = version
           version
         end
-     
+
         def install_package(name, version)
           Chef::Log.debug("#{@new_resource} installing package #{name} version #{version}")
           package = "#{name}-#{version}"
@@ -84,7 +84,7 @@ class Chef
         end
 
         def remove_package(name, version)
-          Chef::Log.debug("#{@new_resource} removing package #{name} version #{version}") 
+          Chef::Log.debug("#{@new_resource} removing package #{name} version #{version}")
           package = "#{name}"
           out = shell_out!("/opt/local/bin/pkgin -y remove #{package}", :env => nil)
         end

data/lib/chef/provider/package/solaris.rb

@@ -33,12 +33,12 @@ class Chef
         # end
         def define_resource_requirements
           super
-          requirements.assert(:install) do |a| 
+          requirements.assert(:install) do |a|
             a.assertion { @new_resource.source }
             a.failure_message Chef::Exceptions::Package, "Source for package #{@new_resource.name} required for action install"
           end
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { !@new_resource.source || @package_source_found } 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !@new_resource.source || @package_source_found }
             a.failure_message Chef::Exceptions::Package, "Package #{@new_resource.name} not found: #{@new_resource.source}"
             a.whyrun "would assume #{@new_resource.source} would be have previously been made available"
           end
@@ -51,7 +51,7 @@ class Chef
 
           if @new_resource.source
             @package_source_found = ::File.exists?(@new_resource.source)
-            if @package_source_found 
+            if @package_source_found
               Chef::Log.debug("#{@new_resource} checking pkg status")
               status = popen4("pkginfo -l -d #{@new_resource.source} #{@new_resource.package_name}") do |pid, stdin, stdout, stderr|
                 stdout.each do |line|
@@ -107,13 +107,23 @@ class Chef
         def install_package(name, version)
           Chef::Log.debug("#{@new_resource} package install options: #{@new_resource.options}")
           if @new_resource.options.nil?
+            if ::File.directory?(@new_resource.source) # CHEF-4469
+              command = "pkgadd -n -d #{@new_resource.source} #{@new_resource.package_name}"
+            else
+              command = "pkgadd -n -d #{@new_resource.source} all"
+            end
             run_command_with_systems_locale(
-                    :command => "pkgadd -n -d #{@new_resource.source} all"
+                    :command => command
                   )
             Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           else
+            if ::File.directory?(@new_resource.source) # CHEF-4469
+              command = "pkgadd -n#{expand_options(@new_resource.options)} -d #{@new_resource.source} #{@new_resource.package_name}"
+            else
+              command = "pkgadd -n#{expand_options(@new_resource.options)} -d #{@new_resource.source} all"
+            end
             run_command_with_systems_locale(
-              :command => "pkgadd -n#{expand_options(@new_resource.options)} -d #{@new_resource.source} all"
+              :command => command
             )
             Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           end

data/lib/chef/provider/package/yum-dump.py

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -249,8 +249,8 @@ def yum_dump(options):
 
 # Preserve order of enable/disable repo args like yum does
 def gather_repo_opts(option, opt, value, parser):
-  if getattr(parser.values, option.dest, None) is None: 
-    setattr(parser.values, option.dest, []) 
+  if getattr(parser.values, option.dest, None) is None:
+    setattr(parser.values, option.dest, [])
   getattr(parser.values, option.dest).append((opt, value.split(',')))
 
 def main():

data/lib/chef/provider/package/yum.rb

@@ -667,7 +667,7 @@ class Chef
 
             @allow_multi_install = []
 
-            @extra_repo_control = nil 
+            @extra_repo_control = nil
 
             # these are for subsequent runs if we are on an interval
             Chef::Client.when_run_starts do
@@ -1046,7 +1046,7 @@ class Chef
           end
 
           # At this point package_name could be:
-          # 
+          #
           # 1) a package name, eg: "foo"
           # 2) a package name.arch, eg: "foo.i386"
           # 3) or a dependency, eg: "foo >= 1.1"
@@ -1154,7 +1154,7 @@ class Chef
         # Hacky - better overall solution? Custom compare in Package provider?
         def action_upgrade
           # Could be uninstalled or have no candidate
-          if @current_resource.version.nil? || candidate_version.nil? 
+          if @current_resource.version.nil? || candidate_version.nil?
             super
           # Ensure the candidate is newer
           elsif RPMVersion.parse(candidate_version) > RPMVersion.parse(@current_resource.version)

data/lib/chef/provider/powershell_script.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -23,7 +23,7 @@ class Chef
     class PowershellScript < Chef::Provider::WindowsScript
 
       protected
-      
+
       EXIT_STATUS_NORMALIZATION_SCRIPT = "\nif ($? -eq $true) {exit 0} elseif ( $LASTEXITCODE -ne 0) {exit $LASTEXITCODE} else { exit 1 }"
       EXIT_STATUS_RESET_SCRIPT = "$LASTEXITCODE=0\n"
 
@@ -41,12 +41,12 @@ class Chef
       end
 
       public
-      
+
       def initialize (new_resource, run_context)
         super(new_resource, run_context, '.ps1')
         NormalizeScriptExitStatus(new_resource.code)
       end
-      
+
       def flags
         default_flags = [
           "-NoLogo",
@@ -60,8 +60,8 @@ class Chef
           # file created by the base class that contains the script
           # code -- otherwise, powershell.exe does not propagate the
           # error status of a failed Windows process that ran at the
-          # end of the script, it gets changed to '1'.                         
-          "-File"                         
+          # end of the script, it gets changed to '1'.
+          "-File"
         ]
 
         interpreter_flags = default_flags.join(' ')

data/lib/chef/provider/remote_file/ftp.rb

@@ -143,6 +143,7 @@ class Chef
             ftp.voidcmd("TYPE #{typecode.upcase}")
           end
           ftp.getbinaryfile(filename, tempfile.path)
+          tempfile.close if tempfile
           tempfile
         end
 

data/lib/chef/provider/remote_file/http.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/rest'
+require 'chef/http/simple'
 require 'chef/digester'
 require 'chef/provider/remote_file'
 require 'chef/provider/remote_file/cache_control_data'
@@ -56,19 +56,12 @@ class Chef
         end
 
         def fetch
-          tempfile = nil
-          begin
-            rest = Chef::REST.new(uri, nil, nil, http_client_opts)
-            tempfile = rest.streaming_request(uri, headers)
-            update_cache_control_data(tempfile, rest.last_response)
-          rescue Net::HTTPRetriableError => e
-            if e.response.is_a? Net::HTTPNotModified
-              tempfile = nil
-            else
-              raise e
-            end
+          http = Chef::HTTP::Simple.new(uri, http_client_opts)
+          tempfile = http.streaming_request(uri, headers)
+          if tempfile
+            update_cache_control_data(tempfile, http.last_response)
+            tempfile.close
           end
-          
           tempfile
         end
 

data/lib/chef/provider/remote_file/local_file.rb

@@ -38,6 +38,7 @@ class Chef
           tempfile = Chef::FileContentManagement::Tempfile.new(new_resource).tempfile
           Chef::Log.debug("#{new_resource} staging #{uri.path} to #{tempfile.path}")
           FileUtils.cp(uri.path, tempfile.path)
+          tempfile.close if tempfile
           tempfile
         end
 

data/lib/chef/provider/resource_update.rb

@@ -4,27 +4,27 @@ class Chef
 
     # {
     #    "run_id" : "1000",
-    #    "resource" : { 
+    #    "resource" : {
     #         "type" : "file",
-    #         "name" : "/etc/passwd", 
+    #         "name" : "/etc/passwd",
     #         "start_time" : "2012-01-09T08:15:30-05:00",
     #         "end_time" : "2012-01-09T08:15:30-05:00",
     #         "status" : "modified",
-    #         "initial_state" : "exists", 
-    #         "final_state" : "modified", 
-    #         "before" : { 
-    #              "group" : "root", 
+    #         "initial_state" : "exists",
+    #         "final_state" : "modified",
+    #         "before" : {
+    #              "group" : "root",
     #              "owner" : "root",
     #              "checksum" : "xyz"
     #         },
-    #         "after" : { 
-    #              "group" : "root", 
+    #         "after" : {
+    #              "group" : "root",
     #              "owner" : "root",
     #              "checksum" : "abc"
     #         },
     #         "delta" : "escaped delta goes here"
     #    },
-    #    "event_data" : "" 
+    #    "event_data" : ""
     # }
 
     class ResourceUpdate

data/lib/chef/provider/ruby_block.rb

@@ -7,9 +7,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@ class Chef
       end
 
       def action_run
-        converge_by("execute the ruby block #{@new_resource.name}") do 
+        converge_by("execute the ruby block #{@new_resource.name}") do
           @new_resource.block.call
           Chef::Log.info("#{@new_resource} called")
         end

data/lib/chef/provider/script.rb

@@ -27,7 +27,7 @@ class Chef
         super
         @code = @new_resource.code
       end
-      
+
       def action_run
         script_file.puts(@code)
         script_file.close

data/lib/chef/provider/service.rb

@@ -35,7 +35,7 @@ class Chef
       end
 
      def load_new_resource_state
-        # If the user didn't specify a change in enabled state, 
+        # If the user didn't specify a change in enabled state,
         # it will be the same as the old resource
        if ( @new_resource.enabled.nil? )
          @new_resource.enabled(@current_resource.enabled)
@@ -54,7 +54,7 @@ class Chef
          a.failure_message Chef::Exceptions::UnsupportedAction, "#{self.to_s} does not support :reload"
          # if a service is not declared to support reload, that won't
          # typically change during the course of a run - so no whyrun
-         # alternative here. 
+         # alternative here.
        end
       end
 

data/lib/chef/provider/service/debian.rb

@@ -41,17 +41,17 @@ class Chef
           shared_resource_requirements
           requirements.assert(:all_actions) do |a|
             update_rcd = "/usr/sbin/update-rc.d"
-            a.assertion { ::File.exists? update_rcd } 
+            a.assertion { ::File.exists? update_rcd }
             a.failure_message Chef::Exceptions::Service, "#{update_rcd} does not exist!"
             # no whyrun recovery - this is a base system component of debian
-            # distros and must be present 
-          end 
+            # distros and must be present
+          end
 
           requirements.assert(:all_actions) do |a|
-            a.assertion { @priority_success } 
+            a.assertion { @priority_success }
             a.failure_message  Chef::Exceptions::Service, "/usr/sbin/update-rc.d -n -f #{@current_resource.service_name} failed - #{@rcd_status.inspect}"
-            # This can happen if the service is not yet installed,so we'll fake it. 
-            a.whyrun ["Unable to determine priority of service, assuming service would have been correctly installed earlier in the run.", 
+            # This can happen if the service is not yet installed,so we'll fake it.
+            a.whyrun ["Unable to determine priority of service, assuming service would have been correctly installed earlier in the run.",
                       "Assigning temporary priorities to continue.",
                       "If this service is not properly installed prior to this point, this will fail."] do
               temp_priorities = {"6"=>[:stop, "20"],
@@ -74,7 +74,7 @@ class Chef
             [stdout, stderr].each do |iop|
               iop.each_line do |line|
                 if UPDATE_RC_D_PRIORITIES =~ line
-                  # priority[runlevel] = [ S|K, priority ] 
+                  # priority[runlevel] = [ S|K, priority ]
                   # S = Start, K = Kill
                   # debian runlevels: 0 Halt, 1 Singleuser, 2 Multiuser, 3-5 == 2, 6 Reboot
                   priority[$1] = [($2 == "S" ? :start : :stop), $3]
@@ -86,6 +86,12 @@ class Chef
             end
           end
 
+          # Reduce existing priority back to an integer if appropriate, picking
+          # runlevel 2 as a baseline
+          if priority[2] && [2..5].all? { |runlevel| priority[runlevel] == priority[2] }
+            priority = priority[2].last
+          end
+
           unless @rcd_status.exitstatus == 0
             @priority_success = false
           end
@@ -105,14 +111,28 @@ class Chef
           enabled
         end
 
-        def enable_service()
+        # Override method from parent to ensure priority is up-to-date
+        def action_enable
+          if @current_resource.enabled && @current_resource.priority == @new_resource.priority
+            Chef::Log.debug("#{@new_resource} already enabled - nothing to do")
+          else
+            converge_by("enable service #{@new_resource}") do
+              enable_service
+              Chef::Log.info("#{@new_resource} enabled")
+            end
+          end
+          load_new_resource_state
+          @new_resource.enabled(true)
+        end
+
+        def enable_service
           if @new_resource.priority.is_a? Integer
             run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
             run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults #{@new_resource.priority} #{100 - @new_resource.priority}")
           elsif @new_resource.priority.is_a? Hash
-            # we call the same command regardless of we're enabling or disabling  
+            # we call the same command regardless of we're enabling or disabling
             # users passing a Hash are responsible for setting their own start priorities
-            set_priority()
+            set_priority
           else # No priority, go with update-rc.d defaults
             run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
             run_command(:command => "/usr/sbin/update-rc.d #{@new_resource.service_name} defaults")
@@ -120,23 +140,23 @@ class Chef
 
         end
 
-        def disable_service()
+        def disable_service
           if @new_resource.priority.is_a? Integer
             # Stop processes in reverse order of start using '100 - start_priority'
             run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
             run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} stop #{100 - @new_resource.priority} 2 3 4 5 .")
           elsif @new_resource.priority.is_a? Hash
-            # we call the same command regardless of we're enabling or disabling  
+            # we call the same command regardless of we're enabling or disabling
             # users passing a Hash are responsible for setting their own stop priorities
-            set_priority()
-          else 
+            set_priority
+          else
             # no priority, using '100 - 20 (update-rc.d default)' to stop in reverse order of start
             run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} remove")
             run_command(:command => "/usr/sbin/update-rc.d -f #{@new_resource.service_name} stop 80 2 3 4 5 .")
           end
         end
 
-        def set_priority()
+        def set_priority
           args = ""
           @new_resource.priority.each do |level, o|
             action = o[0]

data/lib/chef/provider/service/freebsd.rb

@@ -38,13 +38,13 @@ class Chef
           elsif ::File.exists?("/usr/local/etc/rc.d/#{current_resource.service_name}")
             @init_command = "/usr/local/etc/rc.d/#{current_resource.service_name}"
           else
-            @rcd_script_found = false 
+            @rcd_script_found = false
             return
           end
           Chef::Log.debug("#{@current_resource} found at #{@init_command}")
           determine_current_status!
           # Default to disabled if the service doesn't currently exist
-          # at all 
+          # at all
           var_name = service_enable_variable_name
           if ::File.exists?("/etc/rc.conf") && var_name
             read_rc_conf.each do |line|
@@ -70,19 +70,19 @@ class Chef
         def define_resource_requirements
           shared_resource_requirements
           requirements.assert(:start, :enable, :reload, :restart) do |a|
-            a.assertion { @rcd_script_found } 
+            a.assertion { @rcd_script_found }
             a.failure_message Chef::Exceptions::Service, "#{@new_resource}: unable to locate the rc.d script"
           end
 
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { @enabled_state_found }  
-            # for consistentcy with original behavior, this will not fail in non-whyrun mode; 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { @enabled_state_found }
+            # for consistentcy with original behavior, this will not fail in non-whyrun mode;
             # rather it will silently set enabled state=>false
-            a.whyrun "Unable to determine enabled/disabled state, assuming this will be correct for an actual run.  Assuming disabled." 
+            a.whyrun "Unable to determine enabled/disabled state, assuming this will be correct for an actual run.  Assuming disabled."
           end
 
           requirements.assert(:start, :enable, :reload, :restart) do |a|
-            a.assertion { @rcd_script_found && service_enable_variable_name != nil } 
+            a.assertion { @rcd_script_found && service_enable_variable_name != nil }
             a.failure_message Chef::Exceptions::Service, "Could not find the service name in #{@init_command} and rcvar"
             # No recovery in whyrun mode - the init file is present but not correct.
           end
@@ -133,7 +133,7 @@ class Chef
           # corresponding to this service
           # For example: to enable the service mysql-server with the init command /usr/local/etc/rc.d/mysql-server, you need
           # to set mysql_enable="YES" in /etc/rc.conf$
-          if @rcd_script_found   
+          if @rcd_script_found
             ::File.open(@init_command) do |rcscript|
               rcscript.each_line do |line|
                 if line =~ /^name="?(\w+)"?/