rubygems-update 1.8.30 → 2.0.0.preview2

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -3,7 +3,8 @@ require 'ostruct'
 require 'webrick'
 require 'webrick/https'
 require 'rubygems/remote_fetcher'
-require 'rubygems/format'
+require 'rubygems/package'
+require 'minitest/mock'
 
 # = Testing Proxy Settings
 #
@@ -87,6 +88,8 @@ gems:
     ENV.delete 'HTTP_PROXY_USER'
     ENV.delete 'http_proxy_pass'
     ENV.delete 'HTTP_PROXY_PASS'
+    ENV.delete 'no_proxy'
+    ENV.delete 'NO_PROXY'
 
     base_server_uri = "http://localhost:#{SERVER_PORT}"
     @proxy_uri = "http://localhost:#{PROXY_PORT}"
@@ -101,6 +104,7 @@ gems:
 
     # TODO: why does the remote fetcher need it written to disk?
     @a1, @a1_gem = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
+    @a1.loaded_from = File.join(@gemhome, 'specifications', @a1.full_name)
 
     Gem::RemoteFetcher.fetcher = nil
 
@@ -173,6 +177,21 @@ gems:
     end
   end
 
+  def test_api_endpoint
+    uri = URI.parse "http://gems.example.com/foo"
+    target = MiniTest::Mock.new
+    target.expect :target, "http://blah.com"
+
+    dns = MiniTest::Mock.new
+    dns.expect :getresource, target, [String, Object]
+
+    fetch = Gem::RemoteFetcher.new nil, dns
+    assert_equal URI.parse("http://blah.com/foo"), fetch.api_endpoint(uri)
+
+    target.verify
+    dns.verify
+  end
+
   def util_fuck_with_fetcher data, blow = false
     fetcher = Gem::RemoteFetcher.fetcher
     fetcher.instance_variable_set :@test_data, data
@@ -278,8 +297,8 @@ gems:
         inst = Gem::RemoteFetcher.fetcher
       end
 
-      assert_equal File.join(@tempdir, @a1.file_name),
-        inst.download(@a1, local_path)
+      assert_equal(File.join(@tempdir, @a1.file_name),
+                   inst.download(@a1, local_path))
     ensure
       FileUtils.chmod 0755, @a1.cache_dir
     end
@@ -305,6 +324,7 @@ gems:
       s.platform = Gem::Platform::CURRENT
       s.instance_variable_set :@original_platform, original_platform
     end
+    e1.loaded_from = File.join(@gemhome, 'specifications', e1.full_name)
 
     e1_data = nil
     File.open e1_gem, 'rb' do |fp|
@@ -334,7 +354,7 @@ gems:
     cache_path = @a1.cache_file
     FileUtils.mv local_path, cache_path
 
-    gem = Gem::Format.from_file_by_path cache_path
+    gem = Gem::Package.new cache_path
 
     assert_equal cache_path, inst.download(gem.spec, cache_path)
   end
@@ -342,7 +362,7 @@ gems:
   def test_download_unsupported
     inst = Gem::RemoteFetcher.fetcher
 
-    e = assert_raises Gem::InstallError do
+    e = assert_raises ArgumentError do
       inst.download @a1, 'ftp://gems.rubyforge.org'
     end
 
@@ -624,6 +644,32 @@ gems:
     assert_equal "too many redirects (#{url})", e.message
   end
 
