chef 12.0.0.alpha.2 → 12.0.0.rc.0

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

@@ -359,6 +359,9 @@ class Chef
           Chef::Log.logger
         end
 
+        provides :chef_gem
+        provides :gem_package
+
         include Chef::Mixin::GetSourceFromPackage
 
         def initialize(new_resource, run_context=nil)
@@ -493,6 +496,7 @@ class Chef
         def target_version_already_installed?
           return false unless @current_resource && @current_resource.version
           return false if @current_resource.version.nil?
+          return false if @new_resource.version.nil?
 
           Gem::Requirement.new(@new_resource.version).satisfied_by?(Gem::Version.new(@current_resource.version))
         end

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

@@ -29,6 +29,8 @@ class Chef
       class SmartOS < Chef::Provider::Package
         attr_accessor :is_virtual_package
 
+        provides :smartos_package, os: "solaris2", platform_family: "smartos"
+
         def load_current_resource
           Chef::Log.debug("#{@new_resource} loading current resource")
           @current_resource = Chef::Resource::Package.new(@new_resource.name)

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

@@ -27,6 +27,8 @@ class Chef
 
         include Chef::Mixin::GetSourceFromPackage
 
+        provides :solaris_package, os: "solaris2"
+
         # def initialize(*args)
         #   super
         #   @current_resource = Chef::Resource::Package.new(@new_resource.name)

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

@@ -25,8 +25,11 @@ class Chef
     class Package
       class Windows < Chef::Provider::Package
 
-        # Depending on the installer, we may need to examine installer_type or 
-        # source attributes, or search for text strings in the installer file 
+        provides :package, os: "windows"
+        provides :windows_package, os: "windows"
+
+        # Depending on the installer, we may need to examine installer_type or
+        # source attributes, or search for text strings in the installer file
         # binary to determine the installer type for the user. Since the file
         # must be on disk to do so, we have to make this choice in the provider.
         require 'chef/provider/package/windows/msi.rb'

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

@@ -29,6 +29,8 @@ class Chef
     class Package
       class Yum < Chef::Provider::Package
 
+        provides :yum_package, os: "linux"
+
         class RPMUtils
           class << self
 

data/lib/chef/provider/powershell_script.rb

@@ -51,6 +51,8 @@ $chefscriptresult = {
 }.invokereturnasis()
 if ($interpolatedexitcode -and $chefscriptresult.gettype().name -eq 'boolean') { exit [int32](!$chefscriptresult) } else { exit 0 }
 EOH
+        Chef::Log.debug("powershell_script provider called with script code:\n\n#{code}\n")
+        Chef::Log.debug("powershell_script provider will execute transformed code:\n\n#{@code}\n")
       end
 
       public
@@ -65,7 +67,7 @@ EOH
           "-NoLogo",
           "-NonInteractive",
           "-NoProfile",
-          "-ExecutionPolicy RemoteSigned",
+          "-ExecutionPolicy Unrestricted",
           # Powershell will hang if STDIN is redirected
           # http://connect.microsoft.com/PowerShell/feedback/details/572313/powershell-exe-can-hang-if-stdin-is-redirected
           "-InputFormat None",

data/lib/chef/provider/remote_directory.rb

@@ -26,30 +26,30 @@ require 'uri'
 require 'tempfile'
 require 'net/https'
 require 'set'
+require 'chef/util/path_helper'
 
 class Chef
   class Provider
     class RemoteDirectory < Chef::Provider::Directory
 
+      provides :remote_directory
+
       include Chef::Mixin::FileClass
 
       def action_create
         super
