From 5e9a693c09367d318b2ecc8c1d2de0d4eeccb70c Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Tue, 14 Jul 2020 16:49:40 -0700 Subject: Update to Chefstyle 1.2 + some fixes Signed-off-by: Tim Smith --- Gemfile.lock | 14 +++++++------- chef-bin/chef-bin.gemspec | 1 - chef-config/chef-config.gemspec | 1 - chef-utils/chef-utils.gemspec | 1 - lib/chef/provider/mount/solaris.rb | 1 - lib/chef/provider/package/zypper.rb | 1 - lib/chef/resource/execute.rb | 4 ++-- omnibus/Gemfile.lock | 12 ++++++------ spec/functional/resource/aix_service_spec.rb | 1 - spec/functional/resource/aixinit_service_spec.rb | 1 - spec/functional/resource/apt_package_spec.rb | 1 - spec/functional/resource/cron_spec.rb | 1 - spec/functional/resource/insserv_spec.rb | 1 - spec/unit/mixin/securable_spec.rb | 1 - 14 files changed, 15 insertions(+), 26 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d27ba968ea..dba57aa46f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: d8d6cc3aa61b8ba9611be452f43618f5a6138ade + revision: 605f02c66120e999c00895fe3d53769472759aa5 branch: master specs: - chefstyle (1.1.2) - rubocop (= 0.86.0) + chefstyle (1.2.0) + rubocop (= 0.88.0) GIT remote: https://github.com/chef/ohai.git @@ -228,7 +228,7 @@ GEM ipaddress (0.8.3) iso8601 (0.13.0) json (2.3.1) - json_schemer (0.2.11) + json_schemer (0.2.12) ecma-re-validator (~> 0.2) hana (~> 1.3) regexp_parser (~> 1.5) @@ -318,13 +318,13 @@ GEM rspec_junit_formatter (0.2.3) builder (< 4) rspec-core (>= 2, < 4, != 2.12.0) - rubocop (0.86.0) + rubocop (0.88.0) parallel (~> 1.10) - parser (>= 2.7.0.1) + parser (>= 2.7.1.1) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 1.7) rexml - rubocop-ast (>= 0.0.3, < 1.0) + rubocop-ast (>= 0.1.0, < 1.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 2.0) rubocop-ast (0.1.0) diff --git a/chef-bin/chef-bin.gemspec b/chef-bin/chef-bin.gemspec index 1e7c45d8e9..bbf57f3d21 100644 --- a/chef-bin/chef-bin.gemspec +++ b/chef-bin/chef-bin.gemspec @@ -1,4 +1,3 @@ -# coding: utf-8 lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-bin/version" diff --git a/chef-config/chef-config.gemspec b/chef-config/chef-config.gemspec index 6229acdade..6b4312c13d 100644 --- a/chef-config/chef-config.gemspec +++ b/chef-config/chef-config.gemspec @@ -1,4 +1,3 @@ -# coding: utf-8 lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-config/version" diff --git a/chef-utils/chef-utils.gemspec b/chef-utils/chef-utils.gemspec index cbd745e991..0fd6ad668d 100644 --- a/chef-utils/chef-utils.gemspec +++ b/chef-utils/chef-utils.gemspec @@ -1,4 +1,3 @@ -# coding: utf-8 lib = File.expand_path("lib", __dir__) $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) require "chef-utils/version" diff --git a/lib/chef/provider/mount/solaris.rb b/lib/chef/provider/mount/solaris.rb index 203efa2cd4..245e04f40e 100644 --- a/lib/chef/provider/mount/solaris.rb +++ b/lib/chef/provider/mount/solaris.rb @@ -1,4 +1,3 @@ -# Encoding: utf-8 # Author:: Hugo Fichter # Author:: Lamont Granquist () # Author:: Joshua Timberman () diff --git a/lib/chef/provider/package/zypper.rb b/lib/chef/provider/package/zypper.rb index 5532f89d1f..1096dcd044 100644 --- a/lib/chef/provider/package/zypper.rb +++ b/lib/chef/provider/package/zypper.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # # Authors:: Adam Jacob () # Ionuț Arțăriși () diff --git a/lib/chef/resource/execute.rb b/lib/chef/resource/execute.rb index ff2043596b..cc4837c901 100644 --- a/lib/chef/resource/execute.rb +++ b/lib/chef/resource/execute.rb @@ -630,11 +630,11 @@ class Chef end # if domain is provided in both username and domain - if specified_user.kind_of?(String) && ((specified_user.include? '\\') || (specified_user.include? "@")) && specified_domain + if specified_user.is_a?(String) && ((specified_user.include? '\\') || (specified_user.include? "@")) && specified_domain raise ArgumentError, "The domain is provided twice. Username: `#{specified_user}`, Domain: `#{specified_domain}`. Please specify domain only once." end - if specified_user.kind_of?(String) && specified_domain.nil? + if specified_user.is_a?(String) && specified_domain.nil? # Splitting username of format: Domain\Username domain_and_user = user.split('\\') diff --git a/omnibus/Gemfile.lock b/omnibus/Gemfile.lock index 00c685a6f1..9d623a82e7 100644 --- a/omnibus/Gemfile.lock +++ b/omnibus/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/chef/omnibus - revision: 320d9350cdf39abdcc4c37d5bc2971b3c222a0a0 + revision: 67f54efcae3ca08c7035b8835fd808f2d1c755de branch: master specs: - omnibus (7.0.14) + omnibus (7.0.15) aws-sdk-s3 (~> 1) chef-cleanroom (~> 1.0) chef-sugar (>= 3.3) @@ -32,7 +32,7 @@ GEM artifactory (3.0.15) awesome_print (1.8.0) aws-eventstream (1.1.0) - aws-partitions (1.339.0) + aws-partitions (1.341.0) aws-sdk-core (3.103.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.239.0) @@ -41,7 +41,7 @@ GEM aws-sdk-kms (1.36.0) aws-sdk-core (~> 3, >= 3.99.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.73.0) + aws-sdk-s3 (1.74.0) aws-sdk-core (~> 3, >= 3.102.1) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.1) @@ -230,7 +230,7 @@ GEM wmi-lite (~> 1.0) mixlib-versioning (1.2.12) molinillo (0.6.6) - multi_json (1.14.1) + multi_json (1.15.0) multipart-post (2.1.1) necromancer (0.5.1) net-scp (3.0.0) @@ -295,7 +295,7 @@ GEM structured_warnings (0.4.0) syslog-logger (1.6.8) systemu (2.6.5) - test-kitchen (2.5.2) + test-kitchen (2.5.3) bcrypt_pbkdf (~> 1.0) ed25519 (~> 1.2) license-acceptance (~> 1.0, >= 1.0.11) diff --git a/spec/functional/resource/aix_service_spec.rb b/spec/functional/resource/aix_service_spec.rb index e7e6d0e822..ae29d54f2a 100755 --- a/spec/functional/resource/aix_service_spec.rb +++ b/spec/functional/resource/aix_service_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Kaustubh Deorukhkar () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/aixinit_service_spec.rb b/spec/functional/resource/aixinit_service_spec.rb index bb89277e40..6d1df895bf 100755 --- a/spec/functional/resource/aixinit_service_spec.rb +++ b/spec/functional/resource/aixinit_service_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Kaustubh Deorukhkar () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/apt_package_spec.rb b/spec/functional/resource/apt_package_spec.rb index 431c106cb0..228882a2e7 100644 --- a/spec/functional/resource/apt_package_spec.rb +++ b/spec/functional/resource/apt_package_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Daniel DeLeo () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/cron_spec.rb b/spec/functional/resource/cron_spec.rb index bd75a86558..009234f527 100644 --- a/spec/functional/resource/cron_spec.rb +++ b/spec/functional/resource/cron_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Kaustubh Deorukhkar () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/functional/resource/insserv_spec.rb b/spec/functional/resource/insserv_spec.rb index 788a46469b..bd3b98a1e2 100644 --- a/spec/functional/resource/insserv_spec.rb +++ b/spec/functional/resource/insserv_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Dheeraj Dubey () # Copyright:: Copyright (c) Chef Software Inc. diff --git a/spec/unit/mixin/securable_spec.rb b/spec/unit/mixin/securable_spec.rb index 538241551a..4863693dba 100644 --- a/spec/unit/mixin/securable_spec.rb +++ b/spec/unit/mixin/securable_spec.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # # Author:: Mark Mzyk () # Copyright:: Copyright (c) Chef Software Inc. -- cgit v1.2.1