rubygems-update 2.7.11 → 3.0.9

data/lib/rubygems/ext/builder.rb

@@ -6,7 +6,6 @@
 #++
 
 require 'rubygems/user_interaction'
-require 'thread'
 
 class Gem::Ext::Builder
 
@@ -28,18 +27,18 @@ class Gem::Ext::Builder
   end
 
   def self.make(dest_path, results)
-    unless File.exist? 'Makefile' then
+    unless File.exist? 'Makefile'
       raise Gem::InstallError, 'Makefile not found'
     end
 
     # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
     make_program = ENV['MAKE'] || ENV['make'] || $1
-    unless make_program then
+    unless make_program
       make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
     end
 
-    destdir = '"DESTDIR=%s"' % ENV['DESTDIR'] if RUBY_VERSION > '2.0'
+    destdir = '"DESTDIR=%s"' % ENV['DESTDIR']
 
     ['clean', '', 'install'].each do |target|
       # Pass DESTDIR via command line to override what's in MAKEFLAGS
@@ -57,6 +56,7 @@ class Gem::Ext::Builder
   end
 
   def self.redirector
+    warn "#{caller[0]}: Use IO.popen(..., err: [:child, :out])"
     '2>&1'
   end
 
@@ -64,28 +64,35 @@ class Gem::Ext::Builder
     verbose = Gem.configuration.really_verbose
 
     begin
-      # TODO use Process.spawn when ruby 1.8 support is dropped.
       rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], nil
       if verbose
         puts("current directory: #{Dir.pwd}")
-        puts(command)
-        system(command)
-      else
-        results << "current directory: #{Dir.pwd}"
-        results << command
-        results << `#{command} #{redirector}`
+        p(command)
       end
+      results << "current directory: #{Dir.pwd}"
+      results << (command.respond_to?(:shelljoin) ? command.shelljoin : command)
+
+      redirections = verbose ? {} : {err: [:child, :out]}
+      IO.popen(command, "r", redirections) do |io|
+        if verbose
+          IO.copy_stream(io, $stdout)
+        else
+          results << io.read
+        end
+      end
+    rescue => error
+      raise Gem::InstallError, "#{command_name || class_name} failed#{error.message}"
     ensure
       ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps
     end
 
-    unless $?.success? then
+    unless $?.success?
       results << "Building has failed. See above output for more information on the failure." if verbose
 
       exit_reason =
-        if $?.exited? then
+        if $?.exited?
           ", exit code #{$?.exitstatus}"
-        elsif $?.signaled? then
+        elsif $?.signaled?
           ", uncaught signal #{$?.termsig}"
         end
 
@@ -98,7 +105,7 @@ class Gem::Ext::Builder
   # have build arguments, saved, set +build_args+ which is an ARGV-style
   # array.
 
-  def initialize spec, build_args = spec.build_args
+  def initialize(spec, build_args = spec.build_args)
     @spec       = spec
     @build_args = build_args
     @gem_dir    = spec.full_gem_path
@@ -109,7 +116,7 @@ class Gem::Ext::Builder
   ##
   # Chooses the extension builder class for +extension+
 
-  def builder_for extension # :nodoc:
+  def builder_for(extension) # :nodoc:
     case extension
     when /extconf/ then
       Gem::Ext::ExtConfBuilder
@@ -131,7 +138,7 @@ class Gem::Ext::Builder
   ##
   # Logs the build +output+ in +build_dir+, then raises Gem::Ext::BuildError.
 
-  def build_error build_dir, output, backtrace = nil # :nodoc:
+  def build_error(build_dir, output, backtrace = nil) # :nodoc:
     gem_make_out = write_gem_make_out output
 
     message = <<-EOF
@@ -146,12 +153,24 @@ EOF
     raise Gem::Ext::BuildError, message, backtrace
   end
 
-  def build_extension extension, dest_path # :nodoc:
+  def build_extension(extension, dest_path) # :nodoc:
     results = []
 
+    # FIXME: Determine if this line is necessary and, if so, why.
+    # Notes:
+    # 1. As far as I can tell, this method is only called by +build_extensions+.
+    # 2. The existence of this line implies +extension+ is, or previously was,
+    #    sometimes +false+ or +nil+.
+    # 3. #1 and #2 combined suggests, but does not confirm, that
+    #    +@specs.extensions+ sometimes contained +false+ or +nil+ values.
+    # 4. Nothing seems to explicitly handle +extension+ being empty,
+    #    which makes me wonder both what it should do and what it does.
+    #
+    # - @duckinator
     extension ||= '' # I wish I knew why this line existed
