chef 14.5.33 → 14.6.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f32c9c7263c21045b7ee27b9d8dfdd8576d7ff4083d8966eedc4689d47e4fdb6
-  data.tar.gz: 2c3918f9e7e5935e1ac40cfaee6bfd5c0e768c10763f2d091965fbd7eed65361
+  metadata.gz: a8d51e830e9cccfff4ec27af2c3e3bd92e5ae45f0c43d2d4142b4663744d73d0
+  data.tar.gz: 07d9387a39d2e53d2b81120cebfa00276e74bcb583826605c3a16eede5773da1
 SHA512:
-  metadata.gz: 6d8e510d9adb98352f68f235c5b0ba91940a38bcb710eafa1d4959b2ca0c2d7b818047d3db12d801170de62a28fcf17e2c03f07495925f3dbda04bf12201ce68
-  data.tar.gz: d0be6f90066117daecd40a45390bca44654bbf6ceadad084db86654fe35a9c5bc5ae75553897fe3d7aa6db542b2e9992d4c58a35bbf50b63b081f56b6ff94cc5
+  metadata.gz: 85186af3f82ce9835901e31b66b3f134a8a131a28bab7ea8fcd663f073c8a866e04062e891c2765c0f07197e02b7b412a89aafb4ea4607c705f35940603ec93e
+  data.tar.gz: 49d21188f23f5492bfce0dc2058d1abeb9daf87b12edb70de46dcc9809e25c6db345a5e1e5c5d5a67674922ca4323ece9573572c5c6d95311ab1926d32512fc5

data/Gemfile

@@ -13,7 +13,7 @@ gem "cheffish", "~> 14"
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
-  gem "inspec-core", "~> 2"
+  gem "inspec-core", "~> 3"
   gem "chef-vault"
 end
 
@@ -47,12 +47,14 @@ group(:ruby_shadow) do
 end
 
 group(:development, :test) do
-  gem "rake"
+  # we pin rake as a copy of rake is installed from the ruby source
+  # if you bump the ruby version you should confirm we don't end up with
+  # two rake gems installed again
+  gem "rake", "<= 12.3.0"
   gem "simplecov"
   gem "webmock"
 
   # for testing new chefstyle rules
-  # gem 'chefstyle', github: 'chef/chefstyle'
   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "master"
 end
 

data/chef-universal-mingw32.gemspec

@@ -14,9 +14,10 @@ gemspec.add_dependency "win32-process", "~> 0.8.2"
 gemspec.add_dependency "win32-service", "~> 1.0"
 gemspec.add_dependency "windows-api", "~> 0.4.4"
 gemspec.add_dependency "wmi-lite", "~> 1.0"
-gemspec.add_dependency "win32-taskscheduler", "~> 1.0.0"
+gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
+gemspec.add_dependency "iso8601", "~> 0.12.1"
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
-gemspec.files += %w{ext/win32-eventlog/Rakefile ext/win32-eventlog/chef-log.man}
+gemspec.files += Dir.glob("{distro,ext}/**/*")
 
 gemspec.executables += %w{ chef-service-manager chef-windows-service }
 

data/chef.gemspec

@@ -5,7 +5,7 @@ Gem::Specification.new do |s|
   s.name = "chef"
   s.version = Chef::VERSION
   s.platform = Gem::Platform::RUBY
-  s.extra_rdoc_files = ["README.md", "CONTRIBUTING.md", "LICENSE" ]
+  s.extra_rdoc_files = ["README.md", "LICENSE" ]
   s.summary = "A systems integration framework, built to bring the benefits of configuration management to your entire infrastructure."
   s.description = s.summary
   s.license = "Apache-2.0"
@@ -38,10 +38,9 @@ Gem::Specification.new do |s|
   s.add_dependency "plist", "~> 3.2"
   s.add_dependency "iniparse", "~> 1.4"
   s.add_dependency "addressable"
-  s.add_dependency "iso8601", "~> 0.11.0"
 
   # Audit mode requires these, so they are non-developmental dependencies now
