rubygems-update 3.0.9 → 3.1.0.pre1

data/test/rubygems/test_gem_available_set.rb

@@ -68,7 +68,7 @@ class TestGemAvailableSet < Gem::TestCase
 
   def test_best
     a1, _ = util_gem 'a', '1'
-    a2, _  = util_gem 'a', '2'
+    a2, _ = util_gem 'a', '2'
 
     set = Gem::AvailableSet.new
     set.add a1, @source
@@ -97,7 +97,7 @@ class TestGemAvailableSet < Gem::TestCase
 
   def test_sorted_normal_versions
     a1, _ = util_gem 'a', '1'
-    a2, _  = util_gem 'a', '2'
+    a2, _ = util_gem 'a', '2'
 
     set = Gem::AvailableSet.new
     set.add a1, @source
@@ -127,4 +127,5 @@ class TestGemAvailableSet < Gem::TestCase
 
     assert_equal [a3a, a2, a2a, a1, a1a], g
   end
+
 end

data/test/rubygems/test_gem_bundler_version_finder.rb

@@ -2,6 +2,7 @@
 require 'rubygems/test_case'
 
 class TestGemBundlerVersionFinder < Gem::TestCase
+
   def setup
     super
 
@@ -115,7 +116,7 @@ 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 2.a 2.0 2.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
+      assert_equal %w[2.a 2 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.a 3.0 3.1.1], util_filter_specs(specs).map(&:version).map(&:to_s)
@@ -127,4 +128,5 @@ class TestGemBundlerVersionFinder < Gem::TestCase
     bvf.filter!(specs)
     specs
   end
+
 end

data/test/rubygems/test_gem_command.rb

@@ -3,7 +3,9 @@ require 'rubygems/test_case'
 require 'rubygems/command'
 
 class Gem::Command
+
   public :parser
+
 end
 
 class TestGemCommand < Gem::TestCase
@@ -15,7 +17,7 @@ class TestGemCommand < Gem::TestCase
 
     @common_options = Gem::Command.common_options.dup
     Gem::Command.common_options.clear
