chef 12.0.0.alpha.1-x86-mingw32 → 12.0.0.alpha.2-x86-mingw32

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

@@ -58,10 +58,10 @@ class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init
   end
 
   def enable_service()
-    run_command(:command => "/sbin/rc-update add #{@new_resource.service_name} default")
+    shell_out!("/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")
+    shell_out!("/sbin/rc-update del #{@new_resource.service_name} default")
   end
 end

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

@@ -24,6 +24,8 @@ class Chef
     class Service
       class Init < Chef::Provider::Service::Simple
 
+        attr_accessor :init_command
+
         def initialize(new_resource, run_context)
           super
           @init_command = "/etc/init.d/#{@new_resource.service_name}"
@@ -48,7 +50,7 @@ class Chef
           if @new_resource.start_command
             super
           else
-            shell_out!("#{default_init_command} start")
+            shell_out_with_systems_locale!("#{default_init_command} start")
           end
         end
 
@@ -56,7 +58,7 @@ class Chef
           if @new_resource.stop_command
             super
           else
-            shell_out!("#{default_init_command} stop")
+            shell_out_with_systems_locale!("#{default_init_command} stop")
           end
         end
 
@@ -64,7 +66,7 @@ class Chef
           if @new_resource.restart_command
             super
           elsif @new_resource.supports[:restart]
-            shell_out!("#{default_init_command} restart")
+            shell_out_with_systems_locale!("#{default_init_command} restart")
           else
             stop_service
             sleep 1
@@ -76,7 +78,7 @@ class Chef
           if @new_resource.reload_command
             super
           elsif @new_resource.supports[:reload]
-            shell_out!("#{default_init_command} reload")
+            shell_out_with_systems_locale!("#{default_init_command} reload")
           end
         end
       end

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

@@ -37,12 +37,12 @@ class Chef
         end
 
         def enable_service()
-          run_command(:command => "/sbin/insserv -r -f #{@new_resource.service_name}")
-          run_command(:command => "/sbin/insserv -d -f #{@new_resource.service_name}")
+          shell_out!("/sbin/insserv -r -f #{@new_resource.service_name}")
+          shell_out!("/sbin/insserv -d -f #{@new_resource.service_name}")
         end
 
         def disable_service()
-          run_command(:command => "/sbin/insserv -r -f #{@new_resource.service_name}")
+          shell_out!("/sbin/insserv -r -f #{@new_resource.service_name}")
         end
       end
     end

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

@@ -83,7 +83,7 @@ class Chef
             if @new_resource.start_command
               super
             else
-              shell_out!("launchctl load -w '#{@plist}'", :user => @owner_uid, :group => @owner_gid)
+              shell_out_with_systems_locale!("launchctl load -w '#{@plist}'", :user => @owner_uid, :group => @owner_gid)
             end
           end
         end
@@ -95,7 +95,7 @@ class Chef
             if @new_resource.stop_command
               super
             else
-              shell_out!("launchctl unload '#{@plist}'", :user => @owner_uid, :group => @owner_gid)
+              shell_out_with_systems_locale!("launchctl unload '#{@plist}'", :user => @owner_uid, :group => @owner_gid)
             end
           end
         end

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

@@ -25,6 +25,8 @@ class Chef
     class Service
       class Simple < Chef::Provider::Service
 
+        attr_reader :status_load_success
+
         def load_current_resource
           @current_resource = Chef::Resource::Service.new(@new_resource.name)
           @current_resource.service_name(@new_resource.service_name)
@@ -83,16 +85,16 @@ class Chef
         end
 
         def start_service
-          shell_out!(@new_resource.start_command)
+          shell_out_with_systems_locale!(@new_resource.start_command)
         end
 
         def stop_service
-          shell_out!(@new_resource.stop_command)
+          shell_out_with_systems_locale!(@new_resource.stop_command)
         end
 
         def restart_service
           if @new_resource.restart_command
-            shell_out!(@new_resource.restart_command)
+            shell_out_with_systems_locale!(@new_resource.restart_command)
           else
             stop_service
             sleep 1
@@ -101,7 +103,7 @@ class Chef
         end
 
         def reload_service
