rubygems-update 1.3.5 → 1.3.6

data/test/test_gem_commands_server_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/server_command'
 
 class TestGemCommandsServerCommand < RubyGemTestCase

data/test/test_gem_commands_sources_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/sources_command'
 
 class TestGemCommandsSourcesCommand < RubyGemTestCase
@@ -115,48 +115,9 @@ beta-gems.example.com is not a URI
     assert_equal '', @ui.error
   end
 
-  def test_execute_add_legacy
-    util_setup_fake_fetcher
-    util_setup_source_info_cache
-
-    si = Gem::SourceIndex.new
-    si.add_spec @a1
-
-    @fetcher.data["#{@new_repo}/yaml"] = ''
-
-    @cmd.handle_options %W[--add #{@new_repo}]
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    assert_equal [@gem_repo], Gem.sources
-
-    expected = <<-EOF
-WARNING:  RubyGems 1.2+ index not found for:
-\t#{@new_repo}
-
-Will cause RubyGems to revert to legacy indexes, degrading performance.
-    EOF
-
-    assert_equal "#{@new_repo} added to sources\n", @ui.output
-    assert_equal expected, @ui.error
-  end
-
   def test_execute_clear_all
     @cmd.handle_options %w[--clear-all]
 
-    util_setup_source_info_cache
-
-    cache = Gem::SourceInfoCache.cache
-    cache.update
-    cache.write_cache
-
-    assert File.exist?(cache.system_cache_file),
-           'system cache file'
-    assert File.exist?(cache.latest_system_cache_file),
-           'latest system cache file'
-
     util_setup_spec_fetcher
 
     fetcher = Gem::SpecFetcher.fetcher
@@ -179,11 +140,6 @@ Will cause RubyGems to revert to legacy indexes, degrading performance.
     assert_equal expected, @ui.output
     assert_equal '', @ui.error
 
-    refute File.exist?(cache.system_cache_file),
-           'system cache file'
-    refute File.exist?(cache.latest_system_cache_file),
-           'latest system cache file'
-
     refute File.exist?(fetcher.dir), 'cache dir removed'
   end
 
@@ -249,30 +205,5 @@ Will cause RubyGems to revert to legacy indexes, degrading performance.
     assert_equal '', @ui.error
   end
 
-  def test_execute_update_legacy
-    @cmd.handle_options %w[--update]
-
-    util_setup_fake_fetcher
-    util_setup_source_info_cache
-    Gem::SourceInfoCache.reset
-
-    si = Gem::SourceIndex.new
-    si.add_spec @a1
-    @fetcher.data["#{@gem_repo}yaml"] = YAML.dump si
-    @fetcher.data["#{@gem_repo}Marshal.#{@marshal_version}"] = si.dump
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-Bulk updating Gem source index for: #{@gem_repo}
-source cache successfully updated
-    EOF
-
-    assert_equal expected, @ui.output
-    assert_equal '', @ui.error
-  end
-
 end
 

data/test/test_gem_commands_specification_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/specification_command'
 
 class TestGemCommandsSpecificationCommand < RubyGemTestCase
@@ -80,7 +80,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_equal "--- foo\n\n", @ui.output
+    assert_equal "foo", YAML.load(@ui.output)
   end
 
   def test_execute_marshal
@@ -106,8 +106,7 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
 
     util_setup_spec_fetcher foo
 
-    FileUtils.rm File.join(@gemhome, 'specifications',
-                           "#{foo.full_name}.gemspec")
+    FileUtils.rm File.join(@gemhome, 'specifications', foo.spec_name)
 
     @cmd.options[:args] = %w[foo]
     @cmd.options[:domain] = :remote

data/test/test_gem_commands_stale_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/stale_command'
 
 class TestGemCommandsStaleCommand < RubyGemTestCase

data/test/test_gem_commands_uninstall_command.rb

@@ -1,6 +1,5 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-require File.join(File.expand_path(File.dirname(__FILE__)),
-                  'gem_installer_test_case')
+require File.expand_path('../gemutilities', __FILE__)
+require File.expand_path('../gem_installer_test_case', __FILE__)
 require 'rubygems/commands/uninstall_command'
 
 class TestGemCommandsUninstallCommand < GemInstallerTestCase
@@ -60,7 +59,7 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
 
   def test_execute_prerelease
     @spec = quick_gem "pre", "2.b"
-    @gem = File.join @tempdir, "#{@spec.full_name}.gem"
+    @gem = File.join @tempdir, @spec.file_name
     FileUtils.touch @gem
 
     util_setup_gem

data/test/test_gem_commands_unpack_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/unpack_command'
 
 class TestGemCommandsUnpackCommand < RubyGemTestCase

data/test/test_gem_commands_update_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/commands/update_command'
 
 class TestGemCommandsUpdateCommand < RubyGemTestCase
@@ -13,14 +13,14 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
 
     util_setup_fake_fetcher
 
-    @a1_path = File.join @gemhome, 'cache', "#{@a1.full_name}.gem"
-    @a2_path = File.join @gemhome, 'cache', "#{@a2.full_name}.gem"
+    @a1_path = File.join @gemhome, 'cache', @a1.file_name
+    @a2_path = File.join @gemhome, 'cache', @a2.file_name
 
     util_setup_spec_fetcher @a1, @a2
 
-    @fetcher.data["#{@gem_repo}gems/#{@a1.full_name}.gem"] =
+    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
       read_binary @a1_path
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
       read_binary @a2_path
   end
 
@@ -65,9 +65,9 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     @a2.add_dependency 'c', '2'
     @a2.add_dependency 'b', '2'
 
-    @b2_path = File.join @gemhome, 'cache', "#{@b2.full_name}.gem"
-    @c1_2_path = File.join @gemhome, 'cache', "#{@c1_2.full_name}.gem"
-    @c2_path = File.join @gemhome, 'cache', "#{@c2.full_name}.gem"
+    @b2_path = File.join @gemhome, 'cache', @b2.file_name
+    @c1_2_path = File.join @gemhome, 'cache', @c1_2.file_name
+    @c2_path = File.join @gemhome, 'cache', @c2.file_name
 
     @source_index = Gem::SourceIndex.new
     @source_index.add_spec @a1
@@ -80,12 +80,12 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     util_build_gem @a2
     util_build_gem @c2
 
-    @fetcher.data["#{@gem_repo}gems/#{@a1.full_name}.gem"] = read_binary @a1_path
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] = read_binary @a2_path
-    @fetcher.data["#{@gem_repo}gems/#{@b2.full_name}.gem"] = read_binary @b2_path
-    @fetcher.data["#{@gem_repo}gems/#{@c1_2.full_name}.gem"] =
+    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] = read_binary @a1_path
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] = read_binary @a2_path
+    @fetcher.data["#{@gem_repo}gems/#{@b2.file_name}"] = read_binary @b2_path
+    @fetcher.data["#{@gem_repo}gems/#{@c1_2.file_name}"] =
       read_binary @c1_2_path
