rubygems-update 1.3.5 → 1.3.6

data/test/test_gem_commands_environment_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/environment_command'
 
 class TestGemCommandsEnvironmentCommand < RubyGemTestCase

data/test/test_gem_commands_fetch_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/package'
 require 'rubygems/security'
 require 'rubygems/commands/fetch_command'
@@ -15,8 +15,8 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
     util_setup_fake_fetcher
     util_setup_spec_fetcher @a2
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
-      File.read(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      File.read(File.join(@gemhome, 'cache', @a2.file_name))
 
     @cmd.options[:args] = [@a2.name]
 
@@ -26,19 +26,21 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, "#{@a2.full_name}.gem")),
+    assert File.exist?(File.join(@tempdir, @a2.file_name)),
            "#{@a2.full_name} fetched"
   end
 
-  def test_execute_legacy
-    util_setup_fake_fetcher
-    util_setup_source_info_cache @a2
+  def test_execute_prerelease
+    util_setup_fake_fetcher true
+    util_setup_spec_fetcher @a2, @a2_pre
 
-    @fetcher.data["#{@gem_repo}yaml"] = ''
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
-      File.read(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      File.read(File.join(@gemhome, 'cache', @a2.file_name))
+    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
+      File.read(File.join(@gemhome, 'cache', @a2_pre.file_name))
 
     @cmd.options[:args] = [@a2.name]
+    @cmd.options[:prerelease] = true
 
     use_ui @ui do
       Dir.chdir @tempdir do
@@ -46,8 +48,8 @@ class TestGemCommandsFetchCommand < RubyGemTestCase
       end
     end
 
-    assert File.exist?(File.join(@tempdir, "#{@a2.full_name}.gem")),
-           "#{@a2.full_name} fetched"
+    assert File.exist?(File.join(@tempdir, @a2_pre.file_name)),
+           "#{@a2_pre.full_name} not fetched"
   end
 
 end

data/test/test_gem_commands_generate_index_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/indexer'
 require 'rubygems/commands/generate_index_command'
 

data/test/test_gem_commands_install_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/install_command'
 
 class TestGemCommandsInstallCommand < RubyGemTestCase
@@ -15,10 +15,10 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     util_setup_fake_fetcher(:prerelease)
     util_setup_spec_fetcher @a2, @a2_pre
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
-      read_binary(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.full_name}.gem"] =
-      read_binary(File.join(@gemhome, 'cache', "#{@a2_pre.full_name}.gem"))
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
+    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
+      read_binary(File.join(@gemhome, 'cache', @a2_pre.file_name))
 
     @cmd.options[:args] = [@a2.name]
 
@@ -37,10 +37,10 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     util_setup_fake_fetcher(:prerelease)
     util_setup_spec_fetcher @a2, @a2_pre
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
-      read_binary(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.full_name}.gem"] =
-      read_binary(File.join(@gemhome, 'cache', "#{@a2_pre.full_name}.gem"))
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
+    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
+      read_binary(File.join(@gemhome, 'cache', @a2_pre.file_name))
 
     @cmd.handle_options [@a2_pre.name, '--version', @a2_pre.version.to_s]
     assert @cmd.options[:prerelease]
@@ -79,7 +79,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     util_setup_fake_fetcher
     @cmd.options[:domain] = :local
 
-    FileUtils.mv File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"),
+    FileUtils.mv File.join(@gemhome, 'cache', @a2.file_name),
                  File.join(@tempdir)
 
     @cmd.options[:args] = [@a2.name]
@@ -109,7 +109,7 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     util_setup_fake_fetcher
     @cmd.options[:user_install] = false
 
-    FileUtils.mv File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"),
+    FileUtils.mv File.join(@gemhome, 'cache', @a2.file_name),
                  File.join(@tempdir)
 
     @cmd.options[:args] = [@a2.name]
@@ -178,10 +178,10 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     util_setup_fake_fetcher(:prerelease)
     util_setup_spec_fetcher @a2, @a2_pre
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
-      read_binary(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
-    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.full_name}.gem"] =
-      read_binary(File.join(@gemhome, 'cache', "#{@a2_pre.full_name}.gem"))
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
+    @fetcher.data["#{@gem_repo}gems/#{@a2_pre.file_name}"] =
+      read_binary(File.join(@gemhome, 'cache', @a2_pre.file_name))
 
     @cmd.options[:prerelease] = true
     @cmd.options[:args] = [@a2_pre.name]
@@ -204,14 +204,16 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     util_setup_fake_fetcher
     util_setup_spec_fetcher @a2
 
-    @fetcher.data["#{@gem_repo}gems/#{@a2.full_name}.gem"] =
-      read_binary(File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"))
+    @fetcher.data["#{@gem_repo}gems/#{@a2.file_name}"] =
+      read_binary(File.join(@gemhome, 'cache', @a2.file_name))
 
     @cmd.options[:args] = [@a2.name]
 
     use_ui @ui do
       e = assert_raises Gem::SystemExitException do
-        @cmd.execute
+        capture_io do
+          @cmd.execute
+        end
       end
       assert_equal 0, e.exit_code
     end
@@ -230,10 +232,10 @@ class TestGemCommandsInstallCommand < RubyGemTestCase
     util_setup_fake_fetcher
     @cmd.options[:domain] = :local
 
-    FileUtils.mv File.join(@gemhome, 'cache', "#{@a2.full_name}.gem"),
+    FileUtils.mv File.join(@gemhome, 'cache', @a2.file_name),
                  File.join(@tempdir)
 
-    FileUtils.mv File.join(@gemhome, 'cache', "#{@b2.full_name}.gem"),
+    FileUtils.mv File.join(@gemhome, 'cache', @b2.file_name),
                  File.join(@tempdir)
 
     @cmd.options[:args] = [@a2.name, @b2.name]

data/test/test_gem_commands_list_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/list_command'
 
 class TestGemCommandsListCommand < RubyGemTestCase

data/test/test_gem_commands_lock_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/lock_command'
 
 class TestGemCommandsLockCommand < RubyGemTestCase

data/test/test_gem_commands_mirror_command.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/indexer'
 require 'rubygems/commands/mirror_command'
 
@@ -46,10 +46,10 @@ class TestGemCommandsMirrorCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert File.exist?(File.join(mirror, 'gems', "#{@a1.full_name}.gem"))
-    assert File.exist?(File.join(mirror, 'gems', "#{@a2.full_name}.gem"))
-    assert File.exist?(File.join(mirror, 'gems', "#{@b2.full_name}.gem"))
-    assert File.exist?(File.join(mirror, 'gems', "#{@c1_2.full_name}.gem"))
+    assert File.exist?(File.join(mirror, 'gems', @a1.file_name))
+    assert File.exist?(File.join(mirror, 'gems', @a2.file_name))
+    assert File.exist?(File.join(mirror, 'gems', @b2.file_name))
+    assert File.exist?(File.join(mirror, 'gems', @c1_2.file_name))
     assert File.exist?(File.join(mirror, "Marshal.#{@marshal_version}"))
   ensure
     orig_HOME.nil? ? ENV.delete('HOME') : ENV['HOME'] = orig_HOME

data/test/test_gem_commands_outdated_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/outdated_command'
 
 class TestGemCommandsOutdatedCommand < RubyGemTestCase
@@ -19,12 +19,10 @@ class TestGemCommandsOutdatedCommand < RubyGemTestCase
     remote_10 = quick_gem 'foo', '1.0'
     remote_20 = quick_gem 'foo', '2.0'
 
-    remote_spec_file = File.join @gemhome, 'specifications',
-                                 remote_10.full_name + ".gemspec"
+    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.full_name + ".gemspec"
+    remote_spec_file = File.join @gemhome, 'specifications', remote_20.spec_name
     FileUtils.rm remote_spec_file
 
     @fetcher = Gem::FakeFetcher.new

data/test/test_gem_commands_owner_command.rb

@@ -0,0 +1,105 @@
+require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/commands/owner_command'
+
+class TestGemCommandsOwnerCommand < RubyGemTestCase
+
+  def setup
+    super
+
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+    Gem.configuration.rubygems_api_key = "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
+
+    @cmd = Gem::Commands::OwnerCommand.new
+  end
+
+  def test_show_owners
+    response = <<EOF
+---
+- email: user1@example.com
+- email: user2@example.com
+EOF
+
+    @fetcher.data["https://rubygems.org/api/v1/gems/freewill/owners.yaml"] = [response, 200, 'OK']
+
+    use_ui @ui do
+      @cmd.show_owners("freewill")
+    end
+
+    assert_equal Net::HTTP::Get, @fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
+
+    assert_match %r{Owners for gem: freewill}, @ui.output
+    assert_match %r{- user1@example.com}, @ui.output
+    assert_match %r{- user2@example.com}, @ui.output
+  end
+
+  def test_show_owners_denied
+    response = "You don't have permission to push to this gem"
+    @fetcher.data["https://rubygems.org/api/v1/gems/freewill/owners.yaml"] = [response, 403, 'Forbidden']
+
+    assert_raises MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.show_owners("freewill")
+      end
+    end
+
+    assert_match response, @ui.output
+  end
+
+  def test_add_owners
+    response = "Owner added successfully."
+    @fetcher.data["https://rubygems.org/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+
+    use_ui @ui do
+      @cmd.add_owners("freewill", ["user-new1@example.com"])
+    end
+
+    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
+    assert_equal "email=user-new1%40example.com", @fetcher.last_request.body
+
+    assert_match response, @ui.output
+  end
+
+  def test_add_owners_denied
+    response = "You don't have permission to push to this gem"
+    @fetcher.data["https://rubygems.org/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
+
+    assert_raises MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.add_owners("freewill", ["user-new1@example.com"])
+      end
+    end
+
+    assert_match response, @ui.output
+  end
+
+  def test_remove_owners
+    response = "Owner removed successfully."
+    @fetcher.data["https://rubygems.org/api/v1/gems/freewill/owners"] = [response, 200, 'OK']
+
+    use_ui @ui do
+      @cmd.remove_owners("freewill", ["user-remove1@example.com"])
+    end
+
+    assert_equal Net::HTTP::Delete, @fetcher.last_request.class
+    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
+    assert_equal "email=user-remove1%40example.com", @fetcher.last_request.body
+
+    assert_match response, @ui.output
+  end
+
+  def test_remove_owners_denied
+    response = "You don't have permission to push to this gem"
+    @fetcher.data["https://rubygems.org/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
+
+    assert_raises MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.remove_owners("freewill", ["user-remove1@example.com"])
+      end
+    end
+
+    assert_match response, @ui.output
+  end
+end

data/test/test_gem_commands_pristine_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/pristine_command'
 
 class TestGemCommandsPristineCommand < RubyGemTestCase
@@ -75,7 +75,7 @@ class TestGemCommandsPristineCommand < RubyGemTestCase
 
     install_gem a
 
-    FileUtils.rm File.join(@gemhome, 'cache', "#{a.full_name}.gem")
+    FileUtils.rm File.join(@gemhome, 'cache', a.file_name)
 
     @cmd.options[:args] = %w[a]
 

data/test/test_gem_commands_push_command.rb

@@ -0,0 +1,61 @@
+require File.expand_path('../gemutilities', __FILE__)
+require 'rubygems/commands/push_command'
+
+class TestGemCommandsPushCommand < RubyGemTestCase
+
+  def setup
+    super
+
+    @gems_dir = File.join @tempdir, 'gems'
+    @cache_dir = File.join @gemhome, 'cache'
+    FileUtils.mkdir @gems_dir
+    Gem.configuration.rubygems_api_key = "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
+    @spec, @path = util_gem("freewill", "1.0.0")
+
+    @fetcher = Gem::FakeFetcher.new
+    Gem::RemoteFetcher.fetcher = @fetcher
+
+    @cmd = Gem::Commands::PushCommand.new
+  end
+
+  def test_sending_gem
+    response = "Successfully registered gem: freewill (1.0.0)"
+    @fetcher.data["https://rubygems.org/api/v1/gems"] = [response, 200, 'OK']
+
+    use_ui @ui do
+      @cmd.send_gem(@path)
+    end
+
+    assert_match %r{Pushing gem to RubyGems.org...}, @ui.output
+
+    assert_equal Net::HTTP::Post, @fetcher.last_request.class
+    assert_equal Gem.read_binary(@path), @fetcher.last_request.body
+    assert_equal File.size(@path), @fetcher.last_request["Content-Length"].to_i
+    assert_equal "application/octet-stream", @fetcher.last_request["Content-Type"]
+    assert_equal Gem.configuration.rubygems_api_key, @fetcher.last_request["Authorization"]
+
+    assert_match response, @ui.output
+  end
+
+  def test_raises_error_with_no_arguments
+    def @cmd.sign_in; end
+    assert_raises Gem::CommandLineError do
+      @cmd.execute
+    end
+  end
+
+  def test_sending_gem_denied
+    response = "You don't have permission to push to this gem"
+    @fetcher.data["https://rubygems.org/api/v1/gems"] = [response, 403, 'Forbidden']
+
+    assert_raises MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.send_gem(@path)
+      end
+    end
+
+    assert_match response, @ui.output
+  end
+
+end
+

data/test/test_gem_commands_query_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/query_command'
 
 class TestGemCommandsQueryCommand < RubyGemTestCase
@@ -58,6 +58,28 @@ pl (1)
     assert_equal '', @ui.error
   end
 
+  def test_execute_all_prerelease
+    a1_name = @a1.full_name
+    a2_name = @a2.full_name
+
+    @cmd.handle_options %w[-r --all --prerelease]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    expected = <<-EOF
+
+*** REMOTE GEMS ***
+
+a (3.a, 2, 1)
+pl (1)
+    EOF
+
+    assert_equal expected, @ui.output
+    assert_equal '', @ui.error
+  end
+
   def test_execute_details
     @a2.summary = 'This is a lot of text. ' * 4
     @a2.authors = ['Abraham Lincoln', 'Hirohito']
@@ -216,61 +238,6 @@ pl (1)
     assert_equal 1, e.exit_code
   end
 
-  def test_execute_legacy
-    Gem::SpecFetcher.fetcher = nil
-    si = util_setup_source_info_cache @a1, @a2, @pl1
-
-    @fetcher.data["#{@gem_repo}yaml"] = YAML.dump si
-    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] =
-      si.dump
-
-    @fetcher.data.delete "#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"
-
-    @cmd.handle_options %w[-r]
-
-    use_ui @ui do
-      @cmd.execute
-    end
-
-    expected = <<-EOF
-
-*** REMOTE GEMS ***
-
-a (2)
-pl (1)
-    EOF
-
-    assert_equal expected, @ui.output
-
-    expected = <<-EOF
-WARNING:  RubyGems 1.2+ index not found for:
-\t#{@gem_repo}
-
-RubyGems will revert to legacy indexes degrading performance.
-    EOF
-
-    assert_equal expected, @ui.error
-  end
-
-  def test_execute_legacy_prerelease
-    Gem::SpecFetcher.fetcher = nil
-    si = util_setup_source_info_cache @a1, @a2, @pl1
-
-    @fetcher.data["#{@gem_repo}yaml"] = YAML.dump si
-    @fetcher.data["#{@gem_repo}Marshal.#{Gem.marshal_version}"] =
-      si.dump
-
-    @fetcher.data.delete "#{@gem_repo}latest_specs.#{Gem.marshal_version}.gz"
-
-    @cmd.handle_options %w[-r --prerelease]
-
-    e = assert_raises Gem::OperationNotSupportedError do
-      @cmd.execute
-    end
-
-    assert_equal 'Prereleases not supported on legacy repositories', e.message
-  end
-
   def test_execute_local_details
     @a3a.summary = 'This is a lot of text. ' * 4
     @a3a.authors = ['Abraham Lincoln', 'Hirohito']