-          shell_out!(@new_resource.reload_command)
+          shell_out_with_systems_locale!(@new_resource.reload_command)
         end
 
       protected

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

@@ -56,7 +56,7 @@ class Chef
         alias_method :start_service, :enable_service
 
         def reload_service
-          shell_out!("#{default_init_command} refresh #{@new_resource.service_name}")
+          shell_out_with_systems_locale!("#{default_init_command} refresh #{@new_resource.service_name}")
         end
 
         def restart_service

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

@@ -28,7 +28,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
     if @new_resource.status_command
       Chef::Log.debug("#{@new_resource} you have specified a status command, running..")
 
-      unless shell_out_with_systems_locale(@new_resource.status_command).error?
+      unless shell_out(@new_resource.status_command).error?
         @current_resource.running(true)
       else
         @status_check_success = false
@@ -61,7 +61,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
       if @new_resource.start_command
         super
       else
-        shell_out_with_systems_locale("/bin/systemctl start #{@new_resource.service_name}")
+        shell_out_with_systems_locale!("/bin/systemctl start #{@new_resource.service_name}")
       end
     end
   end
@@ -73,7 +73,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
       if @new_resource.stop_command
         super
       else
-        shell_out_with_systems_locale("/bin/systemctl stop #{@new_resource.service_name}")
+        shell_out_with_systems_locale!("/bin/systemctl stop #{@new_resource.service_name}")
       end
     end
   end
@@ -82,7 +82,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
     if @new_resource.restart_command
       super
     else
-      shell_out_with_systems_locale("/bin/systemctl restart #{@new_resource.service_name}")
+      shell_out_with_systems_locale!("/bin/systemctl restart #{@new_resource.service_name}")
     end
   end
 
@@ -91,7 +91,7 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
       super
     else
       if @current_resource.running
-        shell_out_with_systems_locale("/bin/systemctl reload #{@new_resource.service_name}")
+        shell_out_with_systems_locale!("/bin/systemctl reload #{@new_resource.service_name}")
       else
         start_service
       end
@@ -99,18 +99,18 @@ class Chef::Provider::Service::Systemd < Chef::Provider::Service::Simple
   end
 
   def enable_service
-    shell_out_with_systems_locale("/bin/systemctl enable #{@new_resource.service_name}")
+    shell_out!("/bin/systemctl enable #{@new_resource.service_name}")
   end
 
   def disable_service
-    shell_out_with_systems_locale("/bin/systemctl disable #{@new_resource.service_name}")
+    shell_out!("/bin/systemctl disable #{@new_resource.service_name}")
   end
 
   def is_active?
-    shell_out_with_systems_locale("/bin/systemctl is-active #{@new_resource.service_name} --quiet").exitstatus == 0
+    shell_out("/bin/systemctl is-active #{@new_resource.service_name} --quiet").exitstatus == 0
   end
 
   def is_enabled?
-    shell_out_with_systems_locale("/bin/systemctl is-enabled #{@new_resource.service_name} --quiet").exitstatus == 0
+    shell_out("/bin/systemctl is-enabled #{@new_resource.service_name} --quiet").exitstatus == 0
   end
 end

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

@@ -97,10 +97,10 @@ class Chef
             Chef::Log.debug("#{@new_resource} you have specified a status command, running..")
 
             begin
-              if run_command_with_systems_locale(:command => @new_resource.status_command) == 0
+              if shell_out!(@new_resource.status_command) == 0
                 @current_resource.running true
               end
-            rescue Chef::Exceptions::Exec
+            rescue
               @command_success = false
               @current_resource.running false
               nil
@@ -153,7 +153,7 @@ class Chef
             if @new_resource.start_command
               super
             else
-              run_command_with_systems_locale(:command => "/sbin/start #{@job}")
+              shell_out_with_systems_locale!("/sbin/start #{@job}")
             end
           end
         end
@@ -167,7 +167,7 @@ class Chef
             if @new_resource.stop_command
               super
             else
-              run_command_with_systems_locale(:command => "/sbin/stop #{@job}")
+              shell_out_with_systems_locale!("/sbin/stop #{@job}")
             end
           end
         end
