rubygems-update 1.5.3 → 1.6.0

data/test/rubygems/test_gem_builder.rb

@@ -4,7 +4,7 @@ require 'rubygems/builder'
 class TestGemBuilder < Gem::TestCase
 
   def test_build
-    builder = Gem::Builder.new quick_gem('a')
+    builder = Gem::Builder.new quick_spec('a')
 
     use_ui @ui do
       Dir.chdir @tempdir do

data/test/rubygems/test_gem_command_manager.rb

@@ -11,7 +11,7 @@ class TestGemCommandManager < Gem::TestCase
 
   def test_run_interrupt
     old_load_path = $:.dup
-    $: << "test/rubygems"
+    $: << File.expand_path("test/rubygems", @@project_dir)
     Gem.load_env_plugins
 
     use_ui @ui do
@@ -27,7 +27,7 @@ class TestGemCommandManager < Gem::TestCase
 
   def test_run_crash_command
     old_load_path = $:.dup
-    $: << "test/rubygems"
+    $: << File.expand_path("test/rubygems", @@project_dir)
 
     @command_manager.register_command :crash
     use_ui @ui do

data/test/rubygems/test_gem_commands_build_command.rb

@@ -7,7 +7,7 @@ class TestGemCommandsBuildCommand < Gem::TestCase
   def setup
     super
 
-    @gem = quick_gem 'some_gem' do |s|
+    @gem = quick_spec 'some_gem' do |s|
       s.rubyforge_project = 'example'
     end
 

data/test/rubygems/test_gem_commands_cert_command.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/cert_command'
+require 'rubygems/fix_openssl_warnings' if RUBY_VERSION < "1.9"
 
 unless defined? OpenSSL then
   warn "`gem cert` tests are being skipped, module OpenSSL not found"
@@ -15,7 +16,7 @@ class TestGemCommandsCertCommand < Gem::TestCase
 
     @cmd = Gem::Commands::CertCommand.new
 
-    root = File.expand_path(File.dirname(__FILE__))
+    root = File.expand_path(File.dirname(__FILE__), @@project_dir)
 
     FileUtils.cp File.join(root, 'data', 'gem-private_key.pem'), @tempdir
     FileUtils.cp File.join(root, 'data', 'gem-public_cert.pem'), @tempdir

data/test/rubygems/test_gem_commands_dependency_command.rb

@@ -26,7 +26,7 @@ class TestGemCommandsDependencyCommand < Gem::TestCase
       @cmd.execute
     end
 
-    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n  baz (> 1, runtime)\n\n",
+    assert_equal "Gem foo-2\n  bar (> 1)\n  baz (> 1)\n\n",
                  @ui.output
     assert_equal '', @ui.error
   end
@@ -77,7 +77,7 @@ Gem pl-1-x86-linux
   end
 
   def test_execute_pipe_format
-    quick_gem 'foo' do |gem|
+    quick_spec 'foo' do |gem|
       gem.add_dependency 'bar', '> 1'
     end
 
@@ -121,6 +121,7 @@ Gem b-2
   end
 
   def test_execute_reverse
+    # FIX: this shouldn't need to write out, but fails if you switch it
     quick_gem 'foo' do |gem|
       gem.add_dependency 'bar', '> 1'
     end
@@ -140,9 +141,9 @@ Gem b-2
 
     expected = <<-EOF
 Gem foo-2
-  bar (> 1, runtime)
+  bar (> 1)
   Used by
-    baz-2 (foo (>= 0, runtime))
+    baz-2 (foo (>= 0))
 
     EOF
 
@@ -188,7 +189,7 @@ ERROR:  Only reverse dependencies for local gems are supported.
       @cmd.execute
     end
 
-    assert_equal "Gem foo-2\n  bar (> 1, runtime)\n\n", @ui.output
+    assert_equal "Gem foo-2\n  bar (> 1)\n\n", @ui.output
     assert_equal '', @ui.error
   end
 

data/test/rubygems/test_gem_commands_fetch_command.rb

@@ -16,7 +16,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase
     util_setup_spec_fetcher @a2
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(File.join(@gemhome, 'cache', @a2.file_name))
+      File.read(Gem.cache_gem(@a2.file_name, @gemhome))
 
     @cmd.options[:args] = [@a2.name]
 
