summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-02-21 16:52:23 +0100
committerDavid Rodríguez <deivid.rodriguez@riseup.net>2019-03-12 10:15:42 +0100
commit2cebfbb7a48aa93819959108733ca870121e11b1 (patch)
tree052147d19c26370ad53415caeb83f002da86e764
parent7f1be9e81977dfd5a29bc7df92baac3072bf5e5e (diff)
downloadbundler-2cebfbb7a48aa93819959108733ca870121e11b1.tar.gz
Remove messy TODO comments
Classic problem: comments do not get as curated as code, so they no longer make sense. I prefer to remove them and try to keep the code self-explaining and in good shape instead.
-rw-r--r--lib/bundler/dsl.rb17
1 files changed, 0 insertions, 17 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index c736fc9730..3849cff339 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -290,21 +290,7 @@ module Bundler
warn_deprecated_git_source(:github, <<-'RUBY'.strip, 'Change any "reponame" :github sources to "username/reponame".')
"https://github.com/#{repo_name}.git"
RUBY
- # It would be better to use https instead of the git protocol, but this
- # can break deployment of existing locked bundles when switching between
- # different versions of Bundler. The change will be made in 2.0, which
- # does not guarantee compatibility with the 1.x series.
- #
- # See https://github.com/bundler/bundler/pull/2569 for discussion
- #
- # This can be overridden by adding this code to your Gemfiles:
- #
- # git_source(:github) do |repo_name|
- # repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
- # "https://github.com/#{repo_name}.git"
- # end
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
- # TODO: 2.0 upgrade this setting to the default
if Bundler.feature_flag.github_https?
Bundler::SharedHelpers.major_deprecation 2, "The `github.https` setting will be removed"
"https://github.com/#{repo_name}.git"
@@ -313,14 +299,12 @@ module Bundler
end
end
- # 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"')
"https://gist.github.com/#{repo_name}.git"
end
- # TODO: 2.0 remove this deprecated git source
git_source(:bitbucket) do |repo_name|
warn_deprecated_git_source(:bitbucket, <<-'RUBY'.strip)
user_name, repo_name = repo_name.split("/")
@@ -488,7 +472,6 @@ repo_name ||= user_name
end
def warn_deprecated_git_source(name, replacement, additional_message = nil)
- # TODO: 2.0 remove deprecation
additional_message &&= " #{additional_message}"
replacement = if replacement.count("\n").zero?
"{|repo_name| #{replacement} }"