chef 15.17.4 → 16.0.257

data/lib/chef/provider/group.rb

@@ -122,7 +122,7 @@ class Chef
         true
       end
 
-      def action_create
+      action :create do
         case @group_exists
         when false
           converge_by("create group #{new_resource.group_name}") do
@@ -139,7 +139,7 @@ class Chef
         end
       end
 
-      def action_remove
+      action :remove do
         return unless @group_exists
 
         converge_by("remove group #{new_resource.group_name}") do
@@ -148,7 +148,7 @@ class Chef
         end
       end
 
-      def action_manage
+      action :manage do
         return unless @group_exists && compare_group
 
         converge_by(["manage group #{new_resource.group_name}"] + change_desc) do
@@ -157,7 +157,7 @@ class Chef
         end
       end
 
-      def action_modify
+      action :modify do
         return unless compare_group
 
         converge_by(["modify group #{new_resource.group_name}"] + change_desc) do

data/lib/chef/provider/http_request.rb

@@ -32,7 +32,7 @@ class Chef
       end
 
       # Send a HEAD request to new_resource.url
-      def action_head
+      action :head do
         message = check_message(new_resource.message)
         # CHEF-4762: we expect a nil return value from Chef::HTTP for a "200 Success" response
         # and false for a "304 Not Modified" response
@@ -49,7 +49,7 @@ class Chef
       end
 
       # Send a GET request to new_resource.url
-      def action_get
+      action :get do
         converge_by("#{new_resource} GET to #{new_resource.url}") do
 
           message = check_message(new_resource.message)
@@ -63,7 +63,7 @@ class Chef
       end
 
       # Send a PATCH request to new_resource.url, with the message as the payload
