Auto merge of #3884 - bundler:rubocop-first, r=indirect

Run Rubocop before specs

This fails faster on style issues.

1 files changed, 6 insertions, 4 deletions

diff --git a/Rakefile b/Rakefile
index f365e127a6..b7898f9500 100644
--- a/Rakefile
+++ b/Rakefile
@@ -238,6 +238,11 @@ begin
     task :travis do
       rg = ENV["RGV"] || raise("Rubygems version is required on Travis!")
 
+      if RUBY_VERSION > "1.9.3"
+        puts "\n\e[1;33m[Travis CI] Running bundler linter\e[m\n\n"
+        Rake::Task["rubocop"].invoke
+      end
+
       puts "\n\e[1;33m[Travis CI] Running bundler specs against rubygems #{rg}\e[m\n\n"
       specs = safe_task { Rake::Task["spec:rubygems:#{rg}"].invoke }
 
@@ -253,10 +258,7 @@ begin
       puts "\n\e[1;33m[Travis CI] Running bundler real world specs against rubygems #{rg}\e[m\n\n"
       realworld = safe_task { Rake::Task["spec:rubygems:#{rg}:realworld"].invoke }
 
-      puts "\n\e[1;33m[Travis CI] Running bundler linter\e[m\n\n"
-      rubocop = RUBY_VERSION < "1.9.3" || safe_task { Rake::Task["rubocop"].invoke }
-
-      { "specs" => specs, "sudo" => sudos, "realworld" => realworld, "rubocop" => rubocop }.each do |name, passed|
+      { "specs" => specs, "sudo" => sudos, "realworld" => realworld }.each do |name, passed|
         if passed
           puts "\e[0;32m[Travis CI] #{name} passed\e[m"
         else