-        files_to_purge = Set.new(Dir.glob(::File.join(@new_resource.path, '**', '*'),
-                                          ::File::FNM_DOTMATCH).select do |name|
-                                   name !~ /(?:^|#{Regexp.escape(::File::SEPARATOR)})\.\.?$/
-                                 end)
+        # Mark all files as needing to be purged
+        files_to_purge = Set.new(ls(@new_resource.path)) # Make sure each path is clean
 
+        # Transfer files
         files_to_transfer.each do |cookbook_file_relative_path|
           create_cookbook_file(cookbook_file_relative_path)
-          # the file is removed from the purge list
-          files_to_purge.delete(::File.join(@new_resource.path, cookbook_file_relative_path))
-          # parent directories are also removed from the purge list
-          directories=::File.dirname(::File.join(@new_resource.path, cookbook_file_relative_path)).split(::File::SEPARATOR)
-          for i in 0..directories.length-1
-            files_to_purge.delete(::File.join(directories[0..i]))
+          # parent directories and file being transfered are removed from the purge list
+          Pathname.new(Chef::Util::PathHelper.cleanpath(::File.join(@new_resource.path, cookbook_file_relative_path))).descend do |d|
+            files_to_purge.delete(d.to_s)
           end
         end
+
         purge_unmanaged_files(files_to_purge)
       end
 
@@ -61,6 +61,21 @@ class Chef
 
       protected
 
+      # List all excluding . and ..
+      def ls(path)
+        files = Dir.glob(::File.join(Chef::Util::PathHelper.escape_glob(path), '**', '*'),
+                 ::File::FNM_DOTMATCH)
+
+        # Remove current directory and previous directory
+        files.reject! do |name|
+          basename = Pathname.new(name).basename().to_s
+          ['.', '..'].include?(basename)
+        end
+
+        # Clean all the paths... this is required because of the join
+        files.map {|f| Chef::Util::PathHelper.cleanpath(f)}
+      end
+
       def purge_unmanaged_files(unmanaged_files)
         if @new_resource.purge
           unmanaged_files.sort.reverse.each do |f|

data/lib/chef/provider/route.rb

@@ -24,6 +24,8 @@ require 'ipaddr'
 class Chef::Provider::Route < Chef::Provider
     include Chef::Mixin::Command
 
+    provides :route
+
     attr_accessor :is_running
 
     MASK = {'0.0.0.0'          => '0',

data/lib/chef/provider/ruby_block.rb

@@ -20,6 +20,8 @@
 class Chef
   class Provider
     class RubyBlock < Chef::Provider
+      provides :ruby_block
+
       def whyrun_supported?
         true
       end

data/lib/chef/provider/script.rb

@@ -22,6 +22,12 @@ require 'chef/provider/execute'
 class Chef
   class Provider
     class Script < Chef::Provider::Execute
+      provides :bash
+      provides :csh
+      provides :perl
+      provides :python
+      provides :ruby
+      provides :script
 
       def initialize(new_resource, run_context)
         super

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

@@ -0,0 +1,128 @@
+#
+# Author:: kaustubh (<kaustubh@clogeny.com>)
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/provider/service'
+
+class Chef
+  class Provider
+    class Service
+      class Aix < Chef::Provider::Service
+        attr_reader :status_load_success
+
+        provides :service, os: "aix"
+
+        def initialize(new_resource, run_context)
+          super
+        end
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Service.new(@new_resource.name)
+          @current_resource.service_name(@new_resource.service_name)
+
+          @status_load_success = true
+          @priority_success = true
+          @is_resource_group = false
+
+          determine_current_status!
+
+          @current_resource
+        end
+
+        def whyrun_supported?
+          true
+        end
+
+        def start_service
+          if @is_resource_group
+            shell_out!("startsrc -g #{@new_resource.service_name}")
+          else
+            shell_out!("startsrc -s #{@new_resource.service_name}")
+          end
+        end
+
+        def stop_service
+          if @is_resource_group
+            shell_out!("stopsrc -g #{@new_resource.service_name}")
+          else
+            shell_out!("stopsrc -s #{@new_resource.service_name}")
+          end
+        end
+
+        def restart_service
+          stop_service
+          start_service
+        end
+
+        def reload_service
+          if @is_resource_group
+            shell_out!("refresh -g #{@new_resource.service_name}")
+          else
+            shell_out!("refresh -s #{@new_resource.service_name}")
+          end
+        end
+
+        def shared_resource_requirements
+          super
+          requirements.assert(:all_actions) do |a|
+            a.assertion { @status_load_success }
+            a.whyrun ["Service status not available. Assuming a prior action would have installed the service.", "Assuming status of not running."]
+          end
+        end
+
+        def define_resource_requirements
+          # FIXME? need reload from service.rb
+          shared_resource_requirements
+        end
+
+        protected
+        def determine_current_status!
+          Chef::Log.debug "#{@new_resource} using lssrc to check the status "
+          begin
+            services = shell_out!("lssrc -a | grep -w #{@new_resource.service_name}").stdout.split("\n")
+            is_resource_group?(services)
+
+            if services.length == 1 && services[0].split(' ').last == "active"
+              @current_resource.running true
+            else
+              @current_resource.running false
+            end
+            Chef::Log.debug "#{@new_resource} running: #{@current_resource.running}"
+            # ShellOut sometimes throws different types of Exceptions than ShellCommandFailed.
+            # Temporarily catching different types of exceptions here until we get Shellout fixed.
+            # TODO: Remove the line before one we get the ShellOut fix.
+          rescue Mixlib::ShellOut::ShellCommandFailed, SystemCallError
+            @status_load_success = false
+            @current_resource.running false
+            nil
+          end
+        end
+
+        def is_resource_group? (services)
+          if services.length > 1
+            Chef::Log.debug("#{@new_resource.service_name} is a group")
+            @is_resource_group = true
+          elsif services[0].split(' ')[1] == @new_resource.service_name
+            Chef::Log.debug("#{@new_resource.service_name} is a group")
+            @is_resource_group = true
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,117 @@
+#
+# Author:: kaustubh (<kaustubh@clogeny.com>)
+# Copyright:: Copyright (c) 2014 Chef Software, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/provider/service/init'
+
+class Chef
+  class Provider
+    class Service
+      class AixInit < Chef::Provider::Service::Init
+        RC_D_SCRIPT_NAME = /\/etc\/rc.d\/rc2.d\/([SK])(\d\d|)/i
+
+        def initialize(new_resource, run_context)
+          super
+          @init_command = "/etc/rc.d/init.d/#{@new_resource.service_name}"
+        end
+
+        def load_current_resource
+          super
+          @priority_success = true
+          @rcd_status = nil
+
+          set_current_resource_attributes
+          @current_resource
+        end
+
+        def action_enable
+          if @new_resource.priority.nil?
+            priority_ok = true
+          else
+            priority_ok = @current_resource.priority == @new_resource.priority
+          end
+          if @current_resource.enabled and priority_ok
+            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
+          Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"]).each { |f| ::File.delete(f)}
+
+          if @new_resource.priority.is_a? Integer
+            create_symlink(2, 'S', @new_resource.priority)
+
+          elsif @new_resource.priority.is_a? Hash
+            @new_resource.priority.each do |level,o|
+              create_symlink(level,(o[0] == :start ? 'S' : 'K'),o[1])
+            end
+          else
+            create_symlink(2, 'S', '')
+          end
+        end
+
+        def disable_service
+          Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"]).each { |f| ::File.delete(f) }
+
+          if @new_resource.priority.is_a? Integer
+            create_symlink(2, 'K',100 - @new_resource.priority)
+          elsif @new_resource.priority.is_a? Hash
+            @new_resource.priority.each do |level,o|
+              create_symlink(level, 'K', 100 - o[1]) if o[0] == :stop
+            end
+          else
+            create_symlink(2, 'K', '')
+          end
+        end
+
+        def create_symlink(run_level, status, priority)
+          ::File.symlink("/etc/rc.d/init.d/#{@new_resource.service_name}", "/etc/rc.d/rc#{run_level}.d/#{status}#{priority}#{@new_resource.service_name}")
+        end
+
+        def set_current_resource_attributes
+          # assuming run level 2 for aix
+          is_enabled = false
+          files = Dir.glob(["/etc/rc.d/rc2.d/[SK][0-9][0-9]#{@new_resource.service_name}", "/etc/rc.d/rc2.d/[SK]#{@new_resource.service_name}"])
+
+          priority = {}
+
+          files.each do |file|
+            if (RC_D_SCRIPT_NAME =~ file)
+              priority[2] = [($1 == "S" ? :start : :stop), ($2.empty? ? '' : $2.to_i)]
+              if $1 == "S"
+                is_enabled = true
+              end
+            end
+          end
+
+          if is_enabled && files.length == 1
+            priority = priority[2][1]
+          end
+          @current_resource.enabled(is_enabled)
+          @current_resource.priority(priority)
+        end
+      end
+    end
+  end
+end

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

@@ -20,6 +20,12 @@ require 'chef/provider/service/init'
 
 class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
 
+  provides :service, platform_family: "arch"
+
+  def self.supports?(resource, action)
+    ::File.exist?("/etc/rc.d/#{resource.service_name}")
+  end
+
   def initialize(new_resource, run_context)
     super
     @init_command = "/etc/rc.d/#{@new_resource.service_name}"

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

@@ -25,13 +25,19 @@ class Chef
         UPDATE_RC_D_ENABLED_MATCHES = /\/rc[\dS].d\/S|not installed/i
         UPDATE_RC_D_PRIORITIES = /\/rc([\dS]).d\/([SK])(\d\d)/i
 
+        provides :service, platform_family: "debian"
+
+        def self.supports?(resource, action)
+          Chef::Platform::ServiceHelpers.service_resource_providers.include?(:debian)
+        end
+
         def load_current_resource
           super
           @priority_success = true
           @rcd_status = nil
-          @current_resource.priority(get_priority)
-          @current_resource.enabled(service_currently_enabled?(@current_resource.priority))
-          @current_resource
+          current_resource.priority(get_priority)
+          current_resource.enabled(service_currently_enabled?(current_resource.priority))
+          current_resource
         end
 
         def define_resource_requirements
@@ -47,7 +53,7 @@ class Chef
 
           requirements.assert(:all_actions) do |a|
             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}"
+            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.",
                       "Assigning temporary priorities to continue.",
@@ -59,7 +65,7 @@ class Chef
                 "3"=>[:start, "20"],
                 "4"=>[:start, "20"],
                 "5"=>[:start, "20"]}
