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

data/lib/rubygems/test_utilities.rb

@@ -29,7 +29,6 @@ require 'rubygems/remote_fetcher'
 # See RubyGems' tests for more examples of FakeFetcher.
 
 class Gem::FakeFetcher
-
   attr_reader :data
   attr_reader :last_request
   attr_accessor :paths
@@ -162,16 +161,13 @@ class Gem::FakeFetcher
 
     download spec, source.uri.to_s
   end
-
 end
 
 # :stopdoc:
 class Gem::RemoteFetcher
-
   def self.fetcher=(fetcher)
     @fetcher = fetcher
   end
-
 end
 # :startdoc:
 
@@ -191,7 +187,6 @@ end
 # After the gems are created they are removed from Gem.dir.
 
 class Gem::TestCase::SpecFetcherSetup
-
   ##
   # Executes a SpecFetcher setup block.  Yields an instance then creates the
   # gems and specifications defined in the instance.
@@ -346,7 +341,6 @@ class Gem::TestCase::SpecFetcherSetup
       io.write spec.to_ruby_for_cache
     end
   end
-
 end
 
 ##
@@ -358,7 +352,6 @@ end
 # This class was added to flush out problems in Rubinius' IO implementation.
 
 class TempIO < Tempfile
-
   ##
   # Creates a new TempIO that will be initialized to contain +string+.
 
@@ -376,5 +369,4 @@ class TempIO < Tempfile
     flush
     Gem.read_binary path
   end
-
 end

data/lib/rubygems/uninstaller.rb

@@ -21,7 +21,6 @@ require 'rubygems/user_interaction'
 # file.  See Gem.pre_uninstall and Gem.post_uninstall for details.
 
 class Gem::Uninstaller
-
   include Gem::UserInteraction
 
   include Gem::InstallerUninstallerUtils
@@ -374,5 +373,4 @@ class Gem::Uninstaller
 
     raise e
   end
-
 end

data/lib/rubygems/uri_formatter.rb

@@ -9,7 +9,6 @@ require 'cgi'
 #   p uf.normalize #=> 'http://example.com'
 
 class Gem::UriFormatter
-
   ##
   # The URI to be formatted.
 
@@ -44,5 +43,4 @@ class Gem::UriFormatter
     return unless @uri
     CGI.unescape @uri
   end
-
 end

data/lib/rubygems/uri_parser.rb

@@ -5,7 +5,6 @@
 #
 
 class Gem::UriParser
-
   ##
   # Parses the #uri, raising if it's invalid
 
@@ -32,5 +31,4 @@ class Gem::UriParser
   rescue URI::InvalidURIError
     uri
   end
-
 end

data/lib/rubygems/user_interaction.rb

@@ -172,7 +172,6 @@ end
 # Gem::StreamUI implements a simple stream based user interface.
 
 class Gem::StreamUI
-
   extend Gem::Deprecate
 
   ##
@@ -387,7 +386,6 @@ class Gem::StreamUI
   # An absolutely silent progress reporter.
 
   class SilentProgressReporter
-
     ##
     # The count of items is never updated for the silent progress reporter.
 
@@ -412,14 +410,12 @@ class Gem::StreamUI
 
     def done
     end
-
   end
 
   ##
   # A basic dotted progress reporter.
 
   class SimpleProgressReporter
-
     include Gem::DefaultUserInteraction
 
     ##
@@ -457,14 +453,12 @@ class Gem::StreamUI
     def done
       @out.puts "\n#{@terminal_message}"
     end
-
   end
 
   ##
   # A progress reporter that prints out messages about the current progress.
 
   class VerboseProgressReporter
-
     include Gem::DefaultUserInteraction
 
     ##
@@ -501,7 +495,6 @@ class Gem::StreamUI
     def done
       @out.puts @terminal_message
     end
-
   end
 
   ##
@@ -519,7 +512,6 @@ class Gem::StreamUI
   # An absolutely silent download reporter.
 
   class SilentDownloadReporter
-
     ##
     # The silent download reporter ignores all arguments
 