@@ -35,9 +35,9 @@ class TestGemCommandsFetchCommand < Gem::TestCase
     util_setup_spec_fetcher @a2, @a2_pre
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      File.read(File.join(@gemhome, 'cache', @a2.file_name))
+      File.read(Gem.cache_gem(@a2.file_name, @gemhome))
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      File.read(File.join(@gemhome, 'cache', @a2_pre.file_name))
+      File.read(Gem.cache_gem(@a2_pre.file_name, @gemhome))
 
     @cmd.options[:args] = [@a2.name]
     @cmd.options[:prerelease] = true
@@ -57,7 +57,7 @@ class TestGemCommandsFetchCommand < Gem::TestCase
     util_setup_spec_fetcher @a1, @a2
 
     @fetcher.data["#{@gem_repo}gems/#{@a1.file_name}"] =
-      File.read(File.join(@gemhome, 'cache', @a1.file_name))
+      File.read(Gem.cache_gem(@a1.file_name, @gemhome))
 
     @cmd.options[:args] = [@a2.name]
     @cmd.options[:version] = Gem::Requirement.new '1'

data/test/rubygems/test_gem_commands_install_command.rb

@@ -1,6 +1,12 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/install_command'
 
+begin
+  gem "rdoc"
+rescue Gem::LoadError
+  # ignore
+end
+
 class TestGemCommandsInstallCommand < Gem::TestCase
 
   def setup
@@ -16,9 +22,9 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     util_setup_spec_fetcher @a2, @a2_pre
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
+      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @a2_pre.file_name))
+      read_binary(Gem.cache_gem(@a2_pre.file_name, @gemhome))
 
     @cmd.options[:args] = [@a2.name]
 
@@ -38,11 +44,12 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     util_setup_spec_fetcher @a2, @a2_pre
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
+      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @a2_pre.file_name))
+      read_binary(Gem.cache_gem(@a2_pre.file_name, @gemhome))
 
-    @cmd.handle_options [@a2_pre.name, '--version', @a2_pre.version.to_s]
+    @cmd.handle_options [@a2_pre.name, '--version', @a2_pre.version.to_s,
+                         "--no-ri", "--no-rdoc"]
     assert @cmd.options[:prerelease]
     assert @cmd.options[:version].satisfied_by?(@a2_pre.version)
 
@@ -79,8 +86,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     util_setup_fake_fetcher
     @cmd.options[:domain] = :local
 
-    FileUtils.mv File.join(@gemhome, 'cache', @a2.file_name),
-                 File.join(@tempdir)
+    FileUtils.mv Gem.cache_gem(@a2.file_name, @gemhome), @tempdir
 
     @cmd.options[:args] = [@a2.name]
 
@@ -109,8 +115,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     util_setup_fake_fetcher
     @cmd.options[:user_install] = false
 
-    FileUtils.mv File.join(@gemhome, 'cache', @a2.file_name),
-                 File.join(@tempdir)
+    FileUtils.mv Gem.cache_gem(@a2.file_name, @gemhome), @tempdir
 
     @cmd.options[:args] = [@a2.name]
 
@@ -177,7 +182,7 @@ class TestGemCommandsInstallCommand < Gem::TestCase
     correctly_spelled = "non_existent_with_hint"
 
     util_setup_fake_fetcher
-    util_setup_spec_fetcher quick_gem(correctly_spelled, '2')
+    util_setup_spec_fetcher quick_spec(correctly_spelled, '2')
 
     @cmd.options[:args] = [misspelled]
 
@@ -201,9 +206,9 @@ ERROR:  Possible alternatives: non_existent_with_hint
     util_setup_spec_fetcher @a2, @a2_pre
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
+      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
     @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @a2_pre.file_name))
+      read_binary(Gem.cache_gem(@a2_pre.file_name, @gemhome))
 
     @cmd.options[:prerelease] = true
     @cmd.options[:args] = [@a2_pre.name]
@@ -227,7 +232,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
     util_setup_spec_fetcher @a2
 
     @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
+      read_binary(Gem.cache_gem(@a2.file_name, @gemhome))
 
     @cmd.options[:args] = [@a2.name]
 