@@ -179,7 +179,7 @@ class Chef
           # Older versions of upstart would fail on restart if the service was currently stopped, check for that. LP:430883
           else
             if @current_resource.running
-              run_command_with_systems_locale(:command => "/sbin/restart #{@job}")
+              shell_out_with_systems_locale!("/sbin/restart #{@job}")
             else
               start_service
             end
@@ -191,7 +191,7 @@ class Chef
             super
           else
             # upstart >= 0.6.3-4 supports reload (HUP)
-            run_command_with_systems_locale(:command => "/sbin/reload #{@job}")
+            shell_out_with_systems_locale!("/sbin/reload #{@job}")
           end
         end
 

data/lib/chef/provider/subversion.rb

@@ -60,7 +60,7 @@ class Chef
       def action_checkout
         if target_dir_non_existent_or_empty?
           converge_by("perform checkout of #{@new_resource.repository} into #{@new_resource.destination}") do
-            run_command(run_options(:command => checkout_command))
+            shell_out!(run_options(command: checkout_command))
           end
         else
           Chef::Log.debug "#{@new_resource} checkout destination #{@new_resource.destination} already exists or is a non-empty directory - nothing to do"
@@ -77,7 +77,7 @@ class Chef
 
       def action_force_export
         converge_by("export #{@new_resource.repository} into #{@new_resource.destination}") do
-          run_command(run_options(:command => export_command))
+          shell_out!(run_options(command: export_command))
         end
       end
 
@@ -88,7 +88,7 @@ class Chef
           Chef::Log.debug "#{@new_resource} current revision: #{current_rev} target revision: #{revision_int}"
           unless current_revision_matches_target_revision?
             converge_by("sync #{@new_resource.destination} from #{@new_resource.repository}") do
-              run_command(run_options(:command => sync_command))
+              shell_out!(run_options(command: sync_command))
               Chef::Log.info "#{@new_resource} updated to revision: #{revision_int}"
             end
           end
@@ -100,14 +100,14 @@ class Chef
       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}"
-				c
+        c
       end
 
       def checkout_command
         c = scm :checkout, @new_resource.svn_arguments, verbose, authentication,
             "-r#{revision_int}", @new_resource.repository, @new_resource.destination
         Chef::Log.info "#{@new_resource} checked out #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
-				c
+        c
       end
 
       def export_command
@@ -116,7 +116,7 @@ class Chef
             "-r#{revision_int}" << @new_resource.repository << @new_resource.destination
         c = scm :export, *args
         Chef::Log.info "#{@new_resource} exported #{@new_resource.repository} at revision #{@new_resource.revision} to #{@new_resource.destination}"
-				c
+        c
       end
 
       # If the specified revision isn't an integer ("HEAD" for example), look

data/lib/chef/provider/user/dscl.rb

@@ -109,18 +109,18 @@ user password using shadow hash.")
           @current_resource = Chef::Resource::User.new(@new_resource.username)
           @current_resource.username(@new_resource.username)
 
-          user_info = read_user_info
-          if user_info
-            @current_resource.uid(dscl_get(user_info, :uid))
-            @current_resource.gid(dscl_get(user_info, :gid))
-            @current_resource.home(dscl_get(user_info, :home))
-            @current_resource.shell(dscl_get(user_info, :shell))
-            @current_resource.comment(dscl_get(user_info, :comment))
-            @authentication_authority = dscl_get(user_info, :auth_authority)
-
-            if @new_resource.password && dscl_get(user_info, :password) == "********"
+          @user_info = read_user_info
+          if @user_info
+            @current_resource.uid(dscl_get(@user_info, :uid))
+            @current_resource.gid(dscl_get(@user_info, :gid))
+            @current_resource.home(dscl_get(@user_info, :home))
+            @current_resource.shell(dscl_get(@user_info, :shell))
+            @current_resource.comment(dscl_get(@user_info, :comment))
+            @authentication_authority = dscl_get(@user_info, :auth_authority)
+
+            if @new_resource.password && dscl_get(@user_info, :password) == "********"
               # A password is set. Let's get the password information from shadow file
