rubygems-update 1.3.6 → 1.3.7

data/test/test_gem.rb

@@ -16,6 +16,8 @@ class TestGem < RubyGemTestCase
                       else
                         %r|/[Rr]uby/[Gg]ems/[0-9.]+|
                       end
+
+    util_remove_interrupt_command
   end
 
   def test_self_all_load_paths
@@ -258,6 +260,8 @@ class TestGem < RubyGemTestCase
 
   def test_self_find_files
     discover_path = File.join 'lib', 'foo', 'discover.rb'
+    cwd = File.expand_path '..', __FILE__
+    $LOAD_PATH.unshift cwd.dup
 
     foo1 = quick_gem 'foo', '1' do |s|
       s.files << discover_path
@@ -281,12 +285,14 @@ class TestGem < RubyGemTestCase
     Gem.searcher = nil
 
     expected = [
-      File.expand_path('foo/discover.rb', File.dirname(__FILE__)),
+      File.expand_path('../foo/discover.rb', __FILE__),
       File.join(foo2.full_gem_path, discover_path),
       File.join(foo1.full_gem_path, discover_path),
     ]
 
     assert_equal expected, Gem.find_files('foo/discover')
+  ensure
+    assert_equal cwd, $LOAD_PATH.shift
   end
 
   def test_self_latest_load_paths
@@ -437,7 +443,7 @@ class TestGem < RubyGemTestCase
   def test_self_refresh
     util_make_gems
 
-    a1_spec = File.join @gemhome, "specifications", @a1.spec_name 
+    a1_spec = File.join @gemhome, "specifications", @a1.spec_name
 
     FileUtils.mv a1_spec, @tempdir
 
@@ -613,6 +619,38 @@ class TestGem < RubyGemTestCase
     ENV['USERPATH'] = orig_user_path
   end if '1.9' > RUBY_VERSION
 
+  def test_load_plugins
+    with_plugin('load') { Gem.load_plugins }
+    assert_equal :loaded, TEST_PLUGIN_LOAD
+
+    util_remove_interrupt_command
+
+    # Should attempt to cause a StandardError
+    with_plugin('standarderror') { Gem.load_plugins }
+    assert_equal :loaded, TEST_PLUGIN_STANDARDERROR
+
+    util_remove_interrupt_command
+
+    # Should attempt to cause an Exception
+    with_plugin('exception') { Gem.load_plugins }
+    assert_equal :loaded, TEST_PLUGIN_EXCEPTION
+  end
+
+  def with_plugin(path)
+    test_plugin_path = File.expand_path "../plugin/#{path}", __FILE__
+
+    # A single test plugin should get loaded once only, in order to preserve
+    # sane test semantics.
+    refute_includes $LOAD_PATH, test_plugin_path
+    $LOAD_PATH.unshift test_plugin_path
+
+    capture_io do
+      yield
+    end
+  ensure
+    $LOAD_PATH.delete test_plugin_path
+  end
+
   def util_ensure_gem_dirs
     Gem.ensure_gem_subdirectories @gemhome
     @additional.each do |dir|
@@ -661,5 +699,10 @@ class TestGem < RubyGemTestCase
       defined?(@RUBY_REVISION)
   end
 
+  def util_remove_interrupt_command
+    Gem::Commands.send :remove_const, :InterruptCommand if
+      Gem::Commands.const_defined? :InterruptCommand
+  end
+
 end
 

data/test/test_gem_command_manager.rb

@@ -10,6 +10,8 @@ class TestGemCommandManager < RubyGemTestCase
   end
 
   def test_run_interrupt
+    Gem.load_plugins
+
     use_ui @ui do
       assert_raises MockGemUi::TermError do
         @command_manager.run 'interrupt'
@@ -19,6 +21,18 @@ class TestGemCommandManager < RubyGemTestCase
     end
   end
 
