rubygems-update 2.7.6 → 2.7.11

data/lib/rubygems/test_utilities.rb

@@ -64,7 +64,7 @@ class Gem::FakeFetcher
       data.call
     else
       if path.to_s =~ /gz$/ and not data.nil? and not data.empty? then
-        data = Gem.gunzip data
+        data = Gem::Util.gunzip data
       end
 
       data

data/lib/rubygems/user_interaction.rb

@@ -6,6 +6,8 @@
 #++
 
 require 'rubygems/util'
+require 'rubygems/deprecate'
+require 'rubygems/text'
 
 ##
 # Module that defines the default UserInteraction.  Any class including this
@@ -13,6 +15,8 @@ require 'rubygems/util'
 
 module Gem::DefaultUserInteraction
 
+  include Gem::Text
+
   ##
   # The default UI is a class variable of the singleton class for this
   # module.
@@ -160,8 +164,8 @@ module Gem::UserInteraction
   # Calls +say+ with +msg+ or the results of the block if really_verbose
   # is true.
 
-  def verbose msg = nil
-    say(msg || yield) if Gem.configuration.really_verbose
+  def verbose(msg = nil)
+    say(clean_text(msg || yield)) if Gem.configuration.really_verbose
   end
 end
 
@@ -170,6 +174,8 @@ end
 
 class Gem::StreamUI
 
+  extend Gem::Deprecate
+
   ##
   # The input stream
 
@@ -384,6 +390,7 @@ class Gem::StreamUI
   def debug(statement)
     @errs.puts statement
   end
+  deprecate :debug, :none, 2018, 12
 
   ##
   # Terminate the application with exit code +status+, running any exit

data/lib/rubygems/util/licenses.rb

@@ -8,7 +8,7 @@ class Gem::Licenses
 
   # Software Package Data Exchange (SPDX) standard open-source software
   # license identifiers