-  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5", "< 3.8" }
+  %w{rspec-core rspec-expectations rspec-mocks}.each { |gem| s.add_dependency gem, "~> 3.5" }
   s.add_dependency "rspec_junit_formatter", "~> 0.2.0"
   s.add_dependency "serverspec", "~> 2.7"
   s.add_dependency "specinfra", "~> 2.10"
@@ -59,5 +58,5 @@ Gem::Specification.new do |s|
   s.executables  = %w{ chef-client chef-solo knife chef-shell chef-apply chef-resource-inspector }
 
   s.require_paths = %w{ lib }
-  s.files = %w{Gemfile Rakefile LICENSE README.md CONTRIBUTING.md VERSION} + Dir.glob("{distro,lib,lib-backcompat,tasks,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("*.gemspec")
+  s.files = %w{Gemfile Rakefile LICENSE README.md} + Dir.glob("{lib,tasks,spec}/**/*", File::FNM_DOTMATCH).reject { |f| File.directory?(f) } + Dir.glob("*.gemspec")
 end

data/lib/chef/api_client.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Nuo Yan (<nuo@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -110,7 +110,7 @@ class Chef
     # Private key is included if available.
     #
     # @return [Hash]
-    def to_hash
+    def to_h
       result = {
         "name" => @name,
         "public_key" => @public_key,
@@ -123,11 +123,13 @@ class Chef
       result
     end
 
+    alias_method :to_hash, :to_h
+
     # The JSON representation of the object.
     #
     # @return [String] the JSON string.
     def to_json(*a)
-      Chef::JSONCompat.to_json(to_hash, *a)
+      Chef::JSONCompat.to_json(to_h, *a)
     end
 
     def self.from_hash(o)

data/lib/chef/api_client_v1.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Nuo Yan (<nuo@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software, Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -146,7 +146,7 @@ class Chef
     # Private key is included if available.
     #
     # @return [Hash]
-    def to_hash
+    def to_h
       result = {
         "name" => @name,
         "validator" => @validator,
@@ -159,11 +159,13 @@ class Chef
       result
     end
 
+    alias_method :to_hash, :to_h
+
     # The JSON representation of the object.
     #
     # @return [String] the JSON string.
     def to_json(*a)
-      Chef::JSONCompat.to_json(to_hash, *a)
+      Chef::JSONCompat.to_json(to_h, *a)
     end
 
     def self.from_hash(o)
@@ -312,7 +314,7 @@ class Chef
 
         new_client = chef_rest_v0.post("clients", payload)
       end
-      Chef::ApiClientV1.from_hash(to_hash.merge(new_client))
+      Chef::ApiClientV1.from_hash(to_h.merge(new_client))
     end
 
     # As a string

data/lib/chef/application.rb

@@ -205,7 +205,7 @@ class Chef
     # Based on config and whether or not STDOUT is a tty, should we setup a
     # secondary logger for stdout?
     def want_additional_logger?
-      Chef::Config.is_default?(:log_location) && Chef::Config[:log_location].tty? && !Chef::Config[:daemonize]
+      ( Chef::Config[:log_location].class != IO ) && STDOUT.tty? && !Chef::Config[:daemonize]
     end
 
     def configure_stdout_logger

data/lib/chef/audit/audit_reporter.rb

@@ -118,7 +118,7 @@ class Chef
 
         audit_history_url = "controls"
         Chef::Log.trace("Sending audit report (run-id: #{audit_data.run_id})")
-        run_data = audit_data.to_hash
+        run_data = audit_data.to_h
 
         if @audit_phase_error
           error_info = "#{@audit_phase_error.class}: #{@audit_phase_error.message}"

data/lib/chef/audit/control_group_data.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Tyler Ball (<tball@chef.io>)
 #
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -35,15 +35,17 @@ class Chef
         control_groups << control_group
       end
 
-      def to_hash
+      def to_h
         {
             node_name: node_name,
             run_id: run_id,
             start_time: start_time,
             end_time: end_time,
-            control_groups: control_groups.collect { |c| c.to_hash },
+            control_groups: control_groups.collect { |c| c.to_h },
         }
       end
+
+      alias_method :to_hash, :to_h
     end
 
     class ControlGroupData
@@ -76,7 +78,7 @@ class Chef
         control
       end
 
-      def to_hash
+      def to_h
         # We sort it so the examples appear in the output in the same order
         # they appeared in the recipe
         controls.sort! { |x, y| x.line_number <=> y.line_number }
@@ -85,12 +87,14 @@ class Chef
               status: status,
               number_succeeded: number_succeeded,
               number_failed: number_failed,
-              controls: controls.collect { |c| c.to_hash },
+              controls: controls.collect { |c| c.to_h },
         }
         # If there is a duplicate key, metadata will overwrite it
         add_display_only_data(h).merge(metadata)
       end
 
+      alias_method :to_hash, :to_h
+
       private
 
       def create_control(control_data)
@@ -122,7 +126,7 @@ class Chef
         end
       end
 
-      def to_hash
+      def to_h
         h = {
             name: name,
             status: status,
@@ -133,6 +137,8 @@ class Chef
         h[:context] = context || []
         h
       end
+
+      alias_method :to_hash, :to_h
     end
 
   end

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -311,7 +311,7 @@ class Chef
             cookbook_type = path[0]
             result = nil
             begin
-              result = Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_hash
+              result = Chef::CookbookManifest.new(entry.chef_object, policy_mode: cookbook_type == "cookbook_artifacts").to_h
             rescue Chef::ChefFS::FileSystem::NotFoundError => e
               raise ChefZero::DataStore::DataNotFoundError.new(to_zero_path(e.entry), e)
             end
@@ -334,7 +334,7 @@ class Chef
             end
 
             if cookbook_type == "cookbook_artifacts"
-              result["metadata"] = result["metadata"].to_hash
+              result["metadata"] = result["metadata"].to_h
               result["metadata"].delete_if do |key, value|
                 value == [] ||
                   (value == {} && !%w{dependencies attributes recipes}.include?(key)) ||

data/lib/chef/chef_fs/data_handler/data_handler_base.rb

@@ -114,7 +114,7 @@ class Chef
         def from_ruby(path)
           r = chef_class.new
           r.from_file(path)
-          r.to_hash
+          r.to_h
         end
 
         #

data/lib/chef/cookbook/manifest_v0.rb

@@ -1,5 +1,5 @@
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2015-2016, Chef Software Inc.
+# Copyright:: Copyright 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,42 +26,47 @@ class Chef
 
       COOKBOOK_SEGMENTS = %w{ resources providers recipes definitions libraries attributes files templates root_files }.freeze
 
-      def self.from_hash(hash)
-        response = Mash.new(hash)
-        response[:all_files] = COOKBOOK_SEGMENTS.inject([]) do |memo, segment|
-          next memo if hash[segment].nil? || hash[segment].empty?
-          hash[segment].each do |file|
-            file["name"] = "#{segment}/#{file["name"]}"
-            memo << file
+      class << self
+
+        def from_hash(hash)
+          response = Mash.new(hash)
+          response[:all_files] = COOKBOOK_SEGMENTS.inject([]) do |memo, segment|
+            next memo if hash[segment].nil? || hash[segment].empty?
+            hash[segment].each do |file|
+              file["name"] = "#{segment}/#{file["name"]}"
+              memo << file
+            end
+            response.delete(segment)
+            memo
           end
-          response.delete(segment)
-          memo
+          response
         end
-        response
-      end
 
-      def self.to_hash(manifest)
-        result = manifest.manifest.dup
-        result.delete("all_files")
+        def to_h(manifest)
+          result = manifest.manifest.dup
+          result.delete("all_files")
 
-        files = manifest.by_parent_directory
-        files.keys.each_with_object(result) do |parent, memo|
-          if COOKBOOK_SEGMENTS.include?(parent)
-            memo[parent] ||= []
-            files[parent].each do |file|
-              file["name"] = file["name"].split("/")[1]
-              file.delete("full_path")
-              memo[parent] << file
+          files = manifest.by_parent_directory
+          files.keys.each_with_object(result) do |parent, memo|
+            if COOKBOOK_SEGMENTS.include?(parent)
+              memo[parent] ||= []
+              files[parent].each do |file|
+                file["name"] = file["name"].split("/")[1]
+                file.delete("full_path")
+                memo[parent] << file
+              end
             end
           end
-        end
-        # Ensure all segments are set to [] if they don't exist.
-        # See https://github.com/chef/chef/issues/6044
-        COOKBOOK_SEGMENTS.each do |segment|
-          result[segment] ||= []
+          # Ensure all segments are set to [] if they don't exist.
+          # See https://github.com/chef/chef/issues/6044
+          COOKBOOK_SEGMENTS.each do |segment|
+            result[segment] ||= []
+          end
+
+          result.merge({ "frozen?" => manifest.frozen_version?, "chef_type" => "cookbook_version" })
         end
 
-        result.merge({ "frozen?" => manifest.frozen_version?, "chef_type" => "cookbook_version" })
+        alias_method :to_hash, :to_h
       end
     end
   end

data/lib/chef/cookbook/manifest_v2.rb

@@ -1,4 +1,4 @@
-# Copyright:: Copyright 2015-2016, Chef Software Inc.
+# Copyright:: Copyright 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,17 +23,21 @@ class Chef
 
       minimum_api_version 2
 
-      def self.from_hash(hash)
-        Chef::Log.trace "processing manifest: #{hash}"
-        Mash.new hash
-      end
+      class << self
+        def from_hash(hash)
+          Chef::Log.trace "processing manifest: #{hash}"
+          Mash.new hash
+        end
+
+        def to_h(manifest)
+          result = manifest.manifest.dup
+          result["all_files"].map! { |file| file.delete("full_path"); file }
+          result["frozen?"] = manifest.frozen_version?
+          result["chef_type"] = "cookbook_version"
+          result.to_hash
+        end
 
-      def self.to_hash(manifest)
-        result = manifest.manifest.dup
-        result["all_files"].map! { |file| file.delete("full_path"); file }
-        result["frozen?"] = manifest.frozen_version?
-        result["chef_type"] = "cookbook_version"
-        result.to_hash
+        alias_method :to_hash, :to_h
       end
 
     end

data/lib/chef/cookbook/metadata.rb

@@ -465,7 +465,7 @@ class Chef
         end
       end
 
-      def to_hash
+      def to_h
         {
           NAME                   => name,
           DESCRIPTION            => description,
@@ -488,8 +488,10 @@ class Chef
         }
       end
 
+      alias_method :to_hash, :to_h
+
       def to_json(*a)
-        Chef::JSONCompat.to_json(to_hash, *a)
+        Chef::JSONCompat.to_json(to_h, *a)
       end
 
       def self.from_hash(o)

data/lib/chef/cookbook_manifest.rb

@@ -1,5 +1,5 @@
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2015-2016, Chef Software Inc.
+# Copyright:: Copyright 2015-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,7 +40,7 @@ class Chef
     def_delegator :@cookbook_version, :frozen_version?
 
     # Create a new CookbookManifest object for the given `cookbook_version`.
-    # You can subsequently call #to_hash to get a Hash representation of the
+    # You can subsequently call #to_h to get a Hash representation of the
     # cookbook_version in the "manifest" format, or #to_json to get a JSON
     # representation of the cookbook_version.
     #
@@ -119,12 +119,14 @@ class Chef
       @policy_mode
     end
 
-    def to_hash
-      CookbookManifestVersions.to_hash(self)
+    def to_h
+      CookbookManifestVersions.to_h(self)
     end
 
+    alias_method :to_hash, :to_h
+
     def to_json(*a)
-      result = to_hash
+      result = to_h
       result["json_class"] = "Chef::CookbookVersion"
       Chef::JSONCompat.to_json(result, *a)
     end
@@ -321,5 +323,6 @@ class Chef
 
     def_versioned_delegator :from_hash
     def_versioned_delegator :to_hash
+    def_versioned_delegator :to_h
   end
 end