rubygems-update 1.3.7 → 1.4.0

data/test/test_gem_package_task.rb

@@ -2,7 +2,7 @@ require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems'
 require 'rubygems/package_task'
 
-class TestGemPackageTask < MiniTest::Unit::TestCase
+class TestGemPackageTask < RubyGemTestCase
 
   def test_gem_package
     gem = Gem::Specification.new do |g|

data/test/test_gem_platform.rb

@@ -117,7 +117,6 @@ class TestGemPlatform < RubyGemTestCase
 
   def test_initialize_platform
     platform = Gem::Platform.new 'cpu-my_platform1'
-    expected = Gem::Platform.new platform
 
     assert_equal 'cpu', platform.cpu
     assert_equal 'my_platform', platform.os

data/test/test_gem_remote_fetcher.rb

@@ -562,7 +562,7 @@ gems:
       end
     end
 
-    conn = { 'gems.example.com:80' => conn }
+    conn = { "#{Thread.current.object_id}:gems.example.com:80" => conn }
     fetcher.instance_variable_set :@connections, conn
 
     data = fetcher.open_uri_or_path 'http://gems.example.com/redirect'
@@ -581,7 +581,7 @@ gems:
       res
     end
 
-    conn = { 'gems.example.com:80' => conn }
+    conn = { "#{Thread.current.object_id}:gems.example.com:80" => conn }
     fetcher.instance_variable_set :@connections, conn
 
     e = assert_raises Gem::RemoteFetcher::FetchError do
@@ -646,11 +646,13 @@ gems:
 
   def assert_error(exception_class=Exception)
     got_exception = false
+
     begin
       yield
-    rescue exception_class => ex
+    rescue exception_class
       got_exception = true
     end
+
     assert got_exception, "Expected exception conforming to #{exception_class}"
   end
 

data/test/test_gem_requirement.rb

@@ -216,9 +216,9 @@ class TestGemRequirement < RubyGemTestCase
     refute_satisfied_by "2.0",     "~> 1.4.4"
 
     refute_satisfied_by "1.1.pre", "~> 1.0.0"
-    assert_satisfied_by "1.1.pre", "~> 1.1"
+    refute_satisfied_by "1.1.pre", "~> 1.1"
     refute_satisfied_by "2.0.a",   "~> 1.0"
-    assert_satisfied_by "2.0.a",   "~> 2.0"
+    refute_satisfied_by "2.0.a",   "~> 2.0"
   end
 
   def test_satisfied_by_eh_multiple

data/test/test_gem_security.rb

@@ -0,0 +1,90 @@
+require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/security'
+
+class TestGemSecurity < RubyGemTestCase
+
+  def test_class_build_cert
+    name = OpenSSL::X509::Name.parse "CN=nobody/DC=example"
+    key = OpenSSL::PKey::RSA.new 512
+    opt = { :cert_age => 60 }
+
+    cert = Gem::Security.build_cert name, key, opt
+
+    assert_kind_of OpenSSL::X509::Certificate, cert
+
+    assert_equal    2,                     cert.version
+    assert_equal    0,                     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
+
+    constraints = cert.extensions.find { |ext| ext.oid == 'basicConstraints' }
+    assert_equal 'CA:FALSE', constraints.value
+
+    key_usage = cert.extensions.find { |ext| ext.oid == 'keyUsage' }
+    assert_equal 'Digital Signature, Key Encipherment, Data Encipherment',
+                 key_usage.value
+
+    key_ident = cert.extensions.find { |ext| ext.oid == 'subjectKeyIdentifier' }
+    assert_equal 59, key_ident.value.length
+
+    assert_equal name.to_s, cert.issuer.to_s
+    assert_equal name.to_s, cert.subject.to_s
+  end
+
+  def test_class_build_self_signed_cert
+    email = 'nobody@example'
+    opt = {
+      :cert_age  => 60,
+      :key_size  => 512,
+      :save_cert => false,
+      :save_key  => false,
+    }
+
+    result = Gem::Security.build_self_signed_cert email, opt
+
+    key = result[:key]
+
+    assert_kind_of OpenSSL::PKey::RSA, key
+    # assert_equal 512, key.something_here
+
+    cert = result[:cert]
+
+    assert_equal '/CN=nobody/DC=example', cert.issuer.to_s
+  end
+
+  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
+
+    cert.subject    = name
+    cert.public_key = key.public_key
+
+    signed = Gem::Security.sign_cert cert, key, cert
+
+    assert cert.verify key
+    assert_equal name.to_s, signed.subject.to_s
+  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
+
+    assert_equal '/CN=nobody/DC=example/DC=com',
+                 Gem::Security.email_to_name('nobody@example.com', munger).to_s
+
+    assert_equal '/CN=no.body/DC=example',
+                 Gem::Security.email_to_name('no.body@example', munger).to_s
+
+    assert_equal '/CN=no_body/DC=example',
+                 Gem::Security.email_to_name('no+body@example', munger).to_s
+  end
+
+end
+

data/test/test_gem_server.rb

@@ -92,7 +92,7 @@ class TestGemServer < RubyGemTestCase
   def test_listen
     util_listen
 
