aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler
diff options
context:
space:
mode:
authorMike Heffner <mikeh@fesnel.com>2011-05-22 19:03:19 -0400
committerMike Heffner <mikeh@fesnel.com>2011-05-22 19:03:19 -0400
commit4fc8385c4394680cc597b62d92ae9cecf0e62cdf (patch)
tree207bb04b494a78f6415b017349c952e587dece2a /lib/bundler
parent20d2e86da72d598f8fcd313f1263dbade069b817 (diff)
downloadbundler-4fc8385c4394680cc597b62d92ae9cecf0e62cdf.tar.gz
Escape single quotes with the URI.
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/source.rb11
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/bundler/source.rb b/lib/bundler/source.rb
index c2e7382b..7fd04864 100644
--- a/lib/bundler/source.rb
+++ b/lib/bundler/source.rb
@@ -602,6 +602,13 @@ module Bundler
Digest::SHA1.hexdigest(input)
end
+ # Escape the URI for shell commands. To support a single quote
+ # within the URI we must end the string, escape the quote and
+ # restart.
+ def uri_escaped
+ "'#{uri.gsub("'") {|s| "'\\''"}}'"
+ end
+
def cache_path
@cache_path ||= begin
git_scope = "#{base_name}-#{uri_hash}"
@@ -619,12 +626,12 @@ module Bundler
return if has_revision_cached?
Bundler.ui.info "Updating #{uri}"
in_cache do
- git %|fetch --force --quiet --tags '#{uri}' "refs/heads/*:refs/heads/*"|
+ git %|fetch --force --quiet --tags #{uri_escaped} "refs/heads/*:refs/heads/*"|
end
else
Bundler.ui.info "Fetching #{uri}"
FileUtils.mkdir_p(cache_path.dirname)
- git %|clone '#{uri}' "#{cache_path}" --bare --no-hardlinks|
+ git %|clone #{uri_escaped} "#{cache_path}" --bare --no-hardlinks|
end
end