summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2021-01-26 11:35:08 -0800
committerTim Smith <tsmith84@gmail.com>2021-01-26 15:06:04 -0800
commit4a9f3fc42f29cbd1d018a524daaf214fe19182ab (patch)
treec36d6a37047aa900f65274c673142c86799ebce4
parentd071e751d3df6015cb6995be6de0ddaf040a558a (diff)
downloadchef-4a9f3fc42f29cbd1d018a524daaf214fe19182ab.tar.gz
Update Chefstyle to the latest
Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--.rubocop.yml10
-rw-r--r--Gemfile.lock12
2 files changed, 16 insertions, 6 deletions
diff --git a/.rubocop.yml b/.rubocop.yml
index b4fac0c953..26d10359c5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -32,6 +32,16 @@ Lint/DeprecatedConstants:
Exclude:
- chef/lib/chef/node/attribute.rb # false alarms
+
+# This cop shouldn't alert on the helper / specs itself
+Chef/Ruby/LegacyPowershellOutMethods:
+ Exclude:
+ - 'lib/chef/mixin/powershell_out.rb'
+ - 'spec/functional/mixin/powershell_out_spec.rb'
+ - 'spec/unit/mixin/powershell_out_spec.rb'
+ - 'lib/chef/resource/windows_feature_powershell.rb' # https://github.com/chef/chef/issues/10927
+ - 'lib/chef/provider/package/powershell.rb' # https://github.com/chef/chef/issues/10926
+
# set additional paths
Chef/Ruby/UnlessDefinedRequire:
Include:
diff --git a/Gemfile.lock b/Gemfile.lock
index 47ddea258b..11db0e5240 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
GIT
remote: https://github.com/chef/chefstyle.git
- revision: a226b7d33c2119003dc47839e8c5559a22bf5ab9
+ revision: b5cb2d3e4bbcb77fb5c6ed3357e89c670d64682f
branch: master
specs:
- chefstyle (1.5.9)
- rubocop (= 1.7.0)
+ chefstyle (1.6.0)
+ rubocop (= 1.8.1)
GIT
remote: https://github.com/chef/ohai.git
@@ -307,15 +307,15 @@ GEM
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.9.0)
rspec-support (3.9.4)
- rubocop (1.7.0)
+ rubocop (1.8.1)
parallel (~> 1.10)
- parser (>= 2.7.1.5)
+ parser (>= 3.0.0.0)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
rexml
rubocop-ast (>= 1.2.0, < 2.0)
ruby-progressbar (~> 1.7)
- unicode-display_width (>= 1.4.0, < 2.0)
+ unicode-display_width (>= 1.4.0, < 3.0)
rubocop-ast (1.4.1)
parser (>= 2.7.1.5)
ruby-prof (1.2.0)