@@ -254,11 +259,9 @@ ERROR:  Possible alternatives: non_existent_with_hint
     util_setup_fake_fetcher
     @cmd.options[:domain] = :local
 
-    FileUtils.mv File.join(@gemhome, 'cache', @a2.file_name),
-                 File.join(@tempdir)
+    FileUtils.mv Gem.cache_gem(@a2.file_name, @gemhome), @tempdir
 
-    FileUtils.mv File.join(@gemhome, 'cache', @b2.file_name),
-                 File.join(@tempdir)
+    FileUtils.mv Gem.cache_gem(@b2.file_name, @gemhome), @tempdir
 
     @cmd.options[:args] = [@a2.name, @b2.name]
 
@@ -287,7 +290,7 @@ ERROR:  Possible alternatives: non_existent_with_hint
     util_setup_spec_fetcher @b2
 
     @fetcher.data["#{@gem_repo}gems/#{@b2.file_name}"] =
-      read_binary(File.join(@gemhome, 'cache', @b2.file_name))
+      read_binary(Gem.cache_gem(@b2.file_name, @gemhome))
 
     uninstall_gem(@b2)
 

data/test/rubygems/test_gem_commands_lock_command.rb

@@ -45,7 +45,7 @@ gem 'a', '= 1'
     expected = <<-EXPECTED
 require 'rubygems'
 gem 'd', '= 1'
-# Unable to satisfy 'z (>= 0, runtime)' from currently installed gems
+# Unable to satisfy 'z (>= 0)' from currently installed gems
     EXPECTED
 
     assert_equal expected, @ui.output

data/test/rubygems/test_gem_commands_outdated_command.rb

@@ -16,14 +16,11 @@ class TestGemCommandsOutdatedCommand < Gem::TestCase
   def test_execute
     quick_gem 'foo', '0.1'
     quick_gem 'foo', '0.2'
-    remote_10 = quick_gem 'foo', '1.0'
-    remote_20 = quick_gem 'foo', '2.0'
+    remote_10 = quick_spec 'foo', '1.0'
+    remote_20 = quick_spec 'foo', '2.0'
 
     remote_spec_file = File.join @gemhome, 'specifications', remote_10.spec_name
-    FileUtils.rm remote_spec_file
-
     remote_spec_file = File.join @gemhome, 'specifications', remote_20.spec_name
-    FileUtils.rm remote_spec_file
 
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher

data/test/rubygems/test_gem_commands_owner_command.rb

@@ -47,6 +47,20 @@ EOF
     assert_match response, @ui.output
   end
 
+  def test_show_owners_key
+    response = "- email: user1@example.com\n"
+    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+    File.open Gem.configuration.credentials_path, 'a' do |f|
+      f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
+    end
+    Gem.configuration.load_api_keys
+
+    @cmd.handle_options %w(-k other)
+    @cmd.show_owners('freewill')
+
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+  end
+
   def test_add_owners
     response = "Owner added successfully."
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
@@ -75,6 +89,20 @@ EOF
     assert_match response, @ui.output
   end
 
+  def test_add_owners_key
+    response = "Owner added successfully."
+    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    File.open Gem.configuration.credentials_path, 'a' do |f|
+      f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
+    end
+    Gem.configuration.load_api_keys
+
+    @cmd.handle_options %w(-k other)
+    @cmd.add_owners('freewill', ['user-new1@example.com'])
+
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+  end
+
   def test_remove_owners
     response = "Owner removed successfully."
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
@@ -102,4 +130,18 @@ EOF
 
     assert_match response, @ui.output
   end
+
+  def test_remove_owners_key
+    response = "Owner removed successfully."
+    @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+    File.open Gem.configuration.credentials_path, 'a' do |f|
+      f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
+    end
+    Gem.configuration.load_api_keys
+
+    @cmd.handle_options %w(-k other)
+    @cmd.remove_owners('freewill', ['user-remove1@example.com'])
+
+    assert_equal '701229f217cdf23b1344c7b4b54ca97', @fetcher.last_request['Authorization']
+  end
 end

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -9,7 +9,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute
-    a = quick_gem 'a' do |s| s.executables = %w[foo] end
+    a = quick_spec 'a' do |s| s.executables = %w[foo] end
     FileUtils.mkdir_p File.join(@tempdir, 'bin')
     File.open File.join(@tempdir, 'bin', 'foo'), 'w' do |fp|
       fp.puts "#!/usr/bin/ruby"