+
     extension_dir =
-      File.expand_path File.join @gem_dir, File.dirname(extension)
+      File.expand_path File.join(@gem_dir, File.dirname(extension))
     lib_dir = File.join @spec.full_gem_path, @spec.raw_require_paths.first
 
     builder = builder_for extension
@@ -160,11 +179,19 @@ EOF
       FileUtils.mkdir_p dest_path
 
       CHDIR_MUTEX.synchronize do
-        Dir.chdir extension_dir do
-          results = builder.build(extension, @gem_dir, dest_path,
+        pwd = Dir.getwd
+        Dir.chdir extension_dir
+        begin
+          results = builder.build(extension, dest_path,
                                   results, @build_args, lib_dir)
 
           verbose { results.join("\n") }
+        ensure
+          begin
+            Dir.chdir pwd
+          rescue SystemCallError
+            Dir.chdir dest_path
+          end
         end
       end
 
@@ -193,6 +220,7 @@ EOF
 
     FileUtils.rm_f @spec.gem_build_complete_path
 
+    # FIXME: action at a distance: @ran_rake modified deep in build_extension(). - @duckinator
     @ran_rake = false # only run rake once
 
     @spec.extensions.each do |extension|
@@ -207,7 +235,7 @@ EOF
   ##
   # Writes +output+ to gem_make.out in the extension install directory.
 
-  def write_gem_make_out output # :nodoc:
+  def write_gem_make_out(output) # :nodoc:
     destination = File.join @spec.extension_dir, 'gem_make.out'
 
     FileUtils.mkdir_p @spec.extension_dir
@@ -218,4 +246,3 @@ EOF
   end
 
 end
-

data/lib/rubygems/ext/cmake_builder.rb

@@ -2,8 +2,8 @@
 require 'rubygems/command'
 
 class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
-  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile') then
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
+    unless File.exist?('Makefile')
       cmd = "cmake . -DCMAKE_INSTALL_PREFIX=#{dest_path}"
       cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
 

data/lib/rubygems/ext/configure_builder.rb

@@ -7,8 +7,8 @@
 
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
 
-  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
-    unless File.exist?('Makefile') then
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
+    unless File.exist?('Makefile')
       cmd = "sh ./configure --prefix=#{dest_path}"
       cmd << " #{args.join ' '}" unless args.empty?
 
@@ -21,4 +21,3 @@ class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
   end
 
 end
-

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -7,11 +7,12 @@
 
 require 'fileutils'
 require 'tempfile'
+require 'shellwords'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
   FileEntry = FileUtils::Entry_ # :nodoc:
 
-  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
     tmp_dest = Dir.mktmpdir(".gem.", ".")
 
     # Some versions of `mktmpdir` return absolute paths, which will break make
@@ -23,9 +24,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
     # spaces do not work.
     #
     # Details: https://github.com/rubygems/rubygems/issues/977#issuecomment-171544940
-    #
-    # TODO: Make this unconditional when rubygems no longer supports Ruby 1.9.x.
-    tmp_dest = get_relative_path(tmp_dest) unless Gem.win_platform? && RUBY_VERSION <= '2.0'
+    tmp_dest = get_relative_path(tmp_dest)
 
     Tempfile.open %w"siteconf .rb", "." do |siteconf|
       siteconf.puts "require 'rbconfig'"
@@ -40,13 +39,15 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
       destdir = ENV["DESTDIR"]
 
       begin
-        cmd = [Gem.ruby, "-r", get_relative_path(siteconf.path), File.basename(extension), *args].join ' '
+        cmd = Gem.ruby.shellsplit << "-I" << File.expand_path("../../..", __FILE__) <<
+              "-r" << get_relative_path(siteconf.path) << File.basename(extension)
+        cmd.push(*args)
 
         begin
           run cmd, results
         ensure
           if File.exist? 'mkmf.log'
-            unless $?.success? then
+            unless $?.success?
               results << "To see why this extension failed to compile, please check" \
                 " the mkmf.log which can be found here:\n"
               results << "  " + File.join(dest_path, 'mkmf.log') + "\n"
@@ -62,7 +63,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
 
         if tmp_dest
           # TODO remove in RubyGems 3
-          if Gem.install_extension_in_lib and lib_dir then
+          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 }

data/lib/rubygems/ext/rake_builder.rb

