Merge pull request #3851 from esasse/esasse-rubocop-6

Fix Style/SpaceBeforeSemicolon

3 files changed, 20 insertions, 25 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index c3874e78f7..5577ee960a 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -454,11 +454,6 @@ Style/SpaceBeforeBlockBraces:
 Style/SpaceBeforeComma:
   Enabled: false
 
-# Offense count: 23
-# Cop supports --auto-correct.
-Style/SpaceBeforeSemicolon:
-  Enabled: false
-
 # Offense count: 117
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SpaceBeforeBlockParameters.
diff --git a/lib/bundler.rb b/lib/bundler.rb
index 0928d1a68d..f2df9a764a 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -53,23 +53,23 @@ module Bundler
     end
   end
 
-  class GemfileNotFound       < BundlerError; status_code(10) ; end
-  class GemNotFound           < BundlerError; status_code(7)  ; end
-  class GemfileError          < BundlerError; status_code(4)  ; end
-  class InstallError          < BundlerError; status_code(5)  ; end
-  class InstallHookError      < BundlerError; status_code(8)  ; end
-  class PathError             < BundlerError; status_code(13) ; end
-  class GitError              < BundlerError; status_code(11) ; end
-  class DeprecatedError       < BundlerError; status_code(12) ; end
-  class GemspecError          < BundlerError; status_code(14) ; end
-  class InvalidOption         < BundlerError; status_code(15) ; end
-  class ProductionError       < BundlerError; status_code(16) ; end
-  class HTTPError             < BundlerError; status_code(17) ; end
-  class RubyVersionMismatch   < BundlerError; status_code(18) ; end
-  class SecurityError         < BundlerError; status_code(19) ; end
-  class LockfileError         < BundlerError; status_code(20) ; end
-  class CyclicDependencyError < BundlerError; status_code(21) ; end
-  class GemfileLockNotFound   < BundlerError; status_code(22) ; end
+  class GemfileNotFound       < BundlerError; status_code(10); end
+  class GemNotFound           < BundlerError; status_code(7); end
+  class GemfileError          < BundlerError; status_code(4); end
+  class InstallError          < BundlerError; status_code(5); end
+  class InstallHookError      < BundlerError; status_code(8); end
+  class PathError             < BundlerError; status_code(13); end
+  class GitError              < BundlerError; status_code(11); end
+  class DeprecatedError       < BundlerError; status_code(12); end
+  class GemspecError          < BundlerError; status_code(14); end
+  class InvalidOption         < BundlerError; status_code(15); end
+  class ProductionError       < BundlerError; status_code(16); end
+  class HTTPError             < BundlerError; status_code(17); end
+  class RubyVersionMismatch   < BundlerError; status_code(18); end
+  class SecurityError         < BundlerError; status_code(19); end
+  class LockfileError         < BundlerError; status_code(20); end
+  class CyclicDependencyError < BundlerError; status_code(21); end
+  class GemfileLockNotFound   < BundlerError; status_code(22); end
 
   # Internal errors, should be rescued
   class VersionConflict  < BundlerError
diff --git a/lib/bundler/rubygems_integration.rb b/lib/bundler/rubygems_integration.rb
index 272276a31a..3d99ad9bb6 100644
--- a/lib/bundler/rubygems_integration.rb
+++ b/lib/bundler/rubygems_integration.rb
@@ -330,7 +330,7 @@ module Bundler
     # under bundler. The new Gem.bin_path only considers gems in
     # +specs+
     def replace_bin_path(specs)
-      gem_class = (class << Gem ; self ; end)
+      gem_class = (class << Gem; self; end)
       redefine_method(gem_class, :bin_path) do |name, *args|
         exec_name = args.first
 
@@ -362,7 +362,7 @@ module Bundler
     # Because Bundler has a static view of what specs are available,
     # we don't #refresh, so stub it out.
     def replace_refresh
-      gem_class = (class << Gem ; self ; end)
+      gem_class = (class << Gem; self; end)
       redefine_method(gem_class, :refresh) { }
     end
 
@@ -446,7 +446,7 @@ module Bundler
 
       def stub_rubygems(specs)
         # Rubygems versions lower than 1.7 use SourceIndex#from_gems_in
-        source_index_class = (class << Gem::SourceIndex ; self ; end)
+        source_index_class = (class << Gem::SourceIndex; self; end)
         source_index_class.send(:define_method, :from_gems_in) do |*args|
           source_index = Gem::SourceIndex.new
           source_index.spec_dirs = *args