+  def test_normalize_uri
+    assert_equal 'FILE://example/',  @fetcher.normalize_uri('FILE://example/')
+    assert_equal 'FTP://example/',   @fetcher.normalize_uri('FTP://example/')
+    assert_equal 'HTTP://example/',  @fetcher.normalize_uri('HTTP://example/')
+    assert_equal 'HTTPS://example/', @fetcher.normalize_uri('HTTPS://example/')
+    assert_equal 'http://example/',  @fetcher.normalize_uri('example/')
+  end
+
+  def test_observe_no_proxy_env_single_host
+    use_ui @ui do
+      ENV["http_proxy"] = @proxy_uri
+      ENV["no_proxy"] = URI::parse(@server_uri).host
+      fetcher = Gem::RemoteFetcher.new nil
+      assert_data_from_server fetcher.fetch_path(@server_uri)
+    end
+  end
+
+  def test_observe_no_proxy_env_list
+    use_ui @ui do
+      ENV["http_proxy"] = @proxy_uri
+      ENV["no_proxy"] = "fakeurl.com, #{URI::parse(@server_uri).host}"
+      fetcher = Gem::RemoteFetcher.new nil
+      assert_data_from_server fetcher.fetch_path(@server_uri)
+    end
+  end
+
   def test_request
     uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}"
     util_stub_connection_for :body => :junk, :code => 200

data/test/rubygems/test_gem_request_set.rb

@@ -0,0 +1,70 @@
+require 'rubygems/test_case'
+require 'rubygems/request_set'
+
+class TestGemRequestSet < Gem::TestCase
+  def setup
+    super
+
+    Gem::RemoteFetcher.fetcher = @fetcher = Gem::FakeFetcher.new
+  end
+
+  def test_gem
+    util_spec "a", "2"
+
+    rs = Gem::RequestSet.new
+    rs.gem "a", "= 2"
+
+    assert_equal [Gem::Dependency.new("a", "=2")], rs.dependencies
+  end
+
+  def test_resolve
+    a = util_spec "a", "2", "b" => ">= 2"
+    b = util_spec "b", "2"
+
+    rs = Gem::RequestSet.new
+    rs.gem "a"
+
+    res = rs.resolve StaticSet.new([a, b])
+    assert_equal 2, res.size
+
+    names = res.map { |s| s.full_name }.sort
+
+    assert_equal ["a-2", "b-2"], names
+  end
+
+  def test_sorted_requests
+    a = util_spec "a", "2", "b" => ">= 2"
+    b = util_spec "b", "2", "c" => ">= 2"
+    c = util_spec "c", "2"
+
+    rs = Gem::RequestSet.new
+    rs.gem "a"
+
+    rs.resolve StaticSet.new([a, b, c])
+
+    names = rs.sorted_requests.map { |s| s.full_name }
+    assert_equal %w!c-2 b-2 a-2!, names
+  end
+
+  def test_install_into
+    a, ad = util_gem "a", "1", "b" => "= 1"
+    b, bd = util_gem "b", "1"
+
+    util_setup_spec_fetcher a, b
+
+    @fetcher.data["http://gems.example.com/gems/#{a.file_name}"] = Gem.read_binary(ad)
+    @fetcher.data["http://gems.example.com/gems/#{b.file_name}"] = Gem.read_binary(bd)
+
+    rs = Gem::RequestSet.new
+    rs.gem "a"
+
+    rs.resolve
+
+    installed = rs.install_into @tempdir
+
+    assert File.exists?(File.join(@tempdir, "specifications", "a-1.gemspec"))
+    assert File.exists?(File.join(@tempdir, "specifications", "b-1.gemspec"))
+
+    assert_equal %w!b-1 a-1!, installed.map { |s| s.full_name }
+  end
+end

data/test/rubygems/test_gem_requirement.rb

@@ -21,9 +21,19 @@ class TestGemRequirement < Gem::TestCase
     assert_requirement_equal "= 2", v(2)
   end
 
-  def test_class_available_as_gem_version_requirement
-    assert_same Gem::Requirement, Gem::Version::Requirement,
-      "Gem::Version::Requirement is aliased for old YAML compatibility."
+  def test_empty_requirements_is_none
+    r = Gem::Requirement.new
+    assert_equal true, r.none?
+  end
+
+  def test_explicit_default_is_none
+    r = Gem::Requirement.new ">= 0"
+    assert_equal true, r.none?
+  end
+
+  def test_basic_non_none
+    r = Gem::Requirement.new "= 1"
+    assert_equal false, r.none?
   end
 
   def test_parse