-              @current_resource.priority(temp_priorities)
+              current_resource.priority(temp_priorities)
             end
           end
         end
@@ -67,7 +73,7 @@ class Chef
         def get_priority
           priority = {}
 
-          @rcd_status = popen4("/usr/sbin/update-rc.d -n -f #{@current_resource.service_name} remove") do |pid, stdin, stdout, stderr|
+          @rcd_status = popen4("/usr/sbin/update-rc.d -n -f #{current_resource.service_name} remove") do |pid, stdin, stdout, stderr|
 
             [stdout, stderr].each do |iop|
               iop.each_line do |line|
@@ -99,7 +105,7 @@ class Chef
         def service_currently_enabled?(priority)
           enabled = false
           priority.each { |runlevel, arguments|
-            Chef::Log.debug("#{@new_resource} runlevel #{runlevel}, action #{arguments[0]}, priority #{arguments[1]}")
+            Chef::Log.debug("#{new_resource} runlevel #{runlevel}, action #{arguments[0]}, priority #{arguments[1]}")
             # if we are in a update-rc.d default startup runlevel && we start in this runlevel
             if %w[ 1 2 3 4 5 S ].include?(runlevel) && arguments[0] == :start
               enabled = true
@@ -111,63 +117,63 @@ class Chef
 
         # Override method from parent to ensure priority is up-to-date
         def action_enable
-          if @new_resource.priority.nil?
+          if new_resource.priority.nil?
             priority_ok = true
           else
-            priority_ok = @current_resource.priority == @new_resource.priority
+            priority_ok = @current_resource.priority == new_resource.priority
           end
-          if @current_resource.enabled and priority_ok
-            Chef::Log.debug("#{@new_resource} already enabled - nothing to do")
+          if current_resource.enabled and priority_ok
+            Chef::Log.debug("#{new_resource} already enabled - nothing to do")
           else
-            converge_by("enable service #{@new_resource}") do
+            converge_by("enable service #{new_resource}") do
               enable_service
-              Chef::Log.info("#{@new_resource} enabled")
+              Chef::Log.info("#{new_resource} enabled")
             end
           end
           load_new_resource_state
-          @new_resource.enabled(true)
+          new_resource.enabled(true)
         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
+          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
             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")
+            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")
           end
 
         end
 
         def disable_service
-          if @new_resource.priority.is_a? Integer
+          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
+            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
             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 .")
+            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 .")
           end
         end
 
         def set_priority
           args = ""
-          @new_resource.priority.each do |level, o|
+          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}")
+          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}")
         end
       end
     end