-    Gem::Command.common_options <<  [
+    Gem::Command.common_options << [
       ['-x', '--exe', 'Execute'], lambda do |*a|
         @xopt = true
       end
@@ -32,7 +34,7 @@ class TestGemCommand < Gem::TestCase
 
   def test_self_add_specific_extra_args
     added_args = %w[--all]
-    @cmd.add_option '--all' do |v,o| end
+    @cmd.add_option('--all') { |v,o| }
 
     Gem::Command.add_specific_extra_args @cmd_name, added_args
 
@@ -96,7 +98,7 @@ class TestGemCommand < Gem::TestCase
 
   def test_invoke_with_bad_options
     use_ui @ui do
-      @cmd.when_invoked do true end
+      @cmd.when_invoked { true }
 
       ex = assert_raises OptionParser::InvalidOption do
         @cmd.invoke('-zzz')
@@ -107,7 +109,7 @@ class TestGemCommand < Gem::TestCase
   end
 
   def test_invoke_with_common_options
-    @cmd.when_invoked do true end
+    @cmd.when_invoked { true }
 
     use_ui @ui do
       @cmd.invoke "-x"
@@ -195,6 +197,93 @@ class TestGemCommand < Gem::TestCase
     assert_equal ['-h', 'command'], args
   end
 
+  def test_deprecate_option_long_name
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"--test\" option has been deprecated and will be removed in Rubygems 3.1, its use is discouraged.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super('test', 'Gem::Command instance for testing')
+
+        add_option('-t', '--test', 'Test command') do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option(long_name: '--test', version: '3.1')
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("--test")
+      assert_equal deprecate_msg, @ui.error
+    end
+  end
+
+  def test_deprecate_option_no_version
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"--test\" option has been deprecated and will be removed in future versions of Rubygems, its use is discouraged.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super('test', 'Gem::Command instance for testing')
+
+        add_option('-t', '--test', 'Test command') do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option(long_name: '--test')
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("--test")
+      assert_equal deprecate_msg, @ui.error
+    end
+  end
+
+  def test_deprecate_option_short_name
+    deprecate_msg = <<-EXPECTED
+WARNING:  The \"-t\" option has been deprecated and will be removed in Rubygems 3.5, its use is discouraged.
+    EXPECTED
+
+    testCommand = Class.new(Gem::Command) do
+      def initialize
+        super('test', 'Gem::Command instance for testing')
+
+        add_option('-t', '--test', 'Test command') do |value, options|
+          options[:test] = true
+        end
+
+        deprecate_option(short_name: '-t', version: '3.5')
+      end
+
+      def execute
+        true
+      end
+    end
+
+    cmd = testCommand.new
+
+    use_ui @ui do
+      cmd.invoke("-t")
+      assert_equal deprecate_msg, @ui.error
+    end
+  end
+
   def test_show_lookup_failure_suggestions_local
     correct    = "non_existent_with_hint"
     misspelled = "nonexistent_with_hint"
@@ -239,7 +328,7 @@ ERROR:  Could not find a valid gem 'other' (>= 0) in any repository
     end
 
     use_ui @ui do
-      @cmd.show_lookup_failure misspelled, Gem::Requirement.default, [], :remote
+      @cmd.show_lookup_failure misspelled, Gem::Requirement.default, []
     end
 
     expected = <<-EXPECTED

data/test/rubygems/test_gem_command_manager.rb

@@ -4,6 +4,8 @@ require 'rubygems/command_manager'
 
 class TestGemCommandManager < Gem::TestCase
 
+  PROJECT_DIR = File.expand_path('../../..', __FILE__).untaint
+
   def setup
     super
 
@@ -58,7 +60,7 @@ class TestGemCommandManager < Gem::TestCase
 
   def test_run_interrupt
     old_load_path = $:.dup
-    $: << File.expand_path("test/rubygems", @@project_dir)
+    $: << File.expand_path("test/rubygems", PROJECT_DIR)
     Gem.load_env_plugins
 
     @command_manager.register_command :interrupt
@@ -77,7 +79,7 @@ class TestGemCommandManager < Gem::TestCase
 
   def test_run_crash_command
     old_load_path = $:.dup
-    $: << File.expand_path("test/rubygems", @@project_dir)
+    $: << File.expand_path("test/rubygems", PROJECT_DIR)
 
     @command_manager.register_command :crash
     use_ui @ui do
@@ -103,16 +105,6 @@ class TestGemCommandManager < Gem::TestCase
     assert_match(/invalid option: --bad-arg/i, @ui.error)
   end
 
-  def test_process_args_bad_no_ri
-    use_ui @ui do
-      assert_raises Gem::MockGemUi::TermError do
-        @command_manager.process_args %w[--no-ri]
-      end
-    end
-
-    assert_match(/invalid option: --no-ri. Use --no-document instead./i, @ui.error)
-  end
-
   # HACK move to install command test
   def test_process_args_install
     #capture all install options
@@ -137,7 +129,7 @@ class TestGemCommandManager < Gem::TestCase
       check_options = nil
       @command_manager.process_args %w[
         install --force --local --document=ri,rdoc --install-dir .
-                --version 3.0 --no-wrapper --bindir .
+        --version 3.0 --no-wrapper --bindir .
       ]
       assert_equal %w[rdoc ri], check_options[:document].sort
       assert_equal true, check_options[:force]

data/test/rubygems/test_gem_commands_build_command.rb

@@ -189,7 +189,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     end
 
     assert_equal '', @ui.output
-    assert_equal "ERROR:  Gemspec file not found: some_gem\n", @ui.error
+    assert_equal "ERROR:  Gemspec file not found: some_gem.gemspec\n", @ui.error
   end
 
   def test_execute_outside_dir
@@ -242,6 +242,71 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     util_test_build_gem @gem
   end
 
+  def test_execute_without_gem_name
+    some_gem = util_spec "some_gem"
+    gemspec_dir = File.join(@tempdir, "build_command_gem")
+    gemspec_file = File.join(gemspec_dir, some_gem.spec_name)
+
+    FileUtils.mkdir_p(gemspec_dir)
+
+    File.open(gemspec_file, "w") do |gs|
+      gs.write(some_gem.to_ruby)
+    end
+
+    @cmd.options[:args] = []
+
+    use_ui @ui do
+      Dir.chdir(gemspec_dir) do
+        @cmd.execute
+      end
+    end
+
+    output = @ui.output.split("\n")
+    assert_equal "  Successfully built RubyGem", output.shift
+    assert_equal "  Name: some_gem", output.shift
+    assert_equal "  Version: 2", output.shift
+    assert_equal "  File: some_gem-2.gem", output.shift
+    assert_equal [], output
+
+    some_gem = File.join(gemspec_dir, File.basename(some_gem.cache_file))
+    assert File.exist?(some_gem)
+  end
+
+  def test_execute_multiple_gemspec_without_gem_name
+    some_gem = util_spec "some_gem"
+    another_gem = util_spec "another_gem"
+    gemspec_dir = File.join(@tempdir, "build_command_gem")
+    gemspec_file = File.join(gemspec_dir, some_gem.spec_name)
+    another_gemspec_file = File.join(gemspec_dir, another_gem.spec_name)
+
+    FileUtils.mkdir_p(gemspec_dir)
+
+    File.open(gemspec_file, "w") do |gs|
+      gs.write(some_gem.to_ruby)
+    end
+
+    File.open(another_gemspec_file, "w") do |gs|
+      gs.write(another_gem.to_ruby)
+    end
+
+    @cmd.options[:args] = []
+
+    use_ui @ui do
+      Dir.chdir(gemspec_dir) do
+        assert_raises Gem::MockGemUi::TermError do
+          @cmd.execute
+        end
+      end
+    end
+
+    gemspecs = ["another_gem-2.gemspec", "some_gem-2.gemspec"]
+    assert_equal "", @ui.output
+    assert_equal @ui.error, "ERROR:  Multiple gemspecs found: #{gemspecs}, please specify one\n"
+
+    expected_gem = File.join(gemspec_dir, File.basename(another_gem.cache_file))
+    refute File.exist?(expected_gem)
+  end
+
   def util_test_build_gem(gem)
     use_ui @ui do
       Dir.chdir @tempdir do
@@ -256,7 +321,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal "  File: some_gem-2.gem", output.shift
     assert_equal [], output
 
-    gem_file = File.join @tempdir, File.basename(gem.cache_file)
+    gem_file = File.join(@tempdir, File.basename(gem.cache_file))
     assert File.exist?(gem_file)
 
     spec = Gem::Package.new(gem_file).spec
@@ -281,7 +346,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
   end
 
   def test_build_signed_gem
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL) && !java_platform?
 
     trust_dir = Gem::Security.trust_dir
 
@@ -308,7 +373,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
   end
 
   def test_build_signed_gem_with_cert_expiration_length_days
-    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL) && !java_platform?
 
     gem_path = File.join Gem.user_home, ".gem"
     Dir.mkdir gem_path