@@ -37,19 +47,19 @@ class TestGemRequirement < Gem::TestCase
   end
 
   def test_parse_bad
-    [
-      nil,
-      '',
-      '! 1',
-      '= junk',
-      '1..2',
-    ].each do |bad|
-      e = assert_raises ArgumentError do
-        Gem::Requirement.parse bad
-      end
+    e = assert_raises Gem::Requirement::BadRequirementError do
+      Gem::Requirement.parse nil
+    end
+
+    assert_equal 'Illformed requirement [nil]', e.message
 
-      assert_equal "Illformed requirement [#{bad.inspect}]", e.message
+    e = assert_raises Gem::Requirement::BadRequirementError do
+      Gem::Requirement.parse ""
     end
+
+    assert_equal 'Illformed requirement [""]', e.message
+
+    assert_equal Gem::Requirement::BadRequirementError.superclass, ArgumentError
   end
 
   def test_prerelease_eh
@@ -69,28 +79,37 @@ class TestGemRequirement < Gem::TestCase
   def test_satisfied_by_eh_bang_equal
     r = req '!= 1.2'
 
-    assert_satisfied_by nil,   r
     assert_satisfied_by "1.1", r
     refute_satisfied_by "1.2", r
     assert_satisfied_by "1.3", r
+
+    assert_raises ArgumentError do
+      assert_satisfied_by nil, r
+    end
   end
 
   def test_satisfied_by_eh_blank
     r = req "1.2"
 
-    refute_satisfied_by nil,   r
     refute_satisfied_by "1.1", r
     assert_satisfied_by "1.2", r
     refute_satisfied_by "1.3", r
+
+    assert_raises ArgumentError do
+      assert_satisfied_by nil, r
+    end
   end
 
   def test_satisfied_by_eh_equal
     r = req "= 1.2"
 
-    refute_satisfied_by nil,   r
     refute_satisfied_by "1.1", r
     assert_satisfied_by "1.2", r
     refute_satisfied_by "1.3", r
+
+    assert_raises ArgumentError do
+      assert_satisfied_by nil, r
+    end
   end
 
   def test_satisfied_by_eh_gt
@@ -100,7 +119,7 @@ class TestGemRequirement < Gem::TestCase
     refute_satisfied_by "1.2", r
     assert_satisfied_by "1.3", r
 
-    assert_raises NoMethodError do
+    assert_raises ArgumentError do
       r.satisfied_by? nil
     end
   end
@@ -112,7 +131,7 @@ class TestGemRequirement < Gem::TestCase
     assert_satisfied_by "1.2", r
     assert_satisfied_by "1.3", r
 
-    assert_raises NoMethodError do
+    assert_raises ArgumentError do
       r.satisfied_by? nil
     end
   end
@@ -124,7 +143,7 @@ class TestGemRequirement < Gem::TestCase
     assert_satisfied_by "1.2", r
     refute_satisfied_by "1.3", r
 
-    assert_raises NoMethodError do
+    assert_raises ArgumentError do
       r.satisfied_by? nil
     end
   end
@@ -136,7 +155,7 @@ class TestGemRequirement < Gem::TestCase
     refute_satisfied_by "1.2", r
     refute_satisfied_by "1.3", r
 
-    assert_raises NoMethodError do
+    assert_raises ArgumentError do
       r.satisfied_by? nil
     end
   end
@@ -148,7 +167,7 @@ class TestGemRequirement < Gem::TestCase
     assert_satisfied_by "1.2", r
     refute_satisfied_by "1.3", r
 
-    assert_raises NoMethodError do
+    assert_raises ArgumentError do
       r.satisfied_by? nil
     end
   end
@@ -160,7 +179,7 @@ class TestGemRequirement < Gem::TestCase
     assert_satisfied_by "1.2", r
     assert_satisfied_by "1.3", r
 
-    assert_raises NoMethodError do
+    assert_raises ArgumentError do
       r.satisfied_by? nil
     end
   end
@@ -202,12 +221,22 @@ class TestGemRequirement < Gem::TestCase
 
   def test_illformed_requirements
     [ ">>> 1.3.5", "> blah" ].each do |rq|