-    @fetcher.data["#{@gem_repo}gems/#{@c2.full_name}.gem"] = read_binary @c2_path
+    @fetcher.data["#{@gem_repo}gems/#{@c2.file_name}"] = read_binary @c2_path
 
     util_setup_spec_fetcher @a1, @a2, @b2, @c1_2, @c2
     util_clear_gems

data/test/test_gem_commands_which_command.rb

@@ -0,0 +1,66 @@
+require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/commands/which_command'
+
+class TestGemCommandsWhichCommand < RubyGemTestCase
+
+  def setup
+    super
+    @cmd = Gem::Commands::WhichCommand.new
+  end
+
+  def test_execute
+    util_foo_bar
+
+    @cmd.handle_options %w[foo_bar]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
+    assert_equal '', @ui.error
+  end
+
+  def test_execute_one_missing
+    util_foo_bar
+
+    @cmd.handle_options %w[foo_bar missing]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal "#{@foo_bar.full_gem_path}/lib/foo_bar.rb\n", @ui.output
+    assert_match %r%Can't find ruby library file or shared library missing\n%,
+                 @ui.error
+  end
+
+  def test_execute_missing
+    @cmd.handle_options %w[missing]
+
+    use_ui @ui do
+      assert_raises MockGemUi::TermError do
+        @cmd.execute
+      end
+    end
+
+    assert_equal '', @ui.output
+    assert_match %r%Can't find ruby library file or shared library missing\n%,
+                 @ui.error
+  end
+
+  def util_foo_bar
+    files = %w[lib/foo_bar.rb Rakefile]
+    @foo_bar = quick_gem 'foo_bar' do |gem|
+      gem.files = files
+    end
+
+    files.each do |file|
+      filename = @foo_bar.full_gem_path + "/#{file}"
+      FileUtils.mkdir_p File.dirname(filename)
+      FileUtils.touch filename
+    end
+  end
+
+end
+

