rubygems-update 2.7.10 → 3.0.0

data/test/rubygems/test_gem_command.rb

@@ -251,4 +251,3 @@ ERROR:  Possible alternatives: non_existent_with_hint
   end
 
 end
-

data/test/rubygems/test_gem_command_manager.rb

@@ -29,6 +29,12 @@ class TestGemCommandManager < Gem::TestCase
                  e.message
   end
 
+  def test_find_alias_command
+    command = @command_manager.find_command 'i'
+
+    assert_kind_of Gem::Commands::InstallCommand, command
+  end
+
   def test_find_command_ambiguous_exact
     ins_command = Class.new
     Gem::Commands.send :const_set, :InsCommand, ins_command
@@ -120,7 +126,7 @@ class TestGemCommandManager < Gem::TestCase
       #check settings
       check_options = nil
       @command_manager.process_args %w[
-        install --force --local --rdoc --install-dir .
+        install --force --local --document=ri,rdoc --install-dir .
                 --version 3.0 --no-wrapper --bindir .
       ]
       assert_equal %w[rdoc ri], check_options[:document].sort
@@ -254,11 +260,10 @@ class TestGemCommandManager < Gem::TestCase
 
     #check settings
     check_options = nil
-    @command_manager.process_args %w[update --force --rdoc --install-dir .]
+    @command_manager.process_args %w[update --force --document=ri --install-dir .]
     assert_includes check_options[:document], 'ri'
     assert_equal true, check_options[:force]
     assert_equal Dir.pwd, check_options[:install_dir]
   end
 
 end
-

data/test/rubygems/test_gem_commands_build_command.rb

@@ -6,16 +6,71 @@ require 'rubygems/package'
 
 class TestGemCommandsBuildCommand < Gem::TestCase
 
+  CERT_FILE = cert_path 'public3072'
+  SIGNING_KEY = key_path 'private3072'
+
+  EXPIRED_CERT_FILE = cert_path 'expired'
+  PRIVATE_KEY_FILE  = key_path 'private'
+
   def setup
     super
 
+    readme_file = File.join(@tempdir, 'README.md')
+
+    File.open readme_file, 'w' do |f|
+      f.write 'My awesome gem'
+    end
+
     @gem = util_spec 'some_gem' do |s|
-      s.rubyforge_project = 'example'
+      s.license = 'AGPL-3.0'
+      s.files = ['README.md']
     end
 
     @cmd = Gem::Commands::BuildCommand.new
   end
 
+  def test_handle_options
+    @cmd.handle_options %w[--force --strict]
+
+    assert @cmd.options[:force]
+    assert @cmd.options[:strict]
+  end
+
+  def test_options_filename
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
+
+    File.open gemspec_file, 'w' do |gs|
+      gs.write @gem.to_ruby
+    end
+
+    @cmd.options[:args] = [gemspec_file]
+    @cmd.options[:output] = "test.gem"
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    file = File.join(@tempdir, File::SEPARATOR, "test.gem")
+    assert File.exist?(file)
+
+    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: test.gem", output.shift
+    assert_equal [], output
+  end
+
+  def test_handle_options_defaults
+    @cmd.handle_options []
+
+    refute @cmd.options[:force]
+    refute @cmd.options[:strict]
+    assert_nil @cmd.options[:output]
+  end
+
   def test_execute
     gemspec_file = File.join(@tempdir, @gem.spec_name)
 
@@ -23,7 +78,80 @@ class TestGemCommandsBuildCommand < Gem::TestCase
       gs.write @gem.to_ruby
     end
 
