Skip to content

Commit

Permalink
Merge pull request #105 from chef/0.92
Browse files Browse the repository at this point in the history
Signed-off-by: Tim Smith <tsmith@chef.io>
  • Loading branch information
tas50 authored Sep 28, 2020
2 parents a40b62d + 6745e40 commit d28f1bf
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 57 deletions.
17 changes: 14 additions & 3 deletions config/upstream.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2463,7 +2463,7 @@ Style/ArrayCoercion:
with a variable you want to treat as an Array, but you're not certain it's an array.
StyleGuide: '#array-coercion'
Safe: false
Enabled: 'pending'
Enabled: false
VersionAdded: '0.88'

Style/ArrayJoin:
Expand Down Expand Up @@ -2863,7 +2863,8 @@ Style/DateTime:
StyleGuide: '#date--time'
Enabled: false
VersionAdded: '0.51'
VersionChanged: '0.59'
VersionChanged: '0.92'
SafeAutoCorrect: false
AllowCoercion: false

Style/DefWithParentheses:
Expand Down Expand Up @@ -3283,11 +3284,16 @@ Style/IpAddresses:
Description: "Don't include literal IP addresses in code."
Enabled: false
VersionAdded: '0.58'
VersionChanged: '0.77'
VersionChanged: '0.91'
# Allow addresses to be permitted
AllowedAddresses:
- "::"
# :: is a valid IPv6 address, but could potentially be legitimately in code
Exclude:
- '**/*.gemfile'
- '**/Gemfile'
- '**/gems.rb'
- '**/*.gemspec'

Style/KeywordParametersOrder:
Description: 'Enforces that optional keyword parameters are placed at the end of the parameters list.'
Expand Down Expand Up @@ -3720,6 +3726,8 @@ Style/OptionalBooleanParameter:
Enabled: pending
Safe: false
VersionAdded: '0.89'
AllowedMethods:
- respond_to_missing?

Style/OrAssignment:
Description: 'Recommend usage of double pipe equals (||=) where applicable.'
Expand Down Expand Up @@ -3988,6 +3996,8 @@ Style/SafeNavigation:
This cop transforms usages of a method call safeguarded by
a check for the existence of the object to
safe navigation (`&.`).
Auto-correction is unsafe as it assumes the object will
be `nil` or truthy, but never `false`.
Enabled: true
VersionAdded: '0.43'
VersionChanged: '0.77'
Expand All @@ -4000,6 +4010,7 @@ Style/SafeNavigation:
- presence
- try
- try!
SafeAutoCorrect: false

Style/Sample:
Description: >-
Expand Down
3 changes: 0 additions & 3 deletions lib/chefstyle.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@
gem "rubocop", "= #{Chefstyle::RUBOCOP_VERSION}"
require "rubocop"

# @TODO remove this monkeypatch after we upgrade from 0.91.0
require_relative "rubocop/monkey_patches/rescue_ensure_alignment"

module RuboCop
class ConfigLoader
RUBOCOP_HOME.gsub!(
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 = "1.4.1"
RUBOCOP_VERSION = "0.91.0"
RUBOCOP_VERSION = "0.92.0"
end
22 changes: 0 additions & 22 deletions lib/rubocop/monkey_patches/rescue_ensure_alignment.rb

This file was deleted.

28 changes: 0 additions & 28 deletions spec/rubocop/monkey_patches/rescue_ensure_alignment_spec.rb

This file was deleted.

0 comments on commit d28f1bf

Please sign in to comment.