rubygems-update 3.1.4 → 3.2.0

data/lib/rubygems/ext/cmake_builder.rb

@@ -1,19 +1,17 @@
 # frozen_string_literal: true
-require 'rubygems/command'
+require_relative '../command'
 
 class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
-
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile')
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, cmake_dir=Dir.pwd)
+    unless File.exist?(File.join(cmake_dir, 'Makefile'))
       cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
       cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
 
-      run cmd, results
+      run cmd, results, class_name, cmake_dir
     end
 
-    make dest_path, results
+    make dest_path, results, cmake_dir
 
     results
   end
-
 end

data/lib/rubygems/ext/configure_builder.rb

@@ -6,18 +6,16 @@
 #++
 
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
-
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile')
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, configure_dir=Dir.pwd)
+    unless File.exist?(File.join(configure_dir, 'Makefile'))
       cmd = "sh ./configure --prefix=#{dest_path}"
       cmd << " #{args.join ' '}" unless args.empty?
 
-      run cmd, results
+      run cmd, results, class_name, configure_dir
     end
 
-    make dest_path, results
+    make dest_path, results, configure_dir
 
     results
   end
-
 end

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -5,16 +5,14 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'fileutils'
-require 'tempfile'
 require 'shellwords'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
+    require 'fileutils'
+    require 'tempfile'
 
-  FileEntry = FileUtils::Entry_ # :nodoc:
-
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
-    tmp_dest = Dir.mktmpdir(".gem.", ".")
+    tmp_dest = Dir.mktmpdir(".gem.", extension_dir)
 
     # Some versions of `mktmpdir` return absolute paths, which will break make
     # if the paths contain spaces. However, on Ruby 1.9.x on Windows, relative
@@ -25,9 +23,9 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
     # spaces do not work.
     #
     # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
-    tmp_dest = get_relative_path(tmp_dest)
+    tmp_dest = get_relative_path(tmp_dest, extension_dir)
 
-    Tempfile.open %w"siteconf .rb", "." do |siteconf|
+    Tempfile.open %w[siteconf .rb], extension_dir do |siteconf|
       siteconf.puts "require 'rbconfig'"
       siteconf.puts "dest_path = #{tmp_dest.dump}"
       %w[sitearchdir sitelibdir].each do |dir|
@@ -40,19 +38,22 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
       destdir = ENV["DESTDIR"]
 
       begin
+        # workaround for https://github.com/oracle/truffleruby/issues/2115
+        siteconf_path = RUBY_ENGINE == "truffleruby" ? siteconf.path.dup : siteconf.path
         cmd = Gem.ruby.shellsplit << "-I" << File.expand_path("../../..", __FILE__) <<
-              "-r" << get_relative_path(siteconf.path) << File.basename(extension)
+              "-r" << get_relative_path(siteconf_path, extension_dir) << File.basename(extension)
         cmd.push(*args)
 
         begin
-          run(cmd, results) do |s, r|
-            if File.exist? 'mkmf.log'
+          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
+              FileUtils.mv mkmf_log, dest_path
             end
           end
           siteconf.unlink
@@ -60,18 +61,20 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
         ENV["DESTDIR"] = nil
 
-        make dest_path, results
+        make dest_path, results, extension_dir
 
         if tmp_dest
+          full_tmp_dest = File.join(extension_dir, tmp_dest)
+
           # TODO remove in RubyGems 3
           if Gem.install_extension_in_lib and lib_dir
             FileUtils.mkdir_p lib_dir
-            entries = Dir.entries(tmp_dest) - %w[. ..]
-            entries = entries.map { |entry| File.join tmp_dest, entry }
+            entries = Dir.entries(full_tmp_dest) - %w[. ..]
+            entries = entries.map {|entry| File.join full_tmp_dest, entry }
             FileUtils.cp_r entries, lib_dir, :remove_destination => true
           end
 
