chef 11.6.2 → 11.8.0.rc.1

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

@@ -44,7 +44,7 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
 
   def define_resource_requirements
     requirements.assert(:all_actions) do |a|
-      a.assertion { ::File.exists?("/sbin/rc-update") } 
+      a.assertion { ::File.exists?("/sbin/rc-update") }
       a.failure_message Chef::Exceptions::Service, "/sbin/rc-update does not exist"
       # no whyrun recovery -t his is a core component whose presence is
       # unlikely to be affected by what we do in the course of a chef run
@@ -52,15 +52,15 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
 
     requirements.assert(:all_actions) do |a|
       a.assertion { @found_script }
-      # No failure, just informational output from whyrun 
+      # No failure, just informational output from whyrun
       a.whyrun "Could not find service #{@new_resource.service_name} under any runlevel"
     end
   end
-  
+
   def enable_service()
     run_command(:command => "/sbin/rc-update add #{@new_resource.service_name} default")
   end
-  
+
   def disable_service()
     run_command(:command => "/sbin/rc-update del #{@new_resource.service_name} default")
   end

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

@@ -47,7 +47,7 @@ class Chef
             end
           end
         end
- 
+
         def start_service
           if @new_resource.start_command
             super

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

@@ -32,9 +32,9 @@ class Chef
           if Dir.glob("/etc/rc**/S*#{@current_resource.service_name}").empty?
             @current_resource.enabled false
           else
-            @current_resource.enabled true 
+            @current_resource.enabled true
           end
-  
+
           @current_resource
         end
 

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

@@ -24,7 +24,7 @@ class Chef
   class Provider
     class Service
       class Invokercd < Chef::Provider::Service::Init
-        
+
         def initialize(new_resource, run_context)
           super
           @init_command = "/usr/sbin/invoke-rc.d #{@new_resource.service_name}"

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

@@ -48,7 +48,7 @@ class Chef
           requirements.assert(:start, :enable, :reload, :restart) do |a|
             a.assertion { !@service_missing }
             a.failure_message Chef::Exceptions::Service, "#{@new_resource}: unable to locate the init.d script!"
-            a.whyrun "Assuming service would be disabled. The init script is not presently installed." 
+            a.whyrun "Assuming service would be disabled. The init script is not presently installed."
           end
         end
 
@@ -59,7 +59,7 @@ class Chef
             chkconfig = shell_out!("/sbin/chkconfig --list #{@current_resource.service_name}", :returns => [0,1])
             @current_resource.enabled(!!(chkconfig.stdout =~ CHKCONFIG_ON))
             @service_missing = !!(chkconfig.stderr =~ CHKCONFIG_MISSING)
-          end 
+          end
 
           @current_resource
         end

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

@@ -45,8 +45,8 @@ class Chef
 
         def shared_resource_requirements
           super
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { @status_load_success } 
+          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
@@ -74,12 +74,12 @@ class Chef
           end
 
           requirements.assert(:all_actions) do |a|
-            a.assertion { @new_resource.status_command or @new_resource.supports[:status] or 
-              (!ps_cmd.nil? and !ps_cmd.empty?) } 
+            a.assertion { @new_resource.status_command or @new_resource.supports[:status] or
+              (!ps_cmd.nil? and !ps_cmd.empty?) }
             a.failure_message Chef::Exceptions::Service, "#{@new_resource} could not determine how to inspect the process table, please set this node's 'command.ps' attribute"
           end
-          requirements.assert(:all_actions) do |a| 
-            a.assertion { !@ps_command_failed } 
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !@ps_command_failed }
             a.failure_message Chef::Exceptions::Service, "Command #{ps_cmd} failed to execute, cannot determine service current status"
           end
         end

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

@@ -31,7 +31,7 @@ class Chef
           @init_command = "/usr/sbin/svcadm"
           @status_command = "/bin/svcs -l"
         end
-        
+
 
         def load_current_resource
           @current_resource = Chef::Resource::Service.new(@new_resource.name)

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

@@ -50,7 +50,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
   def define_resource_requirements
     shared_resource_requirements
     requirements.assert(:all_actions) do |a|
-      a.assertion { @status_check_success } 
+      a.assertion { @status_check_success }
       # We won't stop in any case, but in whyrun warn and tell what we're doing.
       a.whyrun ["Failed to determine status of #{@new_resource}, using command #{@new_resource.status_command}.",
         "Assuming service would have been installed and is disabled"]
@@ -99,11 +99,11 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
 
   def enable_service
     run_command_with_systems_locale(:command => "/bin/systemctl enable #{@new_resource.service_name}")
-  end 
+  end
 
   def disable_service
     run_command_with_systems_locale(:command => "/bin/systemctl disable #{@new_resource.service_name}")
