chef 12.0.0.alpha.1 → 12.0.0.alpha.2

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

@@ -112,14 +112,10 @@ class Chef
         def install_package(name, version)
           Chef::Log.debug("#{@new_resource} package install options: #{@new_resource.options}")
           if @new_resource.options.nil?
-            run_command_with_systems_locale(
-                    :command => "installp -aYF -d #{@new_resource.source} #{@new_resource.package_name}"
-                  )
+            shell_out!( "installp -aYF -d #{@new_resource.source} #{@new_resource.package_name}" )
             Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           else
-            run_command_with_systems_locale(
-              :command => "installp -aYF #{expand_options(@new_resource.options)} -d #{@new_resource.source} #{@new_resource.package_name}"
-            )
+            shell_out!( "installp -aYF #{expand_options(@new_resource.options)} -d #{@new_resource.source} #{@new_resource.package_name}" )
             Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           end
         end
@@ -128,14 +124,10 @@ class Chef
 
         def remove_package(name, version)
           if @new_resource.options.nil?
-            run_command_with_systems_locale(
-                    :command => "installp -u #{name}"
-                  )
+            shell_out!( "installp -u #{name}" )
             Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
           else
-            run_command_with_systems_locale(
-              :command => "installp -u #{expand_options(@new_resource.options)} #{name}"
-            )
+            shell_out!( "installp -u #{expand_options(@new_resource.options)} #{name}" )
             Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
           end
         end

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

@@ -65,15 +65,13 @@ class Chef
         def install_package(name, version)
           package_name = "#{name}@#{version}"
           normal_command = "pkg#{expand_options(@new_resource.options)} install -q #{package_name}"
-          if @new_resource.respond_to?(:accept_license) and @new_resource.accept_license
-            command = normal_command.gsub('-q', '-q --accept')
-          else
-            command = normal_command
-          end
-          begin
-            run_command_with_systems_locale(:command => command)
-          rescue
-          end
+          command =
+            if @new_resource.respond_to?(:accept_license) and @new_resource.accept_license
+              normal_command.gsub('-q', '-q --accept')
+            else
+              normal_command
+            end
+          shell_out(command)
         end
 
         def upgrade_package(name, version)
@@ -82,9 +80,7 @@ class Chef
 
         def remove_package(name, version)
           package_name = "#{name}@#{version}"
-          run_command_with_systems_locale(
-            :command => "pkg#{expand_options(@new_resource.options)} uninstall -q #{package_name}"
-          )
+          shell_out!( "pkg#{expand_options(@new_resource.options)} uninstall -q #{package_name}" )
         end
       end
     end

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

@@ -45,27 +45,21 @@ class Chef
           unless @current_resource.version == version
             command = "port#{expand_options(@new_resource.options)} install #{name}"
             command << " @#{version}" if version and !version.empty?
-            run_command_with_systems_locale(
-              :command => command
-            )
+            shell_out!(command)
           end
         end
 
         def purge_package(name, version)
           command = "port#{expand_options(@new_resource.options)} uninstall #{name}"
           command << " @#{version}" if version and !version.empty?
-          run_command_with_systems_locale(
-            :command => command
-          )
+          shell_out!(command)
         end
 
         def remove_package(name, version)
           command = "port#{expand_options(@new_resource.options)} deactivate #{name}"
           command << " @#{version}" if version and !version.empty?
 
-          run_command_with_systems_locale(
-            :command => command
-          )
+          shell_out!(command)
         end
 
         def upgrade_package(name, version)
@@ -78,9 +72,7 @@ class Chef
             # that hasn't been installed.
             install_package(name, version)
           elsif current_version != version
-            run_command_with_systems_locale(
-              :command => "port#{expand_options(@new_resource.options)} upgrade #{name} @#{version}"
-            )
+            shell_out!( "port#{expand_options(@new_resource.options)} upgrade #{name} @#{version}" )
           end
         end
 

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

@@ -86,9 +86,7 @@ class Chef
         end
 
         def install_package(name, version)
-          run_command_with_systems_locale(
-            :command => "pacman --sync --noconfirm --noprogressbar#{expand_options(@new_resource.options)} #{name}"
-          )
+          shell_out!( "pacman --sync --noconfirm --noprogressbar#{expand_options(@new_resource.options)} #{name}" )
         end
 
         def upgrade_package(name, version)
