chef 15.7.32 → 15.8.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3ebb04ffde602265dce9ac87318e3b8e2f7a68a0f6e23a66622c8f929a0e16
-  data.tar.gz: 7bb9217015f5ba3d3ff4dc351e30f840fba861c237e6d113c1eb23c425cab46c
+  metadata.gz: b4bfd0936e85a14def6d08f1d293f5ae247bb89a845342f6c7818856627bd77b
+  data.tar.gz: 9716dcf24df69c197fe6064788e2ed5f81d47395d1beeabfc8b750425c53f3a8
 SHA512:
-  metadata.gz: f01aae84235878b6145b2acf34c187696549150594d879abddc32cea95e5e0cfa144f500c55dfd50126206d9bcd7a35b5359fb9ef68ce4bd0b69033acc56e9e1
-  data.tar.gz: d95315b5cc3361acf54d7cd274f6ec27392667244c58b205b5e768433a95f26f354b44dd7683edef131be2d818b17921f0caf66dc2ee76714556e1ae0fd89b68
+  metadata.gz: 6aaffecb25528b55237179dc9bcc06849700cfed58765826a136d59b1d5f72280f7c6879b0bcf79ba9d408ec54336db7dc4a1ccf6ac934abcd495ab2c843c3f9
+  data.tar.gz: 3c495b0ab4f181c2ebec8c5a84bff67dbec5afc615211011233fed31cb8b0b7e48838ac2ec9e3d937018bf7e337652bc54036c9210353d2da42dfe48057143ff

data/chef-universal-mingw32.gemspec

@@ -11,7 +11,7 @@ gemspec.add_dependency "win32-eventlog", "0.6.3"
 gemspec.add_dependency "win32-mmap", "~> 0.4.1"
 gemspec.add_dependency "win32-mutex", "~> 0.4.2"
 gemspec.add_dependency "win32-process", "~> 0.8.2"
-gemspec.add_dependency "win32-service", ">= 2.1.2", "< 3.0"
+gemspec.add_dependency "win32-service", ">= 2.1.5", "< 3.0"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
 gemspec.add_dependency "iso8601", "~> 0.12.1"

data/lib/chef/dsl/declare_resource.rb

@@ -69,7 +69,7 @@ class Chef
       # @return [Chef::Resource] The resource
       #
       # @example
-      #   delete_resource!(:template, '/x/y.txy')
+      #   delete_resource!(:template, '/x/y.txt')
       #
       def delete_resource!(type, name, run_context: self.run_context)
         run_context.resource_collection.delete("#{type}[#{name}]").tap do |resource|
@@ -93,7 +93,7 @@ class Chef
       # @return [Chef::Resource] The resource
       #
       # @example
-      #   delete_resource(:template, '/x/y.txy')
+      #   delete_resource(:template, '/x/y.txt')
       #
       def delete_resource(type, name, run_context: self.run_context)
         delete_resource!(type, name, run_context: run_context)
@@ -114,7 +114,7 @@ class Chef
       # @return [Chef::Resource] The updated resource
       #
       # @example
-      #   edit_resource!(:template, '/x/y.txy') do
+      #   edit_resource!(:template, '/x/y.txt') do
       #     cookbook_name: cookbook_name
       #   end
       #
@@ -147,8 +147,8 @@ class Chef
       # @return [Chef::Resource] The updated or created resource
       #
       # @example
-      #   resource = edit_resource(:template, '/x/y.txy') do
-      #     source "y.txy.erb"
+      #   resource = edit_resource(:template, '/x/y.txt') do
+      #     source "y.txt.erb"
       #     variables {}
       #   end
       #   resource.variables.merge!({ home: "/home/klowns"  })
@@ -199,7 +199,7 @@ class Chef
       # @return [Chef::Resource] The updated resource
       #
       # @example
-      #   resource = find_resource!(:template, '/x/y.txy')
+      #   resource = find_resource!(:template, '/x/y.txt')
       #
       def find_resource!(type, name, run_context: self.run_context)
         raise ArgumentError, "find_resource! does not take a block" if block_given?
@@ -219,7 +219,7 @@ class Chef
       # @return [Chef::Resource] The updated resource
       #
       # @example
-      #   if ( find_resource(:template, '/x/y.txy') )
+      #   if ( find_resource(:template, '/x/y.txt') )
       #     # do something
       #   else
       #     # don't worry about the error
@@ -259,7 +259,7 @@ class Chef
       # @return [Chef::Resource] The new resource.
       #
       # @example
-      #   declare_resource(:file, '/x/y.txy', caller[0]) do
+      #   declare_resource(:file, '/x/y.txt', caller[0]) do
       #     action :delete
       #   end
       #   # Equivalent to
