From 5d257f1b3b2223a79db565948cefd9f4a5599c0a Mon Sep 17 00:00:00 2001
From: Samuel Giddins <segiddins@segiddins.me>
Date: Tue, 27 Jun 2017 17:39:34 +0200
Subject: [DSL] Remove default git sources on 2.0

---
 lib/bundler/dsl.rb          |  3 +++
 lib/bundler/feature_flag.rb |  1 +
 lib/bundler/settings.rb     |  1 +
 man/bundle-config.ronn      |  3 +++
 spec/bundler/dsl_spec.rb    | 21 +++++++++++++++++++--
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index b91e4034a7..c368c533fe 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -204,6 +204,7 @@ module Bundler
 
     def github(repo, options = {})
       raise ArgumentError, "GitHub sources require a block" unless block_given?
+      raise DeprecatedError, "The #github method has been removed" if Bundler.feature_flag.skip_default_git_sources?
       github_uri  = @git_sources["github"].call(repo)
       git_options = normalize_hash(options).merge("uri" => github_uri)
       git_source  = @sources.add_git_source(git_options)
@@ -264,6 +265,8 @@ module Bundler
   private
 
     def add_git_sources
+      return if Bundler.feature_flag.skip_default_git_sources?
+
       git_source(:github) do |repo_name|
         warn_deprecated_git_source(:github, <<-'RUBY'.strip, 'Change any "reponame" :github sources to "username/reponame".')
 "https://github.com/#{repo_name}.git"
diff --git a/lib/bundler/feature_flag.rb b/lib/bundler/feature_flag.rb
index 4ba1780cee..f2671015b3 100644
--- a/lib/bundler/feature_flag.rb
+++ b/lib/bundler/feature_flag.rb
@@ -36,6 +36,7 @@ module Bundler
     settings_flag(:only_update_to_newer_versions) { bundler_2_mode? }
     settings_flag(:plugins) { @bundler_version >= Gem::Version.new("1.14") }
     settings_flag(:prefer_gems_rb) { bundler_2_mode? }
+    settings_flag(:skip_default_git_sources) { bundler_2_mode? }
     settings_flag(:unlock_source_unlocks_spec) { !bundler_2_mode? }
     settings_flag(:update_requires_all_flag) { bundler_2_mode? }
 
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index b9eefa9624..f131a310b9 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -34,6 +34,7 @@ module Bundler
       plugins
       prefer_gems_rb
       silence_root_warning
+      skip_default_git_sources
       unlock_source_unlocks_spec
       update_requires_all_flag
     ].freeze
diff --git a/man/bundle-config.ronn b/man/bundle-config.ronn
index de041b7ab8..4085d2726c 100644
--- a/man/bundle-config.ronn
+++ b/man/bundle-config.ronn
@@ -240,6 +240,9 @@ learn more about their operation in [bundle install(1)][bundle-install].
 * `global_gem_cache` (`BUNDLE_GLOBAL_GEM_CACHE`):
    Whether Bundler should cache all gems globally, rather than locally to the
    installing Ruby installation.
+* `skip_default_git_sources` (`BUNDLE_SKIP_DEFAULT_GIT_SOURCES`):
+   Whether Bundler should skip adding default git source shortcuts to the
+   Gemfile DSL.
 
 In general, you should set these settings per-application by using the applicable
 flag to the [bundle install(1)][bundle-install] or [bundle package(1)][bundle-package] command.
diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
index 5b811ff322..080723ac83 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe Bundler::Dsl do
       expect { subject.git_source(:example) }.to raise_error(Bundler::InvalidOption)
     end
 
-    context "default hosts (git, gist)" do
+    context "default hosts (git, gist)", :bundler => "< 2" do
       it "converts :github to :git" do
         subject.gem("sparks", :github => "indirect/sparks")
         github_uri = "git://github.com/indirect/sparks.git"
@@ -62,6 +62,12 @@ RSpec.describe Bundler::Dsl do
         expect(subject.dependencies.first.source.uri).to eq(bitbucket_uri)
       end
     end
+
+    context "default git sources", :bundler => "2" do
+      it "has none" do
+        expect(subject.instance_variable_get(:@git_sources)).to eq({})
+      end
+    end
   end
 
   describe "#method_missing" do
@@ -218,7 +224,7 @@ RSpec.describe Bundler::Dsl do
     #   gem 'spree_api'
     #   gem 'spree_backend'
     # end
-    describe "#github" do
+    describe "#github", :bundler => "< 2" do
       it "from github" do
         spree_gems = %w[spree_core spree_api spree_backend]
         subject.github "spree" do
@@ -230,6 +236,17 @@ RSpec.describe Bundler::Dsl do
         end
       end
     end
+
+    describe "#github", :bundler => "2" do
+      it "from github" do
+        expect do
+          spree_gems = %w[spree_core spree_api spree_backend]
+          subject.github "spree" do
+            spree_gems.each {|spree_gem| subject.send :gem, spree_gem }
+          end
+        end.to raise_error(Bundler::DeprecatedError, /github method has been removed/)
+      end
+    end
   end
 
   describe "syntax errors" do
-- 
cgit v1.2.1