From ba148c921a368513102b3011b9bced8a84c58f28 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Mon, 21 Dec 2020 11:45:05 -0800 Subject: [PATCH 1/2] Update to RuboCop 1.6.1 Signed-off-by: Tim Smith --- lib/chefstyle/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chefstyle/version.rb b/lib/chefstyle/version.rb index 9c3791c..061696c 100644 --- a/lib/chefstyle/version.rb +++ b/lib/chefstyle/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Chefstyle VERSION = "1.5.7" - RUBOCOP_VERSION = "1.5.2" + RUBOCOP_VERSION = "1.6.1" end \ No newline at end of file From aaae60a9948808c486e774257798804062d09fa2 Mon Sep 17 00:00:00 2001 From: Tim Smith Date: Mon, 21 Dec 2020 11:45:42 -0800 Subject: [PATCH 2/2] Vendor rubocop-1.6.1 upstream configuration. Obvious fix; these changes are the result of automation not creative thinking. --- config/upstream.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/config/upstream.yml b/config/upstream.yml index a437be0..ed2884e 100644 --- a/config/upstream.yml +++ b/config/upstream.yml @@ -3209,9 +3209,10 @@ Style/ExponentialNotation: Style/FloatDivision: Description: 'For performing float division, coerce one side only.' StyleGuide: '#float-division' - Reference: 'https://github.com/rubocop-hq/ruby-style-guide/issues/628' + Reference: 'https://blog.rubystyle.guide/ruby/2019/06/21/float-division.html' Enabled: true VersionAdded: '0.72' + VersionChanged: '1.6' EnforcedStyle: single_coerce SupportedStyles: - left_coerce @@ -4025,6 +4026,7 @@ Style/RedundantArgument: Enabled: pending Safe: false VersionAdded: '1.4' + VersionChanged: '1.6' Methods: # Array#join join: '' @@ -4272,7 +4274,7 @@ Style/SingleLineBlockParams: Description: 'Enforces the names of some block params.' Enabled: false VersionAdded: '0.16' - VersionChanged: '0.47' + VersionChanged: '1.6' Methods: - reduce: - acc @@ -4345,6 +4347,7 @@ Style/StringConcatenation: Enabled: true Safe: false VersionAdded: '0.89' + VersionChanged: '1.6' Style/StringHashKeys: Description: 'Prefer symbols instead of strings as hash keys.'