summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Koronen <koronen@kth.se>2015-08-08 16:56:30 +0200
committerVictor Koronen <koronen@kth.se>2015-08-14 12:29:44 +0200
commit132b95ee70e3e9d3b318429bd53c879a7c503341 (patch)
tree848c67384d490a08aa89e0f9fd696b9d1a345980
parentea73d220a5e012f8ec41fef1770152145114ca5b (diff)
downloadbundler-132b95ee70e3e9d3b318429bd53c879a7c503341.tar.gz
Fix Style/LineEndConcatenation
-rw-r--r--.rubocop_todo.yml5
-rw-r--r--lib/bundler/installer.rb4
-rw-r--r--spec/runtime/with_clean_env_spec.rb4
3 files changed, 4 insertions, 9 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 9166deb8c5..b545eae4fe 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -213,11 +213,6 @@ Style/InfiniteLoop:
Style/LeadingCommentSpace:
Enabled: false
-# Offense count: 4
-# Cop supports --auto-correct.
-Style/LineEndConcatenation:
- Enabled: false
-
# Offense count: 2
Style/ModuleFunction:
Enabled: false
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index e4a9a8c9fe..00bd2158eb 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -123,7 +123,7 @@ module Bundler
options[dep.name] = bins unless bins.empty?
end
if options.any?
- Bundler.ui.warn "#{spec.name} has no executables, but you may want " +
+ Bundler.ui.warn "#{spec.name} has no executables, but you may want " \
"one from a gem it depends on."
options.each {|name, bins| Bundler.ui.warn " #{name} has: #{bins.join(", ")}" }
else
@@ -264,7 +264,7 @@ module Bundler
def create_bundle_path
Bundler.mkdir_p(Bundler.bundle_path.to_s) unless Bundler.bundle_path.exist?
rescue Errno::EEXIST
- raise PathError, "Could not install to path `#{Bundler.settings[:path]}` " +
+ raise PathError, "Could not install to path `#{Bundler.settings[:path]}` " \
"because of an invalid symlink. Remove the symlink so the directory can be created."
end
diff --git a/spec/runtime/with_clean_env_spec.rb b/spec/runtime/with_clean_env_spec.rb
index 1c6114c033..13dd629a16 100644
--- a/spec/runtime/with_clean_env_spec.rb
+++ b/spec/runtime/with_clean_env_spec.rb
@@ -27,8 +27,8 @@ describe "Bundler.with_env helpers" do
gemfile ""
bundle "install --path vendor/bundle"
- code = "Bundler.with_clean_env do;" +
- " print ENV['GEM_PATH'] != '';" +
+ code = "Bundler.with_clean_env do;" \
+ " print ENV['GEM_PATH'] != '';" \
"end"
result = bundle "exec ruby -e #{code.inspect}"