-          FileEntry.new(tmp_dest).traverse do |ent|
+          FileUtils::Entry_.new(full_tmp_dest).traverse do |ent|
             destent = ent.class.new(dest_path, ent.rel)
             destent.exist? or FileUtils.mv(ent.path, destent.path)
           end
@@ -89,9 +92,8 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
   private
 
-  def self.get_relative_path(path)
-    path[0..Dir.pwd.length - 1] = '.' if path.start_with?(Dir.pwd)
+  def self.get_relative_path(path, base)
+    path[0..base.length - 1] = '.' if path.start_with?(base)
     path
   end
-
 end

data/lib/rubygems/ext/rake_builder.rb

@@ -8,10 +8,9 @@
 require "shellwords"
 
 class Gem::Ext::RakeBuilder < Gem::Ext::Builder
-
-  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil, extension_dir=Dir.pwd)
     if File.basename(extension) =~ /mkrf_conf/i
-      run([Gem.ruby, File.basename(extension), *args], results)
+      run([Gem.ruby, File.basename(extension), *args], results, class_name, extension_dir)
     end
 
     rake = ENV['rake']
@@ -27,9 +26,8 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
     end
 
     rake_args = ["RUBYARCHDIR=#{dest_path}", "RUBYLIBDIR=#{dest_path}", *args]
-    run(rake + rake_args, results)
+    run(rake + rake_args, results, class_name, extension_dir)
 
     results
   end
-
 end

data/lib/rubygems/gem_runner.rb

@@ -7,7 +7,6 @@
 
 require 'rubygems'
 require 'rubygems/command_manager'
-require 'rubygems/config_file'
 require 'rubygems/deprecate'
 
 ##
@@ -25,14 +24,9 @@ Gem.load_env_plugins rescue nil
 # classes they call directly.
 
 class Gem::GemRunner
-
-  def initialize(options={})
-    if !options.empty? && !Gem::Deprecate.skip
-      Kernel.warn "NOTE: passing options to Gem::GemRunner.new is deprecated with no replacement. It will be removed on or after 2016-10-01."
-    end
-
-    @command_manager_class = options[:command_manager] || Gem::CommandManager
-    @config_file_class = options[:config_file] || Gem::ConfigFile
+  def initialize
+    @command_manager_class = Gem::CommandManager
+    @config_file_class = Gem::ConfigFile
   end
 
   ##
@@ -80,7 +74,6 @@ class Gem::GemRunner
     Gem.use_paths Gem.configuration[:gemhome], Gem.configuration[:gempath]
     Gem::Command.extra_args = Gem.configuration[:gem]
   end
-
 end
 
 Gem.load_plugins

data/lib/rubygems/gemcutter_utilities.rb

@@ -8,10 +8,12 @@ require 'rubygems/text'
 module Gem::GemcutterUtilities
 
   ERROR_CODE = 1
+  API_SCOPES = %i[index_rubygems push_rubygem yank_rubygem add_owner remove_owner access_webhooks show_dashboard].freeze
 
   include Gem::Text
 
   attr_writer :host
+  attr_writer :scope
 
   ##
   # Add the --key option
@@ -19,7 +21,7 @@ module Gem::GemcutterUtilities
   def add_key_option
     add_option('-k', '--key KEYNAME', Symbol,
                'Use the given API key',
-               'from ~/.gem/credentials') do |value,options|
+               "from #{Gem.configuration.credentials_path}") do |value,options|
       options[:key] = value
     end
   end
@@ -72,7 +74,7 @@ module Gem::GemcutterUtilities
   #
   # If +allowed_push_host+ metadata is present, then it will only allow that host.
 
-  def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, &block)
+  def rubygems_api_request(method, path, host = nil, allowed_push_host = nil, scope: nil, &block)
     require 'net/http'
 
     self.host = host if host
@@ -95,11 +97,19 @@ module Gem::GemcutterUtilities
 
     request_method = Net::HTTP.const_get method.to_s.capitalize
     response = Gem::RemoteFetcher.fetcher.request(uri, request_method, &block)