@@ -351,4 +416,77 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal(28, cert_days_to_expire)
   end
 
+  def test_build_auto_resign_cert
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL) && !java_platform?
+
+    gem_path = File.join Gem.user_home, ".gem"
+    Dir.mkdir gem_path
+
+    Gem::Security.trust_dir
+
+    tmp_expired_cert_file = File.join gem_path, "gem-public_cert.pem"
+    File.write(tmp_expired_cert_file, File.read(EXPIRED_CERT_FILE))
+
+    tmp_private_key_file = File.join gem_path, "gem-private_key.pem"
+    File.write(tmp_private_key_file, File.read(PRIVATE_KEY_FILE))
+
+    spec = util_spec 'some_gem' do |s|
+      s.signing_key = tmp_private_key_file
+      s.cert_chain  = [tmp_expired_cert_file]
+    end
+
+    gemspec_file = File.join(@tempdir, spec.spec_name)
+
+    File.open gemspec_file, 'w' do |gs|
+      gs.write spec.to_ruby
+    end
+
+    @cmd.options[:args] = [gemspec_file]
+
+    Gem.configuration.cert_expiration_length_days = 28
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    output = @ui.output.split "\n"
+    assert_equal "INFO:  Your certificate has expired, trying to re-sign it...", output.shift
+    assert_equal "INFO:  Your cert: #{tmp_expired_cert_file } has been auto re-signed with the key: #{tmp_private_key_file}", output.shift
+    assert_match(/INFO:  Your expired cert will be located at: .+\Wgem-public_cert\.pem\.expired\.[0-9]+/, output.shift)
+  end
+
+  def test_build_is_reproducible
+    epoch = ENV["SOURCE_DATE_EPOCH"]
+    new_epoch = Time.now.to_i.to_s
+    ENV["SOURCE_DATE_EPOCH"] = new_epoch
+
+    gem_file = File.basename(@gem.cache_file)
+
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
+    File.write(gemspec_file, @gem.to_ruby)
+    @cmd.options[:args] = [gemspec_file]
+
+    util_test_build_gem @gem
+
+    build1_contents = File.read(gem_file)
+
+    # Guarantee the time has changed.
+    sleep 1 if Time.now.to_i == new_epoch
+
+    ENV["SOURCE_DATE_EPOCH"] = new_epoch
+
+    @ui = Gem::MockGemUi.new
+    @cmd.options[:args] = [gemspec_file]
+
+    util_test_build_gem @gem
+
+    build2_contents = File.read(gem_file)
+
+    assert_equal build1_contents, build2_contents
+  ensure
+    ENV["SOURCE_DATE_EPOCH"] = epoch
+  end
+
 end

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -6,6 +6,10 @@ unless defined?(OpenSSL::SSL)
   warn 'Skipping `gem cert` tests.  openssl not found.'
 end
 