@@ -545,14 +537,12 @@ class Gem::StreamUI
 
     def done
     end
-
   end
 
   ##
   # A progress reporter that behaves nicely with threaded downloading.
 
   class ThreadedDownloadReporter
-
     MUTEX = Mutex.new
 
     ##
@@ -601,9 +591,7 @@ class Gem::StreamUI
         @out.puts message
       end
     end
-
   end
-
 end
 
 ##
@@ -611,7 +599,6 @@ end
 # STDOUT, and STDERR.
 
 class Gem::ConsoleUI < Gem::StreamUI
-
   ##
   # The Console UI has no arguments as it defaults to reading input from
   # stdin, output to stdout and warnings or errors to stderr.
@@ -619,14 +606,12 @@ class Gem::ConsoleUI < Gem::StreamUI
   def initialize
     super STDIN, STDOUT, STDERR, true
   end
-
 end
 
 ##
 # SilentUI is a UI choice that is absolutely silent.
 
 class Gem::SilentUI < Gem::StreamUI
-
   ##
   # The SilentUI has no arguments as it does not use any stream.
 
@@ -652,5 +637,4 @@ class Gem::SilentUI < Gem::StreamUI
   def progress_reporter(*args) # :nodoc:
     SilentProgressReporter.new(@outs, *args)
   end
-
 end

data/lib/rubygems/util.rb

@@ -71,11 +71,9 @@ module Gem::Util
   end
 
   class << self
-
     extend Gem::Deprecate
 
     rubygems_deprecate :silent_system
-
   end
 
   ##

data/lib/rubygems/util/licenses.rb

@@ -2,7 +2,6 @@
 require 'rubygems/text'
 
 class Gem::Licenses
-
   extend Gem::Text
 
   NONSTANDARD = 'Nonstandard'.freeze
@@ -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:
@@ -141,5 +140,4 @@ class Gem::Validator
 
     errors
   end
-
 end

data/lib/rubygems/version.rb

@@ -150,7 +150,6 @@
 # a zero to give a sensible result.
 
 class Gem::Version
-
   autoload :Requirement, File.expand_path('requirement', __dir__)
 
   include Comparable
@@ -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/rubygems-update.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rubygems-update"
-  s.version = "3.2.0.rc.1"
+  s.version = "3.2.0.rc.2"
   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"]
 

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/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 defined?(OpenSSL::SSL)
+  warn 'Skipping bundled certificates tests.  openssl not found.'
+end
+
 require 'rubygems/request'
 
 # = Testing Bundled CA
@@ -8,52 +14,43 @@ 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__
+class TestBundledCA < Gem::TestCase
+  def bundled_certificate_store
+    store = OpenSSL::X509::Store.new
 
-    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)
-      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
+    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_fastly
+    assert_https('rubygems.global.ssl.fastly.net')
+  end
 
+  def test_accessing_new_index
+    assert_https('fastly.rubygems.org')
   end
-end
+end if defined?(OpenSSL::SSL)

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

@@ -3,7 +3,6 @@ require 'rubygems/test_case'
 require 'rubygems/deprecate'
 
 class TestDeprecate < Gem::TestCase
-
   def setup
     super
 
@@ -41,7 +40,6 @@ class TestDeprecate < Gem::TestCase
   end
 
   class Thing
-
     extend Gem::Deprecate
     attr_accessor :message
     def foo
@@ -51,11 +49,9 @@ class TestDeprecate < Gem::TestCase
       @message = "bar"
     end
     rubygems_deprecate :foo, :bar
-
   end
 
   class OtherThing
-
     extend Gem::Deprecate
     attr_accessor :message
     def foo
@@ -65,7 +61,6 @@ class TestDeprecate < Gem::TestCase
       @message = "bar"
     end
     deprecate :foo, :bar, 2099, 3
-
   end
 
   def test_deprecated_method_calls_the_old_method
@@ -115,5 +110,4 @@ class TestDeprecate < Gem::TestCase
     assert_match(/Thing#foo is deprecated; use bar instead\./, err)
     assert_match(/on or after 2099-03-01/, err)
   end
-
 end