summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErick Sasse <esasse@gmail.com>2015-10-03 22:23:50 -0700
committerErick Sasse <esasse@gmail.com>2015-10-03 22:23:50 -0700
commit8131317c649c2452596cc0663ac9a40cf7c9f448 (patch)
tree6b60ae54f9dcddb22a2b2f2800f3dc398a41d157
parente833ef9b2b22dcc966e6dbf81df7198dae9988ce (diff)
downloadbundler-8131317c649c2452596cc0663ac9a40cf7c9f448.tar.gz
Fix Style/SpaceInsideStringInterpolation
-rw-r--r--.rubocop_todo.yml5
-rw-r--r--lib/bundler/dsl.rb6
-rw-r--r--lib/bundler/resolver.rb2
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 8ed5cd6a93..1413a57362 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -450,9 +450,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