rubygems-update 2.0.17 → 2.1.0.rc.1

data/test/rubygems/test_gem_dependency_resolver.rb

@@ -15,7 +15,9 @@ class TestGemDependencyResolver < Gem::TestCase
     exp = expected.sort_by { |s| s.full_name }
     act = actual.map { |a| a.spec }.sort_by { |s| s.full_name }
 
-    assert_equal exp, act
+    msg = "Set of gems was not the same: #{exp.map { |x| x.full_name}.inspect} != #{act.map { |x| x.full_name}.inspect}"
+
+    assert_equal exp, act, msg
   end
 
   def test_no_overlap_specificly
@@ -177,7 +179,8 @@ class TestGemDependencyResolver < Gem::TestCase
       r.resolve
     end
 
-    assert_equal "unable to find any gem matching dependency 'a (>= 0)'", e.message
+    assert_equal "Unable to resolve dependency: (unknown) requires a (>= 0)",
+                 e.message
 
     assert_equal "a (>= 0)", e.dependency.to_s
   end
@@ -215,7 +218,7 @@ class TestGemDependencyResolver < Gem::TestCase
       r.resolve
     end
 
-    assert_equal "detected 1 conflict with dependency 'c (>= 2)'", e.message
+    assert_match "a-1 requires c (>= 2) but it conflicted", e.message
 
     assert_equal "c (>= 2)", e.dependency.to_s
 

data/test/rubygems/test_gem_dependency_resolver_dependency_conflict.rb

@@ -0,0 +1,36 @@
+require 'rubygems/test_case'
+require 'rubygems/dependency_resolver'
+
+class TestGemDependencyResolverDependencyConflict < Gem::TestCase
+
+  def test_explanation
+    root  =
+      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+    child =
+      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
+
+    conflict =
+      Gem::DependencyResolver::DependencyConflict.new child, child.requester
+
+    expected = <<-EXPECTED
+  Activated net-ssh-2.2.2 instead of (>= 2.6.5) via:
+    net-ssh-2.2.2, rye-0.9.8
+    EXPECTED
+
+    assert_equal expected, conflict.explanation
+  end
+
+  def test_request_path
+    root  =
+      dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+    child =
+      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', root
+
+    conflict =
+      Gem::DependencyResolver::DependencyConflict.new child, nil
+
+    assert_equal %w[net-ssh-2.2.2 rye-0.9.8], conflict.request_path
+  end
+
+end
+

data/test/rubygems/test_gem_ext_builder.rb

@@ -50,10 +50,8 @@ install:
       refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results
     end
 
-    if /nmake/ !~ results
-      assert_match %r%^all: destination$%,     results
-      assert_match %r%^install: destination$%, results
-    end
+    assert_match %r%^all: destination$%,     results
+    assert_match %r%^install: destination$%, results
   end
 
 end

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -120,8 +120,13 @@ checking for main\(\) in .*?nonexistent/m, error.message)
       extconf.puts <<-'EXTCONF'
 include RbConfig
 
-ruby_exe = "#{CONFIG['RUBY_INSTALL_NAME']}#{CONFIG['EXEEXT']}"
-ruby = File.join CONFIG['bindir'], ruby_exe
+ruby =
+  if ENV['RUBY'] then
+    ENV['RUBY']
+  else
+    ruby_exe = "#{CONFIG['RUBY_INSTALL_NAME']}#{CONFIG['EXEEXT']}"
+    File.join CONFIG['bindir'], ruby_exe
+  end
 
 open 'Makefile', 'w' do |io|
   io.write <<-Makefile

data/test/rubygems/test_gem_gem_runner.rb

@@ -7,6 +7,7 @@ class TestGemGemRunner < Gem::TestCase
     super
 
     @orig_args = Gem::Command.build_args
+    @runner = Gem::GemRunner.new
   end
 
   def teardown
@@ -41,23 +42,26 @@ class TestGemGemRunner < Gem::TestCase
     assert_equal %w[--commands], Gem::Command.extra_args
   end
 
-  def test_build_args_are_handled
-    Gem.clear_paths
-
-    cls = Class.new(Gem::Command) do
-      def execute
-      end
-    end
+  def test_extract_build_args
+    args = %w[]
+    assert_equal [], @runner.extract_build_args(args)
+    assert_equal %w[], args
 
