summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHomu <homu@barosl.com>2015-10-13 00:43:56 +0900
committerHomu <homu@barosl.com>2015-10-13 00:43:56 +0900
commit73576e1c0db09f056f6569b14301c633cc79c815 (patch)
tree9ae32ff63a4981891062f4e4abd0841a96b89a6c
parent264a3f943e6573a01d3d2c674b113244ec68c11b (diff)
parentaff29a68406c6f32a9f9277d03aa582d91fd40f5 (diff)
downloadbundler-73576e1c0db09f056f6569b14301c633cc79c815.tar.gz
Auto merge of #4052 - bundler:excessive-dots, r=segiddins
Remove excessive periods from DSL error messages Apparently, a period is already added when interpolating those messages, some lines below.
-rw-r--r--lib/bundler/dsl.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index 3d74c7659a..d601cc2635 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -57,7 +57,7 @@ module Bundler
unless spec
raise InvalidOption, "There was an error loading the gemspec at " \
- "#{file}. Make sure you can build the gem, then try again."
+ "#{file}. Make sure you can build the gem, then try again"
end
gem spec.name, :path => path, :glob => glob
@@ -70,10 +70,10 @@ module Bundler
@gemspecs << gemspecs.first
when 0
- raise InvalidOption, "There are no gemspecs at #{expanded_path}."
+ raise InvalidOption, "There are no gemspecs at #{expanded_path}"
else
raise InvalidOption, "There are multiple gemspecs at #{expanded_path}. " \
- "Please use the :name option to specify which one should be used."
+ "Please use the :name option to specify which one should be used"
end
end
@@ -256,10 +256,10 @@ module Bundler
def normalize_options(name, version, opts)
if name.is_a?(Symbol)
- raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name}"' instead.}
+ raise GemfileError, %{You need to specify gem names as Strings. Use 'gem "#{name}"' instead}
end
if name =~ /\s/
- raise GemfileError, %{'#{name}' is not a valid gem name because it contains whitespace.}
+ raise GemfileError, %{'#{name}' is not a valid gem name because it contains whitespace}
end
normalize_hash(opts)
@@ -362,7 +362,7 @@ module Bundler
raise GemspecError, "Warning: this Gemfile contains multiple primary sources. " \
"Each source after the first must include a block to indicate which gems " \
"should come from that source. To downgrade this error to a warning, run " \
- "`bundle config --delete disable_multisource`."
+ "`bundle config --delete disable_multisource`"
else
Bundler.ui.warn "Warning: this Gemfile contains multiple primary sources. " \
"Using `source` more than once without a block is a security risk, and " \