chef 12.6.0 → 12.7.2

data/lib/chef/event_dispatch/base.rb

@@ -298,7 +298,7 @@ class Chef
       #
 
       # Called before action is executed on a resource.
-      def resource_action_start(resource, action, notification_type=nil, notifier=nil)
+      def resource_action_start(resource, action, notification_type = nil, notifier = nil)
       end
 
       # Called when a resource action has been skipped b/c of a conditional
@@ -381,7 +381,7 @@ class Chef
       end
 
       # Emit a message about something being deprecated.
-      def deprecation(message, location=caller(2..2)[0])
+      def deprecation(message, location = caller(2..2)[0])
       end
 
       def run_list_expanded(run_list_expansion)

data/lib/chef/event_dispatch/dispatcher.rb

@@ -1,4 +1,4 @@
-require 'chef/event_dispatch/base'
+require "chef/event_dispatch/base"
 
 class Chef
   module EventDispatch
@@ -54,7 +54,7 @@ class Chef
       end
 
       # Special case deprecation, since it needs to know its caller
-      def deprecation(message, location=caller(2..2)[0])
+      def deprecation(message, location = caller(2..2)[0])
         call_subscribers(:deprecation, message, location)
       end
     end

data/lib/chef/event_dispatch/dsl.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Ranjib Dey (<ranjib@linux.com>)
-# Copyright:: Copyright (c) 2015 Ranjib Dey
+# Copyright:: Copyright 2015-2016, Ranjib Dey
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-require 'chef/event_dispatch/base'
-require 'chef/exceptions'
-require 'chef/config'
+require "chef/event_dispatch/base"
+require "chef/exceptions"
+require "chef/config"
 
 class Chef
   module EventDispatch
@@ -33,7 +33,7 @@ class Chef
 
         # Use event.register API to add anonymous handler if Chef.run_context
         # and associated event dispatcher is set, else fallback to
-        # Chef::Config[:hanlder]
+        # Chef::Config[:event_handlers]
         if Chef.run_context && Chef.run_context.events
           Chef::Log.debug("Registering handler '#{name}' using events api")
           Chef.run_context.events.register(handler)
@@ -55,6 +55,7 @@ class Chef
       end
 
       private
+
       def validate!(event_type)
         all_event_types = (Chef::EventDispatch::Base.instance_methods - Object.instance_methods)
         raise Chef::Exceptions::InvalidEventType, "Invalid event type: #{event_type}" unless all_event_types.include?(event_type)

data/lib/chef/event_loggers/base.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Jay Mundrawala (<jdm@getchef.com>)
+# Author:: Jay Mundrawala (<jdm@chef.io>)
 #
-# Copyright:: 2014, Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/event_dispatch/base'
+require "chef/event_dispatch/base"
 
 class Chef
   module EventLoggers

data/lib/chef/event_loggers/windows_eventlog.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Jay Mundrawala (<jdm@getchef.com>)
+# Author:: Jay Mundrawala (<jdm@chef.io>)
 #
-# Copyright:: 2014, Chef Software, Inc.
+# Copyright:: Copyright 2014-2016, Chef Software, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -16,9 +16,9 @@
 # limitations under the License.
 #
 
-require 'chef/event_loggers/base'
-require 'chef/platform/query_helpers'
-require 'chef/win32/eventlog'
+require "chef/event_loggers/base"
+require "chef/platform/query_helpers"
+require "chef/win32/eventlog"
 
 class Chef
   module EventLoggers
@@ -35,14 +35,14 @@ class Chef
       LOG_CATEGORY_ID = 11001
 
       # Since we must install the event logger, this is not really configurable
-      SOURCE = 'Chef'
+      SOURCE = "Chef"
 
       def self.available?
         return Chef::Platform::windows?
       end
 
       def initialize
-        @eventlog = ::Win32::EventLog::open('Application')
+        @eventlog = ::Win32::EventLog::open("Application")
       end
 
       def run_start(version)
@@ -50,7 +50,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => RUN_START_EVENT_ID,
-          :data => [version]
+          :data => [version],
         )
       end
 
@@ -60,7 +60,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => RUN_STARTED_EVENT_ID,
-          :data => [run_status.run_id]
+          :data => [run_status.run_id],
         )
       end
 