-    test_obj = cls.new :ba_test
+    args = %w[foo]
+    assert_equal [], @runner.extract_build_args(args)
+    assert_equal %w[foo], args
 
-    cmds = Gem::CommandManager.new
-    cmds.register_command :ba_test, test_obj
+    args = %w[--foo]
+    assert_equal [], @runner.extract_build_args(args)
+    assert_equal %w[--foo], args
 
-    runner = Gem::GemRunner.new :command_manager => cmds
-    runner.run(%W[ba_test -- --build_arg1 --build_arg2])
+    args = %w[--foo --]
+    assert_equal [], @runner.extract_build_args(args)
+    assert_equal %w[--foo], args
 
-    assert_equal %w[--build_arg1 --build_arg2], test_obj.options[:build_args]
+    args = %w[--foo -- --bar]
+    assert_equal %w[--bar], @runner.extract_build_args(args)
+    assert_equal %w[--foo], args
   end
 
 end

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -101,7 +101,7 @@ class TestGemGemcutterUtilities < Gem::TestCase
   def test_sign_in_with_host
     api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
 
-    util_sign_in [api_key, 200, 'OK'], 'http://example.com', ['http://example.com']
+    util_sign_in [api_key, 200, 'OK'], 'http://example.com', :param
 
     assert_match "Enter your http://example.com credentials.",
                  @sign_in_ui.output
@@ -112,20 +112,6 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert_equal api_key, credentials[:rubygems_api_key]
   end
 
-  def test_sign_in_with_host_nil
-    api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
-
-    util_sign_in [api_key, 200, 'OK'], nil, [nil]
-
-    assert_match "Enter your RubyGems.org credentials.",
-                 @sign_in_ui.output
-    assert @fetcher.last_request["authorization"]
-    assert_match %r{Signed in.}, @sign_in_ui.output
-
-    credentials = YAML.load_file Gem.configuration.credentials_path
-    assert_equal api_key, credentials[:rubygems_api_key]
-  end
-
   def test_sign_in_with_host_ENV
     api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     util_sign_in [api_key, 200, 'OK'], 'http://example.com'
@@ -177,14 +163,14 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert_match %r{Access Denied.}, @sign_in_ui.output
   end
 
-  def util_sign_in response, host = nil, args = []
+  def util_sign_in response, host = nil, style = :ENV
     skip 'Always uses $stdin on windows' if Gem.win_platform?
 
     email    = 'you@example.com'
     password = 'secret'
 
     if host
-      ENV['RUBYGEMS_HOST'] = host
+      ENV['RUBYGEMS_HOST'] = host if style == :ENV
     else
       host = Gem.host
     end
@@ -196,8 +182,8 @@ class TestGemGemcutterUtilities < Gem::TestCase
     @sign_in_ui = Gem::MockGemUi.new "#{email}\n#{password}\n"
 
     use_ui @sign_in_ui do
-      if args.length > 0 then
-        @cmd.sign_in(*args)
+      if style == :param then
+        @cmd.sign_in host
       else
         @cmd.sign_in
       end
@@ -223,3 +209,4 @@ class TestGemGemcutterUtilities < Gem::TestCase
   end
 
 end
+

data/test/rubygems/test_gem_impossible_dependencies_error.rb

@@ -0,0 +1,41 @@
+require 'rubygems/test_case'
+
+class TestGemImpossibleDependenciesError < Gem::TestCase
+
+  def test_message_conflict
+    request = dependency_request dep('net-ssh', '>= 2.0.13'), 'rye', '0.9.8'
+
+    conflicts = []
+
+    # These conflicts are lies as their dependencies does not have the correct
+    # requested-by entries, but they are suitable for testing the message.
+    # See #485 to construct a correct conflict.
+    net_ssh_2_2_2 =
+      dependency_request dep('net-ssh', '>= 2.6.5'), 'net-ssh', '2.2.2', request
+    net_ssh_2_6_5 =
+      dependency_request dep('net-ssh', '~> 2.2.2'), 'net-ssh', '2.6.5', request
+
+    conflict1 = Gem::DependencyResolver::DependencyConflict.new \
+      net_ssh_2_6_5, net_ssh_2_6_5.requester
+
+    conflict2 = Gem::DependencyResolver::DependencyConflict.new \
+      net_ssh_2_2_2, net_ssh_2_2_2.requester
+
+    conflicts << [net_ssh_2_6_5.requester.spec, conflict1]
+    conflicts << [net_ssh_2_2_2.requester.spec, conflict2]
+
+    error = Gem::ImpossibleDependenciesError.new request, conflicts
+
+    expected = <<-EXPECTED
+rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
+  Activated net-ssh-2.6.5 instead of (~> 2.2.2) via:
+    net-ssh-2.6.5, rye-0.9.8
+  Activated net-ssh-2.2.2 instead of (>= 2.6.5) via:
+    net-ssh-2.2.2, rye-0.9.8
+    EXPECTED
+
+    assert_equal expected, error.message
+  end
+
+end
+