@@ -293,7 +293,7 @@ class Chef
       # @return [Chef::Resource] The new resource.
       #
       # @example
-      #   build_resource(:file, '/x/y.txy', caller[0]) do
+      #   build_resource(:file, '/x/y.txt', caller[0]) do
       #     action :delete
       #   end
       #

data/lib/chef/knife/client_key_create.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "key_create"
 require_relative "key_create_base"
 
 class Chef
@@ -33,6 +32,10 @@ class Chef
 
       banner "knife client key create CLIENT (options)"
 
+      deps do
+        require_relative "key_create"
+      end
+
       attr_reader :actor
 
       def initialize(argv = [])

data/lib/chef/knife/client_key_delete.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "key_delete"
 
 class Chef
   class Knife
@@ -30,6 +29,10 @@ class Chef
     class ClientKeyDelete < Knife
       banner "knife client key delete CLIENT KEYNAME (options)"
 
+      deps do
+        require_relative "key_delete"
+      end
+
       attr_reader :actor
 
       def initialize(argv = [])

data/lib/chef/knife/client_key_edit.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "key_edit"
 require_relative "key_edit_base"
 
 class Chef
@@ -33,6 +32,10 @@ class Chef
 
       banner "knife client key edit CLIENT KEYNAME (options)"
 
+      deps do
+        require_relative "key_edit"
+      end
+
       attr_reader :actor
 
       def initialize(argv = [])

data/lib/chef/knife/client_key_list.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "key_list"
 require_relative "key_list_base"
 
 class Chef
@@ -33,6 +32,10 @@ class Chef
 
       banner "knife client key list CLIENT (options)"
 
+      deps do
+        require_relative "key_list"
+      end
+
       attr_reader :actor
 
       def initialize(argv = [])

data/lib/chef/knife/client_key_show.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "key_show"
 
 class Chef
   class Knife
@@ -30,6 +29,10 @@ class Chef
     class ClientKeyShow < Knife
       banner "knife client key show CLIENT KEYNAME (options)"
 
+      deps do
+        require_relative "key_show"
+      end
+
       attr_reader :actor
 
       def initialize(argv = [])

data/lib/chef/knife/config_list_profiles.rb

@@ -16,13 +16,16 @@
 #
 
 require_relative "../knife"
-require_relative "../workstation_config_loader"
 
 class Chef
   class Knife
     class ConfigListProfiles < Knife
       banner "knife config list-profiles (options)"
 
+      deps do
+        require_relative "../workstation_config_loader"
+      end
+
       option :ignore_knife_rb,
         short: "-i",
         long: "--ignore-knife-rb",

data/lib/chef/knife/config_use_profile.rb

@@ -15,8 +15,6 @@
 # limitations under the License.
 #
 
-require "fileutils" unless defined?(FileUtils)
-
 require_relative "../knife"
 
 class Chef
@@ -24,6 +22,10 @@ class Chef
     class ConfigUseProfile < Knife
       banner "knife config use-profile PROFILE"
 
+      deps do
+        require "fileutils" unless defined?(FileUtils)
+      end
+
       # Disable normal config loading since this shouldn't fail if the profile
       # doesn't exist of the config is otherwise corrupted.
       def configure_chef

data/lib/chef/knife/configure.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "../util/path_helper"
 require_relative "../dist"
 
 class Chef
@@ -27,6 +26,7 @@ class Chef
       attr_reader :chef_repo, :new_client_key, :validation_client_name, :validation_key
 
       deps do
+        require_relative "../util/path_helper"
         require "ohai" unless defined?(Ohai::System)
         Chef::Knife::ClientCreate.load_deps
         Chef::Knife::UserCreate.load_deps

data/lib/chef/knife/cookbook_upload.rb

@@ -19,19 +19,16 @@
 #
 
 require_relative "../knife"
-require_relative "../cookbook_uploader"
-require_relative "../mixin/file_class"
 
 class Chef
   class Knife
     class CookbookUpload < Knife
-
-      include Chef::Mixin::FileClass
-
       CHECKSUM = "checksum".freeze
       MATCH_CHECKSUM = /[0-9a-f]{32,}/.freeze
 
       deps do
+        require_relative "../mixin/file_class"
+        include Chef::Mixin::FileClass
         require_relative "../exceptions"
         require_relative "../cookbook_loader"
         require_relative "../cookbook_uploader"
@@ -111,7 +108,7 @@ class Chef
 
         if cookbooks.empty?
           cookbook_path = config[:cookbook_path].respond_to?(:join) ? config[:cookbook_path].join(", ") : config[:cookbook_path]