@@ -5,33 +5,31 @@
 # See LICENSE.txt for permissions.
 #++
 
+require "shellwords"
+
 class Gem::Ext::RakeBuilder < Gem::Ext::Builder
 
-  def self.build(extension, directory, dest_path, results, args=[], lib_dir=nil)
-    if File.basename(extension) =~ /mkrf_conf/i then
-      cmd = "#{Gem.ruby} #{File.basename extension}".dup
-      cmd << " #{args.join " "}" unless args.empty?
-      run cmd, results
+  def self.build(extension, dest_path, results, args=[], lib_dir=nil)
+    if File.basename(extension) =~ /mkrf_conf/i
+      run([Gem.ruby, File.basename(extension), *args], results)
     end
 
-    # Deal with possible spaces in the path, e.g. C:/Program Files
-    dest_path = '"' + dest_path.to_s + '"' if dest_path.to_s.include?(' ')
-
     rake = ENV['rake']
 
-    rake ||= begin
-               "#{Gem.ruby} -rrubygems #{Gem.bin_path('rake', 'rake')}"
-             rescue Gem::Exception
-             end
-
-    rake ||= Gem.default_exec_format % 'rake'
-
-    cmd = "#{rake} RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
+    if rake
+      rake = rake.shellsplit
+    else
+      begin
+        rake = [Gem.ruby, "-rrubygems", Gem.bin_path('rake', 'rake')]
+      rescue Gem::Exception
+        rake = [Gem.default_exec_format % 'rake']
+      end
+    end
 
-    run cmd, results
+    rake_args = ["RUBYARCHDIR=#{dest_path}", "RUBYLIBDIR=#{dest_path}", *args]
+    run(rake + rake_args, results)
 
     results
   end
 
 end
-

data/lib/rubygems/ext.rb

@@ -16,4 +16,3 @@ require 'rubygems/ext/configure_builder'
 require 'rubygems/ext/ext_conf_builder'
 require 'rubygems/ext/rake_builder'
 require 'rubygems/ext/cmake_builder'
-

data/lib/rubygems/gem_runner.rb

@@ -38,7 +38,7 @@ class Gem::GemRunner
   ##
   # Run the gem command with the following arguments.
 
-  def run args
+  def run(args)
     build_args = extract_build_args args
 
     do_configuration args
@@ -63,7 +63,7 @@ class Gem::GemRunner
   # Separates the build arguments (those following <code>--</code>) from the
   # other arguments in the list.
 
-  def extract_build_args args # :nodoc:
+  def extract_build_args(args) # :nodoc:
     return [] unless offset = args.index('--')
 
     build_args = args.slice!(offset...args.length)

data/lib/rubygems/gemcutter_utilities.rb

@@ -7,6 +7,8 @@ require 'rubygems/text'
 
 module Gem::GemcutterUtilities
 
+  ERROR_CODE = 1
+
   include Gem::Text
 
   # TODO: move to Gem::Command
@@ -27,11 +29,23 @@ module Gem::GemcutterUtilities
     end
   end
 
+  ##
+  # Add the --otp option
+
+  def add_otp_option
+    add_option('--otp CODE',
+               'Digit code for multifactor authentication') do |value, options|
+      options[:otp] = value
+    end
+  end
+
   ##
   # The API key from the command options or from the user's configuration.
 
   def api_key
-    if options[:key] then
+    if ENV["GEM_HOST_API_KEY"]
+      ENV["GEM_HOST_API_KEY"]
+    elsif options[:key]
       verify_api_key options[:key]
     elsif Gem.configuration.api_keys.key?(host)
       Gem.configuration.api_keys[host]
@@ -69,7 +83,7 @@ module Gem::GemcutterUtilities
     self.host = host if host
     unless self.host
       alert_error "You must specify a gem server"
-      terminate_interaction 1 # TODO: question this
+      terminate_interaction(ERROR_CODE)
     end
 
     if allowed_push_host
@@ -78,7 +92,7 @@ module Gem::GemcutterUtilities
 
       unless (host_uri.scheme == allowed_host_uri.scheme) && (host_uri.host == allowed_host_uri.host)
         alert_error "#{self.host.inspect} is not allowed by the gemspec, which only allows #{allowed_push_host.inspect}"
-        terminate_interaction 1
+        terminate_interaction(ERROR_CODE)
       end
     end
 