@@ -69,7 +69,7 @@ class Chef
           :event_type => ::Win32::EventLog::INFO_TYPE,
           :source => SOURCE,
           :event_id => RUN_COMPLETED_EVENT_ID,
-          :data => [@run_status.run_id, @run_status.elapsed_time.to_s]
+          :data => [@run_status.run_id, @run_status.elapsed_time.to_s],
         )
       end
 
@@ -92,7 +92,7 @@ class Chef
           :event_id => RUN_FAILED_EVENT_ID,
           :data => data + [e.class.name,
                            e.message,
-                           e.backtrace.join("\n")]
+                           e.backtrace.join("\n")],
         )
       end
 

data/lib/chef/exceptions.rb

@@ -1,8 +1,8 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Seth Falcon (<seth@opscode.com>)
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Falcon (<seth@chef.io>)
 # Author:: Kyle Goodwin (<kgoodwin@primerevenue.com>)
-# Copyright:: Copyright 2008-2015 Chef Software, Inc.
+# Copyright:: Copyright 2008-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef-config/exceptions'
+require "chef-config/exceptions"
 
 class Chef
   # == Chef::Exceptions
@@ -28,12 +28,12 @@ class Chef
     ConfigurationError = ChefConfig::ConfigurationError
 
     # Backcompat with Chef::ShellOut code:
-    require 'mixlib/shellout/exceptions'
+    require "mixlib/shellout/exceptions"
 
     def self.const_missing(const_name)
       if const_name == :ShellCommandFailed
         Chef::Log.warn("Chef::Exceptions::ShellCommandFailed is deprecated, use Mixlib::ShellOut::ShellCommandFailed")
-        called_from = caller[0..3].inject("Called from:\n") {|msg, trace_line| msg << "  #{trace_line}\n" }
+        called_from = caller[0..3].inject("Called from:\n") { |msg, trace_line| msg << "  #{trace_line}\n" }
         Chef::Log.warn(called_from)
         Mixlib::ShellOut::ShellCommandFailed
       else
@@ -71,6 +71,7 @@ class Chef
     class RoleNotFound < RuntimeError; end
     class DuplicateRole < RuntimeError; end
     class ValidationFailed < ArgumentError; end
+    class CannotValidateStaticallyError < ArgumentError; end
     class InvalidPrivateKey < ArgumentError; end
     class MissingKeyAttribute < ArgumentError; end
     class KeyCommandInputError < ArgumentError; end
@@ -137,22 +138,6 @@ class Chef
     # Errors originating from calls to the Win32 API
     class Win32APIError < RuntimeError; end
 
-    class Win32NetAPIError < Win32APIError
-      attr_reader :msg, :error_code
-      def initialize(msg, error_code)
-        @msg = msg
-        @error_code = error_code
-
-        formatted_message = ""
-        formatted_message << "---- Begin Win32 API output ----\n"
-        formatted_message << "Net Api Error Code: #{error_code}\n"
-        formatted_message << "Net Api Error Message: #{msg}\n"
-        formatted_message << "---- End Win32 API output ----\n"
-
-        super(formatted_message)
-      end
-    end
-
     # Thrown when Win32 API layer binds to non-existent Win32 function.  Occurs
     # when older versions of Windows don't support newer Win32 API functions.
     class Win32APIFunctionNotImplemented < NotImplementedError; end
@@ -170,6 +155,7 @@ class Chef
 
     class CannotDetermineHomebrewOwner < Package; end
     class CannotDetermineWindowsInstallerType < Package; end
+    class NoWindowsPackageSource < Package; end
 
     # Can not create staging file during file deployment
     class FileContentStagingError < RuntimeError
@@ -219,7 +205,7 @@ class Chef
     class ImmutableAttributeModification < NoMethodError
       def initialize
         super "Node attributes are read-only when you do not specify which precedence level to set. " +