-    util_test_build_gem @gem, gemspec_file
+    @cmd.options[:args] = [gemspec_file]
+
+    util_test_build_gem @gem
+  end
+
+  def test_execute_bad_name
+    [".", "-", "_"].each do |special_char|
+      gem = util_spec 'some_gem_with_bad_name' do |s|
+        s.name = "#{special_char}bad_gem_name"
+        s.license = 'AGPL-3.0'
+        s.files = ['README.md']
+      end
+
+      gemspec_file = File.join(@tempdir, gem.spec_name)
+
+      File.open gemspec_file, 'w' do |gs|
+        gs.write gem.to_ruby
+      end
+
+      @cmd.options[:args] = [gemspec_file]
+
+      use_ui @ui do
+        Dir.chdir @tempdir do
+          assert_raises Gem::InvalidSpecificationException do
+            @cmd.execute
+          end
+        end
+      end
+    end
+  end
+
+  def test_execute_strict_without_warnings
+    gemspec_file = File.join(@tempdir, @gem.spec_name)
+
+    File.open gemspec_file, 'w' do |gs|
+      gs.write @gem.to_ruby
+    end
+
+    @cmd.options[:strict] = true
+    @cmd.options[:args] = [gemspec_file]
+
+    util_test_build_gem @gem
+  end
+
+  def test_execute_strict_with_warnings
+    bad_gem = util_spec 'some_bad_gem' do |s|
+      s.files = ['README.md']
+    end
+
+    gemspec_file = File.join(@tempdir, bad_gem.spec_name)
+
+    File.open gemspec_file, 'w' do |gs|
+      gs.write bad_gem.to_ruby
+    end
+
+    @cmd.options[:args] = [gemspec_file]
+    @cmd.options[:strict] = true
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        assert_raises Gem::InvalidSpecificationException do
+          @cmd.execute
+        end
+      end
+    end
+
+    error = @ui.error.split "\n"
+    assert_equal "WARNING:  licenses is empty, but is recommended.  Use a license identifier from", error.shift
+    assert_equal "http://spdx.org/licenses or 'Nonstandard' for a nonstandard license.", error.shift
+    assert_equal "WARNING:  See http://guides.rubygems.org/specification-reference/ for help", error.shift
+    assert_equal [], error
+
+    gem_file = File.join @tempdir, File.basename(@gem.cache_file)
+    refute File.exist?(gem_file)
   end
 
   def test_execute_bad_spec
@@ -64,6 +192,43 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal "ERROR:  Gemspec file not found: some_gem\n", @ui.error
   end
 
+  def test_execute_outside_dir
+    gemspec_dir = File.join @tempdir, 'build_command_gem'
+    gemspec_file = File.join gemspec_dir, @gem.spec_name
+    readme_file = File.join gemspec_dir, 'README.md'
+
+    FileUtils.mkdir_p gemspec_dir
+
+    File.open readme_file, 'w' do |f|
+      f.write "My awesome gem"
+    end
+
+    File.open gemspec_file, 'w' do |gs|
+      gs.write @gem.to_ruby
+    end
+
+    @cmd.options[:args] = [gemspec_file]
+
+    use_ui @ui do
+      @cmd.execute
+    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
+
+    gem_file = File.join gemspec_dir, File.basename(@gem.cache_file)
+    assert File.exist?(gem_file)
+
+    spec = Gem::Package.new(gem_file).spec
+
+    assert_equal "some_gem", spec.name
+    assert_equal "this is a summary", spec.summary
+  end
+
   def test_can_find_gemspecs_without_dot_gemspec
     gemspec_file = File.join(@tempdir, @gem.spec_name)
 
@@ -71,12 +236,12 @@ class TestGemCommandsBuildCommand < Gem::TestCase
       gs.write @gem.to_ruby
     end
 
-    util_test_build_gem @gem, gemspec_file
-  end
-
-  def util_test_build_gem(gem, gemspec_file, check_licenses=true)
     @cmd.options[:args] = [gemspec_file]
 
+    util_test_build_gem @gem
+  end
+
+  def util_test_build_gem(gem)
     use_ui @ui do
       Dir.chdir @tempdir do
         @cmd.execute
@@ -90,10 +255,6 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert_equal "  File: some_gem-2.gem", output.shift
     assert_equal [], output
 
-    if check_licenses
-      assert_match "WARNING:  licenses is empty", @ui.error
-    end
-
     gem_file = File.join @tempdir, File.basename(gem.cache_file)
     assert File.exist?(gem_file)
 
@@ -115,12 +276,9 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     @cmd.options[:args] = [gemspec_file]
     @cmd.options[:force] = true
 
-    util_test_build_gem @gem, gemspec_file, false
+    util_test_build_gem @gem
   end
 
-  CERT_FILE = cert_path 'public3072'
-  SIGNING_KEY = key_path 'private3072'
-
   def test_build_signed_gem
     skip 'openssl is missing' unless defined?(OpenSSL::SSL)
 
@@ -137,7 +295,9 @@ class TestGemCommandsBuildCommand < Gem::TestCase
       gs.write spec.to_ruby
     end
 
-    util_test_build_gem spec, gemspec_file
+    @cmd.options[:args] = [gemspec_file]
+
+    util_test_build_gem spec
 
     trust_dir.trust_cert OpenSSL::X509::Certificate.new(File.read(CERT_FILE))
 
@@ -146,4 +306,48 @@ class TestGemCommandsBuildCommand < Gem::TestCase
     assert gem.verify
   end
 
