Auto merge of #4032 - esasse:rubocop-fix, r=indirect

Fix Style/SpaceInsideStringInterpolation

3 files changed, 4 insertions, 9 deletions

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 28d03d7693..21792ca621 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -175,8 +175,3 @@ Style/SingleLineBlockParams:
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 Style/SpaceAroundEqualsInParameterDefault:
   Enabled: false
-
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/SpaceInsideStringInterpolation:
-  Enabled: false
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index d26bd1b375..3d74c7659a 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -454,9 +454,9 @@ module Bundler
           m << "\n"
           m << "#{indent}from #{trace_line.gsub(/:in.*$/, "")}\n"
           m << "#{indent}-------------------------------------------\n"
-          m << "#{indent}#{    lines[line_numer - 1] }" unless first_line
-          m << "#{indicator}#{ lines[line_numer] }"
-          m << "#{indent}#{    lines[line_numer + 1] }" unless last_line
+          m << "#{indent}#{lines[line_numer - 1]}" unless first_line
+          m << "#{indicator}#{lines[line_numer]}"
+          m << "#{indent}#{lines[line_numer + 1]}" unless last_line
           m << "\n" unless m.end_with?("\n")
           m << "#{indent}-------------------------------------------\n"
         end
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index 439f7d4962..5c7a65d8a7 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -200,7 +200,7 @@ module Bundler
       names = e.dependencies.sort_by(&:name).map {|d| "gem '#{d.name}'" }
       raise CyclicDependencyError, "Your bundle requires gems that depend" \
         " on each other, creating an infinite loop. Please remove" \
-        " #{names.count > 1 ? "either " : "" }#{names.join(" or ")}" \
+        " #{names.count > 1 ? "either " : ""}#{names.join(" or ")}" \
         " and try again."
     end