rubygems-update 1.6.2 → 1.7.0

data/test/rubygems/test_gem_gem_runner.rb

@@ -33,10 +33,7 @@ class TestGemGemRunner < Gem::TestCase
   def test_build_args__are_handled
     Gem.clear_paths
 
-    gr = Gem::GemRunner.new
-    assert_raises(Gem::SystemExitException) do
-      gr.run(%W[--help -- --build_arg1 --build_arg2])
-    end
+    Gem::GemRunner.new.run(%W[help -- --build_arg1 --build_arg2])
 
     assert_equal %w[--build_arg1 --build_arg2], Gem::Command.build_args
   end

data/test/rubygems/test_gem_installer.rb

@@ -654,8 +654,7 @@ load Gem.bin_path('a', 'executable', version)
 
     FileUtils.mv @gemhome, gemhome2
     Gem.source_index.gems.delete b2.full_name
-    source_index = Gem::SourceIndex.from_gems_in File.join(gemhome2,
-                                                           'specifications')
+    source_index = Gem::SourceIndex.new [File.join(gemhome2, 'specifications')]
 
     util_setup_gem
 

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -146,7 +146,7 @@ gems:
       fetcher.fetch_size 'gems.example.com/yaml'
     end
 
-    assert_equal 'uri scheme is invalid', e.message
+    assert_equal 'uri scheme is invalid: nil', e.message
   end
 
   def test_fetch_size_socket_error
@@ -416,7 +416,7 @@ gems:
   def test_fetch_path_gzip
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+    def fetcher.fetch_http(uri, mtime, head = nil)
       Gem.gzip 'foo'
     end
 
@@ -426,7 +426,7 @@ gems:
   def test_fetch_path_gzip_unmodified
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+    def fetcher.fetch_http(uri, mtime, head = nil)
       nil
     end
 
@@ -436,53 +436,59 @@ gems:
   def test_fetch_path_io_error
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+    def fetcher.fetch_http(*)
       raise EOFError
     end
 
+    url = 'http://example.com/uri'
+
     e = assert_raises Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_path 'uri'
+      fetcher.fetch_path url
     end
 
-    assert_equal 'EOFError: EOFError (uri)', e.message
-    assert_equal 'uri', e.uri
+    assert_equal "EOFError: EOFError (#{url})", e.message
+    assert_equal url, e.uri
   end
 
   def test_fetch_path_socket_error
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+    def fetcher.fetch_http(uri, mtime, head = nil)
       raise SocketError
     end
 
+    url = 'http://example.com/uri'
+
     e = assert_raises Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_path 'uri'
+      fetcher.fetch_path url
     end
 
-    assert_equal 'SocketError: SocketError (uri)', e.message
-    assert_equal 'uri', e.uri
+    assert_equal "SocketError: SocketError (#{url})", e.message
+    assert_equal url, e.uri
   end
 
   def test_fetch_path_system_call_error
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri, mtime = nil, head = nil)
+    def fetcher.fetch_http(uri, mtime = nil, head = nil)
       raise Errno::ECONNREFUSED, 'connect(2)'
     end
 
+    url = 'http://example.com/uri'
+
     e = assert_raises Gem::RemoteFetcher::FetchError do
-      fetcher.fetch_path 'uri'
+      fetcher.fetch_path url
     end
 