@@ -39,7 +39,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_all
-    a = quick_gem 'a' do |s| s.executables = %w[foo] end
+    a = quick_spec 'a' do |s| s.executables = %w[foo] end
     FileUtils.mkdir_p File.join(@tempdir, 'bin')
     File.open File.join(@tempdir, 'bin', 'foo'), 'w' do |fp|
       fp.puts "#!/usr/bin/ruby"
@@ -67,15 +67,29 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute_missing_cache_gem
-    a = quick_gem 'a' do |s| s.executables = %w[foo] end
+    a = quick_spec 'a' do |s|
+      s.executables = %w[foo]
+    end
+
     FileUtils.mkdir_p File.join(@tempdir, 'bin')
+
     File.open File.join(@tempdir, 'bin', 'foo'), 'w' do |fp|
       fp.puts "#!/usr/bin/ruby"
     end
 
     install_gem a
 
-    FileUtils.rm File.join(@gemhome, 'cache', a.file_name)
+    a_data = nil
+    open File.join(@gemhome, 'cache', a.file_name), 'rb' do |fp|
+      a_data = fp.read
+    end
+
+    util_setup_fake_fetcher
+    util_setup_spec_fetcher a
+
+    Gem::RemoteFetcher.fetcher.data["http://gems.example.com/gems/#{a.file_name}"] = a_data
+
+    FileUtils.rm Gem.cache_gem(a.file_name, @gemhome)
 
     @cmd.options[:args] = %w[a]
 
@@ -85,11 +99,17 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     out = @ui.output.split "\n"
 
-    assert_equal "Restoring gem\(s\) to pristine condition...", out.shift
-    assert_empty out, out.inspect
+    [
+      "Restoring gem\(s\) to pristine condition...",
+      "Restored a-1",
+      "Cached gem for a-2 not found, attempting to fetch...",
+      "Restored a-2",
+      "Restored a-3.a"
+    ].each do |line|
+      assert_equal line, out.shift
+    end
 
-    assert_equal "ERROR:  Cached gem for #{a.full_name} not found, use `gem install` to restore\n",
-                 @ui.error
+    assert_empty out, out.inspect
   end
 
   def test_execute_no_gem

data/test/rubygems/test_gem_commands_push_command.rb

@@ -1,16 +1,28 @@
 require 'rubygems/test_case'
 require 'rubygems/commands/push_command'
 
+module Gem
+  class << self; remove_method :latest_rubygems_version; end
+
+  def self.latest_rubygems_version
+    Gem::Version.new Gem::VERSION
+  end
+end
+
 class TestGemCommandsPushCommand < Gem::TestCase
 
   def setup
     super
 
-    @gems_dir = File.join @tempdir, 'gems'
-    @cache_dir = File.join @gemhome, 'cache'
+    @gems_dir  = File.join @tempdir, 'gems'
+    @cache_dir = Gem.cache_dir @gemhome
+
     FileUtils.mkdir @gems_dir
-    Gem.configuration.rubygems_api_key = "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
-    @spec, @path = util_gem("freewill", "1.0.0")
+
+    Gem.configuration.rubygems_api_key =
+      "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
+
+    @spec, @path = util_gem "freewill", "1.0.0"
 
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
@@ -77,5 +89,19 @@ class TestGemCommandsPushCommand < Gem::TestCase
     assert_match response, @ui.output
   end
 
-end
+  def test_sending_gem_key
+    @response = "Successfully registered gem: freewill (1.0.0)"
+    @fetcher.data["#{Gem.host}/api/v1/gems"] = [@response, 200, "OK"]
+    File.open Gem.configuration.credentials_path, 'a' do |f|
+      f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
+    end
+    Gem.configuration.load_api_keys
+
+    @cmd.handle_options %w(-k other)
+    @cmd.send_gem(@path)
 
+    assert_equal Gem.configuration.api_keys[:other],
+                 @fetcher.last_request["Authorization"]
+  end
+
+end