+  def test_run_crash_command
+    @command_manager.register_command :crash
+    use_ui @ui do
+      assert_raises MockGemUi::TermError do
+        @command_manager.run 'crash'
+      end
+      assert_equal '', ui.output
+      err = ui.error.split("\n").first
+      assert_equal "ERROR:  Loading command: crash (RuntimeError)", err
+    end
+  end
+
   def test_process_args_bad_arg
     use_ui @ui do
       assert_raises(MockGemUi::TermError) {

data/test/test_gem_commands_contents_command.rb

@@ -139,13 +139,15 @@ Rakefile
   end
 
   def test_handle_options
-    assert_equal false, @cmd.options[:lib_only]
-    assert_equal [], @cmd.options[:specdirs]
-    assert_equal nil, @cmd.options[:version]
+    refute @cmd.options[:lib_only]
+    assert @cmd.options[:prefix]
+    assert_empty @cmd.options[:specdirs]
+    assert_nil @cmd.options[:version]
 
-    @cmd.send :handle_options, %w[-l -s foo --version 0.0.2]
+    @cmd.send :handle_options, %w[-l -s foo --version 0.0.2 --no-prefix]
 
-    assert_equal true, @cmd.options[:lib_only]
+    assert @cmd.options[:lib_only]
+    refute @cmd.options[:prefix]
     assert_equal %w[foo], @cmd.options[:specdirs]
     assert_equal Gem::Requirement.new('0.0.2'), @cmd.options[:version]
   end

data/test/test_gem_commands_environment_command.rb

@@ -12,6 +12,7 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
   def test_execute
     orig_sources = Gem.sources.dup
     Gem.sources.replace %w[http://gems.example.com]
+    Gem.configuration['gemcutter_key'] = 'blah'
 
     @cmd.send :handle_options, %w[]
 
@@ -32,6 +33,7 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
     assert_match %r|GEM PATHS:|, @ui.output
     assert_match %r|- #{Regexp.escape @gemhome}|, @ui.output
     assert_match %r|GEM CONFIGURATION:|, @ui.output
+    assert_match %r|"gemcutter_key" => "\*\*\*\*"|, @ui.output
     assert_match %r|:verbose => |, @ui.output
     assert_match %r|REMOTE SOURCES:|, @ui.output
     assert_equal '', @ui.error
@@ -125,7 +127,7 @@ class TestGemCommandsEnvironmentCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_equal "#{Gem::RubyGemsVersion}\n", @ui.output
+    assert_equal "#{Gem::VERSION}\n", @ui.output
     assert_equal '', @ui.error
   end
 

data/test/test_gem_commands_fetch_command.rb

@@ -27,7 +27,7 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
     end
 
     assert File.exist?(File.join(@tempdir, @a2.file_name)),
-           "#{@a2.full_name} fetched"
+           "#{@a2.full_name} not fetched"
   end
 
   def test_execute_prerelease
@@ -52,5 +52,25 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
            "#{@a2_pre.full_name} not fetched"
   end
 
+  def test_execute_version
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher @a1, @a2
+
+    @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
+      File.read(File.join(@gemhome, 'cache', @a1.file_name))
+
+    @cmd.options[:args] = [@a2.name]
+    @cmd.options[:version] = Gem::Requirement.new '1'
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert File.exist?(File.join(@tempdir, @a1.file_name)),
+           "#{@a1.full_name} not fetched"
+  end
+
 end
 

data/test/test_gem_commands_install_command.rb

@@ -145,8 +145,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     end
 
     # HACK no repository was checked
-    assert_equal "ERROR:  could not find gem no_such_gem locally or in a repository\n",
-                 @ui.error
+    assert_match(/ould not find a valid gem 'no_such_gem'/, @ui.error)
   end
 
   def test_execute_no_gem
@@ -170,8 +169,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
       assert_equal 2, e.exit_code
     end
 
-    assert_equal "ERROR:  could not find gem nonexistent locally or in a repository\n",
-                 @ui.error
+    assert_match(/ould not find a valid gem 'nonexistent'/, @ui.error)
   end
 
   def test_execute_prerelease

data/test/test_gem_commands_query_command.rb

@@ -29,7 +29,34 @@ class TestGemCommandsQueryCommand < RubyGemTestCase
 *** REMOTE GEMS ***
 
 a (2)
-pl (1)
+pl (1 i386-linux)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
+  def test_execute_platform
+    @a1r = @a1.dup
+
+    @a1.platform = 'x86-linux'
+    @a2.platform = 'universal-darwin'
+
+    @si = util_setup_spec_fetcher @a1, @a1r, @a2, @b2, @pl1
+
+    @cmd.handle_options %w[-r -a]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** REMOTE GEMS ***
+
+a (2 universal-darwin, 1 ruby x86-linux)
+b (2)
+pl (1 i386-linux)
     EOF
 
     assert_equal expected, @ui.output
@@ -51,7 +78,7 @@ pl (1)
 *** REMOTE GEMS ***
 
 a (2, 1)
-pl (1)
+pl (1 i386-linux)
     EOF
 
     assert_equal expected, @ui.output
@@ -73,7 +100,7 @@ pl (1)
 *** REMOTE GEMS ***
 
 a (3.a, 2, 1)
-pl (1)
+pl (1 i386-linux)
     EOF
 
     assert_equal expected, @ui.output
@@ -311,7 +338,7 @@ a (3.a, 2, 1)
 a_evil (9)
 b (2)
 c (1.2)
-pl (1)
+pl (1 i386-linux)
     EOF
 
     assert_equal expected, @ui.output
@@ -348,7 +375,7 @@ pl
 
     expected = <<-EOF
 a (2)
-pl (1)
+pl (1 i386-linux)
     EOF
 
     assert_equal expected, @ui.output
@@ -388,7 +415,7 @@ a (3.a, 2, 1)
 a_evil (9)
 b (2)
 c (1.2)
-pl (1)
+pl (1 i386-linux)
     EOF
 
     assert_equal expected, @ui.output

data/test/test_gem_commands_server_command.rb

@@ -13,16 +13,23 @@ class TestGemCommandsServerCommand < RubyGemTestCase
     @cmd.send :handle_options, %w[-p 8808 --no-daemon]
 
     assert_equal false, @cmd.options[:daemon]
-    assert_equal @gemhome, @cmd.options[:gemdir]
+    assert_equal [], @cmd.options[:gemdir]
     assert_equal 8808, @cmd.options[:port]
 
     @cmd.send :handle_options, %w[-p 9999 -d /nonexistent --daemon]
 
     assert_equal true, @cmd.options[:daemon]
-    assert_equal File.expand_path('/nonexistent'), @cmd.options[:gemdir]
+    assert_equal [File.expand_path('/nonexistent')], @cmd.options[:gemdir]
     assert_equal 9999, @cmd.options[:port]
   end
 
+  def test_handle_options_gemdir
+    @cmd.send :handle_options, %w[--dir a --dir b]
+
+    assert_equal [File.expand_path('a'), File.expand_path('b')],
+                 @cmd.options[:gemdir]
+  end
+
   def test_handle_options_port
     @cmd.send :handle_options, %w[-p 0]
     assert_equal 0, @cmd.options[:port]

data/test/test_gem_commands_uninstall_command.rb

@@ -64,8 +64,10 @@ class TestGemCommandsUninstallCommand < GemInstallerTestCase
 
     util_setup_gem
 
-    use_ui @ui do
-      @installer.install
+    build_rake_in do
+      use_ui @ui do
+        @installer.install
+      end
     end
 
     @cmd.options[:args] = ["pre"]

data/test/test_gem_commands_unpack_command.rb

@@ -22,8 +22,8 @@ class TestGemCommandsUnpackCommand < RubyGemTestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, 'a-3.a')), 'a should be installed'
-    assert File.exist?(File.join(@tempdir, 'b-2')),   'b should be installed'
+    assert File.exist?(File.join(@tempdir, 'a-3.a')), 'a should be unpacked'
+    assert File.exist?(File.join(@tempdir, 'b-2')),   'b should be unpacked'
   end
 
   def test_execute_gem_path