+if Gem.java_platform?
+  warn 'Skipping `gem cert` tests on jruby.'
+end
+
 class TestGemCommandsCertCommand < Gem::TestCase
 
   ALTERNATE_CERT = load_cert 'alternate'
@@ -26,6 +30,14 @@ class TestGemCommandsCertCommand < Gem::TestCase
     @cmd = Gem::Commands::CertCommand.new
 
     @trust_dir = Gem::Security.trust_dir
+
+    @cleanup = []
+  end
+
+  def teardown
+    FileUtils.rm_f(@cleanup)
+
+    super
   end
 
   def test_certificates_matching
@@ -593,6 +605,7 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     assert_equal '/CN=nobody/DC=example', EXPIRED_PUBLIC_CERT.issuer.to_s
 
     tmp_expired_cert_file = File.join(Dir.tmpdir, File.basename(EXPIRED_PUBLIC_CERT_FILE))
+    @cleanup << tmp_expired_cert_file
     File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
 
     @cmd.handle_options %W[
@@ -624,6 +637,7 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     assert_equal '/CN=nobody/DC=example', EXPIRED_PUBLIC_CERT.issuer.to_s
 
     tmp_expired_cert_file = File.join(Dir.tmpdir, File.basename(EXPIRED_PUBLIC_CERT_FILE))
+    @cleanup << tmp_expired_cert_file
     File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
 
     @cmd.handle_options %W[
@@ -793,4 +807,4 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
                  e.message
   end
 
-end if defined?(OpenSSL::SSL)
+end if defined?(OpenSSL::SSL) && !Gem.java_platform?