rubygems-update 3.1.2 → 3.2.6

data/lib/rubygems/util/licenses.rb

@@ -2,14 +2,13 @@
 require 'rubygems/text'
 
 class Gem::Licenses
-
   extend Gem::Text
 
   NONSTANDARD = 'Nonstandard'.freeze
 
   # Software Package Data Exchange (SPDX) standard open-source software
   # license identifiers
-  LICENSE_IDENTIFIERS = %w(
+  LICENSE_IDENTIFIERS = %w[
     0BSD
     AAL
     ADSL
@@ -379,10 +378,10 @@ class Gem::Licenses
     xinetd
     xpp
     zlib-acknowledgement
-  ).freeze
+  ].freeze
 
   # exception identifiers
-  EXCEPTION_IDENTIFIERS = %w(
+  EXCEPTION_IDENTIFIERS = %w[
     389-exception
     Autoconf-exception-2.0
     Autoconf-exception-3.0
@@ -410,7 +409,7 @@ class Gem::Licenses
     mif-exception
     openvpn-openssl-exception
     u-boot-exception-2.0
-  ).freeze
+  ].freeze
 
   REGEXP = %r{
     \A
@@ -435,5 +434,4 @@ class Gem::Licenses
     return unless lowest < license.size
     by_distance[lowest]
   end
-
 end

data/lib/rubygems/util/list.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 module Gem
   class List
-
     include Enumerable
     attr_accessor :value, :tail
 
@@ -34,6 +33,5 @@ module Gem
       return List.new(value) unless list
       List.new value, list
     end
-
   end
 end

data/lib/rubygems/validator.rb

@@ -12,7 +12,6 @@ require 'rubygems/installer'
 # Validator performs various gem file and gem database validation
 
 class Gem::Validator
-
   include Gem::UserInteraction
 
   def initialize # :nodoc:
@@ -60,7 +59,7 @@ class Gem::Validator
   # TODO needs further cleanup
 
   def alien(gems=[])
-    errors = Hash.new { |h,k| h[k] = {} }
+    errors = Hash.new {|h,k| h[k] = {} }
 
     Gem::Specification.each do |spec|
       next unless gems.include? spec.name unless gems.empty?
@@ -141,5 +140,4 @@ class Gem::Validator
 
     errors
   end
-
 end

data/lib/rubygems/version.rb

@@ -150,8 +150,7 @@
 # a zero to give a sensible result.
 
 class Gem::Version
-
-  autoload :Requirement, 'rubygems/requirement'
+  autoload :Requirement, File.expand_path('requirement', __dir__)
 
   include Comparable
 
@@ -187,7 +186,7 @@ class Gem::Version
   #   ver3 = Version.create(nil)        # -> nil
 
   def self.create(input)
-    if self === input  # check yourself before you wreck yourself
+    if self === input # check yourself before you wreck yourself
       input
     elsif input.nil?
       nil
@@ -231,7 +230,7 @@ class Gem::Version
   def bump
     @@bump[self] ||= begin
                        segments = self.segments
-                       segments.pop while segments.any? { |s| String === s }
+                       segments.pop while segments.any? {|s| String === s }
                        segments.pop if segments.size > 1
 
                        segments[-1] = segments[-1].succ
@@ -310,7 +309,7 @@ class Gem::Version
   def release
     @@release[self] ||= if prerelease?
                           segments = self.segments
-                          segments.pop while segments.any? { |s| String === s }
+                          segments.pop while segments.any? {|s| String === s }
                           self.class.new segments.join('.')
                         else
                           self
@@ -327,7 +326,7 @@ class Gem::Version
   def approximate_recommendation
     segments = self.segments
 
-    segments.pop    while segments.any? { |s| String === s }
+    segments.pop    while segments.any? {|s| String === s }
     segments.pop    while segments.size > 2
     segments.push 0 while segments.size < 2
 
@@ -404,5 +403,4 @@ class Gem::Version
     numeric_segments = string_segments.slice!(0, string_start || string_segments.size)
     return numeric_segments, string_segments
   end
-
 end

data/lib/rubygems/version_option.rb

@@ -73,4 +73,10 @@ module Gem::VersionOption
     end
   end
 
+  ##
+  # Extract platform given on the command line
+
+  def get_platform_from_requirements(requirements)
+    Gem.platforms[1].to_s if requirements.key? :added_platform
+  end
 end

data/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.1.2"
+  s.version = "3.2.6"
   s.authors = ["Jim Weirich", "Chad Fowler", "Eric Hodel", "Luis Lavena", "Aaron Patterson", "Samuel Giddins", "André Arko", "Evan Phoenix", "Hiroshi SHIBATA"]
   s.email = ["", "", "drbrain@segment7.net", "luislavena@gmail.com", "aaron@tenderlovemaking.com", "segiddins@segiddins.me", "andre@arko.net", "evan@phx.io", "hsbt@ruby-lang.org"]
 
@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["hide_lib_for_update"]
   s.rdoc_options = ["--main", "README.md", "--title=RubyGems Update Documentation"]
   s.extra_rdoc_files = [
-    "History.txt", "LICENSE.txt", "MAINTAINERS.txt",
+    "CHANGELOG.md", "LICENSE.txt", "MAINTAINERS.txt",
     "MIT.txt", "Manifest.txt", "README.md",
     "UPGRADING.md", "POLICIES.md", "CODE_OF_CONDUCT.md",
-    "CONTRIBUTING.md", "bundler/CHANGELOG.md", "bundler/CODE_OF_CONDUCT.md",
+    "CONTRIBUTING.md", "bundler/CHANGELOG.md",
     "bundler/LICENSE.md", "bundler/README.md",
     "hide_lib_for_update/note.txt", *Dir["bundler/man/*.1"]
   ]

data/setup.rb

@@ -11,12 +11,7 @@ if ENV['RUBYOPT'] or defined? Gem
   ENV.delete 'RUBYOPT'
 
   require 'rbconfig'
-  config = defined?(RbConfig) ? RbConfig : Config
-
-  ruby = File.join config::CONFIG['bindir'], config::CONFIG['ruby_install_name']
-  ruby << config::CONFIG['EXEEXT']
-
-  cmd = [ruby, 'setup.rb', *ARGV].compact
+  cmd = [RbConfig.ruby, 'setup.rb', *ARGV].compact
   cmd[1,0] = "--disable-gems"
 
   exec(*cmd)
@@ -24,7 +19,7 @@ end
 
 Dir.chdir File.dirname(__FILE__)
 
-$:.unshift 'lib'
+$:.unshift File.expand_path('lib')
 require 'rubygems'
 require 'rubygems/gem_runner'
 require 'rubygems/exceptions'

data/test/rubygems/plugin/load/rubygems_plugin.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 class TestGem
-
   TEST_PLUGIN_LOAD = :loaded
-
 end

data/test/rubygems/rubygems/commands/crash_command.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
 class Gem::Commands::CrashCommand < Gem::Command
-
   raise "crash"
-
 end

data/test/rubygems/rubygems_plugin.rb

@@ -11,7 +11,6 @@ module Gem::Commands
 end
 
 class Gem::Commands::InterruptCommand < Gem::Command
-
   def initialize
     super('interrupt', 'Raises an Interrupt Exception', {})
   end
@@ -19,7 +18,6 @@ class Gem::Commands::InterruptCommand < Gem::Command
   def execute
     raise Interrupt, "Interrupt exception"
   end
-
 end
 
 Gem::CommandManager.instance.register_command :interrupt

data/test/rubygems/specifications/bar-0.0.2.gemspec

@@ -1,5 +1,3 @@
-# -*- encoding: utf-8 -*-
-
 Gem::Specification.new do |s|
   s.name          = "bar"
   s.version       = "0.0.2"

data/test/rubygems/specifications/rubyforge-0.0.1.gemspec

@@ -0,0 +1,12 @@
+Gem::Specification.new do |s|
+  s.name              = "rubyforge"
+  s.version           = "0.0.1"
+  s.platform          = "ruby"
+  s.require_paths     = ["lib"]
+  s.summary           = "A very bar gem"
+  s.authors           = ["unknown"]
+  s.license           = 'MIT'
+  s.homepage          = 'http://example.com'
+  s.files             = ['README.md']
+  s.rubyforge_project = 'abc'
+end

data/test/rubygems/test_bundled_ca.rb

@@ -1,6 +1,12 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
-require 'net/https'
+require 'net/http'
+require 'rubygems/openssl'
+
+unless Gem::HAVE_OPENSSL
+  warn 'Skipping bundled certificates tests.  openssl not found.'
+end
+
 require 'rubygems/request'
 
 # = Testing Bundled CA
@@ -8,56 +14,47 @@ require 'rubygems/request'
 # The tested hosts are explained in detail here: https://github.com/rubygems/rubygems/commit/5e16a5428f973667cabfa07e94ff939e7a83ebd9
 #
 
-if ENV["CI"] || ENV["TEST_SSL"]
-  class TestBundledCA < Gem::TestCase
-
-    THIS_FILE = File.expand_path __FILE__
-
-    def bundled_certificate_store
-      store = OpenSSL::X509::Store.new
+class TestBundledCA < Gem::TestCase
+  def bundled_certificate_store
+    store = OpenSSL::X509::Store.new
 
-      ssl_cert_glob =
-        File.expand_path '../../../lib/rubygems/ssl_certs/*/*.pem', THIS_FILE
-
-      Dir[ssl_cert_glob].each do |ssl_cert|
-        store.add_file ssl_cert
-      end
-
-      store
+    Gem::Request.get_cert_files.each do |ssl_cert|
+      store.add_file ssl_cert
     end
 
-    def assert_https(host)
-      if self.respond_to? :_assertions # minitest <= 4
-        self._assertions += 1
-      else # minitest >= 5
-        self.assertions += 1
-      end
-      http = Net::HTTP.new(host, 443)
-      http.use_ssl = true
-      http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      http.cert_store = bundled_certificate_store
-      http.get('/')
-    rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
-      skip "#{host} seems offline, I can't tell whether ssl would work."
-    rescue OpenSSL::SSL::SSLError => e
-      # Only fail for certificate verification errors
-      if e.message =~ /certificate verify failed/
-        flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
-      end
-      raise
-    end
+    store
+  end
 
-    def test_accessing_rubygems
-      assert_https('rubygems.org')
+  def assert_https(host)
+    self.assertions += 1
+    http = Net::HTTP.new(host, 443)
+    http.use_ssl = true
+    http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+    http.cert_store = bundled_certificate_store
+    http.get('/')
+  rescue Errno::ENOENT, Errno::ETIMEDOUT, SocketError
+    skip "#{host} seems offline, I can't tell whether ssl would work."
+  rescue OpenSSL::SSL::SSLError => e
+    # Only fail for certificate verification errors
+    if e.message =~ /certificate verify failed/
+      flunk "#{host} is not verifiable using the included certificates. Error was: #{e.message}"
     end
+    raise
+  end
 
-    def test_accessing_fastly
-      assert_https('rubygems.global.ssl.fastly.net')
-    end
+  def test_accessing_rubygems
+    assert_https('rubygems.org')
+  end
 
-    def test_accessing_new_index
-      assert_https('fastly.rubygems.org')
-    end
+  def test_accessing_www_rubygems
+    assert_https('www.rubygems.org')
+  end
 
+  def test_accessing_staging
+    assert_https('staging.rubygems.org')
   end
-end
+
+  def test_accessing_new_index
+    assert_https('index.rubygems.org')
+  end
+end if Gem::HAVE_OPENSSL

data/test/rubygems/test_config.rb

@@ -4,7 +4,6 @@ require 'rubygems'
 require 'shellwords'
 
 class TestConfig < Gem::TestCase
-
   def test_datadir
     util_make_gems
     spec = Gem::Specification.find_by_name("a")
@@ -25,5 +24,4 @@ class TestConfig < Gem::TestCase
     assert_equal(Gem.ruby, ruby)
     assert_match(/\/bad_rake.rb\z/, rake)
   end
-
 end

data/test/rubygems/test_deprecate.rb

@@ -1,15 +1,11 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
-# require 'rubygems/builder'
-# require 'rubygems/package'
 require 'rubygems/deprecate'
 
 class TestDeprecate < Gem::TestCase
-
   def setup
     super
 
-    # Gem::Deprecate.saved_warnings.clear
     @original_skip = Gem::Deprecate.skip
     Gem::Deprecate.skip = false
   end
@@ -17,7 +13,6 @@ class TestDeprecate < Gem::TestCase
   def teardown
     super
 
-    # Gem::Deprecate.saved_warnings.clear
     Gem::Deprecate.skip = @original_skip
   end
 
@@ -45,7 +40,18 @@ class TestDeprecate < Gem::TestCase
   end
 
   class Thing
+    extend Gem::Deprecate
+    attr_accessor :message
+    def foo
+      @message = "foo"
+    end
+    def bar
+      @message = "bar"
+    end
+    rubygems_deprecate :foo, :bar
+  end
 
+  class OtherThing
     extend Gem::Deprecate
     attr_accessor :message
     def foo
@@ -55,7 +61,6 @@ class TestDeprecate < Gem::TestCase
       @message = "bar"
     end
     deprecate :foo, :bar, 2099, 3
-
   end
 
   def test_deprecated_method_calls_the_old_method
@@ -74,7 +79,35 @@ class TestDeprecate < Gem::TestCase
 
     assert_equal "", out
     assert_match(/Thing#foo is deprecated; use bar instead\./, err)
-    assert_match(/on or after 2099-03-01/, err)
+    assert_match(/in Rubygems [0-9]+/, err)
+  end
+
+  def test_rubygems_deprecate_command
+    require 'rubygems/command'
+    foo_command = Class.new(Gem::Command) do
+      extend Gem::Deprecate
+
+      rubygems_deprecate_command
+
+      def execute
+        puts "pew pew!"
+      end
+    end
+
+    Gem::Commands.send(:const_set, :FooCommand, foo_command)
+    assert Gem::Commands::FooCommand.new("foo").deprecated?
+  ensure
+    Gem::Commands.send(:remove_const, :FooCommand)
   end
 
+  def test_deprecated_method_outputs_a_warning_old_way
+    out, err = capture_io do
+      thing = OtherThing.new
+      thing.foo
+    end
+
+    assert_equal "", out
+    assert_match(/Thing#foo is deprecated; use bar instead\./, err)
+    assert_match(/on or after 2099-03-01/, err)
+  end
 end