rubygems-update 1.3.1 → 1.3.2

data/test/test_gem_commands_sources_command.rb

@@ -11,6 +11,10 @@ class TestGemCommandsSourcesCommand < RubyGemTestCase
     @new_repo = "http://beta-gems.example.com"
   end
 
+  def test_initialize_proxy
+    assert @cmd.handles?(['--http-proxy', 'http://proxy.example.com'])
+  end
+
   def test_execute
     util_setup_spec_fetcher
     @cmd.handle_options []
@@ -175,12 +179,12 @@ Will cause RubyGems to revert to legacy indexes, degrading performance.
     assert_equal expected, @ui.output
     assert_equal '', @ui.error
 
-    assert !File.exist?(cache.system_cache_file),
+    refute File.exist?(cache.system_cache_file),
            'system cache file'
-    assert !File.exist?(cache.latest_system_cache_file),
+    refute File.exist?(cache.latest_system_cache_file),
            'latest system cache file'
 
-    assert !File.exist?(fetcher.dir), 'cache dir removed'
+    refute File.exist?(fetcher.dir), 'cache dir removed'
   end
 
   def test_execute_remove
@@ -244,7 +248,7 @@ Will cause RubyGems to revert to legacy indexes, degrading performance.
     assert_equal "source cache successfully updated\n", @ui.output
     assert_equal '', @ui.error
   end
- 
+
   def test_execute_update_legacy
     @cmd.handle_options %w[--update]
 
@@ -269,6 +273,6 @@ source cache successfully updated
     assert_equal expected, @ui.output
     assert_equal '', @ui.error
   end
- 
+
 end
 

data/test/test_gem_commands_specification_command.rb

@@ -70,6 +70,21 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
     assert_equal '', @ui.error
   end
 
+  def test_execute_marshal
+    foo = quick_gem 'foo'
+    Gem.source_index.add_spec foo
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:format] = :marshal
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal foo, Marshal.load(@ui.output)
+    assert_equal '', @ui.error
+  end
+
   def test_execute_remote
     foo = quick_gem 'foo'
 
@@ -92,5 +107,21 @@ class TestGemCommandsSpecificationCommand < RubyGemTestCase
     assert_match %r|name: foo|, @ui.output
   end
 
+  def test_execute_ruby
+    foo = quick_gem 'foo'
+    Gem.source_index.add_spec foo
+
+    @cmd.options[:args] = %w[foo]
+    @cmd.options[:format] = :ruby
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r|Gem::Specification.new|, @ui.output
+    assert_match %r|s.name = %q\{foo\}|, @ui.output
+    assert_equal '', @ui.error
+  end
+
 end
 

data/test/test_gem_commands_uninstall_command.rb

@@ -53,9 +53,10 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
       end
     end
 
-    assert_match(/\AUnknown gem foo >= 0$/, e.message)
+    assert_match(/\Acannot uninstall, check `gem list -d foo`$/, e.message)
     output = @ui.output.split "\n"
-    assert output.empty?, "UI output should be empty after an uninstall error"
+    assert_empty output, "UI output should be empty after an uninstall error"
   end
+
 end
 

data/test/test_gem_commands_unpack_command.rb

@@ -14,7 +14,7 @@ class TestGemCommandsUnpackCommand < RubyGemTestCase
   def test_execute
     util_make_gems
 
-    @cmd.options[:args] = %w[a]
+    @cmd.options[:args] = %w[a b]
 
     use_ui @ui do
       Dir.chdir @tempdir do
@@ -22,7 +22,8 @@ class TestGemCommandsUnpackCommand < RubyGemTestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'a-2'))
+    assert File.exist?(File.join(@tempdir, 'a-2')), 'a should be installed'
+    assert File.exist?(File.join(@tempdir, 'b-2')), 'b should be installed'
   end
 
   def test_execute_gem_path

data/test/test_gem_commands_update_command.rb

@@ -8,6 +8,9 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
 
     @cmd = Gem::Commands::UpdateCommand.new
 
+    @cmd.options[:generate_rdoc] = false
+    @cmd.options[:generate_ri]   = false
+
     util_setup_fake_fetcher
 
     @a1_path = File.join @gemhome, 'cache', "#{@a1.full_name}.gem"
@@ -27,6 +30,8 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     Gem::Installer.new(@a1_path).install
 
     @cmd.options[:args] = []