@@ -96,9 +94,7 @@ class Chef
         end
 
         def remove_package(name, version)
-          run_command_with_systems_locale(
-            :command => "pacman --remove --noconfirm --noprogressbar#{expand_options(@new_resource.options)} #{name}"
-          )
+          shell_out!( "pacman --remove --noconfirm --noprogressbar#{expand_options(@new_resource.options)} #{name}" )
         end
 
         def purge_package(name, version)

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

@@ -110,9 +110,7 @@ class Chef
             pkg = "~#{name}-#{$1}"
           end
 
-          run_command_with_systems_locale(
-            :command => "emerge -g --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}"
-          )
+          shell_out!( "emerge -g --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}" )
         end
 
         def upgrade_package(name, version)
@@ -126,9 +124,7 @@ class Chef
             pkg = "#{@new_resource.package_name}"
           end
 
-          run_command_with_systems_locale(
-            :command => "emerge --unmerge --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}"
-          )
+          shell_out!( "emerge --unmerge --color n --nospinner --quiet#{expand_options(@new_resource.options)} #{pkg}" )
         end
 
         def purge_package(name, version)

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

@@ -90,13 +90,9 @@ class Chef
 
         def install_package(name, version)
           unless @current_resource.version
-            run_command_with_systems_locale(
-              :command => "rpm #{@new_resource.options} -i #{@new_resource.source}"
-            )
+            shell_out!( "rpm #{@new_resource.options} -i #{@new_resource.source}" )
           else
-            run_command_with_systems_locale(
-              :command => "rpm #{@new_resource.options} -U #{@new_resource.source}"
-            )
+            shell_out!( "rpm #{@new_resource.options} -U #{@new_resource.source}" )
           end
         end
 
@@ -104,13 +100,9 @@ class Chef
 
         def remove_package(name, version)
           if version
-            run_command_with_systems_locale(
-              :command => "rpm #{@new_resource.options} -e #{name}-#{version}"
-            )
+            shell_out!( "rpm #{@new_resource.options} -e #{name}-#{version}" )
           else
-            run_command_with_systems_locale(
-              :command => "rpm #{@new_resource.options} -e #{name}"
-            )
+            shell_out!( "rpm #{@new_resource.options} -e #{name}" )
           end
         end
 

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

@@ -112,9 +112,7 @@ class Chef
             else
               command = "pkgadd -n -d #{@new_resource.source} all"
             end
-            run_command_with_systems_locale(
-                    :command => command
-                  )
+            shell_out!(command)
             Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           else
             if ::File.directory?(@new_resource.source) # CHEF-4469
@@ -122,23 +120,17 @@ class Chef
             else
               command = "pkgadd -n#{expand_options(@new_resource.options)} -d #{@new_resource.source} all"
             end
-            run_command_with_systems_locale(
-              :command => command
-            )
+            shell_out!(command)
             Chef::Log.debug("#{@new_resource} installed version #{@new_resource.version} from: #{@new_resource.source}")
           end
         end
 
         def remove_package(name, version)
           if @new_resource.options.nil?
-            run_command_with_systems_locale(
-                    :command => "pkgrm -n #{name}"
-                  )
+            shell_out!( "pkgrm -n #{name}" )
             Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
           else
-            run_command_with_systems_locale(
-              :command => "pkgrm -n#{expand_options(@new_resource.options)} #{name}"
-            )
+            shell_out!( "pkgrm -n#{expand_options(@new_resource.options)} #{name}" )
             Chef::Log.debug("#{@new_resource} removed version #{@new_resource.version}")
           end
         end

data/lib/chef/provider/reboot.rb