@@ -93,11 +107,11 @@ module Gem::GemcutterUtilities
   # 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)
     sign_in_host ||= self.host
     return if api_key
 
-    pretty_host = if Gem::DEFAULT_HOST == sign_in_host then
+    pretty_host = if Gem::DEFAULT_HOST == sign_in_host
                     'RubyGems.org'
                   else
                     sign_in_host
@@ -116,6 +130,13 @@ module Gem::GemcutterUtilities
       request.basic_auth email, password
     end
 
+    if need_otp? response
+      response = rubygems_api_request(:get, "api/v1/api_key", sign_in_host) do |request|
+        request.basic_auth email, password
+        request.add_field "OTP", options[:otp]
+      end
+    end
+
     with_response response do |resp|
       say "Signed in."
       set_api_key host, resp.body
@@ -127,11 +148,11 @@ module Gem::GemcutterUtilities
   # an error.
 
   def verify_api_key(key)
-    if Gem.configuration.api_keys.key? key then
+    if Gem.configuration.api_keys.key? key
       Gem.configuration.api_keys[key]
     else
       alert_error "No such API key. Please add it to your configuration (done automatically on initial `gem push`)."
-      terminate_interaction 1 # TODO: question this
+      terminate_interaction(ERROR_CODE)
     end
   end
 
@@ -142,10 +163,10 @@ module Gem::GemcutterUtilities
   # If the response was not successful, shows an error to the user including
   # the +error_prefix+ and the response body.
 
-  def with_response response, error_prefix = nil
+  def with_response(response, error_prefix = nil)
     case response
     when Net::HTTPSuccess then
-      if block_given? then
+      if block_given?
         yield response
       else
         say clean_text(response.body)
@@ -155,11 +176,25 @@ module Gem::GemcutterUtilities
       message = "#{error_prefix}: #{message}" if error_prefix
 
       say clean_text(message)
-      terminate_interaction 1 # TODO: question this
+      terminate_interaction(ERROR_CODE)
     end
   end
 
-  def set_api_key host, key
+  ##
+  # Returns true when the user has enabled multifactor authentication from
+  # +response+ text.
+
+  def need_otp?(response)
+    return unless response.kind_of?(Net::HTTPUnauthorized) &&
+        response.body.start_with?('You have enabled multifactor authentication')
+    return true if options[:otp]
+
+    say 'You have enabled multi-factor authentication. Please enter OTP code.'
+    options[:otp] = ask 'Code: '
+    true
+  end
+
+  def set_api_key(host, key)
     if host == Gem::DEFAULT_HOST
       Gem.configuration.rubygems_api_key = key
     else
@@ -168,4 +203,3 @@ module Gem::GemcutterUtilities
   end
 
 end
-

data/lib/rubygems/indexer.rb

@@ -4,10 +4,17 @@ 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 LoadError
+rescue *rescue_exceptions
 end
 
 ##
@@ -55,7 +62,7 @@ class Gem::Indexer
     require 'tmpdir'
     require 'zlib'
 
-    unless defined?(Builder::XChar) then
+    unless defined?(Builder::XChar)
       raise "Gem::Indexer requires that the XML Builder library be installed:" +
             "\n\tgem install builder"
     end
@@ -109,7 +116,7 @@ class Gem::Indexer
   ##
   # Builds Marshal quick index gemspecs.
 
-  def build_marshal_gemspecs specs
+  def build_marshal_gemspecs(specs)
     count = specs.count
     progress = ui.progress_reporter count,
                                     "Generating Marshal quick index gemspecs for #{count} gems",
@@ -154,7 +161,7 @@ class Gem::Indexer
           platform = spec.original_platform
 
           # win32-api-1.0.4-x86-mswin32-60
-          unless String === platform then
+          unless String === platform
             alert_warning "Skipping invalid platform in gem: #{spec.full_name}"
             next
           end
@@ -172,7 +179,7 @@ class Gem::Indexer
   ##
   # Builds indices for RubyGems 1.2 and newer. Handles full, latest, prerelease
 
-  def build_modern_indices specs
+  def build_modern_indices(specs)
     prerelease, released = specs.partition { |s|
       s.version.prerelease?
     }
@@ -192,9 +199,9 @@ class Gem::Indexer
                "#{@prerelease_specs_index}.gz"]
   end
 