+    @cmd.options[:generate_rdoc] = true
+    @cmd.options[:generate_ri]   = true
 
     use_ui @ui do
       @cmd.execute
@@ -37,8 +42,10 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     assert_equal "Updating #{@a2.name}", out.shift
     assert_equal "Successfully installed #{@a2.full_name}", out.shift
     assert_equal "Gems updated: #{@a2.name}", out.shift
+    assert_equal "Installing ri documentation for a-2...", out.shift
+    assert_equal "Installing RDoc documentation for a-2...", out.shift
 
-    assert out.empty?, out.inspect
+    assert_empty out
   end
 
   # before:
@@ -101,7 +108,7 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     assert_equal "Gems updated: #{@c2.name}, #{@b2.name}, #{@a2.name}",
                  out.shift
 
-    assert out.empty?, out.inspect
+    assert_empty out
   end
 
   def test_execute_named
@@ -121,7 +128,7 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     assert_equal "Successfully installed #{@a2.full_name}", out.shift
     assert_equal "Gems updated: #{@a2.name}", out.shift
 
-    assert out.empty?, out.inspect
+    assert_empty out
   end
 
   def test_execute_named_up_to_date
@@ -139,7 +146,7 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     assert_equal "Updating installed gems", out.shift
     assert_equal "Nothing to update", out.shift
 
-    assert out.empty?, out.inspect
+    assert_empty out
   end
 
   def test_execute_up_to_date
@@ -157,8 +164,6 @@ class TestGemCommandsUpdateCommand < RubyGemTestCase
     assert_equal "Updating installed gems", out.shift
     assert_equal "Nothing to update", out.shift
 
-    assert out.empty?, out.inspect
+    assert_empty out
   end
-
 end
-

data/test/test_gem_dependency.rb

@@ -20,6 +20,10 @@ class TestGemDependency < RubyGemTestCase
     @r1_0 = Gem::Requirement.new ['> 1.0']
   end
 
+  def dep(name, version)
+    Gem::Dependency.new name, version
+  end
+
   def test_initialize
     assert_equal "pkg", @pkg1_0.name
     assert_equal @r1_0, @pkg1_0.version_requirements
@@ -96,10 +100,6 @@ class TestGemDependency < RubyGemTestCase
   end
 
   def test_equals_tilde
-    def dep(name, version)
-      Gem::Dependency.new name, version
-    end
-
     a0   = dep 'a', '0'
     a1   = dep 'a', '1'
     b0   = dep 'b', '0'
@@ -108,14 +108,64 @@ class TestGemDependency < RubyGemTestCase
     pa0r = dep(/a/, '>= 0')
     pab0r = dep(/a|b/, '>= 0')
 
-    assert((a0    =~ a0), 'match self')
-    assert((pa0   =~ a0), 'match version exact')
-    assert((pa0   =~ a1), 'match version')
-    assert((pa0r  =~ a0), 'match regex simple')
-    assert((pab0r =~ a0), 'match regex complex')
+    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
+
+  def test_equals_tilde_escape
+    a1 = Gem::Dependency.new 'a', '1'
+
+    pab1  = Gem::Dependency.new 'a|b', '>= 1'
+    pab1r = Gem::Dependency.new(/a|b/, '>= 1')
+
+    refute_match pab1,  a1, 'escaped'
+    assert_match pab1r, a1, 'exact regexp'
+  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'
+
+    assert_match pa0, a0, 'match version exact'
+  end
+
+  def test_equals_tilde_spec
+    def spec(name, version)
+      Gem::Specification.new do |spec|
+        spec.name = name
+        spec.version = version
+      end
+    end
+
+    a0   = spec 'a', '0'
+    a1   = spec 'a', '1'
+    b0   = spec 'b', '0'
+
+    pa0  = dep 'a', '>= 0'
+    pa0r = dep(/a/, '>= 0')
+    pab0r = dep(/a|b/, '>= 0')
+
+    assert_match pa0, a0,   'match version exact'
+    assert_match pa0, a1,   'match version'
 
-    assert(!(pa0r =~ b0),         'fail match regex')
-    assert(!(pa0r =~ Object.new), 'fail match Object')
+    assert_match pa0r, a0,  'match regex simple'
+    assert_match pa0r, a1,  'match regex simple'
+
+    assert_match pab0r, a0, 'match regex complex'
+    assert_match pab0r, b0, 'match regex complex'
+
+    refute_match pa0r, b0,         'fail match regex'
+    refute_match pa0r, Object.new, 'fail match Object'
   end
 
   def test_hash