data/test/rubygems/test_gem_install_update_options.rb

@@ -22,12 +22,13 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
       --rdoc
       --ri
       -E
-      -P HighSecurity
       -f
       -i /install_to
       -w
     ]
 
+    args.concat %w[-P HighSecurity] if defined?(OpenSSL::SSL)
+
     assert @cmd.handles?(args)
   end
 
@@ -100,6 +101,8 @@ class TestGemInstallUpdateOptions < Gem::InstallerTestCase
   end
 
   def test_security_policy
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     @cmd.handle_options %w[-P HighSecurity]
 
     assert_equal Gem::Security::HighSecurity, @cmd.options[:security_policy]

data/test/rubygems/test_gem_installer.rb

@@ -4,6 +4,7 @@ class TestGemInstaller < Gem::InstallerTestCase
 
   def setup
     super
+    common_installer_setup
 
     if __name__ =~ /^test_install(_|$)/ then
       FileUtils.rm_r @spec.gem_dir
@@ -14,6 +15,8 @@ class TestGemInstaller < Gem::InstallerTestCase
   end
 
   def teardown
+    common_installer_teardown
+
     super
 
     Gem.configuration = @config
@@ -300,6 +303,8 @@ gem 'other', version
   end
 
   def test_ensure_loadable_spec_security_policy
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     _, a_gem = util_gem 'a', 2 do |s|
       s.add_dependency 'garbage ~> 5'
     end
@@ -1341,7 +1346,7 @@ gem 'other', version
     assert File.exist?(File.join(dest, 'bin', 'executable'))
   end
 