-    return response unless mfa_unauthorized?(response)
 
-    Gem::RemoteFetcher.fetcher.request(uri, request_method) do |req|
-      req.add_field "OTP", get_otp
-      block.call(req)
+    if mfa_unauthorized?(response)
+      response = Gem::RemoteFetcher.fetcher.request(uri, request_method) do |req|
+        req.add_field "OTP", get_otp
+        block.call(req)
+      end
+    end
+
+    if api_key_forbidden?(response)
+      update_scope(scope)
+      Gem::RemoteFetcher.fetcher.request(uri, request_method, &block)
+    else
+      response
     end
   end
 
@@ -112,19 +122,37 @@ module Gem::GemcutterUtilities
     ask 'Code: '
   end
 
+  def update_scope(scope)
+    sign_in_host        = self.host
+    pretty_host         = pretty_host(sign_in_host)
+    update_scope_params = { scope => true }
+
+    say "The existing key doesn't have access of #{scope} on #{pretty_host}. Please sign in to update access."
+
+    email    = ask "   Email: "
+    password = ask_for_password "Password: "
+
+    response = rubygems_api_request(:put, "api/v1/api_key",
+                                    sign_in_host, scope: scope) do |request|
+      request.basic_auth email, password
+      request.add_field "OTP", options[:otp] if options[:otp]
+      request.body = URI.encode_www_form({:api_key => api_key }.merge(update_scope_params))
+    end
+
+    with_response response do |resp|
+      say "Added #{scope} scope to the existing API key"
+    end
+  end
+
   ##
   # Signs in with the RubyGems API at +sign_in_host+ and sets the rubygems API
   # key.
 
-  def sign_in(sign_in_host = nil)
+  def sign_in(sign_in_host = nil, scope: nil)
     sign_in_host ||= self.host
     return if api_key
 
-    pretty_host = if Gem::DEFAULT_HOST == sign_in_host
-                    'RubyGems.org'
-                  else
-                    sign_in_host
-                  end
+    pretty_host = pretty_host(sign_in_host)
 
     say "Enter your #{pretty_host} credentials."
     say "Don't have an account yet? " +
@@ -134,14 +162,18 @@ module Gem::GemcutterUtilities
     password = ask_for_password "Password: "
     say "\n"
 
-    response = rubygems_api_request(:get, "api/v1/api_key",
-                                    sign_in_host) do |request|
+    key_name     = get_key_name(scope)
+    scope_params = get_scope_params(scope)
+
+    response = rubygems_api_request(:post, "api/v1/api_key",
+                                    sign_in_host, scope: scope) do |request|
       request.basic_auth email, password
       request.add_field "OTP", options[:otp] if options[:otp]
+      request.body = URI.encode_www_form({ name: key_name }.merge(scope_params))
     end
 
     with_response response do |resp|
-      say "Signed in."
+      say "Signed in with API key: #{key_name}."
       set_api_key host, resp.body
     end
   end
@@ -195,4 +227,48 @@ module Gem::GemcutterUtilities
     end
   end
 
+  private
+
+  def pretty_host(host)
+    if Gem::DEFAULT_HOST == host
+      'RubyGems.org'
+    else
+      host
+    end
+  end
+
+  def get_scope_params(scope)
+    scope_params = {}
+
+    if scope
+      scope_params = { scope => true }
+    else
+      say "Please select scopes you want to enable for the API key (y/n)"
+      API_SCOPES.each do |scope|
+        selected = ask "#{scope} [y/N]: "
+        scope_params[scope] = true if selected =~ /^[yY](es)?$/
+      end
+      say "\n"
+    end
+
+    scope_params
+  end
+
+  def get_key_name(scope)
+    hostname = Socket.gethostname || "unkown-host"
+    user = ENV["USER"] || ENV["USERNAME"] || "unkown-user"
+    ts = Time.now.strftime("%Y%m%d%H%M%S")
+    default_key_name = "#{hostname}-#{user}-#{ts}"
+
+    key_name = ask "API Key name [#{default_key_name}]: " unless scope
+    if key_name.nil? || key_name.empty?
+      default_key_name
+    else
+      key_name
+    end
+  end
+
+  def api_key_forbidden?(response)
+    response.kind_of?(Net::HTTPForbidden) && response.body.start_with?("The API key doesn't have access")
+  end
 end

