rubygems-update 3.2.0.rc.1 → 3.2.0.rc.2

data/lib/rubygems/commands/server_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/command'
 require 'rubygems/server'
 
 class Gem::Commands::ServerCommand < Gem::Command
-
   def initialize
     super 'server', 'Documentation and gem repository HTTP server',
           :port => 8808, :gemdir => [], :daemon => false
@@ -82,5 +81,4 @@ You can set up a shortcut to gem server documentation using the URL:
     options[:gemdir] = Gem.path if options[:gemdir].empty?
     Gem::Server.run options
   end
-
 end

data/lib/rubygems/commands/setup_command.rb

@@ -6,7 +6,6 @@ require 'rubygems/command'
 # RubyGems checkout or tarball.
 
 class Gem::Commands::SetupCommand < Gem::Command
-
   HISTORY_HEADER = /^===\s*[\d.a-zA-Z]+\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
   VERSION_MATCHER = /^===\s*([\d.a-zA-Z]+)\s*\/\s*\d{4}-\d{2}-\d{2}\s*$/.freeze
 
@@ -16,7 +15,7 @@ class Gem::Commands::SetupCommand < Gem::Command
     require 'tmpdir'
 
     super 'setup', 'Install RubyGems',
-          :format_executable => true, :document => %w[ri],
+          :format_executable => false, :document => %w[ri],
           :force => true,
           :site_or_vendor => 'sitelibdir',
           :destdir => '', :prefix => '', :previous_version => '',
@@ -534,14 +533,14 @@ By default, this RubyGems will install gem as:
   # for installation of bundler as default gems
   def bundler_man1_files_in(dir)
     Dir.chdir dir do
-      Dir['bundle*.1{,.txt}']
+      Dir['bundle*.1{,.txt,.ronn}']
     end
   end
 
   # for installation of bundler as default gems
   def bundler_man5_files_in(dir)
     Dir.chdir dir do
-      Dir['gemfile.5{,.txt}']
+      Dir['gemfile.5{,.txt,.ronn}']
     end
   end
 
@@ -618,15 +617,16 @@ abort "#{deprecation_message}"
   def remove_old_man_files(man_dir)
     man_dirs = { man_dir => "bundler/man" }
     man_dirs.each do |old_man_dir, new_man_dir|
-      man1_files = bundler_man1_files_in(new_man_dir)
-
-      old_man1_dir = "#{old_man_dir}/man1"
+      ["1", "5"].each do |section|
+        man_files = send(:"bundler_man#{section}_files_in", new_man_dir)
 
-      old_man1_files = bundler_man1_files_in(old_man1_dir)
+        old_man_dir_with_section = "#{old_man_dir}/man#{section}"
+        old_man_files = send(:"bundler_man#{section}_files_in", old_man_dir_with_section)
 
-      man1_to_remove = old_man1_files - man1_files
+        man_to_remove = old_man_files - man_files
 
-      remove_file_list(man1_to_remove, old_man1_dir)
+        remove_file_list(man_to_remove, old_man_dir_with_section)
+      end
     end
   end
 
@@ -639,8 +639,6 @@ abort "#{deprecation_message}"
 
         history.force_encoding Encoding::UTF_8
 