-  end 
+  end
 
   def is_active?
     run_command_with_systems_locale({:command => "/bin/systemctl is-active #{@new_resource.service_name}", :ignore_failure => true}) == 0

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

@@ -26,7 +26,7 @@ class Chef
     class Service
       class Upstart < Chef::Provider::Service::Simple
         UPSTART_STATE_FORMAT = /\w+ \(?(\w+)\)?[\/ ](\w+)/
-       
+
         # Upstart does more than start or stop a service, creating multiple 'states' [1] that a service can be in.
         # In chef, when we ask a service to start, we expect it to have started before performing the next step
         # since we have top down dependencies. Which is to say we may follow witha resource next that requires
@@ -40,17 +40,17 @@ class Chef
           # TODO: re-evaluate if this is needed after integrating cookbook fix
           raise ArgumentError, "run_context cannot be nil" unless run_context
           super
-          
+
           run_context.node
-          
+
           @job = @new_resource.service_name
-          
+
           if @new_resource.parameters
             @new_resource.parameters.each do |key, value|
               @job << " #{key}=#{value}"
             end
           end
-          
+
           platform, version = Chef::Platform.find_platform_and_version(run_context.node)
           if platform == "ubuntu" && (8.04..9.04).include?(version.to_f)
             @upstart_job_dir = "/etc/event.d"
@@ -60,8 +60,8 @@ class Chef
             @upstart_conf_suffix = ".conf"
           end
 
-          @command_success = true # new_resource.status_command= false, means upstart used 
-          @config_file_found = true 
+          @command_success = true # new_resource.status_command= false, means upstart used
+          @config_file_found = true
           @upstart_command_success = true
         end
 
@@ -70,18 +70,18 @@ class Chef
           shared_resource_requirements
           requirements.assert(:all_actions) do |a|
             if !@command_success
-              whyrun_msg = @new_resource.status_command ? "Provided status command #{@new_resource.status_command} failed." : 
+              whyrun_msg = @new_resource.status_command ? "Provided status command #{@new_resource.status_command} failed." :
                 "Could not determine upstart state for service"
             end
             a.assertion { @command_success }
-            # no failure here, just document the assumptions made. 
-            a.whyrun "#{whyrun_msg} Assuming service installed and not running." 
+            # no failure here, just document the assumptions made.
+            a.whyrun "#{whyrun_msg} Assuming service installed and not running."
           end
 
-          requirements.assert(:all_actions) do |a| 
-            a.assertion  { @config_file_found } 
-            # no failure here, just document the assumptions made. 
-            a.whyrun "Could not find #{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}. Assuming service is disabled." 
+          requirements.assert(:all_actions) do |a|
+            a.assertion  { @config_file_found }
+            # no failure here, just document the assumptions made.
+            a.whyrun "Could not find #{@upstart_job_dir}/#{@new_resource.service_name}#{@upstart_conf_suffix}. Assuming service is disabled."
           end
         end
 
@@ -176,7 +176,7 @@ class Chef
             super
           # Upstart always provides restart functionality so we don't need to mimic it with stop/sleep/start.
           # Older versions of upstart would fail on restart if the service was currently stopped, check for that. LP:430883
-          else @new_resource.supports[:restart]
+          else
             if @current_resource.running
               run_command_with_systems_locale(:command => "/sbin/restart #{@job}")
             else

data/lib/chef/provider/subversion.rb

@@ -17,7 +17,7 @@
 #
 
 
-#TODO subversion and git should both extend from a base SCM provider. 
+#TODO subversion and git should both extend from a base SCM provider.
 
 require 'chef/log'
 require 'chef/provider'
@@ -52,7 +52,7 @@ class Chef
           # for why run, print a message explaining the potential error.
           parent_directory = ::File.dirname(@new_resource.destination)
           a.assertion { ::File.directory?(parent_directory) }
