diff --git a/config/disable_all.yml b/config/disable_all.yml index 9896035..9a38860 100644 --- a/config/disable_all.yml +++ b/config/disable_all.yml @@ -5,6 +5,8 @@ Bundler/DuplicatedGem: Enabled: false Bundler/GemComment: Enabled: false +Bundler/GemVersion: + Enabled: false Bundler/InsecureProtocolSource: Enabled: false Bundler/OrderedGems: @@ -151,6 +153,8 @@ Layout/RedundantLineBreak: Enabled: false Layout/RescueEnsureAlignment: Enabled: false +Layout/SingleLineBlockChain: + Enabled: false Layout/SpaceAfterColon: Enabled: false Layout/SpaceAfterComma: diff --git a/config/upstream.yml b/config/upstream.yml index c642fb0..77ffac4c 100644 --- a/config/upstream.yml +++ b/config/upstream.yml @@ -130,7 +130,7 @@ AllCops: # What MRI version of the Ruby interpreter is the inspected code intended to # run on? (If there is more than one, set this to the lowest version.) # If a value is specified for TargetRubyVersion then it is used. Acceptable - # values are specificed as a float (i.e. 2.5); the teeny version of Ruby + # values are specificed as a float (i.e. 3.0); the teeny version of Ruby # should not be included. If the project specifies a Ruby version in the # .tool-versions or .ruby-version files, Gemfile or gems.rb file, RuboCop will # try to determine the desired version of Ruby by inspecting the @@ -138,7 +138,7 @@ AllCops: # or gems.locked file. (Although the Ruby version is specified in the Gemfile # or gems.rb file, RuboCop reads the final value from the lock file.) If the # Ruby version is still unresolved, RuboCop will use the oldest officially - # supported Ruby version (currently Ruby 2.4). + # supported Ruby version (currently Ruby 2.5). TargetRubyVersion: ~ # Determines if a notification for extension libraries should be shown when # rubocop is run. Keys are the name of the extension, and values are an array @@ -174,6 +174,20 @@ Bundler/GemComment: IgnoredGems: [] OnlyFor: [] +Bundler/GemVersion: + Description: 'Requires or forbids specifying gem versions.' + Enabled: false + VersionAdded: '1.14' + EnforcedStyle: 'required' + SupportedStyles: + - 'required' + - 'forbidden' + Include: + - '**/*.gemfile' + - '**/Gemfile' + - '**/gems.rb' + AllowedGems: [] + Bundler/InsecureProtocolSource: Description: >- The source `:gemcutter`, `:rubygems` and `:rubyforge` are deprecated @@ -1114,6 +1128,11 @@ Layout/RescueEnsureAlignment: Enabled: true VersionAdded: '0.49' +Layout/SingleLineBlockChain: + Description: 'Put method call on a separate line if chained to a single line block.' + Enabled: false + VersionAdded: '1.14' + Layout/SpaceAfterColon: Description: 'Use spaces after colons.' StyleGuide: '#spaces-operators' diff --git a/lib/chefstyle/version.rb b/lib/chefstyle/version.rb index 45e94eb..6b3f460 100644 --- a/lib/chefstyle/version.rb +++ b/lib/chefstyle/version.rb @@ -1,5 +1,5 @@ # frozen_string_literal: true module Chefstyle VERSION = "2.0.1" - RUBOCOP_VERSION = "1.13.0" + RUBOCOP_VERSION = "1.14.0" end