-      assert_raises ArgumentError, "req [#{rq}] should fail" do
+      assert_raises Gem::Requirement::BadRequirementError, "req [#{rq}] should fail" do
         Gem::Requirement.new rq
       end
     end
   end
 
+  def test_satisfied_by_eh_non_versions
+    assert_raises ArgumentError do
+      req(">= 0").satisfied_by? Object.new
+    end
+
+    assert_raises ArgumentError do
+      req(">= 0").satisfied_by? Gem::Requirement.default
+    end
+  end
+
   def test_satisfied_by_eh_boxed
     refute_satisfied_by "1.3",     "~> 1.4"
     assert_satisfied_by "1.4",     "~> 1.4"

data/test/rubygems/test_gem_security.rb

@@ -4,33 +4,35 @@ require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9"
 
 class TestGemSecurity < Gem::TestCase
 
+  CHILD_KEY = load_key 'child'
+
+  ALTERNATE_CERT = load_cert 'child'
+  CHILD_CERT     = load_cert 'child'
+  EXPIRED_CERT   = load_cert 'expired'
+
   def setup
     super
-    Gem::Security::OPT[:trust_dir] = File.join(Gem.user_home, '.gem', 'trust')
-  end
 
-  def teardown
-    super
-    Gem::Security::OPT[:trust_dir] = File.join(Gem.user_home, '.gem', 'trust')
+    @SEC = Gem::Security
   end
 
-  def test_class_build_cert
-    name = OpenSSL::X509::Name.parse "CN=nobody/DC=example"
-    key = OpenSSL::PKey::RSA.new 512
-    opt = { :cert_age => 60 }
+  def test_class_create_cert
+    name = PUBLIC_CERT.subject
+    key = PRIVATE_KEY
 
-    cert = Gem::Security.build_cert name, key, opt
+    cert = @SEC.create_cert name, key, 60, Gem::Security::EXTENSIONS, 5
 
     assert_kind_of OpenSSL::X509::Certificate, cert
 
     assert_equal    2,                     cert.version
-    assert_equal    0,                     cert.serial
+    assert_equal    5,                     cert.serial
     assert_equal    key.public_key.to_pem, cert.public_key.to_pem
     assert_in_delta Time.now,              cert.not_before, 10
     assert_in_delta Time.now + 60,         cert.not_after, 10
     assert_equal    name.to_s,             cert.subject.to_s
 
-    assert_equal 3, cert.extensions.length
+    assert_equal 3, cert.extensions.length,
+                 cert.extensions.map { |e| e.to_a.first }
 
     constraints = cert.extensions.find { |ext| ext.oid == 'basicConstraints' }
     assert_equal 'CA:FALSE', constraints.value
@@ -41,60 +43,204 @@ class TestGemSecurity < Gem::TestCase
 
     key_ident = cert.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
     assert_equal 59, key_ident.value.length
+    assert_equal 'B0:EB:9C:A5:E5:8E:7D:94:BB:4B:3B:D6:80:CB:A5:AD:5D:12:88:90',
+                 key_ident.value
 
-    assert_equal name.to_s, cert.issuer.to_s
+    assert_equal '', cert.issuer.to_s
     assert_equal name.to_s, cert.subject.to_s
   end
 
-  def test_class_build_self_signed_cert
+  def test_class_create_cert_self_signed
+    subject = PUBLIC_CERT.subject
+
+    cert = @SEC.create_cert_self_signed subject, PRIVATE_KEY, 60
+
+    assert_equal '/CN=nobody/DC=example', cert.issuer.to_s
+  end
+
+  def test_class_create_cert_email
     email = 'nobody@example'
-    opt = {
-      :cert_age  => 60,
-      :key_size  => 512,
-      :save_cert => false,
-      :save_key  => false,
-    }
+    name = PUBLIC_CERT.subject
+    key = PRIVATE_KEY
 