-          a.failure_message(Chef::Exceptions::MissingParentDirectory, 
+          a.failure_message(Chef::Exceptions::MissingParentDirectory,
             "Cannot clone #{@new_resource} to #{@new_resource.destination}, the enclosing directory #{parent_directory} does not exist")
           a.whyrun("Directory #{parent_directory} does not exist, assuming it would have been created")
         end
@@ -91,13 +91,13 @@ class Chef
             converge_by("sync #{@new_resource.destination} from #{@new_resource.repository}") do
               run_command(run_options(:command => sync_command))
               Chef::Log.info "#{@new_resource} updated to revision: #{revision_int}"
-            end 
+            end
           end
         else
           action_checkout
         end
       end
-      
+
       def sync_command
         c = scm :update, @new_resource.svn_arguments, verbose, authentication, "-r#{revision_int}", @new_resource.destination
         Chef::Log.debug "#{@new_resource} updated working copy #{@new_resource.destination} to revision #{@new_resource.revision}"
@@ -156,6 +156,7 @@ class Chef
       def run_options(run_opts={})
         run_opts[:user] = @new_resource.user if @new_resource.user
         run_opts[:group] = @new_resource.group if @new_resource.group
+        run_opts[:timeout] = @new_resource.timeout if @new_resource.timeout
         run_opts
       end
 
@@ -197,7 +198,7 @@ class Chef
       def scm(*args)
         ['svn', *args].compact.join(" ")
       end
-      
+
 
       def target_dir_non_existent_or_empty?
         !::File.exist?(@new_resource.destination) || Dir.entries(@new_resource.destination).sort == ['.','..']

data/lib/chef/provider/user.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.
@@ -79,9 +79,7 @@ class Chef
             end
           end
 
-          if @new_resource.gid
-            convert_group_name
-          end
+          convert_group_name if @new_resource.gid
         end
 
         @current_resource
@@ -89,14 +87,14 @@ class Chef
 
       def define_resource_requirements
         requirements.assert(:all_actions) do |a|
-          a.assertion { @group_name_resolved } 
+          a.assertion { @group_name_resolved }
           a.failure_message Chef::Exceptions::User, "Couldn't lookup integer GID for group name #{@new_resource.gid}"
           a.whyrun "group name #{@new_resource.gid} does not exist.  This will cause group assignment to fail.  Assuming this group will have been created previously."
         end
         requirements.assert(:all_actions) do |a|
-          a.assertion { @shadow_lib_ok } 
+          a.assertion { @shadow_lib_ok }
           a.failure_message Chef::Exceptions::MissingLibrary, "You must have ruby-shadow installed for password support!"
-          a.whyrun "ruby-shadow is not installed. Attempts to set user password will cause failure.  Assuming that this gem will have been previously installed." + 
+          a.whyrun "ruby-shadow is not installed. Attempts to set user password will cause failure.  Assuming that this gem will have been previously installed." +
                    "Note that user update converge may report false-positive on the basis of mismatched password. "
         end
         requirements.assert(:modify, :lock, :unlock) do |a|
@@ -112,9 +110,15 @@ class Chef
       # <true>:: If a change is required
       # <false>:: If the users are identical
       def compare_user
-        [ :uid, :gid, :comment, :home, :shell, :password ].any? do |user_attrib|
+        changed = [ :comment, :home, :shell, :password ].select do |user_attrib|
           !@new_resource.send(user_attrib).nil? && @new_resource.send(user_attrib) != @current_resource.send(user_attrib)
         end
+
+        changed += [ :uid, :gid ].select do |user_attrib|
+          !@new_resource.send(user_attrib).nil? && @new_resource.send(user_attrib).to_s != @current_resource.send(user_attrib).to_s
+        end
+
+        changed.any?
       end
 
       def action_create

data/lib/chef/provider/user/dscl.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.
@@ -25,10 +25,10 @@ class Chef
     class User
       class Dscl < Chef::Provider::User
         include Chef::Mixin::ShellOut
-        
+
         NFS_HOME_DIRECTORY        = %r{^NFSHomeDirectory: (.*)$}
         AUTHENTICATION_AUTHORITY  = %r{^AuthenticationAuthority: (.*)$}
-        
+
         def dscl(*args)
           shell_out("dscl . -#{args.join(' ')}")
         end
@@ -80,7 +80,7 @@ class Chef
           return safe_dscl("delete /Users/#{@new_resource.username} NFSHomeDirectory") if (@new_resource.home.nil? || @new_resource.home.empty?)
           if @new_resource.supports[:manage_home]
             validate_home_dir_specification!
-            
+
             if (@current_resource.home == @new_resource.home) && !new_home_exists?
               ditto_home
             elsif !current_home_exists? && !new_home_exists?
@@ -105,7 +105,7 @@ class Chef
         end
 
         def shadow_hash_set?
-          user_data = safe_dscl("read /Users/#{@new_resource.username}") 
+          user_data = safe_dscl("read /Users/#{@new_resource.username}")
           if user_data =~ /AuthenticationAuthority: / && user_data =~ /ShadowHash/
             true
           else
@@ -116,7 +116,7 @@ class Chef
         def modify_password
           if @new_resource.password
             shadow_hash = nil
-            
+
             Chef::Log.debug("#{new_resource} updating password")
             if osx_shadow_hash?(@new_resource.password)
               shadow_hash = @new_resource.password.upcase
@@ -134,11 +134,11 @@ class Chef
               shadow_hash = String.new("00000000"*155)
               shadow_hash[168] = salted_sha1
             end
-            
+
             ::File.open("/var/db/shadow/hash/#{guid}",'w',0600) do |output|
               output.puts shadow_hash
             end
-            
+
             unless shadow_hash_set?
               safe_dscl("append /Users/#{@new_resource.username} AuthenticationAuthority ';ShadowHash;'")
             end
@@ -159,7 +159,7 @@ class Chef
           dscl_set_shell
           modify_password
         end
-        
+
         def manage_user
           dscl_create_user    if diverged?(:username)
           dscl_create_comment if diverged?(:comment)
@@ -169,15 +169,15 @@ class Chef
           dscl_set_shell      if diverged?(:shell)
           modify_password     if diverged?(:password)
         end
-        
+
         def dscl_create_user
-          safe_dscl("create /Users/#{@new_resource.username}")              
+          safe_dscl("create /Users/#{@new_resource.username}")
         end
-        
+
         def dscl_create_comment
           safe_dscl("create /Users/#{@new_resource.username} RealName '#{@new_resource.comment}'")
         end
-        
+
         def dscl_set_gid
           unless @new_resource.gid && @new_resource.gid.to_s.match(/^\d+$/)
             begin
@@ -189,7 +189,7 @@ class Chef
           end
           safe_dscl("create /Users/#{@new_resource.username} PrimaryGroupID '#{@new_resource.gid}'")
         end
-        
+
         def dscl_set_shell
           if @new_resource.password || ::File.exists?("#{@new_resource.shell}")
             safe_dscl("create /Users/#{@new_resource.username} UserShell '#{@new_resource.shell}'")
@@ -197,10 +197,10 @@ class Chef
             safe_dscl("create /Users/#{@new_resource.username} UserShell '/usr/bin/false'")
           end
         end
-        
+
         def remove_user
           if @new_resource.supports[:manage_home]
-            user_info = safe_dscl("read /Users/#{@new_resource.username}") 
+            user_info = safe_dscl("read /Users/#{@new_resource.username}")
             if nfs_home_match = user_info.match(NFS_HOME_DIRECTORY)
               #nfs_home = safe_dscl("read /Users/#{@new_resource.username} NFSHomeDirectory")
               #nfs_home.gsub!(/NFSHomeDirectory: /,"").gsub!(/\n$/,"")
@@ -228,7 +228,7 @@ class Chef
             false
           end
         end
-        
+
         def check_lock
           return @locked = locked?
         end
@@ -236,27 +236,27 @@ class Chef
         def lock_user
           safe_dscl("append /Users/#{@new_resource.username} AuthenticationAuthority ';DisabledUser;'")
         end
-        
+
         def unlock_user
           auth_info = safe_dscl("read /Users/#{@new_resource.username} AuthenticationAuthority")
           auth_string = auth_info.gsub(/AuthenticationAuthority: /,"").gsub(/;DisabledUser;/,"").strip#.gsub!(/[; ]*$/,"")
           safe_dscl("create /Users/#{@new_resource.username} AuthenticationAuthority '#{auth_string}'")
         end
-        
+
         def validate_home_dir_specification!
           unless @new_resource.home =~ /^\//
-            raise(Chef::Exceptions::InvalidHomeDirectory,"invalid path spec for User: '#{@new_resource.username}', home directory: '#{@new_resource.home}'") 
+            raise(Chef::Exceptions::InvalidHomeDirectory,"invalid path spec for User: '#{@new_resource.username}', home directory: '#{@new_resource.home}'")
           end
         end
-        
+
         def current_home_exists?
           ::File.exist?("#{@current_resource.home}")
         end
-        
+
         def new_home_exists?
-          ::File.exist?("#{@new_resource.home}")          
+          ::File.exist?("#{@new_resource.home}")
         end
-        
+
         def ditto_home
           skel = "/System/Library/User Template/English.lproj"
           raise(Chef::Exceptions::User,"can't find skel at: #{skel}") unless ::File.exists?(skel)
@@ -266,7 +266,7 @@ class Chef
 
         def move_home
           Chef::Log.debug("#{@new_resource} moving #{self} home from #{@current_resource.home} to #{@new_resource.home}")
-          
+
           src = @current_resource.home
           FileUtils.mkdir_p(@new_resource.home)
           files = ::Dir.glob("#{src}/*", ::File::FNM_DOTMATCH) - ["#{src}/.","#{src}/.."]
@@ -274,11 +274,11 @@ class Chef
           ::FileUtils.rmdir(src)
           ::FileUtils.chown_R(@new_resource.username,@new_resource.gid.to_s,@new_resource.home)
         end
-        
+
         def diverged?(parameter)
           parameter_updated?(parameter) && (not @new_resource.send(parameter).nil?)
         end
-        
+
         def parameter_updated?(parameter)
           not (@new_resource.send(parameter) == @current_resource.send(parameter))
         end