chef 11.12.8 → 11.14.0.alpha.2

data/lib/chef/policy_builder/expand_node_object.rb

@@ -107,7 +107,7 @@ class Chef
       def build_node
         # Allow user to override the environment of a node by specifying
         # a config parameter.
-        if Chef::Config[:environment] && !Chef::Config[:environment].chop.empty?
+        if Chef::Config[:environment] && !Chef::Config[:environment].chomp.empty?
           node.chef_environment(Chef::Config[:environment])
         end
 

data/lib/chef/policy_builder/policyfile.rb

@@ -82,7 +82,7 @@ class Chef
           raise UnsupportedFeature, "Policyfile does not support setting the run_list in json data at this time"
         end
 
-        if Chef::Config[:environment] && !Chef::Config[:environment].chop.empty?
+        if Chef::Config[:environment] && !Chef::Config[:environment].chomp.empty?
           raise UnsupportedFeature, "Policyfile does not work with Chef Environments"
         end
       end

data/lib/chef/provider.rb

@@ -22,6 +22,7 @@ require 'chef/mixin/convert_to_class_name'
 require 'chef/dsl/recipe'
 require 'chef/mixin/enforce_ownership_and_permissions'
 require 'chef/mixin/why_run'
+
 class Chef
   class Provider
     include Chef::DSL::Recipe

data/lib/chef/provider/git.rb

@@ -247,7 +247,7 @@ class Chef
                       else
                         @new_resource.revision + '*'
                       end
-        command = git("ls-remote \"#{@new_resource.repository}\"", rev_pattern)
+        command = git("ls-remote \"#{@new_resource.repository}\" \"#{rev_pattern}\"")
         @resolved_reference = shell_out!(command, run_options).stdout
         ref_lines = @resolved_reference.split("\n")
         refs = ref_lines.map { |line| line.split("\t") }

data/lib/chef/provider/link.rb

@@ -99,13 +99,13 @@ class Chef
           if @new_resource.link_type == :symbolic
             converge_by("create symlink at #{@new_resource.target_file} to #{@new_resource.to}") do
               file_class.symlink(canonicalize(@new_resource.to),@new_resource.target_file)
-              Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
+              Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.target_file} -> #{@new_resource.to}")
               Chef::Log.info("#{@new_resource} created")
             end
           elsif @new_resource.link_type == :hard
             converge_by("create hard link at #{@new_resource.target_file} to #{@new_resource.to}") do
               file_class.link(@new_resource.to, @new_resource.target_file)
-              Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.to} -> #{@new_resource.target_file}")
+              Chef::Log.debug("#{@new_resource} created #{@new_resource.link_type} link from #{@new_resource.target_file} -> #{@new_resource.to}")
               Chef::Log.info("#{@new_resource} created")
             end
           end

data/lib/chef/provider/remote_file/content.rb

@@ -48,7 +48,7 @@ class Chef
           begin
             uri = URI.parse(source)
             raw_file = grab_file_from_uri(uri)
-          rescue SocketError, Errno::ECONNREFUSED, Errno::ENOENT, Errno::EACCES, Timeout::Error, Net::HTTPFatalError, Net::FTPError => e
+          rescue SocketError, Errno::ECONNREFUSED, Errno::ENOENT, Errno::EACCES, Timeout::Error, Net::HTTPServerException, Net::HTTPFatalError, Net::FTPError => e
             Chef::Log.warn("#{@new_resource} cannot be downloaded from #{source}: #{e.to_s}")
             if source = sources.shift
               Chef::Log.info("#{@new_resource} trying to download from another mirror")

data/lib/chef/provider/remote_file/local_file.rb

@@ -32,12 +32,18 @@ class Chef
           @new_resource = new_resource
           @uri = uri
         end
+        
+        # CHEF-4472: Remove the leading slash from windows paths that we receive from a file:// URI
+        def fix_windows_path(path) 
+          path.gsub(/^\/([a-zA-Z]:)/,'\1')  
+        end
 
         # Fetches the file at uri, returning a Tempfile-like File handle
         def fetch
+          source_path = Chef::Platform.windows? ? fix_windows_path(uri.path) : uri.path
           tempfile = Chef::FileContentManagement::Tempfile.new(new_resource).tempfile
-          Chef::Log.debug("#{new_resource} staging #{uri.path} to #{tempfile.path}")
-          FileUtils.cp(uri.path, tempfile.path)
+          Chef::Log.debug("#{new_resource} staging #{source_path} to #{tempfile.path}")
+          FileUtils.cp(source_path, tempfile.path)
           tempfile.close if tempfile
           tempfile
         end

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

@@ -17,7 +17,6 @@
 #
 
 require 'chef/provider/service/init'
-require 'chef/mixin/command'
 
 class Chef::Provider::Service::Arch < Chef::Provider::Service::Init
 

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

@@ -16,9 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
 require 'chef/provider/service/init'
-require 'chef/mixin/command'
 
 class Chef
   class Provider

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

@@ -17,7 +17,8 @@
 #
 
 require 'chef/mixin/shell_out'