-    out, err = capture_io do
+    capture_io do
       @server.listen
     end
 
@@ -102,10 +102,10 @@ class TestGemServer < RubyGemTestCase
   def test_listen_addresses
     util_listen
 
-    out, err = capture_io do
+    capture_io do
       @server.listen %w[a b]
     end
-    
+
     assert_equal 2, @server.server.listeners.length
   end
 
@@ -125,7 +125,7 @@ class TestGemServer < RubyGemTestCase
   end
 
   def test_quick_a_1_mswin32_gemspec_rz
-    a1_p = quick_gem 'a', '1' do |s| s.platform = Gem::Platform.local end
+    quick_gem 'a', '1' do |s| s.platform = Gem::Platform.local end
 
     data = StringIO.new "GET /quick/a-1-#{Gem::Platform.local}.gemspec.rz HTTP/1.0\r\n\r\n"
     @req.parse data
@@ -143,7 +143,7 @@ class TestGemServer < RubyGemTestCase
   end
 
   def test_quick_common_substrings
-    ab1 = quick_gem 'ab', '1'
+    quick_gem 'ab', '1'
 
     data = StringIO.new "GET /quick/a-1.gemspec.rz HTTP/1.0\r\n\r\n"
     @req.parse data
@@ -236,7 +236,7 @@ class TestGemServer < RubyGemTestCase
   end
 
   def test_quick_marshal_a_1_mswin32_gemspec_rz
-    a1_p = quick_gem 'a', '1' do |s| s.platform = Gem::Platform.local end
+    quick_gem 'a', '1' do |s| s.platform = Gem::Platform.local end
 
     data = StringIO.new "GET /quick/Marshal.#{Gem.marshal_version}/a-1-#{Gem::Platform.local}.gemspec.rz HTTP/1.0\r\n\r\n"
     @req.parse data

data/test/test_gem_source_index.rb

@@ -116,19 +116,14 @@ end
       fp.write 'raise Exception, "epic fail"'
     end
 
-    use_ui @ui do
+    out, err = capture_io do
       assert_equal nil, Gem::SourceIndex.load_specification(spec_file)
     end
 
-    assert_equal '', @ui.output
-
-    expected = <<-EOF
-WARNING:  #<Exception: epic fail>
-raise Exception, "epic fail"
-WARNING:  Invalid .gemspec format in '#{spec_file}'
-    EOF
+    assert_equal '', out
 
-    assert_equal expected, @ui.error
+    expected = "Invalid gemspec in [#{spec_file}]: epic fail\n"
+    assert_equal expected, err
   end
 
   def test_self_load_specification_interrupt
@@ -163,14 +158,13 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
       fp.write '1 +'
     end
 
-    use_ui @ui do
+    out, err = capture_io do
       assert_equal nil, Gem::SourceIndex.load_specification(spec_file)
     end
 
-    assert_equal '', @ui.output
+    assert_equal '', out
 
-    assert_match(/syntax error/, @ui.error)
-    assert_match(/1 \+/, @ui.error)
+    assert_match(/syntax error/, err)
   end
 
   def test_self_load_specification_system_exit

data/test/test_gem_specification.rb