@@ -135,5 +185,6 @@ class TestGemDependency < RubyGemTestCase
 
     refute_equal(runtime.hash, development.hash)
   end
+
 end
 

data/test/test_gem_dependency_installer.rb

@@ -13,8 +13,10 @@ class TestGemDependencyInstaller < RubyGemTestCase
     write_file File.join('gems', 'a-1', 'bin', 'a_bin') do |fp|
       fp.puts "#!/usr/bin/ruby"
     end
+
     @a1, @a1_gem = util_gem 'a', '1' do |s| s.executables << 'a_bin' end
-    @aa1, @aa1_gem = util_gem 'aa', '1' 
+    @aa1, @aa1_gem = util_gem 'aa', '1'
+    @a1_pre, @a1_pre_gem = util_gem 'a', '1.a'
 
     @b1, @b1_gem = util_gem 'b', '1' do |s|
       s.add_dependency 'a'
@@ -44,8 +46,8 @@ class TestGemDependencyInstaller < RubyGemTestCase
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
 
-    si = util_setup_spec_fetcher @a1, @b1, @d1, @d2, @x1_m, @x1_o, @w1, @y1,
-                                 @y1_1_p, @z1
+    si = util_setup_spec_fetcher(@a1, @a1_pre, @b1, @d1, @d2, @x1_m, @x1_o, @w1, @y1,
+                                 @y1_1_p, @z1)
 
     util_clear_gems
   end
@@ -257,7 +259,7 @@ class TestGemDependencyInstaller < RubyGemTestCase
       inst.install 'a'
     end
 
-    assert_match %r|\A#!/usr/bin/env #{Gem::ConfigMap[:RUBY_INSTALL_NAME]}\n|,
+    assert_match %r|\A#!/usr/bin/env #{Gem::ConfigMap[:ruby_install_name]}\n|,
                  File.read(File.join(@gemhome, 'bin', 'a_bin'))
   end
 
@@ -632,5 +634,16 @@ class TestGemDependencyInstaller < RubyGemTestCase
     assert_equal %w[d-1 e-1], inst.gems_to_install.map { |s| s.full_name }
   end
 
-end
+  def test_prerelease_uses_pre_index
+    installer = Gem::DependencyInstaller.new
+    pre_installer = Gem::DependencyInstaller.new(:prerelease => true)
+    dependency = Gem::Dependency.new('a', Gem::Requirement.default)
+
+    releases = installer.find_gems_with_sources(dependency).map{ |gems, *| gems }
+    prereleases = pre_installer.find_gems_with_sources(dependency).map{ |gems, *| gems }
 
+    assert releases.select{ |s| s.name == 'a' and s.version.to_s == '1' }.first
+    assert releases.select{ |s| s.name == 'a' and s.version.to_s == '1.a' }.empty?
+    assert_equal [@a1_pre], prereleases
+  end
+end

data/test/test_gem_dependency_list.rb

@@ -105,7 +105,7 @@ class TestGemDependencyList < RubyGemTestCase
 
     @deplist.add @b2
 
-    assert ! @deplist.ok?, 'unsatisfied dependency'
+    refute @deplist.ok?, 'unsatisfied dependency'
 
     @deplist.add @a1
 
@@ -144,7 +144,7 @@ class TestGemDependencyList < RubyGemTestCase
 
     @deplist.add @b2
 
-    assert ! @deplist.ok_to_remove?("a-1")
+    refute @deplist.ok_to_remove?("a-1")
 
     @deplist.add @a2
 
@@ -161,7 +161,7 @@ class TestGemDependencyList < RubyGemTestCase
 
     @deplist.remove_by_name("a-1")
 
-    assert ! @deplist.ok_to_remove?("a-2")
+    refute @deplist.ok_to_remove?("a-2")
   end
 
   def test_remove_by_name
@@ -169,7 +169,7 @@ class TestGemDependencyList < RubyGemTestCase
 
     @deplist.remove_by_name "a-1"
 
-    assert ! @deplist.ok?
+    refute @deplist.ok?
   end
 
   def test_tsort_each_node
@@ -181,7 +181,7 @@ class TestGemDependencyList < RubyGemTestCase
       assert_equal order.shift, node.full_name
     end
 
-    assert order.empty?
+    assert_empty order
   end
 
   def test_tsort_each_child