-require 'chef/provider/service'
+require 'chef/resource/service'
+require 'chef/provider/service/init'
 require 'chef/mixin/command'
 
 class Chef

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

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
+require 'chef/provider/service/init'
 require 'chef/mixin/command'
 
 class Chef::Provider::Service::Gentoo < Chef::Provider::Service::Init

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

@@ -17,7 +17,6 @@
 #
 
 require 'chef/mixin/shell_out'
-require 'chef/provider/service'
 require 'chef/provider/service/simple'
 require 'chef/mixin/command'
 

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

@@ -16,9 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
 require 'chef/provider/service/init'
-require 'chef/mixin/command'
 
 class Chef
   class Provider

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

@@ -16,9 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
 require 'chef/provider/service/init'
-require 'chef/mixin/command'
 
 class Chef
   class Provider

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

@@ -16,8 +16,9 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
 require 'rexml/document'
+require 'chef/resource/service'
+require 'chef/provider/service/simple'
 
 class Chef
   class Provider

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

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
 require 'chef/provider/service/init'
 require 'chef/mixin/shell_out'
 

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

@@ -18,6 +18,7 @@
 
 require 'chef/mixin/shell_out'
 require 'chef/provider/service'
+require 'chef/resource/service'
 require 'chef/mixin/command'
 
 class Chef

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

@@ -18,6 +18,7 @@
 
 require 'chef/mixin/shell_out'
 require 'chef/provider/service'
+require 'chef/resource/service'
 require 'chef/mixin/command'
 
 class Chef

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
+require 'chef/resource/service'
 require 'chef/provider/service/simple'
 require 'chef/mixin/command'
 

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

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/provider/service'
+require 'chef/resource/service'
 require 'chef/provider/service/simple'
 require 'chef/mixin/command'
 require 'chef/util/file_edit'

data/lib/chef/provider/user.rb

@@ -103,8 +103,8 @@ class Chef
         end
         requirements.assert(:modify, :lock, :unlock) do |a|
           a.assertion { @user_exists }
-          a.failure_message(Chef::Exceptions::User, "Cannot modify user #{@new_resource} - does not exist!")
-          a.whyrun("Assuming user #{@new_resource} would have been created")
+          a.failure_message(Chef::Exceptions::User, "Cannot modify user #{@new_resource.username} - does not exist!")
+          a.whyrun("Assuming user #{@new_resource.username} would have been created")
         end
       end
 
@@ -128,12 +128,12 @@ class Chef
       def action_create
 
         if !@user_exists
-          converge_by("create user #{@new_resource}") do
+          converge_by("create user #{@new_resource.username}") do
             create_user
             Chef::Log.info("#{@new_resource} created")
           end
         elsif compare_user
-          converge_by("alter user #{@new_resource}") do
+          converge_by("alter user #{@new_resource.username}") do
             manage_user
             Chef::Log.info("#{@new_resource} altered")
           end
@@ -142,7 +142,7 @@ class Chef
 
       def action_remove
         if @user_exists
-          converge_by("remove user #{@new_resource}") do
+          converge_by("remove user #{@new_resource.username}") do
             remove_user
             Chef::Log.info("#{@new_resource} removed")
           end
@@ -155,7 +155,7 @@ class Chef
 
       def action_manage
         if @user_exists && compare_user
-          converge_by("manage user #{@new_resource}") do
+          converge_by("manage user #{@new_resource.username}") do
             manage_user
             Chef::Log.info("#{@new_resource} managed")
           end
@@ -168,7 +168,7 @@ class Chef
 
       def action_modify
         if compare_user
-          converge_by("modify user #{@new_resource}") do
+          converge_by("modify user #{@new_resource.username}") do
             manage_user
             Chef::Log.info("#{@new_resource} modified")
           end
@@ -177,7 +177,7 @@ class Chef
 
       def action_lock
         if check_lock() == false
-          converge_by("lock the user #{@new_resource}") do
+          converge_by("lock the user #{@new_resource.username}") do
             lock_user
             Chef::Log.info("#{@new_resource} locked")
           end
@@ -196,7 +196,7 @@ class Chef
 
       def action_unlock
         if check_lock() == true
-          converge_by("unlock user #{@new_resource}") do
+          converge_by("unlock user #{@new_resource.username}") do
             unlock_user
             Chef::Log.info("#{@new_resource} unlocked")
           end

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

@@ -16,6 +16,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'chef/provider/user/useradd'
+
 class Chef
   class Provider
     class User

data/lib/chef/resource.rb

@@ -29,6 +29,7 @@ require 'chef/resource/conditional_action_not_nothing'
 require 'chef/resource_collection'
 require 'chef/resource_platform_map'
 require 'chef/node'
+require 'chef/platform'
 
 require 'chef/mixin/deprecation'
 

data/lib/chef/resource/remote_file.rb

@@ -40,13 +40,37 @@ class Chef
         @provider = Chef::Provider::RemoteFile
       end
 
+      # source can take any of the following as arguments
+      # - A single string argument
+      # - Multiple string arguments
+      # - An array or strings
+      # - A delayed evaluator that evaluates to a string
+      #   or array of strings
+      # All strings must be parsable as URIs.
+      # source returns an array of strings.
       def source(*args)