@@ -777,7 +777,6 @@ Gem::Specification.new do |s|
   s.summary = %q{this is a summary}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = #{Gem::Specification::CURRENT_SPECIFICATION_VERSION}
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -832,7 +831,6 @@ Gem::Specification.new do |s|
   s.test_files = [\"test/suite.rb\"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
@@ -1175,21 +1173,6 @@ end
     end
   end
 
-  def test_validate_rubyforge_project
-    util_setup_validate
-
-    Dir.chdir @tempdir do
-      @a1.rubyforge_project = ''
-
-      use_ui @ui do
-        @a1.validate
-      end
-
-      assert_equal "WARNING:  no rubyforge_project specified\n",
-                   @ui.error, 'error'
-    end
-  end
-
   def test_validate_rubygems_version
     util_setup_validate
 
@@ -1258,7 +1241,9 @@ end
     specfile.write "raise 'boom'"
     specfile.close
     begin
-      Gem::Specification.load(specfile.path)
+      capture_io do
+        Gem::Specification.load(specfile.path)
+      end
     rescue => e
       name_rexp = Regexp.new(Regexp.escape(specfile.path))
       assert e.backtrace.grep(name_rexp).any?

data/test/test_gem_stream_ui.rb

@@ -1,5 +1,6 @@
 require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/user_interaction'
+require 'timeout'
 
 class TestGemStreamUI < RubyGemTestCase
 
@@ -24,6 +25,7 @@ class TestGemStreamUI < RubyGemTestCase
     @err = StringIO.new
 
     @in.extend IsTty
+    @out.extend IsTty
 
     @sui = Gem::StreamUI.new @in, @out, @err
   end
@@ -105,32 +107,94 @@ class TestGemStreamUI < RubyGemTestCase
     assert_equal "which one?\n 1. foo\n 2. bar\n> ", @out.string
   end
 
-  def test_proress_reporter_silent_nil
+  def test_progress_reporter_silent_nil
     @cfg.verbose = nil
     reporter = @sui.progress_reporter 10, 'hi'
     assert_kind_of Gem::StreamUI::SilentProgressReporter, reporter
   end
 
-  def test_proress_reporter_silent_false
+  def test_progress_reporter_silent_false
     @cfg.verbose = false
     reporter = @sui.progress_reporter 10, 'hi'
     assert_kind_of Gem::StreamUI::SilentProgressReporter, reporter
     assert_equal "", @out.string
   end
 
-  def test_proress_reporter_simple
+  def test_progress_reporter_simple
     @cfg.verbose = true
     reporter = @sui.progress_reporter 10, 'hi'
     assert_kind_of Gem::StreamUI::SimpleProgressReporter, reporter
     assert_equal "hi\n", @out.string
   end
 
-  def test_proress_reporter_verbose
+  def test_progress_reporter_verbose
     @cfg.verbose = 0
     reporter = @sui.progress_reporter 10, 'hi'
     assert_kind_of Gem::StreamUI::VerboseProgressReporter, reporter
     assert_equal "hi\n", @out.string
   end
 
-end
+  def test_download_reporter_silent_nil
+    @cfg.verbose = nil
+    reporter = @sui.download_reporter
+    reporter.fetch 'a.gem', 1024
+    assert_kind_of Gem::StreamUI::SilentDownloadReporter, reporter
+    assert_equal "", @out.string
+  end
+
+  def test_download_reporter_silent_false
+    @cfg.verbose = false
+    reporter = @sui.download_reporter
+    reporter.fetch 'a.gem', 1024
+    assert_kind_of Gem::StreamUI::SilentDownloadReporter, reporter
+    assert_equal "", @out.string
+  end
+
+  def test_download_reporter_anything
+    @cfg.verbose = 0
+    reporter = @sui.download_reporter
+    assert_kind_of Gem::StreamUI::VerboseDownloadReporter, reporter
+  end
+
+  def test_verbose_download_reporter
+    @cfg.verbose = true
+    reporter = @sui.download_reporter
+    reporter.fetch 'a.gem', 1024
+    assert_equal "Fetching: a.gem", @out.string
+  end
 
+  def test_verbose_download_reporter_progress
+    @cfg.verbose = true
+    reporter = @sui.download_reporter
+    reporter.fetch 'a.gem', 1024
+    reporter.update 512
+    assert_equal "Fetching: a.gem\rFetching: a.gem ( 50%)", @out.string
+  end
+
+  def test_verbose_download_reporter_progress_once
+    @cfg.verbose = true
+    reporter = @sui.download_reporter
+    reporter.fetch 'a.gem', 1024
+    reporter.update 510
+    reporter.update 512
+    assert_equal "Fetching: a.gem\rFetching: a.gem ( 50%)", @out.string
+  end
+
+  def test_verbose_download_reporter_progress_complete
+    @cfg.verbose = true
+    reporter = @sui.download_reporter
+    reporter.fetch 'a.gem', 1024
+    reporter.update 510
+    reporter.done
+    assert_equal "Fetching: a.gem\rFetching: a.gem ( 50%)\rFetching: a.gem (100%)\n", @out.string
+  end
+
+  def test_verbose_download_reporter_no_tty
+    @out.tty = false
+
+    @cfg.verbose = true
+    reporter = @sui.download_reporter
+    reporter.fetch 'a.gem', 1024
+    assert_equal "", @out.string
+  end
+end

data/test/test_gem_text.rb

@@ -0,0 +1,43 @@
+require File.expand_path('../gemutilities', __FILE__)
+require "rubygems/text"
+
+class TestGemText < RubyGemTestCase
+  include Gem::Text
+
+  def test_format_text
+    assert_equal "text to\nwrap",     format_text("text to wrap", 8)
+  end
+
+  def test_format_text_indent
+    assert_equal "  text to\n  wrap", format_text("text to wrap", 8, 2)
+  end
+
+  def test_format_text_none
+    assert_equal "text to wrap",      format_text("text to wrap", 40)
+  end
+
+  def test_format_text_none_indent
+    assert_equal "  text to wrap",    format_text("text to wrap", 40, 2)
+  end
+
+  def test_levenshtein_distance_add
+    assert_equal 2, levenshtein_distance("zentest", "zntst")
+    assert_equal 2, levenshtein_distance("zntst", "zentest")
+  end
+
+  def test_levenshtein_distance_empty
+    assert_equal 5, levenshtein_distance("abcde", "")
+    assert_equal 5, levenshtein_distance("", "abcde")
+  end
+
+  def test_levenshtein_distance_remove
+    assert_equal 3, levenshtein_distance("zentest", "zentestxxx")
+    assert_equal 3, levenshtein_distance("zentestxxx", "zentest")
+  end
+
+  def test_levenshtein_distance_replace
+    assert_equal 2, levenshtein_distance("zentest", "ZenTest")
+    assert_equal 7, levenshtein_distance("xxxxxxx", "ZenTest")
+    assert_equal 7, levenshtein_distance("zentest", "xxxxxxx")
+  end
+end