data/lib/rubygems/indexer.rb

@@ -1,27 +1,12 @@
 # frozen_string_literal: true
 require 'rubygems'
 require 'rubygems/package'
-require 'time'
 require 'tmpdir'
 
-rescue_exceptions = [LoadError]
-begin
-  require 'bundler/errors'
-rescue LoadError # this rubygems + old ruby
-else # this rubygems + ruby trunk with bundler
-  rescue_exceptions << Bundler::GemfileNotFound
-end
-begin
-  gem 'builder'
-  require 'builder/xchar'
-rescue *rescue_exceptions
-end
-
 ##
 # Top level class for building the gem repository index.
 
 class Gem::Indexer
-
   include Gem::UserInteraction
 
   ##
@@ -62,11 +47,6 @@ class Gem::Indexer
     require 'tmpdir'
     require 'zlib'
 
-    unless defined?(Builder::XChar)
-      raise "Gem::Indexer requires that the XML Builder library be installed:" +
-            "\n\tgem install builder"
-    end
-
     options = { :build_modern => true }.merge options
 
     @build_modern = options[:build_modern]
@@ -383,7 +363,7 @@ class Gem::Indexer
     end
 
     specs = map_gems_to_specs updated_gems
-    prerelease, released = specs.partition { |s| s.version.prerelease? }
+    prerelease, released = specs.partition {|s| s.version.prerelease? }
 
     files = build_marshal_gemspecs specs
 
@@ -442,5 +422,4 @@ class Gem::Indexer
       Marshal.dump specs_index, io
     end
   end
-
 end

data/lib/rubygems/install_update_options.rb

@@ -25,12 +25,12 @@ module Gem::InstallUpdateOptions
     end
 
     add_option(:"Install/Update", '-n', '--bindir DIR',
-               'Directory where executables are',
-               'located') do |value, options|
+               'Directory where executables will be',
+               'placed when the gem is installed') do |value, options|
       options[:bin_dir] = File.expand_path(value)
     end
 
-    add_option(:"Install/Update",       '--document [TYPES]', Array,
+    add_option(:"Install/Update", '--document [TYPES]', Array,
                'Generate documentation for installed gems',
                'List the documentation types you wish to',
                'generate.  For example: rdoc,ri') do |value, options|
@@ -88,7 +88,7 @@ module Gem::InstallUpdateOptions
       options[:ignore_dependencies] = value
     end
 
-    add_option(:"Install/Update",       '--[no-]format-executable',
+    add_option(:"Install/Update", '--[no-]format-executable',
                'Make installed executable names match Ruby.',
                'If Ruby is ruby18, foo_exec will be',
                'foo_exec18') do |value, options|
@@ -122,10 +122,10 @@ module Gem::InstallUpdateOptions
       options[:minimal_deps] = true
     end
 
-    add_option(:"Install/Update", "--minimal-deps",
+    add_option(:"Install/Update", "--[no-]minimal-deps",
                 "Don't upgrade any dependencies that already",
                 "meet version requirements") do |value, options|
-      options[:minimal_deps] = true
+      options[:minimal_deps] = value
     end
 
     add_option(:"Install/Update", "--[no-]post-install-message",
@@ -154,7 +154,7 @@ module Gem::InstallUpdateOptions
                'Omit the named groups (comma separated)',
                'when installing from a gem dependencies',
                'file') do |v,o|
-      options[:without_groups].concat v.map { |without| without.intern }
+      options[:without_groups].concat v.map {|without| without.intern }
     end
 
     add_option(:"Install/Update", '--default',