@@ -0,0 +1,69 @@
+#
+# Author:: Chris Doherty <cdoherty@getchef.com>)
+# Copyright:: Copyright (c) 2014 Chef, 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/log'
+require 'chef/provider'
+
+class Chef
+  class Provider
+    class Reboot < Chef::Provider
+
+      def whyrun_supported?
+        true
+      end
+
+      def load_current_resource
+        @current_resource ||= Chef::Resource::Reboot.new(@new_resource.name)
+        @current_resource.reason(@new_resource.reason)
+        @current_resource.delay_mins(@new_resource.delay_mins)
+        @current_resource
+      end
+
+      def request_reboot
+        node.run_context.request_reboot(
+          :delay_mins => @new_resource.delay_mins,
+          :reason => @new_resource.reason,
+          :timestamp => Time.now,
+          :requested_by => @new_resource.name
+          )
+      end
+
+      def action_request_reboot
+        converge_by("request a system reboot to occur if the run succeeds") do
+          Chef::Log.warn "Reboot requested:'#{@new_resource.name}'"
+          request_reboot
+        end
+      end
+
+      def action_reboot_now
+        converge_by("rebooting the system immediately") do
+          Chef::Log.warn "Rebooting system immediately, requested by '#{@new_resource.name}'"
+          request_reboot
+          throw :end_client_run_early
+        end
+      end
+
+      def action_cancel
+        converge_by("cancel any existing end-of-run reboot request") do
+          Chef::Log.warn "Reboot canceled: '#{@new_resource.name}'"
+          node.run_context.cancel_reboot
+        end
+      end
+    end
+  end
+end

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

@@ -130,15 +130,15 @@ class Chef
 
         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}")
+            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
-            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")
+            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
@@ -146,16 +146,16 @@ class Chef
         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 .")
+            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
-            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 .")
+            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
 
@@ -166,8 +166,8 @@ class Chef
             priority = o[1]
             args += "#{action} #{priority} #{level} . "
           end
-          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} #{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

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

@@ -25,89 +25,76 @@ class Chef
     class Service
       class Freebsd < Chef::Provider::Service::Init
 
-        def load_current_resource
-          @current_resource = Chef::Resource::Service.new(@new_resource.name)
-          @current_resource.service_name(@new_resource.service_name)
-          @rcd_script_found = true
+        attr_reader :enabled_state_found
+
+        def initialize(new_resource, run_context)
+          super
           @enabled_state_found = false
-          # Determine if we're talking about /etc/rc.d or /usr/local/etc/rc.d
-          if ::File.exists?("/etc/rc.d/#{current_resource.service_name}")
-            @init_command = "/etc/rc.d/#{current_resource.service_name}"
-          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
-            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
-          var_name = service_enable_variable_name
-          if ::File.exists?("/etc/rc.conf") && var_name
-            read_rc_conf.each do |line|
-              case line
-              when /#{Regexp.escape(var_name)}="(\w+)"/
-                @enabled_state_found = true
-                if $1 =~ /[Yy][Ee][Ss]/
-                  @current_resource.enabled true
-                elsif $1 =~ /[Nn][Oo][Nn]?[Oo]?[Nn]?[Ee]?/
-                  @current_resource.enabled false
-                end
-              end
-            end
-          end
-          unless @current_resource.enabled
-            Chef::Log.debug("#{@new_resource.name} enable/disable state unknown")
-            @current_resource.enabled false
+          @init_command = nil
+          if ::File.exist?("/etc/rc.d/#{new_resource.service_name}")
+            @init_command = "/etc/rc.d/#{new_resource.service_name}"
+          elsif ::File.exist?("/usr/local/etc/rc.d/#{new_resource.service_name}")
+            @init_command = "/usr/local/etc/rc.d/#{new_resource.service_name}"
           end
+        end
+
+        def load_current_resource
+          @current_resource = Chef::Resource::Service.new(new_resource.name)
+          current_resource.service_name(new_resource.service_name)
+
+          return current_resource unless init_command
 
-          @current_resource
+          Chef::Log.debug("#{current_resource} found at #{init_command}")
+
+          determine_current_status!  # see Chef::Provider::Service::Simple
+
+          determine_enabled_status!
+          current_resource
         end
 
         def define_resource_requirements
           shared_resource_requirements
+
           requirements.assert(:start, :enable, :reload, :restart) do |a|
-            a.assertion { @rcd_script_found }
-            a.failure_message Chef::Exceptions::Service, "#{@new_resource}: unable to locate the rc.d script"
+            a.assertion { init_command }
+            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 }
+            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."
           end
 
           requirements.assert(:start, :enable, :reload, :restart) do |a|