-    assert_match %r|ECONNREFUSED:.*connect\(2\) \(uri\)\z|,
+    assert_match %r|ECONNREFUSED:.*connect\(2\) \(#{Regexp.escape url}\)\z|,
                  e.message
-    assert_equal 'uri', e.uri
+    assert_equal url, e.uri
   end
 
   def test_fetch_path_unmodified
     fetcher = Gem::RemoteFetcher.new nil
 
-    def fetcher.open_uri_or_path(uri, mtime, head = nil)
+    def fetcher.fetch_http(uri, mtime, head = nil)
       nil
     end
 
@@ -545,16 +551,18 @@ gems:
     end
   end
 
-  def test_open_uri_or_path
+  def test_fetch_http
     fetcher = Gem::RemoteFetcher.new nil
+    url = 'http://gems.example.com/redirect'
 
     conn = Object.new
     def conn.started?() true end
     def conn.request(req)
+      url = 'http://gems.example.com/redirect'
       unless defined? @requested then
         @requested = true
         res = Net::HTTPMovedPermanently.new nil, 301, nil
-        res.add_field 'Location', 'http://gems.example.com/real_path'
+        res.add_field 'Location', url
         res
       else
         res = Net::HTTPOK.new nil, 200, nil
@@ -566,19 +574,21 @@ gems:
     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'
+    data = fetcher.fetch_http URI.parse(url)
 
     assert_equal 'real_path', data
   end
 
-  def test_open_uri_or_path_limited_redirects
+  def test_fetch_http_redirects
     fetcher = Gem::RemoteFetcher.new nil
+    url = 'http://gems.example.com/redirect'
 
     conn = Object.new
     def conn.started?() true end
     def conn.request(req)
+      url = 'http://gems.example.com/redirect'
       res = Net::HTTPMovedPermanently.new nil, 301, nil
-      res.add_field 'Location', 'http://gems.example.com/redirect'
+      res.add_field 'Location', url
       res
     end
 
@@ -586,11 +596,10 @@ gems:
     fetcher.instance_variable_set :@connections, conn
 
     e = assert_raises Gem::RemoteFetcher::FetchError do
-      fetcher.open_uri_or_path 'http://gems.example.com/redirect'
+      fetcher.fetch_http URI.parse(url)
     end
 
-    assert_equal 'too many redirects (http://gems.example.com/redirect)',
-                 e.message
+    assert_equal "too many redirects (#{url})", e.message
   end
 
   def test_request
@@ -625,6 +634,85 @@ gems:
     assert_equal t.rfc2822, conn.payload['if-modified-since']
   end
 
+  def test_user_agent
+    ua = @fetcher.user_agent
+
+    assert_match %r%^RubyGems/\S+ \S+ Ruby/\S+ \(.*?\)%,          ua
+    assert_match %r%RubyGems/#{Regexp.escape Gem::VERSION}%,      ua
+    assert_match %r% #{Regexp.escape Gem::Platform.local.to_s} %, ua
+    assert_match %r%Ruby/#{Regexp.escape RUBY_VERSION}%,          ua
+    assert_match %r%\(#{Regexp.escape RUBY_RELEASE_DATE} %,       ua
+  end
+
+  def test_user_agent_engine
+    util_save_version
+
+    Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE)
+    Object.send :const_set,    :RUBY_ENGINE, 'vroom'
+
+    ua = @fetcher.user_agent
+
+    assert_match %r%\) vroom%, ua
+  ensure
+    util_restore_version
+  end
+
+  def test_user_agent_engine_ruby
+    util_save_version
+
+    Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE)
+    Object.send :const_set,    :RUBY_ENGINE, 'ruby'
+
+    ua = @fetcher.user_agent
+
+    assert_match %r%\)%, ua
+  ensure
+    util_restore_version
+  end
+
+  def test_user_agent_patchlevel
+    util_save_version
+
+    Object.send :remove_const, :RUBY_PATCHLEVEL
+    Object.send :const_set,    :RUBY_PATCHLEVEL, 5
+
+    ua = @fetcher.user_agent
+
+    assert_match %r% patchlevel 5\)%, ua
+  ensure
+    util_restore_version
+  end
+
+  def test_user_agent_revision
+    util_save_version
+
+    Object.send :remove_const, :RUBY_PATCHLEVEL
+    Object.send :const_set,    :RUBY_PATCHLEVEL, -1
+    Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
+    Object.send :const_set,    :RUBY_REVISION, 6
+
+    ua = @fetcher.user_agent
+
+    assert_match %r% revision 6\)%, ua
+    assert_match %r%Ruby/#{Regexp.escape RUBY_VERSION}dev%, ua
+  ensure
+    util_restore_version
+  end
+
+  def test_user_agent_revision_missing
+    util_save_version
+
+    Object.send :remove_const, :RUBY_PATCHLEVEL
+    Object.send :const_set,    :RUBY_PATCHLEVEL, -1
+    Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
+
+    ua = @fetcher.user_agent
+
+    assert_match %r%\(#{Regexp.escape RUBY_RELEASE_DATE}\)%, ua
+  ensure
+    util_restore_version
+  end
+
   def test_yaml_error_on_size
     use_ui @ui do
       self.class.enable_yaml = false
@@ -747,5 +835,24 @@ gems:
     assert_equal "/home/skillet", @fetcher.correct_for_windows_path(path)
   end
 
+  def util_save_version
+    @orig_RUBY_ENGINE     = RUBY_ENGINE if defined? RUBY_ENGINE
+    @orig_RUBY_PATCHLEVEL = RUBY_PATCHLEVEL
+    @orig_RUBY_REVISION   = RUBY_REVISION if defined? RUBY_REVISION
+  end
+
+  def util_restore_version
+    Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE)
+    Object.send :const_set,    :RUBY_ENGINE, @orig_RUBY_ENGINE if
+      defined?(@orig_RUBY_ENGINE)
+
+    Object.send :remove_const, :RUBY_PATCHLEVEL
+    Object.send :const_set,    :RUBY_PATCHLEVEL, @orig_RUBY_PATCHLEVEL
+
+    Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
+    Object.send :const_set,    :RUBY_REVISION, @orig_RUBY_REVISION if
+      defined?(@orig_RUBY_REVISION)
+  end
+
 end
 

