rubygems-update 4.0.21 → 4.1.0.beta1

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -27,17 +27,14 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
       cmd << "--target-rbconfig=#{target_rbconfig.path}" if target_rbconfig.path
       cmd.push(*args)
 
-      run(cmd, results, class_name, extension_dir) do |s, r|
-        mkmf_log = File.join(extension_dir, "mkmf.log")
-        if File.exist? mkmf_log
-          unless s.success?
-            r << "To see why this extension failed to compile, please check" \
-              " the mkmf.log which can be found here:\n"
-            r << "  " + File.join(dest_path, "mkmf.log") + "\n"
-          end
-          FileUtils.mv mkmf_log, dest_path
-        end
-      end
+      run(cmd, results, class_name, extension_dir)
+
+      # "clean" is the first make target, and mkmf puts mkmf.log in CLEANFILES,
+      # so park the log next to the built extension before make can delete it.
+      # Whether it is then dropped or kept for inspection is decided by
+      # Gem::Ext::Builder#build_extension.
+      mkmf_log = File.join(extension_dir, "mkmf.log")
+      FileUtils.mv mkmf_log, dest_path if File.exist?(mkmf_log)
 
       ENV["DESTDIR"] = nil
 
@@ -66,10 +63,6 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
     end
 
     results
-  rescue Gem::Ext::Builder::NoMakefileError => error
-    results << error.message
-    results << "Skipping make for #{extension} as no Makefile was found."
-    # We are good, do not re-raise the error.
   ensure
     FileUtils.rm_rf tmp_dest if tmp_dest
   end

data/lib/rubygems/gemcutter_utilities.rb

@@ -48,10 +48,23 @@ module Gem::GemcutterUtilities
       ENV["GEM_HOST_API_KEY"]
     elsif options[:key]
       verify_api_key options[:key]
+    elsif credential_store_key = Gem.configuration.credential_store_api_key_for(host)
+      credential_store_key
     elsif Gem.configuration.api_keys.key?(host)
       Gem.configuration.api_keys[host]
     else
-      Gem.configuration.rubygems_api_key
+      key = Gem.configuration.rubygems_api_key
+
+      # Once the store has refused to answer, this last resort would hand the
+      # RubyGems.org key to a host that has one of its own, or come away with
+      # nothing and let the caller ask for a password.
+      if !@recognizing_session && Gem.configuration.credential_store_read_failed_for?(host) && (key.nil? || !default_host?)
+        alert_error "The credential store could not be read, so no API key for #{host} could be found. " \
+                    "Make the store readable and run the command again."
+        terminate_interaction ERROR_CODE
+      end
+
+      key
     end
   end
 
@@ -155,7 +168,17 @@ module Gem::GemcutterUtilities
   def sign_in(sign_in_host = nil, scope: nil)
     sign_in_host ||= host
     pretty_host = pretty_host(sign_in_host)
-    if api_key
+    # Stopping because the store cannot be read would close the one command
+    # that can re-authenticate. A flag rather than an argument keeps #api_key
+    # callable with no arguments, as command plugins that override it define it.
+    @recognizing_session = true
+    signed_in = begin
+      api_key
+    ensure
+      @recognizing_session = false
+    end
+
+    if signed_in
       say "You are already signed in on #{pretty_host}."
       return
     end
@@ -196,12 +219,31 @@ module Gem::GemcutterUtilities
   def verify_api_key(key)
     if Gem.configuration.api_keys.key? key
       Gem.configuration.api_keys[key]
+    elsif stored_key = stored_api_key_named(key)
+      stored_key
     else
       alert_error "No such API key. Please add it to your configuration (done automatically on initial `gem push`)."
       terminate_interaction(ERROR_CODE)
     end
   end
 
+  ##
+  # The default key, when +name+ is the name the credentials file knows it by.
+  # That file renames :rubygems_api_key to :rubygems on the way in, so the name
+  # survives only there, and moving the key into the store would otherwise put
+  # it out of reach of --key.
+  #
+  # Only that one name. The store is keyed by host, and --key names a key, so
+  # looking any other name up there would let --key reach a host's key and send
+  # it somewhere else. The credentials file keeps the two apart by type, since
+  # --key arrives as a Symbol and host entries are strings.
+
+  def stored_api_key_named(name)
+    return nil unless name.to_s == "rubygems"
+
+    Gem.configuration.credential_store_default_api_key
+  end
+
   ##
   # If +response+ is an HTTP Success (2XX) response, yields the response if a
   # block was given or shows the response body to the user.

data/lib/rubygems/install_update_options.rb

@@ -7,12 +7,14 @@
 #++
 
 require_relative "../rubygems"
