Skip to content

Commit fc4e7de

Browse files
committed
Update RuboCop 0.47.1 -> 0.48.0 for Travis
1 parent 035002b commit fc4e7de

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

.rubocop.yml

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
Lint/AmbiguousBlockAssociation:
2+
Enabled: false
3+
14
Lint/AmbiguousRegexpLiteral:
25
Enabled: false
36

@@ -60,6 +63,9 @@ Style/GuardClause:
6063
Style/IndentArray:
6164
Enabled: false
6265

66+
Style/IndentHeredoc:
67+
Enabled: false
68+
6369
Style/IfUnlessModifier:
6470
Enabled: false
6571

@@ -118,6 +124,9 @@ Style/SpaceBeforeFirstArg:
118124
Style/SpecialGlobalVars:
119125
Enabled: false
120126

127+
Style/SymbolArray:
128+
Enabled: false
129+
121130
Style/TrailingCommaInArguments:
122131
Enabled: false
123132

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ gem 'rspec', '~> 3.0'
1010
gem 'coveralls'
1111

1212
# Pin RuboCop for Travis builds.
13-
gem 'rubocop', '0.47.1'
13+
gem 'rubocop', '0.48.0'

lib/overcommit/configuration.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ def all_plugin_hook_configs
112112
# Returns the built-in hooks that have been enabled for a hook type.
113113
def enabled_builtin_hooks(hook_context)
114114
@hash[hook_context.hook_class_name].keys.
115-
select { |hook_name| hook_name != 'ALL' }.
115+
reject { |hook_name| hook_name == 'ALL' }.
116116
select { |hook_name| built_in_hook?(hook_context, hook_name) }.
117117
select { |hook_name| hook_enabled?(hook_context, hook_name) }
118118
end
119119

120120
# Returns the ad hoc hooks that have been enabled for a hook type.
121121
def enabled_ad_hoc_hooks(hook_context)
122122
@hash[hook_context.hook_class_name].keys.
123-
select { |hook_name| hook_name != 'ALL' }.
123+
reject { |hook_name| hook_name == 'ALL' }.
124124
select { |hook_name| ad_hoc_hook?(hook_context, hook_name) }.
125125
select { |hook_name| hook_enabled?(hook_context, hook_name) }
126126
end

spec/overcommit/hook/commit_msg/capitalized_subject_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# encoding: utf-8
2+
23
require 'spec_helper'
34

45
describe Overcommit::Hook::CommitMsg::CapitalizedSubject do

spec/overcommit/hook/commit_msg/spell_check_spec.rb

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# encoding: utf-8
2+
23
require 'spec_helper'
34

45
describe Overcommit::Hook::CommitMsg::SpellCheck do

0 commit comments

Comments
 (0)