data/test/test_gem_config_file.rb

@@ -1,10 +1,4 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/config_file'
 
 class TestGemConfigFile < RubyGemTestCase
@@ -271,6 +265,18 @@ class TestGemConfigFile < RubyGemTestCase
     assert_equal %w[http://even-more-gems.example.com], Gem.sources
   end
 
+  def test_load_rubygems_api_key_from_credentials
+    temp_cred = File.join Gem.user_home, '.gem', 'credentials'
+    FileUtils.mkdir File.dirname(temp_cred)
+    File.open temp_cred, 'w' do |fp|
+      fp.puts ":rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97"
+    end
+
+    util_config_file
+
+    assert_equal "701229f217cdf23b1344c7b4b54ca97", @cfg.rubygems_api_key
+  end
+
   def util_config_file(args = @cfg_args)
     @cfg = Gem::ConfigFile.new args
   end

data/test/test_gem_dependency.rb

@@ -1,189 +1,137 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
-require 'rubygems/version'
+require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/dependency'
 
 class TestGemDependency < RubyGemTestCase
 
-  def setup
-    super
-
-    @pkg1_0 = Gem::Dependency.new 'pkg', ['> 1.0']
-    @pkg1_1 = Gem::Dependency.new 'pkg', ['> 1.1']
-
-    @oth1_0 = Gem::Dependency.new 'other', ['> 1.0']
+  def test_subclass
+    sc = Class.new Gem::Dependency
+    def sc.requirement() bogus; end
 
-    @r1_0 = Gem::Requirement.new ['> 1.0']
-  end
+    out, err = capture_io do
+      assert_equal Gem::Requirement.default, sc.new('a').version_requirement
+    end
 
-  def dep(name, version)
-    Gem::Dependency.new name, version
+    assert_match %r%deprecated%, err
   end
 
   def test_initialize
-    assert_equal "pkg", @pkg1_0.name
-    assert_equal @r1_0, @pkg1_0.version_requirements
+    d = dep "pkg", "> 1.0"
+
+    assert_equal "pkg", d.name
+    assert_equal req("> 1.0"), d.requirement
   end
 
   def test_initialize_double
-    dep = Gem::Dependency.new("pkg", ["> 1.0", "< 2.0"])
-
-    assert_equal Gem::Requirement.new(["> 1.0", "< 2.0"]),
-                 dep.version_requirements
+    d = dep "pkg", "> 1.0", "< 2.0"
+    assert_equal req("> 1.0", "< 2.0"), d.requirement
   end
 
   def test_initialize_empty
-    dep = Gem::Dependency.new("pkg", [])
-    req = @r1_0
-
-    req.instance_eval do
-      @version = ">= 1.0"
-      @op = ">="
-      @nums = [1,0]
-      @requirements = nil
-    end
-
-    dep.instance_eval do
-      @version_requirement = req
-      @version_requirements = nil
-    end
-
-    assert_equal Gem::Requirement.new([">= 1.0"]), dep.version_requirements
-  end
-
-  def test_initialize_version
-    dep = Gem::Dependency.new 'pkg', Gem::Version.new('2')
-
-    assert_equal 'pkg', dep.name
-
-    assert_equal Gem::Requirement.new('= 2'), dep.version_requirements
+    d = dep "pkg"
+    assert_equal req(">= 0"), d.requirement
   end
 
-  def test_initialize_with_type
-    dep = Gem::Dependency.new("pkg", [], :development)
-    assert_equal(:development, dep.type)
-  end
+  def test_initialize_type
+    assert_equal :runtime, dep("pkg").type
+    assert_equal :development, dep("pkg", [], :development).type
 
-  def test_type_is_runtime_by_default
-    assert_equal(:runtime, Gem::Dependency.new("pkg", []).type)
-  end
-
-  def test_type_is_restricted
     assert_raises ArgumentError do
-      Gem::Dependency.new("pkg", [:sometimes])
+      dep "pkg", :sometimes
     end
   end
 
+  def test_initialize_version
+    d = dep "pkg", v("2")
+    assert_equal req("= 2"), d.requirement
+  end
+
   def test_equals2
-    assert_equal @pkg1_0, @pkg1_0.dup
-    assert_equal @pkg1_0.dup, @pkg1_0
+    o  = dep "other"
+    d  = dep "pkg", "> 1.0"
+    d1 = dep "pkg", "> 1.1"
+
+    assert_equal d, d.dup
+    assert_equal d.dup, d
 
-    refute_equal @pkg1_0, @pkg1_1, "requirements different"
-    refute_equal @pkg1_1, @pkg1_0, "requirements different"
+    refute_equal d, d1
+    refute_equal d1, d
 
-    refute_equal @pkg1_0, @oth1_0, "names different"
-    refute_equal @oth1_0, @pkg1_0, "names different"
+    refute_equal d, o
+    refute_equal o, d
 
-    refute_equal @pkg1_0, Object.new
-    refute_equal Object.new, @pkg1_0
+    refute_equal d, Object.new
+    refute_equal Object.new, d
   end
 
   def test_equals2_type
-    runtime = Gem::Dependency.new("pkg", [])
-    development = Gem::Dependency.new("pkg", [], :development)
-
-    refute_equal(runtime, development)
+    refute_equal dep("pkg", :runtime), dep("pkg", :development)
   end
 
   def test_equals_tilde
-    a0   = dep 'a', '0'
-    a1   = dep 'a', '1'
-    b0   = dep 'b', '0'
-
-    pa0  = dep 'a', '>= 0'
-    pa0r = dep(/a/, '>= 0')
-    pab0r = dep(/a|b/, '>= 0')
-
-    assert_match a0,    a0, 'match self'
-    assert_match pa0,   a0, 'match version exact'
-    assert_match pa0,   a1, 'match version'
-    assert_match pa0r,  a0, 'match regex simple'
-    assert_match pab0r, a0, 'match regex complex'
-
-    refute_match pa0r, b0,         'fail match regex'
-    refute_match pa0r, Object.new, 'fail match Object'
-  end
+    d = dep "a", "0"
 
-  def test_equals_tilde_escape
-    a1 = Gem::Dependency.new 'a', '1'
+    assert_match d,                  d,             "matche self"
+    assert_match dep("a", ">= 0"),   d,             "match version exact"
+    assert_match dep("a", ">= 0"),   dep("a", "1"), "match version"
+    assert_match dep(/a/, ">= 0"),   d,             "match simple regexp"
+    assert_match dep(/a|b/, ">= 0"), d,             "match scary regexp"
 
-    pab1  = Gem::Dependency.new 'a|b', '>= 1'
-    pab1r = Gem::Dependency.new(/a|b/, '>= 1')
+    refute_match dep(/a/), dep("b")
+    refute_match dep("a"), Object.new
+  end
 
-    refute_match pab1,  a1, 'escaped'
-    assert_match pab1r, a1, 'exact regexp'
+  def test_equals_tilde_escape
+    refute_match dep("a|b"), dep("a", "1")
+    assert_match dep(/a|b/), dep("a", "1")
   end
 
   def test_equals_tilde_object
-    a0 = Object.new
-
-    def a0.name() 'a' end
-    def a0.version() '0' end
-
-    pa0  = Gem::Dependency.new 'a', '>= 0'
+    o = Object.new
+    def o.name    ; 'a' end
+    def o.version ; '0' end
 
-    assert_match pa0, a0, 'match version exact'
+    assert_match dep("a"), o
   end
 
   def test_equals_tilde_spec
-    def spec(name, version)
-      Gem::Specification.new do |spec|
-        spec.name = name
-        spec.version = version
-      end
-    end
+    assert_match dep("a", ">= 0"),   spec("a", "0")
+    assert_match dep("a", "1"),      spec("a", "1")
+    assert_match dep(/a/, ">= 0"),   spec("a", "0")
+    assert_match dep(/a|b/, ">= 0"), spec("b", "0")
+    refute_match dep(/a/, ">= 0"),   spec("b", "0")
+  end
 
-    a0   = spec 'a', '0'
-    a1   = spec 'a', '1'
-    b0   = spec 'b', '0'
+  def test_hash
+    d = dep "pkg", "1.0"
 
-    pa0  = dep 'a', '>= 0'
-    pa0r = dep(/a/, '>= 0')
-    pab0r = dep(/a|b/, '>= 0')
+    assert_equal d.hash, d.dup.hash
+    assert_equal d.dup.hash, d.hash
 
-    assert_match pa0, a0,   'match version exact'
-    assert_match pa0, a1,   'match version'
+    refute_equal dep("pkg", "1.0").hash,   dep("pkg", "2.0").hash, "requirement"
+    refute_equal dep("pkg", "1.0").hash,   dep("abc", "1.0").hash, "name"
+    refute_equal dep("pkg", :development), dep("pkg", :runtime), "type"
+  end
 
-    assert_match pa0r, a0,  'match regex simple'
-    assert_match pa0r, a1,  'match regex simple'
+  def test_prerelease_eh
+    d = dep "pkg", "= 1"
 
-    assert_match pab0r, a0, 'match regex complex'
-    assert_match pab0r, b0, 'match regex complex'
+    refute d.prerelease?
 
-    refute_match pa0r, b0,         'fail match regex'
-    refute_match pa0r, Object.new, 'fail match Object'
-  end
+    d.prerelease = true
 
-  def test_hash
-    assert_equal @pkg1_0.hash, @pkg1_0.dup.hash
-    assert_equal @pkg1_0.dup.hash, @pkg1_0.hash
+    assert d.prerelease?
 
-    refute_equal @pkg1_0.hash, @pkg1_1.hash, "requirements different"
-    refute_equal @pkg1_1.hash, @pkg1_0.hash, "requirements different"
+    d = dep "pkg", "= 1.a"
 
-    refute_equal @pkg1_0.hash, @oth1_0.hash, "names different"
-    refute_equal @oth1_0.hash, @pkg1_0.hash, "names different"
-  end
+    assert d.prerelease?
+
+    d.prerelease = false
+
+    assert d.prerelease?
 
-  def test_hash_type
-    runtime = Gem::Dependency.new("pkg", [])
-    development = Gem::Dependency.new("pkg", [], :development)
+    d = dep "pkg", "> 1.a", "> 2"
 
-    refute_equal(runtime.hash, development.hash)
+    assert d.prerelease?
   end
 
 end