-          %Q(To set an attribute use code like `node.default["key"] = "value"')
+          %q{To set an attribute use code like `node.default["key"] = "value"'}
       end
     end
 
@@ -264,7 +250,7 @@ class Chef
 
       attr_reader :expansion
 
-      def initialize(message_or_expansion=NULL)
+      def initialize(message_or_expansion = NULL)
         @expansion = nil
         case message_or_expansion
         when NULL
@@ -273,7 +259,7 @@ class Chef
           super
         when RunList::RunListExpansion
           @expansion = message_or_expansion
-          missing_roles = @expansion.errors.join(', ')
+          missing_roles = @expansion.errors.join(", ")
           super("The expanded run list includes nonexistent roles: #{missing_roles}")
         end
       end
@@ -343,7 +329,7 @@ class Chef
           result = {
             "message" => message,
             "non_existent_cookbooks" => non_existent_cookbooks,
-            "cookbooks_with_no_versions" => cookbooks_with_no_matching_versions
+            "cookbooks_with_no_versions" => cookbooks_with_no_matching_versions,
           }
           Chef::JSONCompat.to_json(result, *a)
         end
@@ -378,7 +364,7 @@ class Chef
             "message" => message,
             "unsatisfiable_run_list_item" => run_list_item,
             "non_existent_cookbooks" => non_existent_cookbooks,
-            "most_constrained_cookbooks" => most_constrained_cookbooks
+            "most_constrained_cookbooks" => most_constrained_cookbooks,
           }
           Chef::JSONCompat.to_json(result, *a)
         end
@@ -396,7 +382,10 @@ class Chef
     # length declared in the http response.
     class ContentLengthMismatch < RuntimeError
       def initialize(response_length, content_length)
-        super "Response body length #{response_length} does not match HTTP Content-Length header #{content_length}."
+        super <<-EOF
+Response body length #{response_length} does not match HTTP Content-Length header #{content_length}.
+This error is most often caused by network issues (proxies, etc) outside of chef-client.
+        EOF
       end
     end
 
@@ -460,7 +449,7 @@ class Chef
     class RunFailedWrappingError < RuntimeError
       attr_reader :wrapped_errors
       def initialize(*errors)
-        errors = errors.select {|e| !e.nil?}
+        errors = errors.select { |e| !e.nil? }
         output = "Found #{errors.size} errors, they are stored in the backtrace"
         @wrapped_errors = errors
         super output
@@ -468,8 +457,8 @@ class Chef
 
       def fill_backtrace
         backtrace = []
-        wrapped_errors.each_with_index do |e,i|
-          backtrace << "#{i+1}) #{e.class} -  #{e.message}"
+        wrapped_errors.each_with_index do |e, i|
+          backtrace << "#{i + 1}) #{e.class} -  #{e.message}"
           backtrace += e.backtrace if e.backtrace
           backtrace << "" unless i == wrapped_errors.length - 1
         end
@@ -485,14 +474,14 @@ class Chef
 
     class CookbookChefVersionMismatch < RuntimeError
       def initialize(chef_version, cookbook_name, cookbook_version, *constraints)
-        constraint_str = constraints.map { |c| c.requirement.as_list.to_s }.join(', ')
+        constraint_str = constraints.map { |c| c.requirement.as_list.to_s }.join(", ")
         super "Cookbook '#{cookbook_name}' version '#{cookbook_version}' depends on chef version #{constraint_str}, but the running chef version is #{chef_version}"
       end
     end
 
     class CookbookOhaiVersionMismatch < RuntimeError
       def initialize(ohai_version, cookbook_name, cookbook_version, *constraints)
-        constraint_str = constraints.map { |c| c.requirement.as_list.to_s }.join(', ')
+        constraint_str = constraints.map { |c| c.requirement.as_list.to_s }.join(", ")
         super "Cookbook '#{cookbook_name}' version '#{cookbook_version}' depends on ohai version #{constraint_str}, but the running ohai version is #{ohai_version}"
       end
     end
@@ -502,7 +491,7 @@ class Chef
       def initialize(resources_found)
         @resources_found = resources_found
         matches_info = @resources_found.each do |r|
-          if r['Module'].nil?
+          if r["Module"].nil?
             "Resource #{r['Name']} was found in #{r['Module']['Name']}"
           else
             "Resource #{r['Name']} is a binary resource"

data/lib/chef/file_access_control.rb

