Skip to content

Commit 8692b78

Browse files
authored
Merge pull request #219 from ruby/rubocop
Fixup rubocop warnings
2 parents 7b01b8a + 879e08f commit 8692b78

6 files changed

Lines changed: 21 additions & 20 deletions

File tree

.rubocop.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ AllCops:
55
- doc/**/*.rb
66
- rake.gemspec
77

8-
Style/LineLength:
8+
Metrics/LineLength:
99
Enabled: true
1010
Max: 120
1111

@@ -16,42 +16,42 @@ Style/StringLiterals:
1616
Enabled: true
1717
EnforcedStyle: double_quotes
1818

19-
Style/IndentationWidth:
19+
Style/MultilineIfThen:
2020
Enabled: true
2121

22-
Style/Tab:
22+
Style/MethodDefParentheses:
2323
Enabled: true
2424

25-
Style/EmptyLines:
25+
Style/BracesAroundHashParameters:
2626
Enabled: true
2727

28-
Style/TrailingBlankLines:
28+
Layout/IndentationWidth:
2929
Enabled: true
3030

31-
Style/TrailingWhitespace:
31+
Layout/Tab:
3232
Enabled: true
3333

34-
Style/SpaceBeforeBlockBraces:
34+
Layout/EmptyLines:
3535
Enabled: true
3636

37-
Style/SpaceInsideBlockBraces:
37+
Layout/TrailingBlankLines:
3838
Enabled: true
3939

40-
Style/SpaceInsideHashLiteralBraces:
40+
Layout/TrailingWhitespace:
4141
Enabled: true
4242

43-
Style/CaseIndentation:
43+
Layout/SpaceBeforeBlockBraces:
4444
Enabled: true
4545

46-
Style/MultilineIfThen:
46+
Layout/SpaceInsideBlockBraces:
4747
Enabled: true
4848

49-
Style/MethodDefParentheses:
49+
Layout/SpaceInsideHashLiteralBraces:
5050
Enabled: true
5151

52-
Style/BracesAroundHashParameters:
52+
Layout/CaseIndentation:
5353
Enabled: true
5454

5555
Lint/EndAlignment:
5656
Enabled: true
57-
AlignWith: variable
57+
EnforcedStyleAlignWith: variable

rake.gemspec

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,5 @@ Rake has the following features:
3939
s.add_development_dependency(%q<minitest>.freeze)
4040
s.add_development_dependency(%q<rdoc>.freeze)
4141
s.add_development_dependency(%q<coveralls>.freeze)
42+
s.add_development_dependency(%q<rubocop>.freeze)
4243
end

test/helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
$:.unshift File.expand_path("../../lib", __FILE__)
33

4-
require 'coveralls'
4+
require "coveralls"
55
Coveralls.wear!
66

77
gem "minitest", "~> 5"

test/test_rake_file_utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def test_sh_with_hash_option
186186
check_expansion
187187

188188
verbose(false) {
189-
sh "#{RUBY} check_expansion.rb", {chdir: "."}, { verbose: false }
189+
sh "#{RUBY} check_expansion.rb", { chdir: "." }, verbose: false
190190
}
191191
end
192192

test/test_rake_rake_test_loader.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class TestRakeRakeTestLoader < Rake::TestCase
66
def setup
77
super
88

9-
@loader = File.join @rake_lib, 'rake/rake_test_loader.rb'
9+
@loader = File.join @rake_lib, "rake/rake_test_loader.rb"
1010
end
1111

1212
def test_pattern
@@ -35,7 +35,7 @@ def test_load_error
3535

3636
assert_empty out
3737

38-
no_such_path = File.join @tempdir, 'no_such_test_file'
38+
no_such_path = File.join @tempdir, "no_such_test_file"
3939

4040
expected =
4141
/\A\n

test/test_rake_rules.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class TestRakeRules < Rake::TestCase
1111
OBJFILE = "abc.o"
1212
FOOFILE = "foo"
1313
DOTFOOFILE = ".foo"
14-
MINFILE = 'abc.min.o'
14+
MINFILE = "abc.min.o"
1515

1616
def setup
1717
super
@@ -400,7 +400,7 @@ def obj.find_prereq(task_name)
400400

401401
def test_works_with_chained_extensions_in_rules
402402
create_file(OBJFILE)
403-
rule('.min.o' => ['.o']) do |t|
403+
rule(".min.o" => [".o"]) do |t|
404404
@runs << t.name
405405
assert_equal OBJFILE, t.source
406406
assert_equal MINFILE, t.name

0 commit comments

Comments
 (0)