-    result = Gem::Security.build_self_signed_cert email, opt
+    cert = @SEC.create_cert_email email, key, 60
 
-    key = result[:key]
+    assert_kind_of OpenSSL::X509::Certificate, cert
 
-    assert_kind_of OpenSSL::PKey::RSA, key
-    # assert_equal 512, key.something_here
+    assert_equal    2,                     cert.version
+    assert_equal    1,                     cert.serial
+    assert_equal    key.public_key.to_pem, cert.public_key.to_pem
+    assert_in_delta Time.now,              cert.not_before, 10
+    assert_in_delta Time.now + 60,         cert.not_after, 10
+    assert_equal    name.to_s,             cert.subject.to_s
+    assert_equal    name.to_s,             cert.issuer.to_s
 
-    cert = result[:cert]
+    assert_equal 5, cert.extensions.length,
+                 cert.extensions.map { |e| e.to_a.first }
 
-    assert_equal '/CN=nobody/DC=example', cert.issuer.to_s
-  end
+    constraints = cert.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    assert_equal 'email:nobody@example', constraints.value
 
-  def test_class_sign_cert
-    name = OpenSSL::X509::Name.parse "CN=nobody/DC=example"
-    key  = OpenSSL::PKey::RSA.new 512
-    cert = OpenSSL::X509::Certificate.new
+    constraints = cert.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    assert_equal 'CA:FALSE', constraints.value
 
-    cert.subject    = name
-    cert.public_key = key.public_key
+    key_usage = cert.extensions.find { |ext| ext.oid == 'keyUsage' }
+    assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
+                 key_usage.value
 
-    signed = Gem::Security.sign_cert cert, key, cert
+    key_ident = cert.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    assert_equal 59, key_ident.value.length
+    assert_equal 'B0:EB:9C:A5:E5:8E:7D:94:BB:4B:3B:D6:80:CB:A5:AD:5D:12:88:90',
+                 key_ident.value
+  end
 
-    assert cert.verify key
-    assert_equal name.to_s, signed.subject.to_s
+  def test_class_create_key
+    key = @SEC.create_key 256
+
+    assert_kind_of OpenSSL::PKey::RSA, key
   end
 
   def test_class_email_to_name
-    munger = Gem::Security::OPT[:munge_re]
-
     assert_equal '/CN=nobody/DC=example',
-                 Gem::Security.email_to_name('nobody@example', munger).to_s
+                 @SEC.email_to_name('nobody@example').to_s
 
     assert_equal '/CN=nobody/DC=example/DC=com',
-                 Gem::Security.email_to_name('nobody@example.com', munger).to_s
+                 @SEC.email_to_name('nobody@example.com').to_s
 
     assert_equal '/CN=no.body/DC=example',
-                 Gem::Security.email_to_name('no.body@example', munger).to_s
+                 @SEC.email_to_name('no.body@example').to_s
 
     assert_equal '/CN=no_body/DC=example',