-        history = history.sub(/^# coding:.*?(?=^=)/m, '')
-
         text = history.split(HISTORY_HEADER)
         text.shift # correct an off-by-one generated by split
         version_lines = history.scan(HISTORY_HEADER)
@@ -736,5 +734,4 @@ abort "#{deprecation_message}"
   def bin_file_names
     @bin_file_names ||= []
   end
-
 end

data/lib/rubygems/commands/signin_command.rb

@@ -3,7 +3,6 @@ require 'rubygems/command'
 require 'rubygems/gemcutter_utilities'
 
 class Gem::Commands::SigninCommand < Gem::Command
-
   include Gem::GemcutterUtilities
 
   def initialize
@@ -31,5 +30,4 @@ class Gem::Commands::SigninCommand < Gem::Command
   def execute
     sign_in options[:host]
   end
-
 end

data/lib/rubygems/commands/signout_command.rb

@@ -2,7 +2,6 @@
 require 'rubygems/command'
 
 class Gem::Commands::SignoutCommand < Gem::Command
-
   def initialize
     super 'signout', 'Sign out from all the current sessions.'
   end
@@ -29,5 +28,4 @@ class Gem::Commands::SignoutCommand < Gem::Command
       say 'You have successfully signed out from all sessions.'
     end
   end
-
 end

data/lib/rubygems/commands/sources_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/spec_fetcher'
 require 'rubygems/local_remote_options'
 
 class Gem::Commands::SourcesCommand < Gem::Command
-
   include Gem::LocalRemoteOptions
 
   def initialize
@@ -220,5 +219,4 @@ To remove a source use the --remove argument:
       say "*** Unable to remove #{desc} source cache ***"
     end
   end
-
 end

data/lib/rubygems/commands/specification_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/version_option'
 require 'rubygems/package'
 
 class Gem::Commands::SpecificationCommand < Gem::Command
-
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
 
@@ -143,5 +142,4 @@ Specific fields in the specification can be extracted in YAML format:
       say "\n"
     end
   end
-
 end

data/lib/rubygems/commands/stale_command.rb

@@ -2,7 +2,6 @@
 require 'rubygems/command'
 
 class Gem::Commands::StaleCommand < Gem::Command
-
   def initialize
     super('stale', 'List gems along with access times')
   end
@@ -37,5 +36,4 @@ longer using.
       say "#{name} at #{atime.strftime '%c'}"
     end
   end
-
 end

data/lib/rubygems/commands/uninstall_command.rb

@@ -10,7 +10,6 @@ require 'fileutils'
 # See `gem help uninstall`
 
 class Gem::Commands::UninstallCommand < Gem::Command
-
   include Gem::VersionOption
 
   def initialize
@@ -195,5 +194,4 @@ that is a dependency of an existing gem.  You can use the
   def uninstall(gem_name)
     Gem::Uninstaller.new(gem_name, options).uninstall
   end
-
 end

data/lib/rubygems/commands/unpack_command.rb

@@ -13,7 +13,6 @@ module Gem::Security # :nodoc:
 end
 
 class Gem::Commands::UnpackCommand < Gem::Command
-
   include Gem::VersionOption
   include Gem::SecurityOption
 
@@ -173,5 +172,4 @@ command help for an example.
 
     path
   end
-
 end

data/lib/rubygems/commands/update_command.rb

@@ -10,7 +10,6 @@ require 'rubygems/install_message' # must come before rdoc for messaging
 require 'rubygems/rdoc'
 
 class Gem::Commands::UpdateCommand < Gem::Command
-
   include Gem::InstallUpdateOptions
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
@@ -75,6 +74,13 @@ command to remove old versions.
     end
   end
 
+  def check_oldest_rubygems(version) # :nodoc:
+    if oldest_supported_version > version
+      alert_error "rubygems #{version} is not supported. The oldest supported version is #{oldest_supported_version}"
+      terminate_interaction 1
+    end
+  end
+
   def check_update_arguments # :nodoc:
     unless options[:args].empty?
       alert_error "Gem names are not allowed with the --system option"
@@ -168,13 +174,13 @@ command to remove old versions.
     update_dir = File.join Gem.dir, 'gems', "rubygems-update-#{version}"
 
     Dir.chdir update_dir do
-      say "Installing RubyGems #{version}"
+      say "Installing RubyGems #{version}" unless options[:silent]
 
       installed = preparing_gem_layout_for(version) do
         system Gem.ruby, '--disable-gems', 'setup.rb', *args
       end
 
-      say "RubyGems system software updated" if installed
+      say "RubyGems system software updated" if installed unless options[:silent]
     end
   end
 
@@ -215,7 +221,7 @@ command to remove old versions.
     rubygems_update.version = version
 
     hig = {
-      'rubygems-update' => rubygems_update
+      'rubygems-update' => rubygems_update,
     }
 
     gems_to_update = which_to_update hig, options[:args], :system
@@ -238,7 +244,7 @@ command to remove old versions.
 
     @installer = Gem::DependencyInstaller.new update_options
 
-    say "Updating #{name}"
+    say "Updating #{name}" unless options[:system] && options[:silent]
     begin
       @installer.install name, Gem::Requirement.new(version)
     rescue Gem::InstallError, Gem::DependencyError => e
@@ -273,6 +279,8 @@ command to remove old versions.
 
     check_latest_rubygems version
 
+    check_oldest_rubygems version
+
     update_gem 'rubygems-update', version
 
     installed_gems = Gem::Specification.find_all_by_name 'rubygems-update', requirement
@@ -283,6 +291,7 @@ command to remove old versions.
 
   def update_rubygems_arguments # :nodoc:
     args = []
+    args << '--silent' if options[:silent]
     args << '--prefix' << Gem.prefix if Gem.prefix
     args << '--no-document' unless options[:document].include?('rdoc') || options[:document].include?('ri')
     args << '--no-format-executable' if options[:no_format_executable]
@@ -311,4 +320,10 @@ command to remove old versions.
     result
   end
 
+  private
+
+  def oldest_supported_version
+    # for Ruby 2.3
+    @oldest_supported_version ||= Gem::Version.new("2.5.2")
+  end
 end

data/lib/rubygems/commands/which_command.rb

@@ -2,7 +2,6 @@
 require 'rubygems/command'
 
 class Gem::Commands::WhichCommand < Gem::Command
-
   def initialize
     super 'which', 'Find the location of a library file you can require',
           :search_gems_first => false, :show_all => false
@@ -85,5 +84,4 @@ requiring to see why it does not behave as you expect.
   def usage # :nodoc:
     "#{program_name} FILE [FILE ...]"
   end
-
 end

data/lib/rubygems/commands/yank_command.rb

@@ -5,7 +5,6 @@ require 'rubygems/version_option'
 require 'rubygems/gemcutter_utilities'
 
 class Gem::Commands::YankCommand < Gem::Command
-
   include Gem::LocalRemoteOptions
   include Gem::VersionOption
   include Gem::GemcutterUtilities
@@ -97,5 +96,4 @@ data you will need to change them immediately and yank your gem.
   def get_platform_from_requirements(requirements)
     Gem.platforms[1].to_s if requirements.key? :added_platform
   end
-
 end

data/lib/rubygems/config_file.rb

@@ -37,7 +37,6 @@ require 'rbconfig'
 # - per environment (gemrc files listed in the GEMRC environment variable)
 
 class Gem::ConfigFile
-
   include Gem::UserInteraction
 
   DEFAULT_BACKTRACE = false
@@ -497,5 +496,4 @@ if you believe they were disclosed to a third party.
       end
     end
   end
-
 end

data/lib/rubygems/core_ext/kernel_warn.rb

@@ -4,16 +4,14 @@
 if RUBY_VERSION >= "2.5"
 
   module Kernel
-    path = "#{__dir__}/" # Frames to be skipped start with this path.
+    rubygems_path = "#{__dir__}/" # Frames to be skipped start with this path.
 
     original_warn = method(:warn)
 
     remove_method :warn
 
     class << self
-
       remove_method :warn
-
     end
 
     module_function define_method(:warn) {|*messages, **kw|
@@ -40,9 +38,11 @@ if RUBY_VERSION >= "2.5"
 
           start += 1
 
-          unless loc.path.start_with?(path)
-            # Non-rubygems frames
-            uplevel -= 1
+          if path = loc.path
+            unless path.start_with?(rubygems_path) or path.start_with?('<internal:')
+              # Non-rubygems frames
+              uplevel -= 1
+            end
           end
         end
         uplevel = start

data/lib/rubygems/dependency.rb

@@ -3,7 +3,6 @@
 # The Dependency class holds a Gem name and a Gem::Requirement.
 
 class Gem::Dependency
-
   ##
   # Valid dependency types.
   #--
@@ -344,5 +343,4 @@ class Gem::Dependency
       :released
     end
   end
-
 end

data/lib/rubygems/dependency_installer.rb

@@ -12,7 +12,6 @@ require 'rubygems/deprecate'
 # Installs a gem along with all its dependencies from local and remote gems.
 
 class Gem::DependencyInstaller
-
   include Gem::UserInteraction
   extend Gem::Deprecate
 
@@ -335,5 +334,4 @@ class Gem::DependencyInstaller
 
     request_set
   end
-
 end

data/lib/rubygems/dependency_list.rb

@@ -17,7 +17,6 @@ require 'rubygems/deprecate'
 # this class necessary anymore?  Especially #ok?, #why_not_ok?
 
 class Gem::DependencyList
-
   attr_reader :specs
 
   include Enumerable
@@ -240,5 +239,4 @@ class Gem::DependencyList
   def active_count(specs, ignored)
     specs.count {|spec| ignored[spec.full_name].nil? }
   end
-
 end

data/lib/rubygems/doctor.rb

@@ -12,7 +12,6 @@ require 'rubygems/user_interaction'
 # removing the bogus specification.
 
 class Gem::Doctor
-
   include Gem::UserInteraction
 
   ##
@@ -129,5 +128,4 @@ class Gem::Doctor
   rescue Errno::ENOENT
     # ignore
   end
-
 end

data/lib/rubygems/errors.rb

@@ -13,13 +13,11 @@ module Gem
   # already activated gems or that RubyGems is otherwise unable to activate.
 
   class LoadError < ::LoadError
-
     # Name of gem
     attr_accessor :name
 
     # Version requirement of gem
     attr_accessor :requirement
-
   end
 
   ##
@@ -27,7 +25,6 @@ module Gem
   # system.  Instead of rescuing from this class, make sure to rescue from the
   # superclass Gem::LoadError to catch all types of load errors.
   class MissingSpecError < Gem::LoadError
-
     def initialize(name, requirement, extra_message=nil)
       @name        = name
       @requirement = requirement
@@ -45,7 +42,6 @@ module Gem
       total = Gem::Specification.stubs.size
       "Could not find '#{name}' (#{requirement}) among #{total} total gem(s)\n"
     end
-
   end
 
   ##
@@ -53,7 +49,6 @@ module Gem
   # not the requested version. Instead of rescuing from this class, make sure to
   # rescue from the superclass Gem::LoadError to catch all types of load errors.
   class MissingSpecVersionError < MissingSpecError
-
     attr_reader :specs
 
     def initialize(name, requirement, specs)
@@ -70,13 +65,11 @@ module Gem
       names = specs.map(&:full_name)
       "Could not find '#{name}' (#{requirement}) - did find: [#{names.join ','}]\n"
     end
-
   end
 
   # Raised when there are conflicting gem specs loaded
 
   class ConflictError < LoadError
-
     ##
     # A Hash mapping conflicting specifications to the dependencies that
     # caused the conflict
@@ -101,7 +94,6 @@ module Gem
 
       super("Unable to activate #{target.full_name}, because #{reason}")
     end
-
   end
 
   class ErrorReason; end
@@ -113,7 +105,6 @@ module Gem
   # in figuring out why a gem couldn't be installed.
   #
   class PlatformMismatch < ErrorReason
-
     ##
     # the name of the gem
     attr_reader :name
@@ -151,7 +142,6 @@ module Gem
          @platforms.size == 1 ? '' : 's',
          @platforms.join(' ,')]
     end
-
   end
 
   ##
@@ -159,7 +149,6 @@ module Gem
   # data from a source
 
   class SourceFetchProblem < ErrorReason
-
     ##
     # Creates a new SourceFetchProblem for the given +source+ and +error+.
 
@@ -190,6 +179,5 @@ module Gem
     # The "exception" alias allows you to call raise on a SourceFetchProblem.
 
     alias exception error
-
   end
 end