Merge pull request #219 from ruby/rubocop

Fixup rubocop warnings
ruby · Aug 21, 2017 · 8692b78 · 8692b78
2 parents 7b01b8a + 879e08f
commit 8692b78
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 20 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -5,7 +5,7 @@ AllCops:
     - doc/**/*.rb
     - rake.gemspec
 
-Style/LineLength:
+Metrics/LineLength:
   Enabled: true
   Max: 120
 
@@ -16,42 +16,42 @@ Style/StringLiterals:
   Enabled: true
   EnforcedStyle: double_quotes
 
-Style/IndentationWidth:
+Style/MultilineIfThen:
   Enabled: true
 
-Style/Tab:
+Style/MethodDefParentheses:
   Enabled: true
 
-Style/EmptyLines:
+Style/BracesAroundHashParameters:
   Enabled: true
 
-Style/TrailingBlankLines:
+Layout/IndentationWidth:
   Enabled: true
 
-Style/TrailingWhitespace:
+Layout/Tab:
   Enabled: true
 
-Style/SpaceBeforeBlockBraces:
+Layout/EmptyLines:
   Enabled: true
 
-Style/SpaceInsideBlockBraces:
+Layout/TrailingBlankLines:
   Enabled: true
 
-Style/SpaceInsideHashLiteralBraces:
+Layout/TrailingWhitespace:
   Enabled: true
 
-Style/CaseIndentation:
+Layout/SpaceBeforeBlockBraces:
   Enabled: true
 
-Style/MultilineIfThen:
+Layout/SpaceInsideBlockBraces:
   Enabled: true
 
-Style/MethodDefParentheses:
+Layout/SpaceInsideHashLiteralBraces:
   Enabled: true
 
-Style/BracesAroundHashParameters:
+Layout/CaseIndentation:
   Enabled: true
 
 Lint/EndAlignment:
   Enabled: true
-  AlignWith: variable
+  EnforcedStyleAlignWith: variable
diff --git a/rake.gemspec b/rake.gemspec
@@ -39,4 +39,5 @@ Rake has the following features:
   s.add_development_dependency(%q<minitest>.freeze)
   s.add_development_dependency(%q<rdoc>.freeze)
   s.add_development_dependency(%q<coveralls>.freeze)
+  s.add_development_dependency(%q<rubocop>.freeze)
 end
diff --git a/test/helper.rb b/test/helper.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 $:.unshift File.expand_path("../../lib", __FILE__)
 
-require 'coveralls'
+require "coveralls"
 Coveralls.wear!
 
 gem "minitest", "~> 5"

diff --git a/test/test_rake_file_utils.rb b/test/test_rake_file_utils.rb
@@ -186,7 +186,7 @@ def test_sh_with_hash_option
     check_expansion
 
     verbose(false) {
-      sh "#{RUBY} check_expansion.rb", {chdir: "."}, { verbose: false }
+      sh "#{RUBY} check_expansion.rb", { chdir: "." }, verbose: false
     }
   end
 

diff --git a/test/test_rake_rake_test_loader.rb b/test/test_rake_rake_test_loader.rb
@@ -6,7 +6,7 @@ class TestRakeRakeTestLoader < Rake::TestCase
   def setup
     super
 
-    @loader = File.join @rake_lib, 'rake/rake_test_loader.rb'
+    @loader = File.join @rake_lib, "rake/rake_test_loader.rb"
   end
 
   def test_pattern
@@ -35,7 +35,7 @@ def test_load_error
 
     assert_empty out
 
-    no_such_path = File.join @tempdir, 'no_such_test_file'
+    no_such_path = File.join @tempdir, "no_such_test_file"
 
     expected =
       /\A\n

diff --git a/test/test_rake_rules.rb b/test/test_rake_rules.rb
@@ -11,7 +11,7 @@ class TestRakeRules < Rake::TestCase
   OBJFILE    = "abc.o"
   FOOFILE    = "foo"
   DOTFOOFILE = ".foo"
-  MINFILE    = 'abc.min.o'
+  MINFILE    = "abc.min.o"
 
   def setup
     super
@@ -400,7 +400,7 @@ def obj.find_prereq(task_name)
 
   def test_works_with_chained_extensions_in_rules
     create_file(OBJFILE)
-    rule('.min.o' => ['.o']) do |t|
+    rule(".min.o" => [".o"]) do |t|
       @runs << t.name
       assert_equal OBJFILE, t.source
       assert_equal MINFILE, t.name