@@ -1,7 +1,7 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Copyright:: Copyright (c) 2008, 2010 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'chef/log'
+require "chef/log"
 
 class Chef
 
@@ -27,10 +27,10 @@ class Chef
   class FileAccessControl
 
     if RUBY_PLATFORM =~ /mswin|mingw|windows/
-      require 'chef/file_access_control/windows'
+      require "chef/file_access_control/windows"
       include FileAccessControl::Windows
     else
-      require 'chef/file_access_control/unix'
+      require "chef/file_access_control/unix"
       include FileAccessControl::Unix
     end
 

data/lib/chef/file_access_control/unix.rb

@@ -1,8 +1,8 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Author:: Daniel DeLeo (<dan@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2008-2011 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Daniel DeLeo (<dan@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
 # limitations under the License.
 #
 
-require 'chef/log'
+require "chef/log"
 
 class Chef
   class FileAccessControl

data/lib/chef/file_access_control/windows.rb

@@ -1,7 +1,7 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright 2011 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,8 +17,8 @@
 # limitations under the License.
 #
 
-require 'chef/win32/security'
-require 'chef/win32/file'
+require "chef/win32/security"
+require "chef/win32/file"
 
 class Chef
   class FileAccessControl

data/lib/chef/file_cache.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,12 +15,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'chef/mixin/params_validate'
-require 'chef/mixin/create_path'
-require 'chef/exceptions'
-require 'chef/json_compat'
-require 'fileutils'
-require 'chef/util/path_helper'
+require "chef/mixin/params_validate"
+require "chef/mixin/create_path"
+require "chef/exceptions"
+require "chef/json_compat"
+require "fileutils"
+require "chef/util/path_helper"
 
 class Chef
   class FileCache
@@ -39,16 +39,16 @@ class Chef
       #
       # === Returns
       # true
-      def store(path, contents, perm=0640)
+      def store(path, contents, perm = 0640)
         validate(
           {
             :path => path,
-            :contents => contents
+            :contents => contents,
           },
           {
             :path => { :kind_of => String },
             :contents => { :kind_of => String },
-          }
+          },
         )
 
         file_path_array = File.split(path)
@@ -69,12 +69,12 @@ class Chef
         validate(
           {
             :file => file,
-            :path => path
+            :path => path,
           },
           {
             :file => { :kind_of => String },
             :path => { :kind_of => String },
-          }
+          },
         )
 
         file_path_array = File.split(path)
@@ -82,7 +82,7 @@ class Chef
         if File.exists?(file) && File.writable?(file)
           FileUtils.mv(
             file,
-            File.join(create_cache_path(File.join(file_path_array), true), file_name)
+            File.join(create_cache_path(File.join(file_path_array), true), file_name),
           )
         else
           raise RuntimeError, "Cannot move #{file} to #{path}!"
@@ -102,14 +102,14 @@ class Chef
       #
       # === Raises
       # Chef::Exceptions::FileNotFound:: If it cannot find the file in the cache
-      def load(path, read=true)
+      def load(path, read = true)
         validate(
           {
             :path => path
           },
           {
             :path => { :kind_of => String }
-          }
+          },
         )
         cache_path = create_cache_path(path, false)
         raise Chef::Exceptions::FileNotFound, "Cannot find #{cache_path} for #{path}!" unless File.exists?(cache_path)
@@ -134,8 +134,8 @@ class Chef
             :path => path
           },
           {
-            :path => { :kind_of => String },
-          }
+            :path => { :kind_of => String }
+          },
         )
         cache_path = create_cache_path(path, false)
         if File.exists?(cache_path)
@@ -181,8 +181,8 @@ class Chef
             :path => path
           },
           {
-            :path => { :kind_of => String },
-          }
+            :path => { :kind_of => String }
+          },
         )
         full_path = create_cache_path(path, false)
         if File.exists?(full_path)
@@ -201,7 +201,7 @@ class Chef
       #
       # === Returns
       # String:: The fully expanded path
-      def create_cache_path(path, create_if_missing=true)
+      def create_cache_path(path, create_if_missing = true)
         cache_dir = File.expand_path(File.join(file_cache_path, path))
         if create_if_missing
           create_path(cache_dir)