chef 15.17.4-universal-mingw32 → 16.0.257-universal-mingw32

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

@@ -21,6 +21,7 @@ require_relative "../../resource/windows_package"
 require_relative "../package"
 require_relative "../../util/path_helper"
 require_relative "../../mixin/checksum"
+require "cgi" unless defined?(CGI)
 
 class Chef
   class Provider
@@ -138,7 +139,7 @@ class Chef
           end
         end
 
-        def action_install
+        action :install do
           if uri_scheme?(new_resource.source)
             download_source_file
             load_current_resource
@@ -277,7 +278,7 @@ class Chef
 
         def default_download_cache_path
           uri = ::URI.parse(new_resource.source)
-          filename = ::File.basename(::URI.unescape(uri.path))
+          filename = ::File.basename(::CGI.unescape(uri.path))
           file_cache_dir = Chef::FileCache.create_cache_path("package/")
           Chef::Util::PathHelper.cleanpath("#{file_cache_dir}/#{filename}")
         end

data/lib/chef/provider/package/windows/msi.rb

@@ -18,7 +18,7 @@
 
 # TODO: Allow new_resource.source to be a Product Code as a GUID for uninstall / network install
 
-require_relative "../../../win32/api/installer" if (RUBY_PLATFORM =~ /mswin|mingw32|windows/) && Chef::Platform.supports_msi?
+require_relative "../../../win32/api/installer" if RUBY_PLATFORM =~ /mswin|mingw32|windows/
 require_relative "../../../mixin/shell_out"
 
 class Chef
@@ -26,7 +26,7 @@ class Chef
     class Package
       class Windows
         class MSI
-          include Chef::ReservedNames::Win32::API::Installer if (RUBY_PLATFORM =~ /mswin|mingw32|windows/) && Chef::Platform.supports_msi?
+          include Chef::ReservedNames::Win32::API::Installer if RUBY_PLATFORM =~ /mswin|mingw32|windows/
           include Chef::Mixin::ShellOut
 
           def initialize(resource, uninstall_entries)

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

@@ -202,14 +202,6 @@ class Chef
           python_helper.compare_versions(v1, v2)
         end
 
-        # Generate the yum syntax for the package
-        def yum_syntax(name, version, arch)
-          s = name
-          s += "-#{version}" if version
-          s += ".#{arch}" if arch
-          s
-        end
-
         def resolve_source_to_version_obj
           shell_out!("rpm -qp --queryformat '%{NAME} %{EPOCH} %{VERSION} %{RELEASE} %{ARCH}\n' #{new_resource.source}").stdout.each_line do |line|
             # this is another case of committing the sin of doing some lightweight mangling of RPM versions in ruby -- but the output of the rpm command

data/lib/chef/provider/package/yum/yum_helper.py

@@ -196,10 +196,6 @@ try:
         setup_exit_handler()
         line = inpipe.readline()
 
-        # only way to detect EOF in python
-        if line == "":
-            break
-
         try:
             command = json.loads(line)
         except ValueError, e:

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

@@ -1,9 +1,9 @@
+# -*- coding: utf-8 -*-
 #
 # Authors:: Adam Jacob (<adam@chef.io>)
 #           Ionuț Arțăriși (<iartarisi@suse.cz>)
 # Copyright:: Copyright (c) Chef Software Inc.
 # Copyright:: 2013-2016, SUSE Linux GmbH
-#
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/provider/powershell_script.rb

@@ -22,6 +22,7 @@ require_relative "windows_script"
 class Chef
   class Provider
     class PowershellScript < Chef::Provider::WindowsScript
+      # FIXME: use composition not inheritance
 
       provides :powershell_script
 
@@ -30,9 +31,9 @@ class Chef
         add_exit_status_wrapper
       end
 
-      def action_run
+      action :run do
         validate_script_syntax!
-        super
+        super()
       end
 
       def command