+  def test_build_signed_gem_with_cert_expiration_length_days
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
+    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
+
+    re_signed_cert = OpenSSL::X509::Certificate.new(File.read(tmp_expired_cert_file))
+    cert_days_to_expire = (re_signed_cert.not_after - re_signed_cert.not_before).to_i / (24 * 60 * 60)
+
+    gem_file = File.join @tempdir, File.basename(spec.cache_file)
+
+    assert File.exist?(gem_file)
+    assert_equal(28, cert_days_to_expire)
+  end
+
 end

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -1,23 +1,24 @@
 # frozen_string_literal: true
 require 'rubygems/test_case'
 require 'rubygems/commands/cert_command'
-require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9"
 
-unless defined?(OpenSSL::SSL) then
+unless defined?(OpenSSL::SSL)
   warn 'Skipping `gem cert` tests.  openssl not found.'
 end
 
 class TestGemCommandsCertCommand < Gem::TestCase
 
   ALTERNATE_CERT = load_cert 'alternate'
+  EXPIRED_PUBLIC_CERT = load_cert 'expired'
 
   ALTERNATE_KEY_FILE = key_path 'alternate'
   PRIVATE_KEY_FILE   = key_path 'private'
   PUBLIC_KEY_FILE    = key_path 'public'
 
-  ALTERNATE_CERT_FILE = cert_path 'alternate'
-  CHILD_CERT_FILE     = cert_path 'child'
-  PUBLIC_CERT_FILE    = cert_path 'public'
+  ALTERNATE_CERT_FILE      = cert_path 'alternate'
+  CHILD_CERT_FILE          = cert_path 'child'
+  PUBLIC_CERT_FILE         = cert_path 'public'
+  EXPIRED_PUBLIC_CERT_FILE = cert_path 'expired'
 
   def setup
     super
@@ -158,7 +159,7 @@ Added '/CN=alternate/DC=example'
     @cmd.handle_options %W[
       --build nobody@example.com
       --days 26
-      ]
+    ]
 
     @build_ui = Gem::MockGemUi.new "#{passphrase}\n#{passphrase}"
 
@@ -191,7 +192,6 @@ Added '/CN=alternate/DC=example'
 
     test = (cert.not_after - cert.not_before).to_i / (24 * 60 * 60)
     assert_equal(test, 26)
-
   end
 
   def test_execute_build_bad_passphrase_confirmation
@@ -583,6 +583,68 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
     assert_equal expected, @ui.error
   end
 
+  def test_execute_re_sign
+    gem_path = File.join Gem.user_home, ".gem"
+    Dir.mkdir gem_path
+
+    path = File.join @tempdir, 'cert.pem'
+    Gem::Security.write EXPIRED_PUBLIC_CERT, path, 0600
+
+    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))
+    File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
+
+    @cmd.handle_options %W[
+      --private-key #{PRIVATE_KEY_FILE}
+      --certificate #{tmp_expired_cert_file}
+      --re-sign
+    ]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected_path = File.join(gem_path, "#{File.basename(tmp_expired_cert_file)}.expired")
+
+    assert_match(
+      /INFO:  Your certificate #{tmp_expired_cert_file} has been re-signed\nINFO:  Your expired certificate will be located at: #{expected_path}\.[0-9]+/,
+      @ui.output
+    )
+    assert_equal '', @ui.error
+  end
+
+  def test_execute_re_sign_with_cert_expiration_length_days
+    gem_path = File.join Gem.user_home, ".gem"
+    Dir.mkdir gem_path
+
+    path = File.join @tempdir, 'cert.pem'
+    Gem::Security.write EXPIRED_PUBLIC_CERT, path, 0600
+
+    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))
+    File.write(tmp_expired_cert_file, File.read(EXPIRED_PUBLIC_CERT_FILE))
+
+    @cmd.handle_options %W[
+      --private-key #{PRIVATE_KEY_FILE}
+      --certificate #{tmp_expired_cert_file}
+      --re-sign
+    ]
+
+    Gem.configuration.cert_expiration_length_days = 28
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    re_signed_cert = OpenSSL::X509::Certificate.new(File.read(tmp_expired_cert_file))
+    cert_days_to_expire = (re_signed_cert.not_after - re_signed_cert.not_before).to_i / (24 * 60 * 60)
+
+    assert_equal(28, cert_days_to_expire)
+    assert_equal '', @ui.error
+  end
+
   def test_handle_options
     @cmd.handle_options %W[
       --add #{PUBLIC_CERT_FILE}
@@ -732,4 +794,3 @@ ERROR:  --private-key not specified and ~/.gem/gem-private_key.pem does not exis
   end
 
 end if defined?(OpenSSL::SSL)
-