rubygems-update 1.4.2 → 1.5.0

data/test/{test_gem_package_tar_output.rb → rubygems/test_gem_package_tar_output.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gem_package_tar_test_case', __FILE__)
+require 'rubygems/package/tar_test_case'
 require 'rubygems/package/tar_output'
 
-class TestGemPackageTarOutput < TarTestCase
+class TestGemPackageTarOutput < Gem::Package::TarTestCase
 
   def setup
     super

data/test/{test_gem_package_tar_reader.rb → rubygems/test_gem_package_tar_reader.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gem_package_tar_test_case', __FILE__)
+require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
-class TestGemPackageTarReader < TarTestCase
+class TestGemPackageTarReader < Gem::Package::TarTestCase
 
   def test_each_entry
     tar = tar_dir_header "foo", "bar", 0

data/test/{test_gem_package_tar_reader_entry.rb → rubygems/test_gem_package_tar_reader_entry.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gem_package_tar_test_case', __FILE__)
+require 'rubygems/package/tar_test_case'
 require 'rubygems/package'
 
-class TestGemPackageTarReaderEntry < TarTestCase
+class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
   def setup
     super
@@ -61,6 +61,16 @@ class TestGemPackageTarReaderEntry < TarTestCase
     assert_equal 'lib/foo', @entry.full_name
   end
 
+  def test_full_name_null
+    @entry.header.prefix << "\000"
+
+    e = assert_raises Gem::Package::TarInvalidError do
+      @entry.full_name
+    end
+
+    assert_equal 'tar is corrupt, name contains null byte', e.message
+  end
+
   def test_getc
     assert_equal ?a, @entry.getc
   end

data/test/{test_gem_package_tar_writer.rb → rubygems/test_gem_package_tar_writer.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gem_package_tar_test_case', __FILE__)
+require 'rubygems/package/tar_test_case'
 require 'rubygems/package/tar_writer'
 
-class TestTarWriter < TarTestCase
+class TestTarWriter < Gem::Package::TarTestCase
 
   def setup
     super

data/test/{test_gem_package_task.rb → rubygems/test_gem_package_task.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems'
 require 'rubygems/package_task'
 
-class TestGemPackageTask < RubyGemTestCase
+class TestGemPackageTask < Gem::TestCase
 
   def test_gem_package
     gem = Gem::Specification.new do |g|
@@ -42,5 +42,18 @@ class TestGemPackageTask < RubyGemTestCase
     assert_equal ["x", "y"], pkg.package_files
   end
 
+  def test_package_dir_path
+    gem = Gem::Specification.new do |g|
+      g.name = 'nokogiri'
+      g.version = '1.5.0'
+      g.platform = 'java'
+    end
+
+    pkg = Gem::PackageTask.new gem
+    pkg.define
+
+    assert_equal 'pkg/nokogiri-1.5.0-java', pkg.package_dir_path
+  end
+
 end
 

data/test/{test_gem_platform.rb → rubygems/test_gem_platform.rb}

@@ -1,8 +1,8 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/platform'
 require 'rbconfig'
 
-class TestGemPlatform < RubyGemTestCase
+class TestGemPlatform < Gem::TestCase
 
   def test_self_local
     util_set_arch 'i686-darwin8.10.1'

data/test/{test_gem_remote_fetcher.rb → rubygems/test_gem_remote_fetcher.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'ostruct'
 require 'webrick'
 require 'rubygems/remote_fetcher'
@@ -18,7 +18,7 @@ require 'rubygems/format'
 # software doesn't really care, as long as we hit the proxy URL when a
 # proxy is configured.
 
-class TestGemRemoteFetcher < RubyGemTestCase
+class TestGemRemoteFetcher < Gem::TestCase
 
   include Gem::DefaultUserInteraction
 
@@ -372,7 +372,7 @@ gems:
       uri.user, uri.password = 'domain%5Cuser', 'bar'
       fetcher = Gem::RemoteFetcher.new uri.to_s
       proxy = fetcher.instance_variable_get("@proxy_uri")
-      assert_equal 'domain\user', URI.unescape(proxy.user)
+      assert_equal 'domain\user', fetcher.unescape(proxy.user)
       assert_equal 'bar', proxy.password
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
@@ -383,7 +383,7 @@ gems:
       fetcher = Gem::RemoteFetcher.new uri.to_s
       proxy = fetcher.instance_variable_get("@proxy_uri")
       assert_equal 'user', proxy.user
-      assert_equal 'my pass', URI.unescape(proxy.password)
+      assert_equal 'my pass', fetcher.unescape(proxy.password)
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
   end
@@ -406,8 +406,8 @@ gems:
       ENV['http_proxy_pass'] = 'my bar'
       fetcher = Gem::RemoteFetcher.new nil
       proxy = fetcher.instance_variable_get("@proxy_uri")
-      assert_equal 'foo\user', URI.unescape(proxy.user)
-      assert_equal 'my bar', URI.unescape(proxy.password)
+      assert_equal 'foo\user', fetcher.unescape(proxy.user)
+      assert_equal 'my bar', fetcher.unescape(proxy.password)
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
   end
@@ -611,7 +611,7 @@ gems:
     assert_equal '', response.body
   end
 
-  def test_request_unmodifed
+  def test_request_unmodified
     uri = URI.parse "#{@gem_repo}/specs.#{Gem.marshal_version}"
     conn = util_stub_connection_for :body => '', :code => 304
 

data/test/{test_gem_requirement.rb → rubygems/test_gem_requirement.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require "rubygems/requirement"
 
-class TestGemRequirement < RubyGemTestCase
+class TestGemRequirement < Gem::TestCase
 
   def test_equals2
     r = req "= 1.2"

data/test/{test_gem_security.rb → rubygems/test_gem_security.rb}

@@ -1,7 +1,7 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/security'
 
-class TestGemSecurity < RubyGemTestCase
+class TestGemSecurity < Gem::TestCase
 
   def test_class_build_cert
     name = OpenSSL::X509::Name.parse "CN=nobody/DC=example"
@@ -86,5 +86,4 @@ class TestGemSecurity < RubyGemTestCase
                  Gem::Security.email_to_name('no+body@example', munger).to_s
   end
 
-end
-
+end if defined?(OpenSSL)

data/test/{test_gem_server.rb → rubygems/test_gem_server.rb}

@@ -1,4 +1,4 @@
-require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/test_case'
 require 'rubygems/server'
 require 'stringio'
 
@@ -7,7 +7,7 @@ class Gem::Server
   attr_reader :server
 end
 
-class TestGemServer < RubyGemTestCase
+class TestGemServer < Gem::TestCase
 
   def setup
     super
@@ -109,104 +109,6 @@ class TestGemServer < RubyGemTestCase
     assert_equal 2, @server.server.listeners.length
   end
 
-  def test_quick_a_1_gemspec_rz
-    data = StringIO.new "GET /quick/a-1.gemspec.rz HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.quick @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert @res['date']
-    assert_equal 'application/x-deflate', @res['content-type']
-
-    spec = YAML.load Gem.inflate(@res.body)
-    assert_equal 'a', spec.name
-    assert_equal Gem::Version.new(1), spec.version
-  end
-
-  def test_quick_a_1_mswin32_gemspec_rz
-    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
-
-    @server.quick @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert @res['date']
-    assert_equal 'application/x-deflate', @res['content-type']
-
-    spec = YAML.load Gem.inflate(@res.body)
-    assert_equal 'a', spec.name
-    assert_equal Gem::Version.new(1), spec.version
-    assert_equal Gem::Platform.local, spec.platform
-  end
-
-  def test_quick_common_substrings
-    quick_gem 'ab', '1'
-
-    data = StringIO.new "GET /quick/a-1.gemspec.rz HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.quick @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert @res['date']
-    assert_equal 'application/x-deflate', @res['content-type']
-
-    spec = YAML.load Gem.inflate(@res.body)
-    assert_equal 'a', spec.name
-    assert_equal Gem::Version.new(1), spec.version
-  end
-
-  def test_quick_index
-    data = StringIO.new "GET /quick/index HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.quick @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
-    assert_equal 'text/plain', @res['content-type']
-    assert_equal "a-1\na-2", @res.body
-  end
-
-  def test_quick_index_rz
-    data = StringIO.new "GET /quick/index.rz HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.quick @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
-    assert_equal 'application/x-deflate', @res['content-type']
-    assert_equal "a-1\na-2", Gem.inflate(@res.body)
-  end
-
-  def test_quick_latest_index
-    data = StringIO.new "GET /quick/latest_index HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.quick @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
-    assert_equal 'text/plain', @res['content-type']
-    assert_equal 'a-2', @res.body
-  end
-
-  def test_quick_latest_index_rz
-    data = StringIO.new "GET /quick/latest_index.rz HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.quick @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
-    assert_equal 'application/x-deflate', @res['content-type']
-    assert_equal 'a-2', Gem.inflate(@res.body)
-  end
-
   def test_quick_missing
     data = StringIO.new "GET /quick/z-9.gemspec.rz HTTP/1.0\r\n\r\n"
     @req.parse data
@@ -305,38 +207,6 @@ class TestGemServer < RubyGemTestCase
                  Marshal.load(Gem.gunzip(@res.body))
   end
 
-  def test_yaml
-    data = StringIO.new "GET /yaml.#{Gem.marshal_version} HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.yaml @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
-    assert_equal 'text/plain', @res['content-type']
-
-    si = Gem::SourceIndex.new
-    si.add_specs @a1, @a2
-
-    assert_equal si, YAML.load(@res.body)
-  end
-
-  def test_yaml_Z
-    data = StringIO.new "GET /yaml.#{Gem.marshal_version}.Z HTTP/1.0\r\n\r\n"
-    @req.parse data
-
-    @server.yaml @req, @res
-
-    assert_equal 200, @res.status, @res.body
-    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
-    assert_equal 'application/x-deflate', @res['content-type']
-
-    si = Gem::SourceIndex.new
-    si.add_specs @a1, @a2
-
-    assert_equal si, YAML.load(Gem.inflate(@res.body))
-  end
-
   def util_listen
     webrick = Object.new
     webrick.instance_variable_set :@listeners, []

data/test/rubygems/test_gem_silent_ui.rb

@@ -0,0 +1,113 @@
+require 'rubygems/test_case'
+require 'rubygems/user_interaction'
+require 'timeout'
+
+class TestGemSilentUI < Gem::TestCase
+
+  def setup
+    super
+    @sui = Gem::SilentUI.new
+  end
+
+  def test_ask
+    value = nil
+    out, err = capture_io do
+      use_ui @sui do
+        value = @sui.ask 'Problem?'
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+
+    assert_nil value, 'No value'
+  end
+
+  def test_ask_for_password
+    value = nil
+    out, err = capture_io do
+      use_ui @sui do
+        value = @sui.ask_for_password 'Problem?'
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+
+    assert_nil value, 'No value'
+  end
+
+  def test_ask_yes_no
+    value = nil
+    out, err = capture_io do
+      use_ui @sui do
+        assert_raises(Gem::OperationNotSupportedError) do
+          @sui.ask_yes_no 'Problem?'
+        end
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+    
+    out, err = capture_io do
+      use_ui @sui do
+        value = @sui.ask_yes_no 'Problem?', true
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+
+    assert value, 'Value is true'
+    
+    out, err = capture_io do
+      use_ui @sui do
+        value = @sui.ask_yes_no 'Problem?', false
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+
+    assert_equal value, false, 'Value is false'
+  end
+
+  def test_choose_from_list
+    value = nil
+    out, err = capture_io do
+      use_ui @sui do
+        value = @sui.choose_from_list 'Problem?', %w[yes no]
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+
+    assert_equal [nil, nil], value, 'Value is nil!'
+  end
+
+  def test_progress_reporter
+    value = nil
+    out, err = capture_io do
+      use_ui @sui do
+        @sui.progress_reporter 10, 'hi'
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+  end
+
+  def test_download_reporter
+    value = nil
+    out, err = capture_io do
+      use_ui @sui do
+        @sui.download_reporter.fetch 'a.gem', 1024
+      end
+    end
+
+    assert_empty out, 'No output'
+    assert_empty err, 'No output'
+  end
+end