-  IDENTIFIERS = %w(
+  LICENSE_IDENTIFIERS = %w(
       0BSD
       AAL
       ADSL
@@ -354,12 +354,43 @@ class Gem::Licenses
       zlib-acknowledgement
   ).freeze
 
+  # exception identifiers
+  EXCEPTION_IDENTIFIERS = %w(
+      389-exception
+      Autoconf-exception-2.0
+      Autoconf-exception-3.0
+      Bison-exception-2.2
+      Bootloader-exception
+      CLISP-exception-2.0
+      Classpath-exception-2.0
+      DigiRule-FOSS-exception
+      FLTK-exception
+      Fawkes-Runtime-exception
+      Font-exception-2.0
+      GCC-exception-2.0
+      GCC-exception-3.1
+      LZMA-exception
+      Libtool-exception
+      Linux-syscall-note
+      Nokia-Qt-exception-1.1
+      OCCT-exception-1.0
+      Qwt-exception-1.0
+      WxWindows-exception-3.1
+      eCos-exception-2.0
+      freertos-exception-2.0
+      gnu-javamail-exception
+      i2p-gpl-java-exception
+      mif-exception
+      openvpn-openssl-exception
+      u-boot-exception-2.0
+  ).freeze
+
   REGEXP = %r{
     \A
     (
-      #{Regexp.union(IDENTIFIERS)}
+      #{Regexp.union(LICENSE_IDENTIFIERS)}
       \+?
-      (\s WITH \s .+)?
+      (\s WITH \s #{Regexp.union(EXCEPTION_IDENTIFIERS)})?
       | #{NONSTANDARD}
     )
     \Z
@@ -370,7 +401,7 @@ class Gem::Licenses
   end
 
   def self.suggestions(license)
-    by_distance = IDENTIFIERS.group_by do |identifier|
+    by_distance = LICENSE_IDENTIFIERS.group_by do |identifier|
       levenshtein_distance(identifier, license)
     end
     lowest = by_distance.keys.min

data/lib/rubygems/version.rb

@@ -170,6 +170,10 @@ class Gem::Version
   # True if the +version+ string matches RubyGems' requirements.
 
   def self.correct? version
+    unless Gem::Deprecate.skip
+      warn "nil versions are discouraged and will be deprecated in Rubygems 4" if version.nil?
+    end
+
     !!(version.to_s =~ ANCHORED_VERSION_PATTERN)
   end
 
@@ -324,7 +328,9 @@ class Gem::Version
     segments.pop    while segments.size > 2
     segments.push 0 while segments.size < 2
 
-    "~> #{segments.join(".")}"
+    recommendation = "~> #{segments.join(".")}"
+    recommendation += ".a" if prerelease?
+    recommendation
   end
 
   ##

data/lib/ubygems.rb

@@ -7,5 +7,8 @@
 # See LICENSE.txt for permissions.
 #++
 
+# TODO: Remove this file at RubyGems 4.0
+# Based by https://bugs.ruby-lang.org/issues/14322#note-4
+warn "`ubygems.rb' is deprecated, and will be removed on or after 2018-12-01. Remove `-rubygems' from your command-line, or use `-r rubygems' instead"
 
 require 'rubygems'

data/test/rubygems/test_bundled_ca.rb

@@ -51,13 +51,16 @@ if ENV["CI"] || ENV["TEST_SSL"]
       assert_https('rubygems.org')
     end
 
-    def test_accessing_fastly
-      assert_https('rubygems.global.ssl.fastly.net')
+    def test_accessing_www_rubygems
+      assert_https('www.rubygems.org')
     end
 
-    def test_accessing_new_index
-      assert_https('fastly.rubygems.org')
+    def test_accessing_staging
+      assert_https('staging.rubygems.org')
     end
 
+    def test_accessing_new_index
+      assert_https('index.rubygems.org')
+    end
   end
 end

data/test/rubygems/test_gem.rb

@@ -209,6 +209,41 @@ class TestGem < Gem::TestCase
     assert_equal %w(a-1 b-2 c-1), loaded_spec_names
   end
 
+  def test_activate_bin_path_gives_proper_error_for_bundler
+    bundler = util_spec 'bundler', '2' do |s|
+      s.executables = ['bundle']
+    end
+
+    install_specs bundler
+
+    File.open("Gemfile.lock", "w") do |f|
+      f.write <<-L.gsub(/ {8}/, "")
+        GEM
+          remote: https://rubygems.org/
+          specs:
+
+        PLATFORMS
+          ruby
+
+        DEPENDENCIES
+
+        BUNDLED WITH
+          9999
+      L
+    end
+
+    File.open("Gemfile", "w") { |f| f.puts('source "https://rubygems.org"') }
+
+    e = assert_raises Gem::GemNotFoundException do
+      load Gem.activate_bin_path("bundler", "bundle", ">= 0.a")
+    end
+
+    assert_includes e.message, "Could not find 'bundler' (9999) required by your #{File.expand_path("Gemfile.lock")}."
+    assert_includes e.message, "To update to the latest version installed on your system, run `bundle update --bundler`."
+    assert_includes e.message, "To install the missing version, run `gem install bundler:9999`"
+    refute_includes e.message, "can't find gem bundler (>= 0.a) with executable bundle"
+  end
+
   def test_self_bin_path_no_exec_name
     e = assert_raises ArgumentError do
       Gem.bin_path 'a'
@@ -387,7 +422,7 @@ class TestGem < Gem::TestCase
     assert_equal %w[https://rubygems.org/], Gem.default_sources
   end
 
-  def test_self_detect_gemdeps
+  def test_self_use_gemdeps
     skip 'Insecure operation - chdir' if RUBY_VERSION <= "1.8.7"
     rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], '-'
 
@@ -399,7 +434,7 @@ class TestGem < Gem::TestCase
     begin
       Dir.chdir 'detect/a/b'
 
-      assert_equal add_bundler_full_name([]), Gem.detect_gemdeps.map(&:full_name)
+      assert_equal add_bundler_full_name([]), Gem.use_gemdeps.map(&:full_name)
     ensure
       Dir.chdir @tempdir
     end
@@ -1214,7 +1249,7 @@ class TestGem < Gem::TestCase
     input = "\x1F\x8B\b\0\xED\xA3\x1AQ\0\x03\xCBH" +
             "\xCD\xC9\xC9\a\0\x86\xA6\x106\x05\0\0\0"
 
-    output = Gem.gunzip input
+    output = Gem::Util.gunzip input
 
     assert_equal 'hello', output
 
@@ -1226,7 +1261,7 @@ class TestGem < Gem::TestCase
   def test_self_gzip
     input = 'hello'
 
-    output = Gem.gzip input
+    output = Gem::Util.gzip input
 
     zipped = StringIO.new output
 
@@ -1450,12 +1485,12 @@ class TestGem < Gem::TestCase
 
     ENV['RUBYGEMS_GEMDEPS'] = path
 
-    Gem.detect_gemdeps
+    Gem.use_gemdeps
 
     assert_equal add_bundler_full_name(%W(a-1 b-1 c-1)), loaded_spec_names
   end
 
-  def test_auto_activation_of_detected_gemdeps_file
+  def test_auto_activation_of_used_gemdeps_file
     skip 'Insecure operation - chdir' if RUBY_VERSION <= "1.8.7"
     util_clear_gems
 
@@ -1476,7 +1511,7 @@ class TestGem < Gem::TestCase
     ENV['RUBYGEMS_GEMDEPS'] = "-"
 
     expected_specs = [a, b, (Gem::USE_BUNDLER_FOR_GEMDEPS || nil) && util_spec("bundler", Bundler::VERSION), c].compact
-    assert_equal expected_specs, Gem.detect_gemdeps.sort_by { |s| s.name }
+    assert_equal expected_specs, Gem.use_gemdeps.sort_by { |s| s.name }
   end
 
   LIB_PATH = File.expand_path "../../../lib".dup.untaint, __FILE__.dup.untaint
@@ -1590,7 +1625,7 @@ class TestGem < Gem::TestCase
 
     assert_equal old_style, Gem.find_unresolved_default_spec("foo.rb")
     assert_equal old_style, Gem.find_unresolved_default_spec("bar.rb")
-    assert_equal nil, Gem.find_unresolved_default_spec("baz.rb")
+    assert_nil              Gem.find_unresolved_default_spec("baz.rb")
 
     Gem.clear_default_specs
 
@@ -1603,8 +1638,8 @@ class TestGem < Gem::TestCase
 
     assert_equal new_style, Gem.find_unresolved_default_spec("foo.rb")
     assert_equal new_style, Gem.find_unresolved_default_spec("bar.rb")
-    assert_equal nil, Gem.find_unresolved_default_spec("exec")
-    assert_equal nil, Gem.find_unresolved_default_spec("README")
+    assert_nil              Gem.find_unresolved_default_spec("exec")
+    assert_nil              Gem.find_unresolved_default_spec("README")
   end
 
   def test_default_gems_use_full_paths

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -88,20 +88,21 @@ class TestGemBundlerVersionFinder < Gem::TestCase
     bvf.stub(:bundler_version, v("2.1.1.1")) do
       assert bvf.compatible?(util_spec("foo"))
       assert bvf.compatible?(util_spec("bundler", "2.1.1.1"))
-      refute bvf.compatible?(util_spec("bundler", "2.1.1.a"))
+      assert bvf.compatible?(util_spec("bundler", "2.1.1.a"))
+      assert bvf.compatible?(util_spec("bundler", "2.999"))
       refute bvf.compatible?(util_spec("bundler", "1.999"))
-      refute bvf.compatible?(util_spec("bundler", "2.999"))
+      refute bvf.compatible?(util_spec("bundler", "3.0.0"))
     end
   end
 
   def test_filter
-    versions = %w[1 1.0 1.0.1.1 2.a 3 3.0]
+    versions = %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1]
     specs = versions.map { |v| util_spec("bundler", v) }
 
-    assert_equal %w[1 1.0 1.0.1.1 2.a 3 3.0], util_filter_specs(specs).map(&:version).map(&:to_s)
+    assert_equal %w[1 1.0 1.0.1.1 2 2.a 2.0 2.1.1 3 3.a 3.0 3.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
 
     bvf.stub(:bundler_version, v("2.1.1.1")) do
-      assert_empty util_filter_specs(specs).map(&:version).map(&:to_s)
+      assert_equal %w[2 2.a 2.0 2.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
     bvf.stub(:bundler_version, v("1.1.1.1")) do
       assert_equal %w[1 1.0 1.0.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
@@ -110,10 +111,10 @@ class TestGemBundlerVersionFinder < Gem::TestCase
       assert_equal %w[1 1.0 1.0.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
     bvf.stub(:bundler_version, v("2.a")) do
-      assert_equal %w[2.a], util_filter_specs(specs).map(&:version).map(&:to_s)
+      assert_equal %w[2 2.a 2.0 2.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
     bvf.stub(:bundler_version, v("3")) do
-      assert_equal %w[3 3.0], util_filter_specs(specs).map(&:version).map(&:to_s)
+      assert_equal %w[3 3.a 3.0 3.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
     end
   end
 

data/test/rubygems/test_gem_command_manager.rb

@@ -114,8 +114,8 @@ class TestGemCommandManager < Gem::TestCase
       assert_equal :both, check_options[:domain]
       assert_equal true, check_options[:wrappers]
       assert_equal Gem::Requirement.default, check_options[:version]
-      assert_equal nil, check_options[:install_dir]
-      assert_equal nil, check_options[:bin_dir]
+      assert_nil   check_options[:install_dir]
+      assert_nil   check_options[:bin_dir]
 
       #check settings
       check_options = nil

data/test/rubygems/test_gem_commands_build_command.rb

@@ -122,6 +122,8 @@ class TestGemCommandsBuildCommand < Gem::TestCase
   SIGNING_KEY = key_path 'private3072'
 
   def test_build_signed_gem
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     trust_dir = Gem::Security.trust_dir
 
     spec = util_spec 'some_gem' do |s|

data/test/rubygems/test_gem_commands_install_command.rb

@@ -416,6 +416,43 @@ ERROR:  Possible alternatives: non_existent_with_hint
     assert_path_exists File.join(a2.doc_dir, 'rdoc')
   end
 
+  def test_execute_rdoc_with_path
+    skip if RUBY_VERSION <= "1.8.7"
+    specs = spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
+  
+    Gem.done_installing(&Gem::RDoc.method(:generation_hook))
+  
+    @cmd.options[:document] = %w[rdoc ri]
+    @cmd.options[:domain] = :local
+    @cmd.options[:install_dir] = 'whatever'
+  
+    a2 = specs['a-2']
+    FileUtils.mv a2.cache_file, @tempdir
+  
+    @cmd.options[:args] = %w[a]
+  
+    use_ui @ui do
+      # Don't use Dir.chdir with a block, it warnings a lot because
+      # of a downstream Dir.chdir with a block
+      old = Dir.getwd
+  
+      begin
+        Dir.chdir @tempdir
+        assert_raises Gem::MockGemUi::SystemExitException, @ui.error do
+          @cmd.execute
+        end
+      ensure
+        Dir.chdir old
+      end
+    end
+  
+    wait_for_child_process_to_exit
+  
+    assert_path_exists 'whatever/doc/a-2', 'documentation not installed'
+  end
+
   def test_execute_saves_build_args
     specs = spec_fetcher do |fetcher|
       fetcher.gem 'a', 2

data/test/rubygems/test_gem_commands_push_command.rb

@@ -95,6 +95,26 @@ class TestGemCommandsPushCommand < Gem::TestCase
                  @fetcher.last_request["Content-Type"]
   end
 
+  def test_execute_allowed_push_host
+    @spec, @path = util_gem "freebird", "1.0.1" do |spec|
+      spec.metadata['allowed_push_host'] = "https://privategemserver.example"
+    end
+
+    @response = "Successfully registered gem: freewill (1.0.0)"
+    @fetcher.data["#{@spec.metadata['allowed_push_host']}/api/v1/gems"] = [@response, 200, 'OK']
+    @fetcher.data["#{Gem.host}/api/v1/gems"] =
+      ['fail', 500, 'Internal Server Error']
+
+    @cmd.options[:args] = [@path]
+
+    @cmd.execute
+
+    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem.read_binary(@path), @fetcher.last_request.body
+    assert_equal "application/octet-stream",
+                 @fetcher.last_request["Content-Type"]
+  end
+
   def test_sending_when_default_host_disabled
     Gem.configuration.disable_default_gem_server = true
     response = "You must specify a gem server"

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -6,7 +6,12 @@ require 'rubygems/commands/setup_command'
 
 class TestGemCommandsSetupCommand < Gem::TestCase
 
-  BUNDLER_VERS = `gem list -e bundler`[/([^() ]+)\)\Z/, 1] || "1.16.1"
+  bundler_gemspec = File.expand_path("../../../bundler/lib/bundler/version.rb", __FILE__)
+  if File.exist?(bundler_gemspec)
+    BUNDLER_VERS = File.read(bundler_gemspec).match(/VERSION = "(#{Gem::Version::VERSION_PATTERN})"/)[1]
+  else
+    BUNDLER_VERS = "1.16.2"
+  end
 
   def setup
     super

data/test/rubygems/test_gem_commands_signin_command.rb

@@ -48,7 +48,7 @@ class TestGemCommandsSigninCommand < Gem::TestCase
 
     assert_equal credentials[:rubygems_api_key], api_key
 
-    assert_equal credentials[host], nil
+    assert_nil credentials[host]
   end
 
   def test_execute_with_host_supplied