summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAgis Anastasopoulos <agis.anast@gmail.com>2015-11-02 05:03:17 +0200
committerSamuel Giddins <segiddins@segiddins.me>2016-07-05 15:11:19 -0300
commit4cfc5a8a34745829a160fa94b41134ab4f88e8a1 (patch)
tree0b623ef4242263eaa448b51baf4a3f61ba25b618
parent7cf8e1530bc03e585e8c36c1101f0f4446540fc8 (diff)
downloadbundler-4cfc5a8a34745829a160fa94b41134ab4f88e8a1.tar.gz
Fix bitbucket/gist sources deprecation warnings
Also fix the respective test failures which were around for a while.
-rw-r--r--lib/bundler/dsl.rb6
-rw-r--r--spec/deprecation_spec.rb6
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index d377125d49..961b7e4036 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -276,14 +276,14 @@ module Bundler
# TODO: 2.0 remove this deprecated git source
git_source(:gist) do |repo_name|
- warn_deprecated_git_source(:gist, "https://gist.github.com/#{repo_name}.git")
+ warn_deprecated_git_source(:gist, 'https://gist.github.com/#{repo_name}.git')
"https://gist.github.com/#{repo_name}.git"
end
# TODO: 2.0 remove this deprecated git source
git_source(:bitbucket) do |repo_name|
user_name, repo_name = repo_name.split "/"
- warn_deprecated_git_source(:bitbucket, "https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git")
+ warn_deprecated_git_source(:bitbucket, 'https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git')
repo_name ||= user_name
"https://#{user_name}@bitbucket.org/#{user_name}/#{repo_name}.git"
end
@@ -443,7 +443,7 @@ module Bundler
Bundler.ui.deprecate "The :#{name} git source is deprecated, and will be removed " \
"in Bundler 2.0. Add this code to your Gemfile to ensure it continues to work:\n" \
" git_source(:#{name}) do |repo_name|\n" \
- " #{repo_string}\n" \
+ " \"#{repo_string}\"\n" \
" end", true
end
diff --git a/spec/deprecation_spec.rb b/spec/deprecation_spec.rb
index a009d164ee..312974ad79 100644
--- a/spec/deprecation_spec.rb
+++ b/spec/deprecation_spec.rb
@@ -108,8 +108,8 @@ describe "Bundler version 1.99" do
msg = "The :bitbucket git source is deprecated, and will be removed " \
"in Bundler 2.0. Add this code to your Gemfile to ensure it " \
"continues to work:\n git_source(:bitbucket) do |repo_name|\n " \
- " https://\#{user_name}@bitbucket.org/\#{user_name}/\#{repo_name}" \
- ".git\n end"
+ " \"https://\#{user_name}@bitbucket.org/\#{user_name}/\#{repo_name}" \
+ ".git\"\n end"
expect(Bundler.ui).to receive(:deprecate).with(msg, true)
subject.gem("not-really-a-gem", :bitbucket => "mcorp/flatlab-rails")
end
@@ -121,7 +121,7 @@ describe "Bundler version 1.99" do
msg = "The :gist git source is deprecated, and will be removed " \
"in Bundler 2.0. Add this code to your Gemfile to ensure it " \
"continues to work:\n git_source(:gist) do |repo_name|\n " \
- " https://gist.github.com/\#{repo_name}.git\n" \
+ " \"https://gist.github.com/\#{repo_name}.git\"\n" \
" end"
expect(Bundler.ui).to receive(:deprecate).with(msg, true)
subject.gem("not-really-a-gem", :gist => "1234")