Skip to content

Commit

Permalink
Merge pull request #136 from chef/bump_rubocop
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <[email protected]>
  • Loading branch information
tas50 authored May 5, 2021
2 parents 6b08692 + 2dd58ff commit 4dafb97
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 3 deletions.
4 changes: 4 additions & 0 deletions config/disable_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ Bundler/DuplicatedGem:
Enabled: false
Bundler/GemComment:
Enabled: false
Bundler/GemVersion:
Enabled: false
Bundler/InsecureProtocolSource:
Enabled: false
Bundler/OrderedGems:
Expand Down Expand Up @@ -151,6 +153,8 @@ Layout/RedundantLineBreak:
Enabled: false
Layout/RescueEnsureAlignment:
Enabled: false
Layout/SingleLineBlockChain:
Enabled: false
Layout/SpaceAfterColon:
Enabled: false
Layout/SpaceAfterComma:
Expand Down
23 changes: 21 additions & 2 deletions config/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,15 @@ 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
# .tool-versions file first, then .ruby-version, followed by the Gemfile.lock
# 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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/chefstyle/version.rb
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 4dafb97

Please sign in to comment.