-                 Gem::Security.email_to_name('no+body@example', munger).to_s
+                 @SEC.email_to_name('no+body@example').to_s
+  end
+
+  def test_class_re_sign
+    re_signed = Gem::Security.re_sign EXPIRED_CERT, PRIVATE_KEY, 60
+
+    assert_in_delta Time.now,      re_signed.not_before, 10
+    assert_in_delta Time.now + 60, re_signed.not_after,  10
+    assert_equal 2,                re_signed.serial
+
+    assert re_signed.verify PUBLIC_KEY
+  end
+
+  def test_class_re_sign_not_self_signed
+    e = assert_raises Gem::Security::Exception do
+      Gem::Security.re_sign CHILD_CERT, CHILD_KEY
+    end
+
+    assert_equal "#{ALTERNATE_CERT.subject} is not self-signed, contact " \
+                 "#{ALTERNATE_CERT.issuer} to obtain a valid certificate",
+                 e.message
+  end
+
+  def test_class_re_sign_wrong_key
+    e = assert_raises Gem::Security::Exception do
+      Gem::Security.re_sign ALTERNATE_CERT, PRIVATE_KEY
+    end
+
+    assert_equal "incorrect signing key for re-signing " \
+                 "#{ALTERNATE_CERT.subject}",
+                 e.message
+  end
+
+  def test_class_reset
+    trust_dir = @SEC.trust_dir
+
+    @SEC.reset
+
+    refute_equal trust_dir, @SEC.trust_dir
+  end
+
+  def test_class_sign
+    issuer = PUBLIC_CERT.subject
+    signee = OpenSSL::X509::Name.parse "/CN=signee/DC=example"
+
+    key  = PRIVATE_KEY
+    cert = OpenSSL::X509::Certificate.new
+    cert.subject = signee
+
+    cert.subject    = signee
+    cert.public_key = key.public_key
+
+    signed = @SEC.sign cert, key, PUBLIC_CERT, 60
+
+    assert_equal    key.public_key.to_pem, signed.public_key.to_pem
+    assert_equal    signee.to_s,           signed.subject.to_s
+    assert_equal    issuer.to_s,           signed.issuer.to_s
+
+    assert_in_delta Time.now,              signed.not_before, 10
+    assert_in_delta Time.now + 60,         signed.not_after, 10
+
+    assert_equal 4, signed.extensions.length,
+                 signed.extensions.map { |e| e.to_a.first }
+
+    constraints = signed.extensions.find { |ext| ext.oid == 'issuerAltName' }
+    assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
+
+    constraints = signed.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    assert_equal 'CA:FALSE', constraints.value
+
+    key_usage = signed.extensions.find { |ext| ext.oid == 'keyUsage' }
+    assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
+                 key_usage.value
+
+    key_ident =
+      signed.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    assert_equal 59, key_ident.value.length
+    assert_equal 'B0:EB:9C:A5:E5:8E:7D:94:BB:4B:3B:D6:80:CB:A5:AD:5D:12:88:90',
+                 key_ident.value
+
+    assert signed.verify key
   end
 
-end if defined?(OpenSSL)
+  def test_class_sign_AltName
+    issuer = PUBLIC_CERT.subject
+    signee = OpenSSL::X509::Name.parse "/CN=signee/DC=example"
+
+    cert = @SEC.create_cert_email 'signee@example', PRIVATE_KEY
+
+    signed = @SEC.sign cert, PRIVATE_KEY, PUBLIC_CERT, 60
+
+    assert_equal    PUBLIC_KEY.to_pem, signed.public_key.to_pem
+    assert_equal    signee.to_s,       signed.subject.to_s
+    assert_equal    issuer.to_s,       signed.issuer.to_s
+
+    assert_in_delta Time.now,          signed.not_before, 10
+    assert_in_delta Time.now + 60,     signed.not_after, 10
+
+    assert_equal 5, signed.extensions.length,
+                 signed.extensions.map { |e| e.to_a.first }
+
+    constraints = signed.extensions.find { |ext| ext.oid == 'issuerAltName' }
+    assert_equal 'email:nobody@example', constraints.value, 'issuerAltName'
+
+    constraints = signed.extensions.find { |ext| ext.oid == 'subjectAltName' }
+    assert_equal 'email:signee@example', constraints.value, 'subjectAltName'
+
+    constraints = signed.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    assert_equal 'CA:FALSE', constraints.value
+
+    key_usage = signed.extensions.find { |ext| ext.oid == 'keyUsage' }
+    assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
+                 key_usage.value
+
+    key_ident =
+      signed.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    assert_equal 59, key_ident.value.length
+    assert_equal 'B0:EB:9C:A5:E5:8E:7D:94:BB:4B:3B:D6:80:CB:A5:AD:5D:12:88:90',
+                 key_ident.value
+
+    assert signed.verify PUBLIC_KEY
+  end
+
+  def test_class_trust_dir
+    trust_dir = @SEC.trust_dir
+
+    expected = File.join Gem.user_home, '.gem/trust'
+
+    assert_equal expected, trust_dir.dir
+  end
+
+end
+