-        if not args.empty?
-          args = Array(args).flatten
-          validate_source(args)
-          @source = args
-        elsif self.instance_variable_defined?(:@source) == true
-          @source
+        arg = parse_source_args(args)
+        ret = set_or_return(:source,
+                            arg,
+                            { :callbacks => {
+                                :validate_source => method(:validate_source)
+                              }})
+        if ret.is_a? String
+          Array(ret)
+        else
+          ret
+        end
+      end
+
+      def parse_source_args(args)
+        if args.empty?
+          nil
+        elsif args[0].is_a?(Chef::DelayedEvaluator) && args.count == 1
+          args[0]
+        elsif args.any? {|a| a.is_a?(Chef::DelayedEvaluator)} && args.count > 1
+          raise Exceptions::InvalidRemoteFileURI, "Only 1 source argument allowed when using a lazy evaluator"
+        else
+          Array(args).flatten
         end
       end
 
@@ -107,6 +131,7 @@ class Chef
       private
 
       def validate_source(source)
+        source = Array(source).flatten
         raise ArgumentError, "#{resource_name} has an empty source" if source.empty?
         source.each do |src|
           unless absolute_uri?(src)
@@ -114,6 +139,7 @@ class Chef
               "#{src.inspect} is not a valid `source` parameter for #{resource_name}. `source` must be an absolute URI or an array of URIs."
           end
         end
+        true
       end
 
       def absolute_uri?(source)

data/lib/chef/run_context.rb

@@ -24,6 +24,7 @@ require 'chef/role'
 require 'chef/log'
 require 'chef/recipe'
 require 'chef/run_context/cookbook_compiler'
+require 'chef/event_dispatch/events_output_stream'
 
 class Chef
 
@@ -249,6 +250,27 @@ ERROR_MESSAGE
       @cookbook_compiler.unreachable_cookbook?(cookbook_name)
     end
 
+    # Open a stream object that can be printed into and will dispatch to events
+    #
+    # == Arguments
+    # options is a hash with these possible options:
+    # - name: a string that identifies the stream to the user. Preferably short.
+    #
+    # Pass a block and the stream will be yielded to it, and close on its own
+    # at the end of the block.
+    def open_stream(options = {})
+      stream = EventDispatch::EventsOutputStream.new(events, options)
+      if block_given?
+        begin
+          yield stream
+        ensure
+          stream.close
+        end
+      else
+        stream
+      end
+    end
+
     private
 
     def loaded_recipe(cookbook, recipe)

data/lib/chef/run_lock.rb

@@ -20,6 +20,9 @@ require 'fcntl'
 if Chef::Platform.windows?
   require 'chef/win32/mutex'
 end
+require 'chef/config'
+require 'chef/exceptions'
+require 'timeout'
 
 class Chef
 
@@ -43,10 +46,13 @@ class Chef
       @runlock_file = lockfile
       @runlock = nil
       @mutex = nil
+      @runpid = nil
     end
 
     # Acquire the system-wide lock. Will block indefinitely if another process
-    # already has the lock.
+    # already has the lock and Chef::Config[:run_lock_timeout] is
+    # not set. Otherwise will block for Chef::Config[:run_lock_timeout]
+    # seconds and exit if the lock is not acquired.
     #
     # Each call to acquire should have a corresponding call to #release.
     #
@@ -55,7 +61,23 @@ class Chef
     # Either acquire() or test() methods should be called in order to
     # get the ownership of run_lock.
     def acquire
-      wait unless test
+      if timeout_given?
+        begin
+          Timeout::timeout(time_to_wait) do
+            unless test
+              if time_to_wait > 0.0
+                wait
+              else
+                exit_from_timeout
+              end
+            end
+          end
+        rescue Timeout::Error => e
+          exit_from_timeout
+        end
+      else
+        wait unless test
+      end
     end
 
     #
@@ -92,7 +114,6 @@ class Chef
     # Waits until acquiring the system-wide lock.
     #
     def wait
-      runpid = runlock.read.strip.chomp
       Chef::Log.warn("Chef client #{runpid} is running, will wait for it to finish and then run.")
       if Chef::Platform.windows?
         mutex.wait
@@ -131,6 +152,7 @@ class Chef
     def reset
       @runlock = nil
       @mutex = nil
+      @runpid = nil
     end
 
     # Since flock mechanism doesn't exist on windows we are using
@@ -144,6 +166,23 @@ class Chef
       @mutex = Chef::ReservedNames::Win32::Mutex.new("Global\\#{runlock_file.gsub(/[\\]/, "/").downcase}")
       mutex.test
     end
+
+    def runpid
+      @runpid ||= runlock.read.strip
+    end
+
+    def timeout_given?
+      !time_to_wait.nil?
+    end
+
+    def time_to_wait
+      Chef::Config[:run_lock_timeout]
+    end
+
+    def exit_from_timeout
+      rp = runpid
+      release # Just to be on the safe side...
+      raise Chef::Exceptions::RunLockTimeout.new(time_to_wait, rp)
+    end
   end
 end
-