From c25d99cdcbaec96bf6a2a75a8f5b0d266df2c759 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 25 Aug 2020 15:45:11 -0700 Subject: Bump deps and resolve new Chefstyle warnings Signed-off-by: Tim Smith --- Gemfile.lock | 4 ++-- lib/chef/cookbook/cookbook_version_loader.rb | 2 +- lib/chef/encrypted_data_bag_item.rb | 2 +- lib/chef/encrypted_data_bag_item/decryptor.rb | 2 +- lib/chef/encrypted_data_bag_item/encryptor.rb | 2 +- lib/chef/http/decompressor.rb | 2 +- lib/chef/provider/package/rubygems.rb | 2 +- lib/chef/resource/chef_client_cron.rb | 2 +- lib/chef/win32/crypto.rb | 2 +- omnibus/Gemfile.lock | 12 ++++++------ 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index c4761a3fe3..7066cf0e4f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: 560b01fae7fea3e5ffc98deef9488838ea3780e2 + revision: b6597339b3b670c50329af0a44017c91eb468477 branch: master specs: - chefstyle (1.2.1) + chefstyle (1.3.1) rubocop (= 0.89.1) GIT diff --git a/lib/chef/cookbook/cookbook_version_loader.rb b/lib/chef/cookbook/cookbook_version_loader.rb index 626a5d423b..faed509321 100644 --- a/lib/chef/cookbook/cookbook_version_loader.rb +++ b/lib/chef/cookbook/cookbook_version_loader.rb @@ -17,7 +17,7 @@ require_relative "../cookbook_version" require_relative "chefignore" require_relative "metadata" require_relative "../util/path_helper" -require "find" +require "find" unless defined?(Find.find) class Chef class Cookbook diff --git a/lib/chef/encrypted_data_bag_item.rb b/lib/chef/encrypted_data_bag_item.rb index 651f176942..4a28d7ed35 100644 --- a/lib/chef/encrypted_data_bag_item.rb +++ b/lib/chef/encrypted_data_bag_item.rb @@ -21,7 +21,7 @@ require_relative "data_bag_item" require_relative "encrypted_data_bag_item/decryptor" require_relative "encrypted_data_bag_item/encryptor" require_relative "dist" -require "open-uri" +require "open-uri" unless defined?(OpenURI) # An EncryptedDataBagItem represents a read-only data bag item where # all values, except for the value associated with the id key, have diff --git a/lib/chef/encrypted_data_bag_item/decryptor.rb b/lib/chef/encrypted_data_bag_item/decryptor.rb index e73d94f580..9bc4f32ed3 100644 --- a/lib/chef/encrypted_data_bag_item/decryptor.rb +++ b/lib/chef/encrypted_data_bag_item/decryptor.rb @@ -19,7 +19,7 @@ require "yaml" unless defined?(YAML) require_relative "../json_compat" require "openssl" unless defined?(OpenSSL) -require "base64" +require "base64" unless defined?(Base64) require "digest/sha2" unless defined?(Digest::SHA2) require_relative "../encrypted_data_bag_item" require_relative "unsupported_encrypted_data_bag_item_format" diff --git a/lib/chef/encrypted_data_bag_item/encryptor.rb b/lib/chef/encrypted_data_bag_item/encryptor.rb index 2d38b9d44e..14094928ca 100644 --- a/lib/chef/encrypted_data_bag_item/encryptor.rb +++ b/lib/chef/encrypted_data_bag_item/encryptor.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "base64" +require "base64" unless defined?(Base64) require "digest/sha2" unless defined?(Digest::SHA2) require "openssl" unless defined?(OpenSSL) require "ffi_yajl" unless defined?(FFI_Yajl) diff --git a/lib/chef/http/decompressor.rb b/lib/chef/http/decompressor.rb index 36329ee63e..984c1deef1 100644 --- a/lib/chef/http/decompressor.rb +++ b/lib/chef/http/decompressor.rb @@ -16,7 +16,7 @@ # limitations under the License. # -require "zlib" +require "zlib" unless defined?(Zlib) require_relative "http_request" class Chef diff --git a/lib/chef/provider/package/rubygems.rb b/lib/chef/provider/package/rubygems.rb index 0f2c236166..0dd62338dc 100644 --- a/lib/chef/provider/package/rubygems.rb +++ b/lib/chef/provider/package/rubygems.rb @@ -33,7 +33,7 @@ require "rubygems/version" require "rubygems/dependency" require "rubygems/spec_fetcher" require "rubygems/platform" -require "rubygems/package" +require "rubygems/package" unless defined?(Gem::Package) require "rubygems/dependency_installer" require "rubygems/uninstaller" require "rubygems/specification" diff --git a/lib/chef/resource/chef_client_cron.rb b/lib/chef/resource/chef_client_cron.rb index 7a3f7992fc..f78bc848c7 100644 --- a/lib/chef/resource/chef_client_cron.rb +++ b/lib/chef/resource/chef_client_cron.rb @@ -17,7 +17,7 @@ require_relative "../resource" require_relative "../dist" require_relative "helpers/cron_validations" -require "digest/md5" +require "digest/md5" unless defined?(Digest::MD5) class Chef class Resource diff --git a/lib/chef/win32/crypto.rb b/lib/chef/win32/crypto.rb index 5a59f844ee..5521f67aee 100644 --- a/lib/chef/win32/crypto.rb +++ b/lib/chef/win32/crypto.rb @@ -20,7 +20,7 @@ require_relative "error" require_relative "api/memory" require_relative "api/crypto" require_relative "unicode" -require "digest" +require "digest" unless defined?(Digest) class Chef module ReservedNames::Win32 diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index b2bf0db34b..e1525b0aa9 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: 3eae1cd2e5b9bb62775485e1dfa59aec8c70f5da + revision: 8a29d6ab88772861a85d6a216f305a7455634a3b branch: master specs: - omnibus (7.0.20) + omnibus (7.0.21) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-sugar (>= 3.3) @@ -32,16 +32,16 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.358.0) - aws-sdk-core (3.104.4) + aws-partitions (1.359.0) + aws-sdk-core (3.105.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-kms (1.36.0) + aws-sdk-kms (1.37.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.78.0) + aws-sdk-s3 (1.79.0) aws-sdk-core (~> 3, >= 3.104.3) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) -- cgit v1.2.1