diff options
| -rw-r--r-- | .rubocop.yml | 6 | ||||
| -rw-r--r-- | Gemfile.lock | 10 | ||||
| -rw-r--r-- | lib/chef/util/dsc/configuration_generator.rb | 1 |
3 files changed, 6 insertions, 11 deletions
diff --git a/.rubocop.yml b/.rubocop.yml index ebee4a6e41..eb41ed78fa 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,16 +18,10 @@ Lint/AssignmentInCondition: Enabled: false Lint/AmbiguousBlockAssociation: Enabled: false -Lint/RedundantSplatExpansion: - Enabled: false Lint/ShadowingOuterLocalVariable: Enabled: false -Lint/EmptyWhen: - Enabled: false Lint/IneffectiveAccessModifier: Enabled: false -Lint/ShadowedException: - Enabled: false # set additional paths Chef/Ruby/UnlessDefinedRequire: diff --git a/Gemfile.lock b/Gemfile.lock index 23d132f039..b877f747e4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,10 +1,10 @@ GIT remote: https://github.com/chef/chefstyle.git - revision: d50b12c4b789910ce39bcfbee8b59cf793ca6b0b + revision: 5b47418dbd6ce864d1ffa1279156107bfc5fc1f6 branch: master specs: chefstyle (1.5.8) - rubocop (= 1.6.1) + rubocop (= 1.7.0) GIT remote: https://github.com/chef/ohai.git @@ -265,7 +265,7 @@ GEM net-ssh-gateway (>= 1.2.0) nori (2.6.0) parallel (1.20.1) - parser (2.7.2.0) + parser (3.0.0.0) ast (~> 2.4.1) parslet (1.8.2) pastel (0.8.0) @@ -286,7 +286,7 @@ GEM rainbow (3.0.0) rake (13.0.3) rb-readline (0.5.5) - regexp_parser (2.0.1) + regexp_parser (2.0.3) rexml (3.2.4) rspec (3.9.0) rspec-core (~> 3.9.0) @@ -304,7 +304,7 @@ GEM diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.9.0) rspec-support (3.9.4) - rubocop (1.6.1) + rubocop (1.7.0) parallel (~> 1.10) parser (>= 2.7.1.5) rainbow (>= 2.2.2, < 4.0) diff --git a/lib/chef/util/dsc/configuration_generator.rb b/lib/chef/util/dsc/configuration_generator.rb index 7e78e1ecab..7785dc3990 100644 --- a/lib/chef/util/dsc/configuration_generator.rb +++ b/lib/chef/util/dsc/configuration_generator.rb @@ -88,6 +88,7 @@ class Chef::Util::DSC when FalseClass switch_present = false when TrueClass + # nothing when String switch_argument = escape_string_parameter_value(switch_value) else |