+require_relative "cooldown_option"
 require_relative "security_option"
 
 ##
 # Mixin methods for install and update options for Gem::Commands
 
 module Gem::InstallUpdateOptions
+  include Gem::CooldownOption
   include Gem::SecurityOption
 
   ##
@@ -192,6 +194,20 @@ module Gem::InstallUpdateOptions
                 "rbconfig.rb for the deployment target platform") do |v, _o|
       Gem.set_target_rbconfig(v)
     end
+
+    add_option(:"Install/Update", "--[no-]build-extension",
+                "Build native extensions during installation.",
+                "Defaults to true") do |v, _o|
+      options[:build_extension] = v
+    end
+
+    add_option(:"Install/Update", "--[no-]install-plugin",
+                "Install plugins during installation.",
+                "Defaults to true") do |v, _o|
+      options[:install_plugin] = v
+    end
+
+    add_cooldown_option :"Install/Update"
   end
 
   ##

data/lib/rubygems/installer.rb

@@ -114,6 +114,12 @@ class Gem::Installer
 
     def copy_to(path)
     end
+
+    def gem
+    end
+
+    def content_address
+    end
   end
 
   ##
@@ -266,6 +272,7 @@ class Gem::Installer
   #     specifications/<gem-version>.gemspec #=> the Gem::Specification
 
   def install
+    assign_content_address
     pre_install_checks
 
     run_pre_install_hooks
@@ -287,7 +294,12 @@ class Gem::Installer
     run_post_build_hooks
 
     generate_bin
-    generate_plugins
+    if options[:install_plugin] == false
+      remove_stale_plugins
+      warn_skipped_plugins
+    else
+      generate_plugins
+    end
 
     write_spec
     write_cache_file
@@ -296,9 +308,13 @@ class Gem::Installer
 
     say clean_text(spec.post_install_message.to_s) if options[:post_install_message] && !spec.post_install_message.nil?
 
-    Gem::Specification.add_spec(spec) unless @install_dir
+    if incompatible_abi_install?
+      say "#{spec.full_name} is scoped to Ruby ABI #{spec.ruby_abi} and will not be visible to the running Ruby (ABI #{Gem.ruby_abi})"
+    else
+      Gem::Specification.add_spec(spec) unless @install_dir
+    end
 
-    load_plugin
+    load_plugin unless options[:install_plugin] == false
 
     run_post_install_hooks
 
@@ -345,9 +361,11 @@ class Gem::Installer
     @installed_specs ||= begin
       specs = []
 
-      Gem::Util.glob_files_in_dir("*.gemspec", File.join(gem_home, "specifications")).each do |path|
-        spec = Gem::Specification.load path
-        specs << spec if spec
+      Gem::SpecificationRecord.dirs_from([gem_home]).each do |dir|
+        Gem::Util.glob_files_in_dir("*.gemspec", dir).each do |path|
+          spec = Gem::Specification.load path
+          specs << spec if spec
+        end
       end
 
       specs
@@ -383,7 +401,7 @@ class Gem::Installer
   #
 
   def spec_file
-    File.join gem_home, "specifications", "#{spec.full_name}.gemspec"
+    File.join Gem::SpecificationRecord.specification_dir_for(spec, gem_home), "#{spec.full_name}.gemspec"
   end
 
   def default_spec_dir
@@ -407,7 +425,24 @@ class Gem::Installer
   def write_spec
     spec.installed_by_version = Gem.rubygems_version
 
-    Gem.write_binary(spec_file, spec.to_ruby_for_cache)
+    spec_file = self.spec_file
+    spec_dir = File.dirname spec_file
+    dir_mode = options[:dir_mode]
+    content_addressed = Gem::ContentAddress.content_addressed?(spec)
+
+    if File.directory? spec_dir
+      if content_addressed && dir_mode && !File.writable?(spec_dir)
+        File.chmod(0o755, spec_dir)
+      end
+    else
+      ensure_writable_dir spec_dir
+    end
+
+    begin
+      Gem.write_binary(spec_file, spec.to_ruby_for_cache)
+    ensure
+      File.chmod(dir_mode, spec_dir) if dir_mode && content_addressed
+    end
   end
 
   ##
@@ -817,11 +852,37 @@ class Gem::Installer
   # configure scripts and rakefiles or mkrf_conf files.
 
   def build_extensions
+    if options[:build_extension] == false
+      warn_skipped_extensions
+      return
+    end
+
     builder = Gem::Ext::Builder.new spec, build_args, Gem.target_rbconfig, build_jobs
 
     builder.build_extensions
   end
 