-              shadow_hash_binary = dscl_get(user_info, :shadow_hash)
+              shadow_hash_binary = dscl_get(@user_info, :shadow_hash)
 
               # Calling shell_out directly since we want to give an input stream
               shadow_hash_xml = convert_binary_plist_to_xml(shadow_hash_binary.string)
@@ -157,22 +157,26 @@ user password using shadow hash.")
 
         def create_user
           dscl_create_user
+          # set_password modifies the plist file of the user directly. So update
+          # the password first before making any modifications to the user.
+          set_password
           dscl_create_comment
           dscl_set_uid
           dscl_set_gid
           dscl_set_home
           dscl_set_shell
-          set_password
         end
 
         def manage_user
+          # set_password modifies the plist file of the user directly. So update
+          # the password first before making any modifications to the user.
+          set_password        if diverged_password?
           dscl_create_user    if diverged?(:username)
           dscl_create_comment if diverged?(:comment)
           dscl_set_uid        if diverged?(:uid)
           dscl_set_gid        if diverged?(:gid)
           dscl_set_home       if diverged?(:home)
           dscl_set_shell      if diverged?(:shell)
-          set_password        if diverged_password?
         end
 
         #
@@ -338,22 +342,18 @@ user password using shadow hash.")
             :input => shadow_info.to_plist, :live_stream => shadow_info_binary)
           command.run_command
 
+          if @user_info.nil?
+            # User is  just created. read_user_info() will read the fresh information
+            # for the user with a cache flush. However with experimentation we've seen
+            # that dscl cache is not immediately updated after the creation of the user
+            # This is odd and needs to be investigated further.
+            sleep 3
+            @user_info = read_user_info
+          end
+
           # Replace the shadow info in user's plist
-          user_info = read_user_info
-          dscl_set(user_info, :shadow_hash, shadow_info_binary)
-
-          #
-          # Before saving the user's plist file we need to wait for dscl to
-          # update its caches and flush them to disk. In order to achieve this
-          # we need to wait first for our changes to get into the dscl cache
-          # and then flush the cache to disk before saving password into the
-          # plist file. 3 seconds is the minimum experimental value for dscl
-          # cache to be updated. We can get rid of this sleep when we find a
-          # trigger to update dscl cache.
-          #
-          sleep 3
-          shell_out("dscacheutil '-flushcache'")
-          save_user_info(user_info)
+          dscl_set(@user_info, :shadow_hash, shadow_info_binary)
+          save_user_info(@user_info)
         end
 
         #
@@ -554,6 +554,10 @@ user password using shadow hash.")
         def read_user_info
           user_info = nil
 
+          # We flush the cache here in order to make sure that we read fresh information
+          # for the user. 
+          shell_out("dscacheutil '-flushcache'")
+
           begin
             user_plist_file = "#{USER_PLIST_DIRECTORY}/#{@new_resource.username}.plist"
             user_plist_info = run_plutil("convert xml1 -o - #{user_plist_file}")

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

@@ -17,6 +17,7 @@
 #
 
 require 'chef/provider/user'
+require 'chef/exceptions'
 if RUBY_PLATFORM =~ /mswin|mingw32|windows/
   require 'chef/util/windows/net_user'
 end
@@ -28,7 +29,7 @@ class Chef
 
         def initialize(new_resource,run_context)
           super
-          @net_user = Chef::Util::Windows::NetUser.new(@new_resource.name)
+          @net_user = Chef::Util::Windows::NetUser.new(@new_resource.username)
         end
 
         def load_current_resource
@@ -37,17 +38,16 @@ class Chef
           user_info = nil
           begin
             user_info = @net_user.get_info
-          rescue
-            @user_exists = false
-            Chef::Log.debug("#{@new_resource} does not exist")
-          end
 
-          if user_info
             @current_resource.uid(user_info[:user_id])
             @current_resource.gid(user_info[:primary_group_id])
             @current_resource.comment(user_info[:full_name])
             @current_resource.home(user_info[:home_dir])
             @current_resource.shell(user_info[:script_path])
+          rescue Chef::Exceptions::UserIDNotFound => e
+            # e.message should be "The user name could not be found" but checking for that could cause a localization bug
+            @user_exists = false
+            Chef::Log.debug("#{@new_resource} does not exist (#{e.message})")
           end
 
           @current_resource