@@ -47,14 +48,7 @@ class Chef
         # error status of a failed Windows process that ran at the
         # end of the script, it gets changed to '1'.
         #
-        # Nano only supports -Command
-        cmd = "\"#{interpreter_path}\" #{new_resource.flags}"
-        if Chef::Platform.windows_nano_server?
-          cmd << " -Command \". '#{script_file.path}'\""
-        else
-          cmd << " -File \"#{script_file.path}\""
-        end
-        cmd
+        "\"#{interpreter_path}\" #{new_resource.flags} -File \"#{script_file.path}\""
       end
 
       protected

data/lib/chef/provider/registry_key.rb

@@ -113,7 +113,7 @@ class Chef
         end
       end
 
-      def action_create
+      action :create do
         unless registry.key_exists?(current_resource.key)
           converge_by("create key #{new_resource.key}") do
             registry.create_key(new_resource.key, new_resource.recursive)
@@ -150,7 +150,7 @@ class Chef
         end
       end
 
-      def action_create_if_missing
+      action :create_if_missing do
         unless registry.key_exists?(new_resource.key)
           converge_by("create key #{new_resource.key}") do
             registry.create_key(new_resource.key, new_resource.recursive)
@@ -171,7 +171,7 @@ class Chef
         end
       end
 
-      def action_delete
+      action :delete do
         if registry.key_exists?(new_resource.key)
           new_resource.unscrubbed_values.each do |value|
             if @name_hash.key?(value[:name].downcase)
@@ -186,7 +186,7 @@ class Chef
         end
       end
 
-      def action_delete_key
+      action :delete_key do
         if registry.key_exists?(new_resource.key)
           converge_by("delete key #{new_resource.key}") do
             registry.delete_key(new_resource.key, new_resource.recursive)

data/lib/chef/provider/remote_directory.rb

@@ -58,8 +58,8 @@ class Chef
 
       # Handle action :create.
       #
-      def action_create
-        super
+      action :create do
+        super()
 
         # Transfer files
         files_to_transfer.each do |cookbook_file_relative_path|
@@ -73,7 +73,7 @@ class Chef
 
       # Handle action :create_if_missing.
       #
-      def action_create_if_missing
+      action :create_if_missing do
         # if this action is called, ignore the existing overwrite flag
         @overwrite = false
         action_create

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

@@ -17,6 +17,7 @@
 #
 
 require "uri" unless defined?(URI)
+require "cgi" unless defined?(CGI)
 require "tempfile" unless defined?(Tempfile)
 require "net/ftp"
 require_relative "../remote_file"
@@ -57,7 +58,7 @@ class Chef
 
         def user
           if uri.userinfo
-            URI.unescape(uri.user)
+            CGI.unescape(uri.user)
           else
             "anonymous"
           end
@@ -65,7 +66,7 @@ class Chef
 
         def pass
           if uri.userinfo
-            URI.unescape(uri.password)
+            CGI.unescape(uri.password)
           else
             nil
           end

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

@@ -17,6 +17,7 @@
 #
 
 require "uri" unless defined?(URI)
+require "cgi" unless defined?(CGI)
 require "tempfile" unless defined?(Tempfile)
 require_relative "../remote_file"
 
@@ -40,7 +41,7 @@ class Chef
 
         def source_path
           @source_path ||= begin
-            path = URI.unescape(uri.path)
+            path = CGI.unescape(uri.path)
             ChefUtils.windows? ? fix_windows_path(path) : path
           end
         end

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

@@ -17,6 +17,7 @@
 #
 
 require "uri" unless defined?(URI)
+require "cgi" unless defined?(CGI)
 require "tempfile" unless defined?(Tempfile)
 require "net/sftp"
 require_relative "../remote_file"
@@ -47,7 +48,7 @@ class Chef
         end
 
         def user
-          URI.unescape(uri.user)
+          CGI.unescape(uri.user)
         end
 
         def fetch