-            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"
+            a.assertion { init_command && 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
         end
 
         def start_service
-          if @new_resource.start_command
+          if new_resource.start_command
             super
           else
-            shell_out!("#{@init_command} faststart")
+            shell_out_with_systems_locale!("#{init_command} faststart")
           end
         end
 
         def stop_service
-          if @new_resource.stop_command
+          if new_resource.stop_command
             super
           else
-            shell_out!("#{@init_command} faststop")
+            shell_out_with_systems_locale!("#{init_command} faststop")
           end
         end
 
         def restart_service
-          if @new_resource.restart_command
-
+          if new_resource.restart_command
             super
-          elsif @new_resource.supports[:restart]
-            shell_out!("#{@init_command} fastrestart")
+          elsif new_resource.supports[:restart]
+            shell_out_with_systems_locale!("#{init_command} fastrestart")
           else
             stop_service
             sleep 1
@@ -115,6 +102,16 @@ class Chef
           end
         end
 
+        def enable_service
+          set_service_enable("YES") unless current_resource.enabled
+        end
+
+        def disable_service
+          set_service_enable("NO") if current_resource.enabled
+        end
+
+        private
+
         def read_rc_conf
           ::File.open("/etc/rc.conf", 'r') { |file| file.readlines }
         end
@@ -127,46 +124,65 @@ class Chef
 
         # The variable name used in /etc/rc.conf for enabling this service
         def service_enable_variable_name
-          # Look for name="foo" in the shell script @init_command. Use this for determining the variable name in /etc/rc.conf
-          # 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
-            ::File.open(@init_command) do |rcscript|
-              rcscript.each_line do |line|
-                if line =~ /^name="?(\w+)"?/
-                  return $1 + "_enable"
+          @service_enable_variable_name ||=
+            begin
+              # Look for name="foo" in the shell script @init_command. Use this for determining the variable name in /etc/rc.conf
+              # 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 init_command
+                ::File.open(init_command) do |rcscript|
+                  rcscript.each_line do |line|
+                    if line =~ /^name="?(\w+)"?/
+                      return $1 + "_enable"
+                    end
+                  end
+                end
+                # some scripts support multiple instances through symlinks such as openvpn.
+                # We should get the service name from rcvar.
+                Chef::Log.debug("name=\"service\" not found at #{init_command}. falling back to rcvar")
+                sn = shell_out!("#{init_command} rcvar").stdout[/(\w+_enable)=/, 1]
+              else
+                # for why-run mode when the rcd_script is not there yet
+                new_resource.service_name
+              end
+            end
+        end
+
+        def determine_enabled_status!
+          var_name = service_enable_variable_name
+          if ::File.exist?("/etc/rc.conf") && var_name
+            read_rc_conf.each do |line|
+              case line
+              when /^#{Regexp.escape(var_name)}="(\w+)"/
+                enabled_state_found!
+                if $1 =~ /^yes$/i
+                  current_resource.enabled true
+                elsif $1 =~ /^(no|none)$/i
+                  current_resource.enabled false
                 end
               end
             end
-            # some scripts support multiple instances through symlinks such as openvpn.
-            # We should get the service name from rcvar.
-            Chef::Log.debug("name=\"service\" not found at #{@init_command}. falling back to rcvar")
-            sn = shell_out!("#{@init_command} rcvar").stdout[/(\w+_enable)=/, 1]
-            return sn
           end
-          # Fallback allows us to keep running in whyrun mode when
-          # the script does not exist.
-          @new_resource.service_name
+
+          if current_resource.enabled.nil?
+            Chef::Log.debug("#{new_resource.name} enable/disable state unknown")
+            current_resource.enabled false
+          end
         end
 
         def set_service_enable(value)
           lines = read_rc_conf
           # Remove line that set the old value
-          lines.delete_if { |line| line =~ /#{Regexp.escape(service_enable_variable_name)}/ }
+          lines.delete_if { |line| line =~ /^#{Regexp.escape(service_enable_variable_name)}=/ }
           # And append the line that sets the new value at the end
           lines << "#{service_enable_variable_name}=\"#{value}\""
           write_rc_conf(lines)
         end
 
-        def enable_service()
-          set_service_enable("YES") unless @current_resource.enabled
-        end
-
-        def disable_service()
-          set_service_enable("NO") if @current_resource.enabled
+        def enabled_state_found!
+          @enabled_state_found = true
         end
-
       end
     end
   end