-  def test_write_build_args
+  def test_write_build_info_file
     refute_path_exists @spec.build_info_file
 
     @installer.build_args = %w[
@@ -1357,7 +1362,7 @@ gem 'other', version
     assert_equal expected, File.read(@spec.build_info_file)
   end
 
-  def test_write_build_args_empty
+  def test_write_build_info_file_empty
     refute_path_exists @spec.build_info_file
 
     @installer.write_build_info_file
@@ -1429,6 +1434,30 @@ gem 'other', version
     assert_match %r!/gemhome/gems/a-2$!, @installer.dir
   end
 
+  def test_default_gem
+    FileUtils.rm_f File.join(Gem.dir, 'specifications')
+
+    @installer.wrappers = true
+    @installer.options[:install_as_default] = true
+    @installer.gem_dir = util_gem_dir @spec
+    @installer.generate_bin
+
+    use_ui @ui do
+      @installer.install
+    end
+
+    assert File.directory? util_inst_bindir
+    installed_exec = File.join util_inst_bindir, 'executable'
+    assert File.exist? installed_exec
+
+    assert File.directory? File.join(Gem.dir, 'specifications')
+    assert File.directory? File.join(Gem.dir, 'specifications', 'default')
+
+    default_spec = eval File.read File.join(Gem.dir, 'specifications', 'default', 'a-2.gemspec')
+    assert_equal Gem::Version.new("2"), default_spec.version
+    assert_equal ['bin/executable'], default_spec.files
+  end
+
   def old_ruby_required
     spec = quick_spec 'old_ruby_required', '1' do |s|
       s.required_ruby_version = '= 1.4.6'

data/test/rubygems/test_gem_name_tuple.rb

@@ -2,6 +2,21 @@ require 'rubygems/test_case'
 require 'rubygems/name_tuple'
 
 class TestGemNameTuple < Gem::TestCase
+
+  def test_full_name
+    n = Gem::NameTuple.new "a", Gem::Version.new(0), "ruby"
+    assert_equal "a-0", n.full_name
+
+    n = Gem::NameTuple.new "a", Gem::Version.new(0), nil
+    assert_equal "a-0", n.full_name
+
+    n = Gem::NameTuple.new "a", Gem::Version.new(0), ""
+    assert_equal "a-0", n.full_name
+
+    n = Gem::NameTuple.new "a", Gem::Version.new(0), "other"
+    assert_equal "a-0-other", n.full_name
+  end
+
   def test_platform_normalization
     n = Gem::NameTuple.new "a", Gem::Version.new(0), "ruby"
     assert_equal "ruby", n.platform
@@ -12,4 +27,11 @@ class TestGemNameTuple < Gem::TestCase
     n = Gem::NameTuple.new "a", Gem::Version.new(0), ""
     assert_equal "ruby", n.platform
   end
+
+  def test_spec_name
+    n = Gem::NameTuple.new "a", Gem::Version.new(0), "ruby"
+    assert_equal "a-0.gemspec", n.spec_name
+  end
+
 end
+

data/test/rubygems/test_gem_package.rb

@@ -64,16 +64,13 @@ class TestGemPackage < Gem::Package::TarTestCase
     reader = Gem::Package::TarReader.new gem_io
 
     checksums = nil
-    tar       = nil
 
     reader.each_entry do |entry|
       case entry.full_name
-      when 'checksums.yaml.gz' then
+      when 'checksums.yaml.gz'
         Zlib::GzipReader.wrap entry do |io|
           checksums = io.read
         end
-      when 'data.tar.gz' then
-        tar = entry.read
       end
     end
 
@@ -86,17 +83,25 @@ class TestGemPackage < Gem::Package::TarTestCase
     metadata_sha1   = Digest::SHA1.hexdigest s.string
     metadata_sha512 = Digest::SHA512.hexdigest s.string
 
+    data_digests = nil
+    util_tar do |tar|
+      data_digests = package.add_contents tar
+    end
+
     expected = {
-      'SHA1' => {
-        'metadata.gz' => metadata_sha1,
-        'data.tar.gz' => Digest::SHA1.hexdigest(tar),
-      },
       'SHA512' => {
         'metadata.gz' => metadata_sha512,
-        'data.tar.gz' => Digest::SHA512.hexdigest(tar),
+        'data.tar.gz' => data_digests['SHA512'].hexdigest,
       }
     }
 
+    if defined?(OpenSSL::Digest) then
+      expected['SHA1'] = {
+        'metadata.gz' => metadata_sha1,
+        'data.tar.gz' => data_digests['SHA1'].hexdigest,
+      }
+    end
+
     assert_equal expected, YAML.load(checksums)
   end
 
@@ -160,11 +165,56 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_build_auto_signed
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     FileUtils.mkdir_p File.join(Gem.user_home, '.gem')
 
     private_key_path = File.join Gem.user_home, '.gem', 'gem-private_key.pem'
     Gem::Security.write PRIVATE_KEY, private_key_path
 
+    public_cert_path = File.join Gem.user_home, '.gem', 'gem-public_cert.pem'
+    FileUtils.cp PUBLIC_CERT_PATH, public_cert_path
+
+    spec = Gem::Specification.new 'build', '1'
+    spec.summary = 'build'
+    spec.authors = 'build'
+    spec.files = ['lib/code.rb']
+
+    FileUtils.mkdir 'lib'
+
+    open 'lib/code.rb', 'w' do |io|
+      io.write '# lib/code.rb'
+    end
+
+    package = Gem::Package.new spec.file_name
+    package.spec = spec
+
+    package.build
+
+    assert_equal Gem::VERSION, spec.rubygems_version
+    assert_path_exists spec.file_name
+
+    reader = Gem::Package.new spec.file_name
+    assert reader.verify
+
+    assert_equal [PUBLIC_CERT.to_pem], reader.spec.cert_chain
+
+    assert_equal %w[metadata.gz       metadata.gz.sig
+                    data.tar.gz       data.tar.gz.sig
+                    checksums.yaml.gz checksums.yaml.gz.sig],
+                 reader.files
+
+    assert_equal %w[lib/code.rb], reader.contents
+  end
+
+  def test_build_auto_signed_encrypted_key
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
+    FileUtils.mkdir_p File.join(Gem.user_home, '.gem')
+
+    private_key_path = File.join Gem.user_home, '.gem', 'gem-private_key.pem'
+    FileUtils.cp ENCRYPTED_PRIVATE_KEY_PATH, private_key_path
+
     public_cert_path = File.join Gem.user_home, '.gem', 'gem-public_cert.pem'
     Gem::Security.write PUBLIC_CERT, public_cert_path
 
@@ -214,6 +264,8 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_build_signed
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     spec = Gem::Specification.new 'build', '1'
     spec.summary = 'build'
     spec.authors = 'build'
@@ -248,6 +300,43 @@ class TestGemPackage < Gem::Package::TarTestCase
     assert_equal %w[lib/code.rb], reader.contents
   end
 
+  def test_build_signed_encryped_key
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
+    spec = Gem::Specification.new 'build', '1'
+    spec.summary = 'build'
+    spec.authors = 'build'
+    spec.files = ['lib/code.rb']
+    spec.cert_chain = [PUBLIC_CERT.to_pem]
+    spec.signing_key = ENCRYPTED_PRIVATE_KEY
+
+    FileUtils.mkdir 'lib'
+
+    open 'lib/code.rb', 'w' do |io|
+      io.write '# lib/code.rb'
+    end
+
+    package = Gem::Package.new spec.file_name
+    package.spec = spec
+
+    package.build
+
+    assert_equal Gem::VERSION, spec.rubygems_version
+    assert_path_exists spec.file_name
+
+    reader = Gem::Package.new spec.file_name
+    assert reader.verify
+
+    assert_equal spec, reader.spec
+
+    assert_equal %w[metadata.gz       metadata.gz.sig
+                    data.tar.gz       data.tar.gz.sig
+                    checksums.yaml.gz checksums.yaml.gz.sig],
+                 reader.files
+
+    assert_equal %w[lib/code.rb], reader.contents
+  end
+
   def test_contents
     package = Gem::Package.new @gem
 
@@ -444,7 +533,7 @@ class TestGemPackage < Gem::Package::TarTestCase
         io.write metadata_gz
       end
 
-      digest = OpenSSL::Digest::SHA1.new
+      digest = Digest::SHA1.new
       digest << metadata_gz
 
       checksums = {
@@ -476,7 +565,8 @@ class TestGemPackage < Gem::Package::TarTestCase
   def test_verify_corrupt
     Tempfile.open 'corrupt' do |io|
       data = Gem.gzip 'a' * 10
-      io.write tar_file_header('metadata.gz', "\000x", 0644, data.length)
+      io.write \
+        tar_file_header('metadata.gz', "\000x", 0644, data.length, Time.now)
       io.write data
       io.rewind
 
@@ -515,6 +605,8 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_verify_security_policy
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     package = Gem::Package.new @gem
     package.security_policy = Gem::Security::HighSecurity
 
@@ -530,6 +622,8 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_verify_security_policy_low_security
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     @spec.cert_chain = [PUBLIC_CERT.to_pem]
     @spec.signing_key = PRIVATE_KEY
 
@@ -548,6 +642,8 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_verify_security_policy_checksum_missing
+    skip 'openssl is missing' unless defined?(OpenSSL::SSL)
+
     @spec.cert_chain = [PUBLIC_CERT.to_pem]
     @spec.signing_key = PRIVATE_KEY
 
@@ -603,6 +699,21 @@ class TestGemPackage < Gem::Package::TarTestCase
                  e.message
   end
 
+  # end #verify tests
+
+  def test_verify_entry
+    entry = Object.new
+    def entry.full_name() raise ArgumentError, 'whatever' end
+
+    package = Gem::Package.new @gem
+
+    e = assert_raises Gem::Package::FormatError do
+      package.verify_entry entry
+    end
+
+    assert_equal "package is corrupt, exception while verifying: whatever (ArgumentError) in #{@gem}", e.message
+  end
+
   def test_spec
     package = Gem::Package.new @gem