@@ -62,7 +63,7 @@ class Chef
         end
 
         def pass
-          URI.unescape(uri.password)
+          CGI.unescape(uri.password)
         end
 
         def validate_path!

data/lib/chef/provider/route.rb

@@ -128,7 +128,7 @@ class Chef
         route_file.close
       end
 
-      def action_add
+      action :add do
         # check to see if load_current_resource found the route
         if is_running
           logger.trace("#{new_resource} route already active - nothing to do")
@@ -144,7 +144,7 @@ class Chef
         generate_config
       end
 
-      def action_delete
+      action :delete do
         if is_running
           command = generate_command(:delete)
           converge_by("run #{command.join(" ")} to delete route ") do
@@ -162,8 +162,10 @@ class Chef
       def generate_config
         if platform_family?("rhel", "amazon", "fedora")
           conf = {}
+          # FIXME FIXME FIXME FIXME: whatever this walking-the-run-context API is, it needs to be removed.
           # walk the collection
-          run_context.resource_collection.each do |resource|
+          rc = run_context.parent_run_context || run_context
+          rc.resource_collection.each do |resource|
             next unless resource.is_a? Chef::Resource::Route
 
             # default to eth0

data/lib/chef/provider/ruby_block.rb

@@ -26,7 +26,7 @@ class Chef
         true
       end
 
-      def action_run
+      action :run do
         converge_by("execute the ruby block #{new_resource.name}") do
           new_resource.block.call
           logger.info("#{new_resource} called")

data/lib/chef/provider/script.rb

@@ -51,13 +51,13 @@ class Chef
         super
       end
 
-      def action_run
+      action :run do
         script_file.puts(code)
         script_file.close
 
         set_owner_and_group
 
-        super
+        super()
 
         unlink_script_file
       end

data/lib/chef/provider/service.rb

@@ -80,7 +80,7 @@ class Chef
         end
       end
 
-      def action_enable
+      action :enable do
         if current_resource.enabled
           logger.trace("#{new_resource} already enabled - nothing to do")
         else
@@ -93,7 +93,7 @@ class Chef
         new_resource.enabled(true)
       end
 
-      def action_disable
+      action :disable do
         if current_resource.enabled
           converge_by("disable service #{new_resource}") do
             disable_service
@@ -106,7 +106,7 @@ class Chef
         new_resource.enabled(false)
       end
 
-      def action_mask
+      action :mask do
         if current_resource.masked
           logger.trace("#{new_resource} already masked - nothing to do")
         else
@@ -119,7 +119,7 @@ class Chef
         new_resource.masked(true)
       end
 
-      def action_unmask
+      action :unmask do
         if current_resource.masked
           converge_by("unmask service #{new_resource}") do
             unmask_service
@@ -132,7 +132,7 @@ class Chef
         new_resource.masked(false)
       end
 
-      def action_start
+      action :start do
         unless current_resource.running
           converge_by("start service #{new_resource}") do
             start_service
@@ -145,7 +145,7 @@ class Chef
         new_resource.running(true)
       end
 
-      def action_stop
+      action :stop do
         if current_resource.running
           converge_by("stop service #{new_resource}") do
             stop_service
@@ -158,7 +158,7 @@ class Chef
         new_resource.running(false)
       end
 
-      def action_restart
+      action :restart do
         converge_by("restart service #{new_resource}") do
           restart_service
           logger.info("#{new_resource} restarted")
@@ -167,7 +167,7 @@ class Chef
         new_resource.running(true)
       end
 
-      def action_reload
+      action :reload do
         if current_resource.running
           converge_by("reload service #{new_resource}") do
             reload_service

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

@@ -38,7 +38,7 @@ class Chef
           @current_resource
         end
 
-        def action_enable
+        action :enable do
           if @new_resource.priority.nil?
             priority_ok = true
           else

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

@@ -32,8 +32,8 @@ class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
   end
 
   def load_current_resource
