Merge pull request #7242 from rubygems/improve-default-gem-handling

Improve default gem handling by treating default gems as any other gem

Author: simi

bundler/lib/bundler/cli/common.rb

@@ -57,6 +57,9 @@ def self.select_spec(name, regex_match = nil)
         specs << spec if regexp && spec.name =~ regexp
       end
 
+      default_spec = default_gem_spec(name)
+      specs << default_spec if default_spec
+
       case specs.count
       when 0
         dep_in_other_group = Bundler.definition.current_dependencies.find {|dep|dep.name == name }
@@ -75,6 +78,12 @@ def self.select_spec(name, regex_match = nil)
       raise GemNotFound, gem_not_found_message(name, Bundler.definition.dependencies)
     end
 
+    def self.default_gem_spec(name)
+      return unless Gem::Specification.respond_to?(:find_all_by_name)
+      gem_spec = Gem::Specification.find_all_by_name(name).last
+      gem_spec if gem_spec&.default_gem?
+    end
+
     def self.ask_for_spec_from(specs)
       specs.each_with_index do |spec, index|
         Bundler.ui.info "#{index.succ} : #{spec.name}", true

bundler/lib/bundler/cli/info.rb

@@ -25,19 +25,8 @@ def run
 
     private
 
-    def spec_for_gem(gem_name)
-      spec = Bundler.definition.specs.find {|s| s.name == gem_name }
-      spec || default_gem_spec(gem_name) || Bundler::CLI::Common.select_spec(gem_name, :regex_match)
-    end
-
-    def default_gem_spec(gem_name)
-      return unless Gem::Specification.respond_to?(:find_all_by_name)
-      gem_spec = Gem::Specification.find_all_by_name(gem_name).last
-      gem_spec if gem_spec&.default_gem?
-    end
-
-    def spec_not_found(gem_name)
-      raise GemNotFound, Bundler::CLI::Common.gem_not_found_message(gem_name, Bundler.definition.dependencies)
+    def spec_for_gem(name)
+      Bundler::CLI::Common.select_spec(name, :regex_match)
     end
 
     def print_gem_version(spec)

bundler/lib/bundler/rubygems_integration.rb

@@ -509,7 +509,7 @@ def path_separator
     end
 
     def all_specs
-      Gem::Specification.stubs.map do |stub|
+      Gem::Specification.stubs.reject(&:default_gem?).map do |stub|
         StubSpecification.from_stub(stub)
       end
     end

bundler/lib/bundler/source/rubygems.rb

@@ -225,11 +225,7 @@ def cached_built_in_gem(spec)
         cached_path = cached_path(spec)
         if cached_path.nil?
           remote_spec = remote_specs.search(spec).first
-          if remote_spec
-            cached_path = fetch_gem(remote_spec)
-          else
-            Bundler.ui.warn "#{spec.full_name} is built in to Ruby, and can't be cached because your Gemfile doesn't have any sources that contain it."
-          end
+          cached_path = fetch_gem(remote_spec)
         end
         cached_path
       end

bundler/spec/cache/gems_spec.rb

@@ -102,8 +102,8 @@
 
     it "uses builtin gems when installing to system gems" do
       bundle "config set path.system true"
-      install_gemfile %(source "#{file_uri_for(gem_repo1)}"; gem 'json', '#{default_json_version}'), verbose: true
-      expect(out).to include("Using json #{default_json_version}")
+      install_gemfile %(source "#{file_uri_for(gem_repo2)}"; gem 'json', '#{default_json_version}'), verbose: true
+      expect(out).to include("Installing json #{default_json_version}")
     end
 
     it "caches remote and builtin gems" do
@@ -143,19 +143,6 @@
       bundle "install --local"
       expect(the_bundle).to include_gems("builtin_gem_2 1.0.2")
     end
-
-    it "errors if the builtin gem isn't available to cache" do
-      bundle "config set path.system true"
-
-      install_gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
-        gem 'json', '#{default_json_version}'
-      G
-
-      bundle :cache, raise_on_error: false
-      expect(exitstatus).to_not eq(0)
-      expect(err).to include("json-#{default_json_version} is built in to Ruby, and can't be cached")
-    end
   end
 
   describe "when there are also git sources" do

bundler/spec/commands/open_spec.rb

@@ -164,7 +164,6 @@
 
       install_gemfile <<-G
         source "#{file_uri_for(gem_repo1)}"
-        gem "json"
       G
     end
 

bundler/spec/runtime/setup_spec.rb

@@ -1281,6 +1281,10 @@ def lock_with(ruby_version = nil)
 
   describe "with gemified standard libraries" do
     it "does not load Digest", :ruby_repo do
+      build_repo2 do
+        build_gem "digest"
+      end
+
       build_git "bar", gemspec: false do |s|
         s.write "lib/bar/version.rb", %(BAR_VERSION = '1.0')
         s.write "bar.gemspec", <<-G
@@ -1299,7 +1303,7 @@ def lock_with(ruby_version = nil)
       end
 
       gemfile <<-G
-        source "#{file_uri_for(gem_repo1)}"
+        source "#{file_uri_for(gem_repo2)}"
         gem "bar", :git => "#{lib_path("bar-1.0")}"
       G