+  def warn_skipped_extensions # :nodoc:
+    return if spec.extensions.empty?
+
+    alert_warning "#{spec.full_name} contains native extensions that were not built.\n" \
+                  "To build extensions, run: gem pristine #{spec.name} --extensions"
+  end
+
+  def warn_skipped_plugins # :nodoc:
+    return if spec.plugins.empty?
+
+    alert_warning "#{spec.full_name} contains plugins that were not installed.\n" \
+                  "To install plugins, run: gem pristine #{spec.name} --only-plugins"
+  end
+
+  def remove_stale_plugins # :nodoc:
+    return unless spec.plugins.empty?
+
+    ensure_writable_dir @plugins_dir
+    remove_plugins_for(spec, @plugins_dir)
+  end
+
   ##
   # Reads the file index and extracts each file into the gem directory.
   #
@@ -935,6 +996,23 @@ class Gem::Installer
 
   private
 
+  def incompatible_abi_install?
+    Gem::ContentAddress.content_addressed?(spec) && spec.ruby_abi != Gem.ruby_abi
+  end
+
+  def assign_content_address
+    address = @package.content_address
+    expected = options[:content_address]
+
+    if expected && address != expected
+      raise Gem::InstallError, "content address mismatch for #{spec.full_name}: " \
+        "expected #{expected}, got #{address || "no content address"}"
+    end
+
+    @gem_dir = nil if address != spec.content_address
+    spec.content_address = address
+  end
+
   def user_install_dir
     # never install to user home in --build-root mode
     return unless @build_root.nil?
@@ -1003,9 +1081,10 @@ class Gem::Installer
     # are loaded at the same time.
     return unless specs.size == 1
 
-    plugin_files = spec.plugins.map do |plugin|
-      File.join(@plugins_dir, "#{spec.name}_plugin#{File.extname(plugin)}")
+    plugin_files = spec.plugins.filter_map do |plugin|
+      path = File.join(@plugins_dir, "#{spec.name}_plugin#{File.extname(plugin)}")
+      path if File.exist?(path)
     end
-    Gem.load_plugin_files(plugin_files)
+    Gem.load_plugin_files(plugin_files) unless plugin_files.empty?
   end
 end

data/lib/rubygems/installer_uninstaller_utils.rb

@@ -10,11 +10,16 @@ module Gem::InstallerUninstallerUtils
 
     require "pathname"
 
-    spec.plugins.each do |plugin|
-      plugin_script_path = File.join plugins_dir, "#{spec.name}_plugin#{File.extname(plugin)}"
+    plugin_script_dir = plugin_stub_dir_for(spec, plugins_dir)
+
+    FileUtils.mkdir_p plugin_script_dir
+    remove_plugins_for(spec, plugins_dir)
+
+    plugins.each do |plugin|
+      plugin_script_path = File.join plugin_script_dir, "#{spec.name}_plugin#{File.extname(plugin)}"
 
       File.open plugin_script_path, "wb" do |file|
-        file.puts "require_relative '#{Pathname.new(plugin).relative_path_from(Pathname.new(plugins_dir))}'"
+        file.puts "require_relative '#{Pathname.new(plugin).relative_path_from(Pathname.new(plugin_script_dir))}'"
       end
 
       verbose plugin_script_path
@@ -23,5 +28,21 @@ module Gem::InstallerUninstallerUtils
 
   def remove_plugins_for(spec, plugins_dir)
     FileUtils.rm_f Gem::Util.glob_files_in_dir("#{spec.name}#{Gem.plugin_suffix_pattern}", plugins_dir)
+    FileUtils.rm_f Gem::Util.glob_files_in_dir("#{spec.name}#{Gem.plugin_suffix_pattern}", ruby_abi_plugin_dir_for(spec, plugins_dir))
+  end
+
+  private
+
+  def plugin_stub_dir_for(spec, plugins_dir)
+    full_spec = spec.to_spec
+    return plugins_dir unless Gem::ContentAddress.content_addressed?(full_spec)
+
+    File.join plugins_dir, full_spec.ruby_abi
+  end
+
+  def ruby_abi_plugin_dir_for(spec, plugins_dir)
+    full_spec = spec.to_spec
+    ruby_abi = Gem::ContentAddress.content_addressed?(full_spec) ? full_spec.ruby_abi : Gem.ruby_abi
+    File.join plugins_dir, ruby_abi
   end
 end

data/lib/rubygems/name_tuple.rb

@@ -2,27 +2,46 @@
 
 ##
 #
-# Represents a gem of name +name+ at +version+ of +platform+. These
-# wrap the data returned from the indexes.
+# Represents a gem of name +name+ at +version+ of +platform+, optionally
+# carrying a +content_address+ and +ruby_abi+ for content-addressable gems.
+# These wrap the data returned from the indexes.
 
 class Gem::NameTuple