data/test/rubygems/test_gem_source_index.rb

@@ -1,6 +1,7 @@
 require 'rubygems/test_case'
 require 'rubygems/source_index'
 require 'rubygems/config_file'
+require 'rubygems/deprecate'
 
 class TestGemSourceIndex < Gem::TestCase
 
@@ -10,182 +11,6 @@ class TestGemSourceIndex < Gem::TestCase
     util_setup_fake_fetcher
   end
 
-  def test_self_from_gems_in
-    spec_dir = File.join @gemhome, 'specifications'
-
-    FileUtils.rm_r spec_dir
-
-    FileUtils.mkdir_p spec_dir
-
-    a1 = quick_spec 'a', '1' do |spec| spec.author = 'author 1' end
-
-    spec_file = File.join spec_dir, a1.spec_name
-
-    File.open spec_file, 'w' do |fp|
-      fp.write a1.to_ruby
-    end
-
-    si = Gem::SourceIndex.from_gems_in spec_dir
-
-    assert_equal [spec_dir], si.spec_dirs
-    assert_equal [a1.full_name], si.gems.keys
-  end
-
-  def test_self_load_specification
-    spec_dir = File.join @gemhome, 'specifications'
-
-    FileUtils.rm_r spec_dir
-
-    FileUtils.mkdir_p spec_dir
-
-    a1 = quick_spec 'a', '1' do |spec| spec.author = 'author 1' end
-
-    spec_file = File.join spec_dir, a1.spec_name
-
-    File.open spec_file, 'w' do |fp|
-      fp.write a1.to_ruby
-    end
-
-    spec = Gem::SourceIndex.load_specification spec_file
-
-    assert_equal a1.author, spec.author
-  end
-
-  def test_self_load_specification_utf_8
-    spec_dir = File.join @gemhome, 'specifications'
-
-    FileUtils.rm_r spec_dir
-
-    FileUtils.mkdir_p spec_dir
-
-    spec_file = File.join spec_dir, "utf-8.gemspec"
-    spec_data = <<-SPEC
-Gem::Specification.new do |s|
-  s.name = %q{utf}
-  s.version = "8"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0")
-  s.authors = ["\317\200"]
-  s.date = %q{2008-09-10}
-  s.description = %q{This is a test description}
-  s.email = %q{example@example.com}
-  s.has_rdoc = true
-  s.homepage = %q{http://example.com}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.2.0}
-  s.summary = %q{this is a summary}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
-    SPEC
-
-    spec_data.force_encoding 'UTF-8'
-
-    File.open spec_file, 'w' do |io| io.write spec_data end
-
-    spec = Gem::SourceIndex.load_specification spec_file
-
-    pi = "\317\200"
-    pi.force_encoding 'UTF-8' if pi.respond_to? :force_encoding
-
-    assert_equal pi, spec.author
-  end if Gem.ruby_version > Gem::Version.new('1.9')
-
-  def test_self_load_specification_exception
-    spec_dir = File.join @gemhome, 'specifications'
-
-    FileUtils.mkdir_p spec_dir
-
-    spec_file = File.join spec_dir, 'a-1.gemspec'
-
-    File.open spec_file, 'w' do |fp|
-      fp.write 'raise Exception, "epic fail"'
-    end
-
-    out, err = capture_io do
-      assert_equal nil, Gem::SourceIndex.load_specification(spec_file)
-    end
-
-    assert_equal '', out
-
-    expected = "Invalid gemspec in [#{spec_file}]: epic fail\n"
-    assert_equal expected, err
-  end
-
-  def test_self_load_specification_interrupt
-    spec_dir = File.join @gemhome, 'specifications'
-
-    FileUtils.mkdir_p spec_dir
-
-    spec_file = File.join spec_dir, 'a-1.gemspec'
-
-    File.open spec_file, 'w' do |fp|
-      fp.write 'raise Interrupt, "^C"'
-    end
-
-    use_ui @ui do
-      assert_raises Interrupt do
-        Gem::SourceIndex.load_specification(spec_file)
-      end
-    end
-
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
-  end
-
-  def test_self_load_specification_syntax_error
-    spec_dir = File.join @gemhome, 'specifications'
-
-    FileUtils.mkdir_p spec_dir
-
-    spec_file = File.join spec_dir, 'a-1.gemspec'
-
-    File.open spec_file, 'w' do |fp|
-      fp.write '1 +'
-    end
-
-    out, err = capture_io do
-      assert_equal nil, Gem::SourceIndex.load_specification(spec_file)
-    end
-
-    assert_equal '', out
-
-    assert_match(/syntax error/, err)
-  end
-
-  def test_self_load_specification_system_exit
-    spec_dir = File.join @gemhome, 'specifications'
-
-    FileUtils.mkdir_p spec_dir
-
-    spec_file = File.join spec_dir, 'a-1.gemspec'
-
-    File.open spec_file, 'w' do |fp|
-      fp.write 'raise SystemExit, "bye-bye"'
-    end
-
-    use_ui @ui do
-      assert_raises SystemExit do
-        Gem::SourceIndex.load_specification(spec_file)
-      end
-    end
-
-    assert_equal '', @ui.output
-    assert_equal '', @ui.error
-  end
-
-  def test_create_from_directory
-    # TODO
-  end
-
   def test_find_name
     assert_equal [@a1, @a2, @a3a], @source_index.find_name('a')
     assert_equal [@a2], @source_index.find_name('a', '= 2')
@@ -203,7 +28,7 @@ end
   end
 
   def test_find_name_empty_cache
-    empty_source_index = Gem::SourceIndex.new({})
+    empty_source_index = Gem::SourceIndex.new
     assert_equal [], empty_source_index.find_name("foo")
   end
 
@@ -310,7 +135,7 @@ end
 
     FileUtils.mv a1_spec, @tempdir
 
-    source_index = Gem::SourceIndex.from_installed_gems
+    source_index = Gem.source_index
 
     refute source_index.gems.include?(@a1.full_name)
 
@@ -321,26 +146,16 @@ end
     assert source_index.gems.include?(@a1.full_name)
   end
 
-  def test_refresh_bang_not_from_dir
-    source_index = Gem::SourceIndex.new
-
-    e = assert_raises RuntimeError do
-      source_index.refresh!
-    end
-
-    assert_equal 'source index not created from disk', e.message
-  end
-
   def test_remove_spec
     deleted = @source_index.remove_spec 'a-1'
 
     assert_equal %w[a-2 a-3.a a_evil-9 c-1.2],
-                 @source_index.all_gems.values.map { |s| s.full_name }.sort
+                 @source_index.gems.values.map { |s| s.full_name }.sort
 
     deleted = @source_index.remove_spec 'a-3.a'
 
     assert_equal %w[a-2 a_evil-9 c-1.2],
-                 @source_index.all_gems.values.map { |s| s.full_name }.sort
+                 @source_index.gems.values.map { |s| s.full_name }.sort
   end
 
   def test_search
@@ -366,8 +181,8 @@ end
       s.platform = Gem::Platform.new 'x86-other_platform1'
     end
 
-    si = Gem::SourceIndex.new(a1.full_name => a1, a1_mine.full_name => a1_mine,
-                              a1_other.full_name => a1_other)
+    si = Gem::SourceIndex.new
+    si.add_specs a1, a1_mine, a1_other
 
     dep = Gem::Dependency.new 'a', Gem::Requirement.new('1')