-    raise Chef::Exceptions::Service, "Could not find /etc/rc.conf" unless ::File.exist?("/etc/rc.conf")
-    raise Chef::Exceptions::Service, "No DAEMONS found in /etc/rc.conf" unless /DAEMONS=\((.*)\)/m.match?(::File.read("/etc/rc.conf"))
+    raise Chef::Exceptions::Service, "Could not find /etc/rc.conf" unless ::File.exists?("/etc/rc.conf")
+    raise Chef::Exceptions::Service, "No DAEMONS found in /etc/rc.conf" unless ::File.read("/etc/rc.conf") =~ /DAEMONS=\((.*)\)/m
 
     super
 

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

@@ -45,7 +45,7 @@ class Chef
           shared_resource_requirements
           requirements.assert(:all_actions) do |a|
             update_rcd = "/usr/sbin/update-rc.d"
-            a.assertion { ::File.exist? 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
@@ -130,7 +130,7 @@ class Chef
         end
 
         # Override method from parent to ensure priority is up-to-date
-        def action_enable
+        action :enable do
           if new_resource.priority.nil?
             priority_ok = true
           else
@@ -149,44 +149,46 @@ class Chef
         end
 
         def enable_service
-          if new_resource.priority.is_a? Integer
-            shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} remove")
-            shell_out!("/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
-            # users passing a Hash are responsible for setting their own start priorities
+          # We call the same command regardless if we're enabling or disabling
+          # Users passing a Hash are responsible for setting their own stop priorities
+          if new_resource.priority.is_a? Hash
             set_priority
-          else # No priority, go with update-rc.d defaults
-            shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} remove")
-            shell_out!("/usr/sbin/update-rc.d #{new_resource.service_name} defaults")
+            return
           end
+
+          start_priority = new_resource.priority.is_a?(Integer) ? new_resource.priority : 20
+          # Stop processes in reverse order of start using '100 - start_priority'.
+          stop_priority = 100 - start_priority
+
+          shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} remove")
+          shell_out!("/usr/sbin/update-rc.d #{new_resource.service_name} defaults #{start_priority} #{stop_priority}")
         end
 
         def disable_service
-          if new_resource.priority.is_a? Integer
-            # Stop processes in reverse order of start using '100 - start_priority'
-            shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} remove")
-            shell_out!("/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
-            # users passing a Hash are responsible for setting their own stop priorities
+          if new_resource.priority.is_a? Hash
+            # We call the same command regardless if we're enabling or disabling
+            # Users passing a Hash are responsible for setting their own stop priorities
             set_priority
-          else
-            # no priority, using '100 - 20 (update-rc.d default)' to stop in reverse order of start
-            shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} remove")
-            shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} stop 80 2 3 4 5 .")
+            return
           end
+
+          shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} remove")
+          shell_out!("/usr/sbin/update-rc.d #{new_resource.service_name} defaults")
+          shell_out!("/usr/sbin/update-rc.d #{new_resource.service_name} disable")
         end
 
         def set_priority
-          args = ""
-          new_resource.priority.each do |level, o|
-            action = o[0]
-            priority = o[1]
-            args += "#{action} #{priority} #{level} . "
-          end
           shell_out!("/usr/sbin/update-rc.d -f #{new_resource.service_name} remove")
-          shell_out!("/usr/sbin/update-rc.d #{new_resource.service_name} #{args}")
+
+          # Reset priorities to default values before applying customizations. This way
+          # the final state will always be consistent, regardless if all runlevels were
+          # provided.
+          shell_out!("/usr/sbin/update-rc.d #{new_resource.service_name} defaults")
+          new_resource.priority.each do |level, (action, _priority)|
+            disable_or_enable = (action == :start ? "enable" : "disable")
+
+            shell_out!("/usr/sbin/update-rc.d #{new_resource.service_name} #{disable_or_enable} #{level}")
+          end
         end
       end
     end