-      def action_patch
+      action :patch do
         converge_by("#{new_resource} PATCH to #{new_resource.url}") do
           message = check_message(new_resource.message)
           body = @http.patch(
@@ -77,7 +77,7 @@ class Chef
       end
 
       # Send a PUT request to new_resource.url, with the message as the payload
-      def action_put
+      action :put do
         converge_by("#{new_resource} PUT to #{new_resource.url}") do
           message = check_message(new_resource.message)
           body = @http.put(
@@ -91,7 +91,7 @@ class Chef
       end
 
       # Send a POST request to new_resource.url, with the message as the payload
-      def action_post
+      action :post do
         converge_by("#{new_resource} POST to #{new_resource.url}") do
           message = check_message(new_resource.message)
           body = @http.post(
@@ -105,7 +105,7 @@ class Chef
       end
 
       # Send a DELETE request to new_resource.url
-      def action_delete
+      action :delete do
         converge_by("#{new_resource} DELETE to #{new_resource.url}") do
           body = @http.delete(
             (new_resource.url).to_s,

data/lib/chef/provider/ifconfig.rb

@@ -171,7 +171,7 @@ class Chef
         end
       end
 
-      def action_add
+      action :add do
         # check to see if load_current_resource found interface in ifconfig
         unless current_resource.inet_addr
           unless new_resource.device == loopback_device
@@ -186,7 +186,7 @@ class Chef
         generate_config
       end
 
-      def action_enable
+      action :enable do
         # check to see if load_current_resource found ifconfig
         # enables, but does not manage config files
         return if current_resource.inet_addr
@@ -199,7 +199,7 @@ class Chef
         end
       end
 
-      def action_delete
+      action :delete do
         # check to see if load_current_resource found the interface
         if current_resource.device
           command = delete_command
@@ -213,7 +213,7 @@ class Chef
         delete_config
       end
 
-      def action_disable
+      action :disable do
         # check to see if load_current_resource found the interface
         # disables, but leaves config files in place.
         if current_resource.device

data/lib/chef/provider/launchd.rb

@@ -55,15 +55,15 @@ class Chef
         types[type]
       end
 
-      def action_create
+      action :create do
         manage_plist(:create)
       end
 
-      def action_create_if_missing
+      action :create_if_missing do
         manage_plist(:create_if_missing)
       end
 
-      def action_delete
+      action :delete do
         # If you delete a service you want to make sure its not loaded or
         # the service will be in memory and you wont be able to stop it.
         if ::File.exists?(@path)
@@ -72,7 +72,7 @@ class Chef
         manage_plist(:delete)
       end
 
-      def action_enable
+      action :enable do
         if manage_plist(:create)
           manage_service(:restart)
         else
@@ -80,33 +80,50 @@ class Chef
         end
       end
 
-      def action_disable
+      action :disable do
         manage_service(:disable)
       end
 
-      def action_restart
+      action :restart do
         manage_service(:restart)
       end
 
       def manage_plist(action)
-        return unless manage_agent?(action)
-
         if source
-          res = cookbook_file_resource
+          cookbook_file @path do
+            cookbook_name = cookbook if cookbook
+            name(@path) if @path
+            backup(backup) if backup
+            group(group) if group
+            mode(mode) if mode
+            owner(owner) if owner
+            source(source) if source
+            action(action)
+            only_if { manage_agent?(action) }
+          end
         else
-          res = file_resource
+          file @path do
+            name(@path) if @path
+            backup(backup) if backup
+            content(content) if content?
+            group(group) if group
+            mode(mode) if mode
+            owner(owner) if owner
+            action(action)
+            only_if { manage_agent?(action) }
+          end
         end
-        res.run_action(action)
-        new_resource.updated_by_last_action(true) if res.updated?
-        res.updated
       end
 
       def manage_service(action)
-        return unless manage_agent?(action)
-
-        res = service_resource
-        res.run_action(action)
-        new_resource.updated_by_last_action(true) if res.updated?
+        macosx_service label do
+          name(label) if label
+          service_name(label) if label
+          plist(@path) if @path
+          session_type(session_type) if session_type
+          action(action)
+          only_if { manage_agent?(action) }
+        end
       end
 
       def manage_agent?(action)
@@ -127,38 +144,6 @@ class Chef
         true
       end
 
-      def service_resource
-        res = Chef::Resource::MacosxService.new(label, run_context)
-        res.name(label) if label
-        res.service_name(label) if label
-        res.plist(@path) if @path
-        res.session_type(session_type) if session_type
-        res
-      end
-
-      def file_resource
-        res = Chef::Resource::File.new(@path, run_context)
-        res.name(@path) if @path
-        res.backup(backup) if backup
-        res.content(content) if content?
-        res.group(group) if group
-        res.mode(mode) if mode
-        res.owner(owner) if owner
-        res
-      end
-
-      def cookbook_file_resource
-        res = Chef::Resource::CookbookFile.new(@path, run_context)
-        res.cookbook_name = cookbook if cookbook
-        res.name(@path) if @path
-        res.backup(backup) if backup
-        res.group(group) if group
-        res.mode(mode) if mode
-        res.owner(owner) if owner
-        res.source(source) if source
-        res
-      end
-
       def define_resource_requirements
         requirements.assert(
           :create, :create_if_missing, :delete, :enable, :disable
@@ -176,7 +161,7 @@ class Chef
 
       def content
         plist_hash = new_resource.plist_hash || gen_hash
-        Plist::Emit.dump(plist_hash) unless plist_hash.nil?
+        ::Plist::Emit.dump(plist_hash) unless plist_hash.nil?
       end
 
       def gen_hash

data/lib/chef/provider/link.rb

@@ -85,7 +85,7 @@ class Chef
         ChefUtils.windows? ? path.tr("/", '\\') : path
       end
 
-      def action_create
+      action :create do
         # current_resource is the symlink that currently exists
         # new_resource is the symlink we need to create
         #   to - the location to link to
@@ -141,7 +141,7 @@ class Chef
         end
       end
 
-      def action_delete
+      action :delete do
         if current_resource.to # Exists
           if ChefUtils.windows? && ::File.directory?(current_resource.target_file)
             converge_by("delete link to dir at #{new_resource.target_file}") do

data/lib/chef/provider/mount.rb

@@ -37,7 +37,7 @@ class Chef
         self.unmount_retries = 20
       end
 
-      def action_mount
+      action :mount do
         unless current_resource.mounted
           converge_by("mount #{current_resource.device} to #{current_resource.mount_point}") do
             mount_fs
@@ -48,7 +48,7 @@ class Chef
         end
       end
 
-      def action_umount
+      action :umount do
         if current_resource.mounted
           converge_by("unmount #{current_resource.device}") do
             umount_fs
@@ -59,7 +59,7 @@ class Chef
         end
       end
 
-      def action_remount
+      action :remount do
         if current_resource.mounted
           if new_resource.supports[:remount]
             converge_by("remount #{current_resource.device}") do
@@ -82,7 +82,7 @@ class Chef
         end
       end
 
-      def action_enable
+      action :enable do
         unless current_resource.enabled && mount_options_unchanged? && device_unchanged?
           converge_by("enable #{current_resource.device}") do
             enable_fs
@@ -93,7 +93,7 @@ class Chef
         end
       end
 
-      def action_disable
+      action :disable do
         if current_resource.enabled
           converge_by("disable #{current_resource.device}") do
             disable_fs

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

@@ -1,3 +1,4 @@
+# Encoding: utf-8
 # Author:: Hugo Fichter
 # Author:: Lamont Granquist (<lamont@chef.io>)
 # Author:: Joshua Timberman (<joshua@chef.io>)

data/lib/chef/provider/osx_profile.rb

@@ -21,6 +21,7 @@ require_relative "../provider"
 require_relative "../resource"
 require_relative "../resource/file"
 require "uuidtools"
+require "plist"
 
 class Chef
   class Provider
@@ -33,6 +34,7 @@ class Chef
         current_resource.profile_name(new_resource.profile_name)
 
         all_profiles = get_installed_profiles
+        # FIXME: stop mutating the desired state
         new_resource.profile(
           new_resource.profile ||
           new_resource.profile_name
@@ -95,7 +97,7 @@ class Chef
         end
       end
 
-      def action_install
+      action :install do
         unless profile_installed?
           converge_by("install profile #{@new_profile_identifier}") do
             profile_path = write_profile_to_disk
@@ -105,7 +107,7 @@ class Chef
         end
       end
 
-      def action_remove
+      action :remove do
         # Clean up profile after removing it
         if profile_installed?
           converge_by("remove profile #{@new_profile_identifier}") do
@@ -149,6 +151,7 @@ class Chef
             ::File.dirname(cookbook_file)
           )
         )
+        # FIXME: should use a real cookbook file, or document what this craziness is
         remote_file = Chef::Resource::CookbookFile.new(
           ::File.join(
             get_cache_dir,
@@ -180,6 +183,7 @@ class Chef
       end
 
       def write_profile_to_disk
+        # FIXME: use a real chef file resource and stop hacking up tempfiles directly
         new_resource.path(Chef::FileCache.create_cache_path("profiles"))
         tempfile = Chef::FileContentManagement::Tempfile.new(new_resource).tempfile
         tempfile.write(@new_profile_hash.to_plist)
@@ -229,7 +233,7 @@ class Chef
       end
 
       def read_plist(xml_file)
-        Plist.parse_xml(xml_file)
+        ::Plist.parse_xml(xml_file)
       end
 
       def profile_installed?

data/lib/chef/provider/package.rb

@@ -189,7 +189,7 @@ class Chef
         end
       end
 
-      def action_lock
+      action :lock do
         packages_locked = if respond_to?(:packages_all_locked?, true)
                             packages_all_locked?(Array(new_resource.package_name), Array(new_resource.version))
                           else
@@ -208,7 +208,7 @@ class Chef
         end
       end
 
-      def action_unlock
+      action :unlock do
         packages_unlocked = if respond_to?(:packages_all_unlocked?, true)
                               packages_all_unlocked?(Array(new_resource.package_name), Array(new_resource.version))
                             else

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

@@ -21,6 +21,7 @@ require_relative "../../resource/cab_package"
 require_relative "../../mixin/shell_out"
 require_relative "../../mixin/uris"
 require_relative "../../mixin/checksum"
+require "cgi" unless defined?(CGI)
 
 class Chef
   class Provider
@@ -45,13 +46,11 @@ class Chef
         end
 
         def download_source_file
-          source_resource.run_action(:create)
-          logger.trace("#{new_resource} fetched source file to #{source_resource.path}")
           source_resource.path
         end
 
         def source_resource
-          @source_resource ||= declare_resource(:remote_file, new_resource.name) do
+          declare_resource(:remote_file, new_resource.name) do
             path default_download_cache_path
             source new_resource.source
             backup false
@@ -60,7 +59,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/chocolatey.rb

@@ -17,14 +17,12 @@
 
 require_relative "../package"
 require_relative "../../resource/chocolatey_package"
-require_relative "../../mixin/powershell_out"
 require_relative "../../win32/api/command_line_helper" if ChefUtils.windows?
 
 class Chef
   class Provider
     class Package
       class Chocolatey < Chef::Provider::Package
-        include Chef::Mixin::PowershellOut
         include Chef::ReservedNames::Win32::API::CommandLineHelper if ChefUtils.windows?
 
         provides :chocolatey_package
@@ -251,7 +249,7 @@ class Chef
         end
 
         # Helper to convert choco.exe list output to a Hash
-        # (names are downcased for case-insensitive matching)
+        # (names are downcased for case-insenstive matching)
         #
         # @param cmd [String] command to run
         # @return [Hash] list output converted to ruby Hash