-  def initialize(name, version, platform = Gem::Platform::RUBY)
+  def initialize(name, version, platform = Gem::Platform::RUBY, content_address: nil, ruby_abi: nil)
     @name = name
     @version = version
 
     platform &&= platform.to_s
     platform = Gem::Platform::RUBY if !platform || platform.empty?
     @platform = platform
+    @content_address = content_address unless content_address.nil?
+    @ruby_abi = ruby_abi unless ruby_abi.nil?
   end
 
-  attr_reader :name, :version, :platform
+  attr_reader :name, :version, :platform, :content_address, :ruby_abi
 
   ##
-  # Turn an array of [name, version, platform] into an array of
-  # NameTuple objects.
+  # Turn an array of tuples into an array of NameTuple objects. Accepts:
+  # * Gem::NameTuple objects (passed through as-is)
+  # * 3-element arrays: [name, version, platform]
+  # * 5-element arrays: [name, version, platform, content_address, ruby_abi]
 
   def self.from_list(list)
-    list.map {|t| new(*t) }
+    list.map do |tuple|
+      case tuple
+      when Gem::NameTuple
+        tuple
+      when Array
+        case tuple.length
+        when 3, 5
+          new(tuple[0], tuple[1], tuple[2], content_address: tuple[3], ruby_abi: tuple[4])
+        else
+          raise ArgumentError, "Expected a 3- or 5-element tuple, got #{tuple.length}"
+        end
+      else
+        raise ArgumentError, "Expected a Gem::NameTuple or Array, got #{tuple.class}"
+      end
+    end
   end
 
   ##
@@ -30,7 +49,7 @@ class Gem::NameTuple
   # [name, version, platform] tuples.
 
   def self.to_basic(list)
-    list.map(&:to_a)
+    list.map {|tuple| [tuple.name, tuple.version, tuple.platform] }
   end
 
   ##
@@ -46,8 +65,9 @@ class Gem::NameTuple
   # of Gem::Specification#full_name.
 
   def full_name
-    case @platform
-    when nil, "", Gem::Platform::RUBY
+    if @content_address
+      "#{@name}-#{@version}-#{@content_address}"
+    elsif @platform.nil? || @platform.empty? || @platform == Gem::Platform::RUBY
       "#{@name}-#{@version}"
     else
       "#{@name}-#{@version}-#{@platform}"
@@ -75,41 +95,58 @@ class Gem::NameTuple
   end
 
   ##
-  # Convert back to the [name, version, platform] tuple
+  # Convert back to the tuple array. Returns [name, version, platform] for
+  # non-content-addressable gems, or [name, version, platform, content_address,
+  # ruby_abi] for content-addressable gems.
 
   def to_a
-    [@name, @version, @platform]
+    if @content_address
+      [@name, @version, @platform, @content_address, @ruby_abi]
+    else
+      [@name, @version, @platform]
+    end
   end
 
   alias_method :deconstruct, :to_a
 
   def deconstruct_keys(keys)
-    { name: @name, version: @version, platform: @platform }
+    {
+      name: @name,
+      version: @version,
+      platform: @platform,
+      content_address: @content_address,
+      ruby_abi: @ruby_abi,
+    }
   end
 
   def inspect # :nodoc:
-    "#<Gem::NameTuple #{@name}, #{@version}, #{@platform}>"
+    "#<Gem::NameTuple name=#{@name} version=#{@version} platform=#{@platform} content_address=#{@content_address} ruby_abi=#{@ruby_abi}>"
   end
 
   alias_method :to_s, :inspect # :nodoc:
 
   def <=>(other)
-    [@name, @version, Gem::Platform.sort_priority(@platform)] <=>
-      [other.name, other.version, Gem::Platform.sort_priority(other.platform)]
+    sort_key <=> other.sort_key
+  end
+
+  def sort_key # :nodoc:
+    [@name, @version, Gem::Platform.sort_priority(@platform), @content_address.to_s, @ruby_abi.to_s]
   end
 
   include Comparable
 
   ##
   # Compare with +other+. Supports another NameTuple or an Array
-  # in the [name, version, platform] format.
+  # in the [name, version, platform, content_address, ruby_abi] format.
 
   def ==(other)
     case other
     when self.class
       @name == other.name &&
         @version == other.version &&
-        @platform == other.platform
+        @platform == other.platform &&
+        @content_address == other.content_address &&
+        @ruby_abi == other.ruby_abi
     when Array
       to_a == other
     else

data/lib/rubygems/package/old.rb

@@ -59,7 +59,7 @@ class Gem::Package::Old < Gem::Package
       header = file_list io
       raise Gem::Exception, errstr unless header
 
-      # verify_extraction_dir expects an already-resolved destination dir
+      # install_location expects an already-resolved destination dir
       destination_dir = File.realpath(destination_dir)
 
       header.each do |entry|