@@ -49,6 +49,7 @@ class TestGemCommandsUnpackCommand < RubyGemTestCase
 
   def test_execute_gem_path_missing
     util_make_gems
+    util_setup_spec_fetcher
 
     Gem.clear_paths
 
@@ -68,6 +69,49 @@ class TestGemCommandsUnpackCommand < RubyGemTestCase
     assert_equal '', @ui.output
   end
 
+  def test_execute_remote
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher @a1, @a2
+    util_clear_gems
+
+    a2_data = nil
+    open File.join(@gemhome, 'cache', @a2.file_name), 'rb' do |fp|
+      a2_data = fp.read
+    end
+
+    Gem::RemoteFetcher.fetcher.data['http://gems.example.com/gems/a-2.gem'] =
+      a2_data
+
+    Gem.configuration.verbose = :really
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert File.exist?(File.join(@tempdir, 'a-2')), 'a should be unpacked'
+  end
+
+  def test_execute_sudo
+    util_make_gems
+
+    File.chmod 0555, @gemhome
+
+    @cmd.options[:args] = %w[b]
+
+    use_ui @ui do
+      Dir.chdir @tempdir do
+        @cmd.execute
+      end
+    end
+
+    assert File.exist?(File.join(@tempdir, 'b-2')), 'b should be unpacked'
+  ensure
+    File.chmod 0755, @gemhome
+  end
+
   def test_execute_with_target_option
     util_make_gems
 

data/test/test_gem_config_file.rb

@@ -46,6 +46,7 @@ class TestGemConfigFile < RubyGemTestCase
       fp.puts ":benchmark: true"
       fp.puts ":bulk_threshold: 10"
       fp.puts ":verbose: false"
+      fp.puts ":rubygems_api_key: 701229f217cdf23b1344c7b4b54ca97"
       fp.puts ":sources:"
       fp.puts "  - http://more-gems.example.com"
       fp.puts "install: --wrappers"
@@ -61,6 +62,7 @@ class TestGemConfigFile < RubyGemTestCase
     assert_equal 10, @cfg.bulk_threshold
     assert_equal false, @cfg.verbose
     assert_equal false, @cfg.update_sources
+    assert_equal "701229f217cdf23b1344c7b4b54ca97", @cfg.rubygems_api_key
     assert_equal %w[http://more-gems.example.com], Gem.sources
     assert_equal '--wrappers', @cfg[:install]
     assert_equal(['/usr/ruby/1.8/lib/ruby/gems/1.8', '/var/ruby/1.8/gem_home'],

data/test/test_gem_dependency.rb

@@ -134,5 +134,16 @@ class TestGemDependency < RubyGemTestCase
     assert d.prerelease?
   end
 
+  def test_version_requirements_equals_deprecated
+    d = dep "pkg", "1.0"
+
+    out, err = capture_io do
+      d.version_requirements = '2.0'
+      assert_equal Gem::Requirement.new(%w[2.0]), d.requirement
+    end
+
+    assert_match %r%deprecated%, err
+  end
+
 end
 

data/test/test_gem_doc_manager.rb

@@ -12,7 +12,7 @@ class TestGemDocManager < RubyGemTestCase
 
   def test_uninstall_doc_unwritable
     orig_mode = File.stat(@spec.installation_path).mode
-    
+
     # File.chmod has no effect on MS Windows directories (it needs ACL).
     if win_platform?
       skip("test_uninstall_doc_unwritable skipped on MS Windows")