-          ui.warn("Could not find any cookbooks in your cookbook path: #{cookbook_path}. Use --cookbook-path to specify the desired path.")
+          ui.warn("Could not find any cookbooks in your cookbook path: '#{File.expand_path(cookbook_path)}'. Use --cookbook-path to specify the desired path.")
         else
           begin
             tmp_cl = Chef::CookbookLoader.copy_to_tmp_dir_from_array(cookbooks)

data/lib/chef/knife/data_bag_from_file.rb

@@ -18,7 +18,6 @@
 #
 
 require_relative "../knife"
-require_relative "../util/path_helper"
 require_relative "data_bag_secret_options"
 
 class Chef
@@ -27,6 +26,7 @@ class Chef
       include DataBagSecretOptions
 
       deps do
+        require_relative "../util/path_helper"
         require_relative "../data_bag"
         require_relative "../data_bag_item"
         require_relative "core/object_loader"

data/lib/chef/knife/exec.rb

@@ -17,13 +17,16 @@
 #
 
 require_relative "../knife"
-require_relative "../util/path_helper"
 require_relative "../dist"
 
 class Chef::Knife::Exec < Chef::Knife
 
   banner "knife exec [SCRIPT] (options)"
 
+  deps do
+    require_relative "../util/path_helper"
+  end
+
   option :exec,
     short: "-E CODE",
     long: "--exec CODE",

data/lib/chef/knife/raw.rb

@@ -15,7 +15,6 @@
 #
 
 require_relative "../knife"
-require_relative "../http"
 
 class Chef
   class Knife

data/lib/chef/knife/rehash.rb

@@ -17,13 +17,16 @@
 #
 
 require_relative "../knife"
-require_relative "core/subcommand_loader"
 
 class Chef
   class Knife
     class Rehash < Chef::Knife
       banner "knife rehash"
 
+      deps do
+        require_relative "core/subcommand_loader"
+      end
+
       def run
         if ! Chef::Knife::SubcommandLoader.autogenerated_manifest?
           ui.msg "Using knife-rehash will speed up knife's load time by caching the location of subcommands on disk."

data/lib/chef/knife/search.rb

@@ -18,7 +18,6 @@
 
 require_relative "../knife"
 require_relative "core/node_presenter"
-require "addressable/uri" unless defined?(Addressable::URI)
 
 class Chef
   class Knife
@@ -27,6 +26,7 @@ class Chef
       include Knife::Core::MultiAttributeReturnOption
 
       deps do
+        require "addressable/uri" unless defined?(Addressable::URI)
         require_relative "../node"
         require_relative "../environment"
         require_relative "../api_client"

data/lib/chef/knife/ssh.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 #
 
-require_relative "../mixin/shell_out"
 require_relative "../knife"
 
 class Chef
@@ -24,15 +23,16 @@ class Chef
     class Ssh < Knife
 
       deps do
+        require_relative "../mixin/shell_out"
         require "net/ssh" unless defined?(Net::SSH)
         require "net/ssh/multi"
         require "readline"
         require_relative "../exceptions"
         require_relative "../search/query"
         require_relative "../util/path_helper"
-      end
 
-      include Chef::Mixin::ShellOut
+        include Chef::Mixin::ShellOut
+      end
 
       attr_writer :password
 

data/lib/chef/knife/ssl_check.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "../config"
 require_relative "../dist"
 
 class Chef
@@ -25,6 +24,7 @@ class Chef
     class SslCheck < Chef::Knife
 
       deps do
+        require_relative "../config"
         require "pp" unless defined?(PP)
         require "socket" unless defined?(Socket)
         require "uri" unless defined?(URI)

data/lib/chef/knife/ssl_fetch.rb

@@ -17,13 +17,13 @@
 #
 
 require_relative "../knife"
-require_relative "../config"
 
 class Chef
   class Knife
     class SslFetch < Chef::Knife
 
       deps do
+        require_relative "../config"
         require "pp" unless defined?(PP)
         require "socket" unless defined?(Socket)
         require "uri" unless defined?(URI)

data/lib/chef/knife/supermarket_install.rb

@@ -17,13 +17,13 @@
 #
 
 require_relative "../knife"
-require_relative "../exceptions"
 
 class Chef
   class Knife
     class SupermarketInstall < Knife
 
       deps do
+        require_relative "../exceptions"
         require "shellwords" unless defined?(Shellwords)
         require "mixlib/archive" unless defined?(Mixlib::Archive)
         require_relative "core/cookbook_scm_repo"

data/lib/chef/knife/user_key_create.rb

@@ -17,7 +17,6 @@
 #
 
 require_relative "../knife"
-require_relative "key_create"
 require_relative "key_create_base"
 
 class Chef
@@ -33,6 +32,10 @@ class Chef
 
       banner "knife user key create USER (options)"
 
+      deps do
+        require_relative "key_create"
+      end
+
       attr_reader :actor
 
       def initialize(argv = [])