@@ -193,7 +193,7 @@ class TestGemDependencyList < RubyGemTestCase
       assert_equal order.shift, node.full_name
     end
 
-    assert order.empty?
+    assert_empty order
   end
 
   # d1 -> b1 -> a1

data/test/test_gem_doc_manager.rb

@@ -18,7 +18,13 @@ class TestGemDocManager < RubyGemTestCase
 
   def test_uninstall_doc_unwritable
     orig_mode = File.stat(@spec.installation_path).mode
-    File.chmod 0, @spec.installation_path
+    
+    # File.chmod has no effect on MS Windows directories (it needs ACL).
+    if win_platform?
+      skip("test_uninstall_doc_unwritable skipped on MS Windows")
+    else
+      File.chmod(0, @spec.installation_path)
+    end
 
     assert_raises Gem::FilePermissionError do
       @manager.uninstall_doc

data/test/test_gem_ext_configure_builder.rb

@@ -16,7 +16,7 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
   end
 
   def test_self_build
-    return if RUBY_PLATFORM =~ /mswin/ # HACK
+    skip("test_self_build skipped on MS Windows (VC++)") if vc_windows?
 
     File.open File.join(@ext, './configure'), 'w' do |configure|
       configure.puts "#!/bin/sh\necho \"#{@makefile_body}\" > Makefile"
@@ -37,7 +37,7 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
   end
 
   def test_self_build_fail
-    return if RUBY_PLATFORM =~ /mswin/ # HACK
+    skip("test_self_build_fail skipped on MS Windows (VC++)") if vc_windows?
     output = []
 
     error = assert_raises Gem::InstallError do
@@ -63,6 +63,10 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
   end
 
   def test_self_build_has_makefile
+    if vc_windows? && !nmake_found?
+      skip("test_self_build_has_makefile skipped - nmake not found")
+    end
+
     File.open File.join(@ext, 'Makefile'), 'w' do |makefile|
       makefile.puts @makefile_body
     end
@@ -72,14 +76,8 @@ class TestGemExtConfigureBuilder < RubyGemTestCase
       Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
     end
 
-    case RUBY_PLATFORM
-    when /mswin/ then
-      assert_equal 'nmake', output[0]
-      assert_equal 'nmake install', output[2]
-    else
-      assert_equal 'make', output[0]
-      assert_equal 'make install', output[2]
-    end
+    assert_equal make_command, output[0]
+    assert_equal "#{make_command} install", output[2]
   end
 
 end

data/test/test_gem_ext_ext_conf_builder.rb

@@ -14,6 +14,10 @@ class TestGemExtExtConfBuilder < RubyGemTestCase
   end
 
   def test_class_build
+    if vc_windows? && !nmake_found?
+      skip("test_class_build skipped - nmake not found")
+    end
+
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
       extconf.puts "require 'mkmf'\ncreate_makefile 'foo'"
     end
@@ -46,6 +50,10 @@ class TestGemExtExtConfBuilder < RubyGemTestCase
   end
 
   def test_class_build_extconf_fail
+    if vc_windows? && !nmake_found?
+      skip("test_class_build_extconf_fail skipped - nmake not found")
+    end
+
     File.open File.join(@ext, 'extconf.rb'), 'w' do |extconf|
       extconf.puts "require 'mkmf'"
       extconf.puts "have_library 'nonexistent' or abort 'need libnonexistent'"
@@ -69,6 +77,10 @@ checking for main\(\) in .*?nonexistent/m, error.message)
   end
 
   def test_class_make
+    if vc_windows? && !nmake_found?
+      skip("test_class_make skipped - nmake not found")
+    end
+
     output = []
     makefile_path = File.join(@ext, 'Makefile')
     File.open makefile_path, 'w' do |makefile|
@@ -82,14 +94,8 @@ checking for main\(\) in .*?nonexistent/m, error.message)
       Gem::Ext::ExtConfBuilder.make @ext, output
     end
 
-    case RUBY_PLATFORM
-    when /mswin/ then
-      assert_equal 'nmake', output[0]
-      assert_equal 'nmake install', output[2]
-    else
-      assert_equal 'make', output[0]
-      assert_equal 'make install', output[2]
-    end
+    assert_equal make_command, output[0]
+    assert_equal "#{make_command} install", output[2]
 
     edited_makefile = <<-EOF
 RUBYARCHDIR = #{@ext}$(target_prefix)