-  def map_gems_to_specs gems
+  def map_gems_to_specs(gems)
     gems.map { |gemfile|
-      if File.size(gemfile) == 0 then
+      if File.size(gemfile) == 0
         alert_warning "Skipping zero-length gem: #{gemfile}"
         next
       end
@@ -228,7 +235,7 @@ class Gem::Indexer
     say "Compressing indices"
 
     Gem.time 'Compressed indices' do
-      if @build_modern then
+      if @build_modern
         gzip @specs_index
         gzip @latest_specs_index
         gzip @prerelease_specs_index
@@ -271,7 +278,7 @@ class Gem::Indexer
   # List of gem file names to index.
 
   def gem_file_list
-    Dir[File.join(@dest_directory, "gems", '*.gem')]
+    Gem::Util.glob_files_in_dir("*.gem", File.join(@dest_directory, "gems"))
   end
 
   ##
@@ -306,7 +313,7 @@ class Gem::Indexer
     files = @files
     files.delete @quick_marshal_dir if files.include? @quick_dir
 
-    if files.include? @quick_marshal_dir and not files.include? @quick_dir then
+    if files.include? @quick_marshal_dir and not files.include? @quick_dir
       files.delete @quick_marshal_dir
 
       dst_name = File.join(@dest_directory, @quick_marshal_dir_base)
@@ -347,7 +354,7 @@ class Gem::Indexer
     data = Gem.read_binary path
     compressed_data = Gem.read_binary "#{path}.#{extension}"
 
-    unless data == Gem::Util.inflate(compressed_data) then
+    unless data == Gem::Util.inflate(compressed_data)
       raise "Compressed file #{compressed_path} does not match uncompressed file #{path}"
     end
   end
@@ -367,7 +374,7 @@ class Gem::Indexer
       gem_mtime >= specs_mtime
     end
 
-    if updated_gems.empty? then
+    if updated_gems.empty?
       say 'No new gems'
       terminate_interaction 0
     end

data/lib/rubygems/install_default_message.rb

@@ -10,4 +10,3 @@ Gem.post_install do |installer|
   ui = Gem::DefaultUserInteraction.ui
   ui.say "Successfully installed #{installer.spec.full_name} as a default gem"
 end
-

data/lib/rubygems/install_message.rb

@@ -10,4 +10,3 @@ Gem.post_install do |installer|
   ui = Gem::DefaultUserInteraction.ui
   ui.say "Successfully installed #{installer.spec.full_name}"
 end
-

data/lib/rubygems/install_update_options.rb

@@ -30,7 +30,7 @@ module Gem::InstallUpdateOptions
       options[:bin_dir] = File.expand_path(value)
     end
 
-    add_option(:"Install/Update",       '--[no-]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|
@@ -50,7 +50,7 @@ module Gem::InstallUpdateOptions
     add_option(:"Install/Update", '--vendor',
                'Install gem into the vendor directory.',
                'Only for use by gem repackagers.') do |value, options|
-      unless Gem.vendor_dir then
+      unless Gem.vendor_dir
         raise OptionParser::InvalidOption.new 'your platform is not supported'
       end
 
@@ -63,30 +63,6 @@ module Gem::InstallUpdateOptions
       options[:document] = []
     end
 
-    add_option(:Deprecated, '--[no-]rdoc',
-               'Generate RDoc for installed gems',
-               'Use --document instead') do |value, options|
-      if value then
-        options[:document] << 'rdoc'
-      else
-        options[:document].delete 'rdoc'
-      end
-
-      options[:document].uniq!
-    end
-
-    add_option(:Deprecated, '--[no-]ri',
-               'Generate ri data for installed gems.',
-               'Use --document instead') do |value, options|
-      if value then
-        options[:document] << 'ri'
-      else
-        options[:document].delete 'ri'
-      end
-
-      options[:document].uniq!
-    end
-
     add_option(:"Install/Update", '-E', '--[no-]env-shebang',
                "Rewrite the shebang line on installed",
                "scripts to use /usr/bin/env") do |value, options|
@@ -164,7 +140,7 @@ module Gem::InstallUpdateOptions
         File.exist? file
       end unless v
 
-      unless v then
+      unless v
         message = v ? v : "(tried #{Gem::GEM_DEP_FILES.join ', '})"
 
         raise OptionParser::InvalidArgument,
@@ -202,7 +178,6 @@ module Gem::InstallUpdateOptions
                'Suggest alternates when gems are not found') do |v,o|
       options[:suggest_alternate] = v
     end
-
   end
 
   ##
@@ -213,4 +188,3 @@ module Gem::InstallUpdateOptions
   end
 
 end
-