rubygems-update 1.8.30 → 2.0.0.preview2

data/test/rubygems/test_gem_commands_mirror.rb

@@ -0,0 +1,32 @@
+require 'rubygems/test_case'
+require 'rubygems/commands/mirror_command'
+
+class TestGemCommandsMirrorCommand < Gem::TestCase
+
+  def setup
+    super
+
+    @cmd = Gem::Commands::MirrorCommand.new
+
+    @mirror_specs = Gem::Specification.find_all_by_name('rubygems-mirror').each do |spec|
+      Gem::Specification.remove_spec spec
+    end
+  end
+
+  def teardown
+    @mirror_specs.each do |spec|
+      Gem::Specification.add_spec spec
+    end
+
+    super
+  end
+
+  def test_execute
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r%Install the rubygems-mirror%i, @ui.error
+  end
+
+end

data/test/rubygems/test_gem_commands_owner_command.rb

@@ -80,10 +80,8 @@ EOF
     response = "You don't have permission to push to this gem"
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
-        @cmd.add_owners("freewill", ["user-new1@example.com"])
-      end
+    use_ui @ui do
+      @cmd.add_owners("freewill", ["user-new1@example.com"])
     end
 
     assert_match response, @ui.output
@@ -122,10 +120,8 @@ EOF
     response = "You don't have permission to push to this gem"
     @fetcher.data["#{Gem.host}/api/v1/gems/freewill/owners"] = [response, 403, 'Forbidden']
 
-    assert_raises Gem::MockGemUi::TermError do
-      use_ui @ui do
-        @cmd.remove_owners("freewill", ["user-remove1@example.com"])
-      end
+    use_ui @ui do
+      @cmd.remove_owners("freewill", ["user-remove1@example.com"])
     end
 
     assert_match response, @ui.output

data/test/rubygems/test_gem_commands_pristine_command.rb

@@ -9,20 +9,31 @@ class TestGemCommandsPristineCommand < Gem::TestCase
   end
 
   def test_execute
-    a = quick_spec 'a' do |s| s.executables = %w[foo] end
+    a = quick_spec 'a' do |s|
+      s.executables = %w[foo]
+      s.files = %w[bin/foo lib/a.rb]
+    end
 
+    write_file File.join(@tempdir, 'lib', 'a.rb') do |fp|
+      fp.puts "puts __FILE__"
+    end
     write_file File.join(@tempdir, 'bin', 'foo') do |fp|
       fp.puts "#!/usr/bin/ruby"
     end
 
     install_gem a
 
-    foo_path = File.join @gemhome, 'gems', a.full_name, 'bin', 'foo'
+    foo_path  = File.join @gemhome, 'gems', a.full_name, 'bin', 'foo'
+    a_rb_path = File.join @gemhome, 'gems', a.full_name, 'lib', 'a.rb'
 
     write_file foo_path do |io|
       io.puts 'I changed it!'
     end
 
+    write_file a_rb_path do |io|
+      io.puts 'I changed it!'
+    end
+
     @cmd.options[:args] = %w[a]
 
     use_ui @ui do
@@ -30,6 +41,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     end
 
     assert_equal "#!/usr/bin/ruby\n", File.read(foo_path), foo_path
+    assert_equal "puts __FILE__\n", File.read(a_rb_path), a_rb_path
 
     out = @ui.output.split "\n"
 
@@ -46,9 +58,11 @@ class TestGemCommandsPristineCommand < Gem::TestCase
 
     install_gem a
 
-    gem_bin = File.join @gemhome, 'gems', a.full_name, 'bin', 'foo'
+    gem_bin  = File.join @gemhome, 'gems', a.full_name, 'bin', 'foo'
+    gem_stub = File.join @gemhome, 'bin', 'foo'
 
     FileUtils.rm gem_bin
+    FileUtils.rm gem_stub
 
     @cmd.handle_options %w[--all]
 
@@ -57,6 +71,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     end
 
     assert File.exist?(gem_bin)
+    assert File.exist?(gem_stub)
 
     out = @ui.output.split "\n"
 
@@ -65,7 +80,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_empty out, out.inspect
   end
 
-  def test_execute_no_exetension
+  def test_execute_no_extension
     a = quick_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
 
     ext_path = File.join @tempdir, 'ext', 'a', 'extconf.rb'
@@ -90,6 +105,38 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_empty out, out.inspect
   end
 
+  def test_execute_with_extension_with_build_args
+    a = quick_spec 'a' do |s| s.extensions << 'ext/a/extconf.rb' end
+
+    ext_path = File.join @tempdir, 'ext', 'a', 'extconf.rb'
+    write_file ext_path do |io|
+      io.write <<-'RUBY'
+      File.open "Makefile", "w" do |f|
+        f.puts "all:\n\techo built\n"
+        f.puts "install:\n\techo built\n"
+      end
+      RUBY
+    end
+
+    build_args = %w!--with-awesome=true --sweet!
+
+    install_gem a, :build_args => build_args
+
+    @cmd.options[:args] = %w[a]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    out = @ui.output.split "\n"
+
+    assert_equal 'Restoring gems to pristine condition...', out.shift
+    assert_equal "Building native extensions with: '--with-awesome=true --sweet'", out.shift
+    assert_equal "This could take a while...", out.shift
+    assert_equal "Restored #{a.full_name}", out.shift
+    assert_empty out, out.inspect
+  end
+
   def test_execute_many
     a = quick_spec 'a'
     b = quick_spec 'b'
@@ -195,5 +242,53 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     assert_match %r|at least one gem name|, e.message
   end
 
+  def test_execute_only_executables
+    a = quick_spec 'a' do |s|
+      s.executables = %w[foo]
+      s.files = %w[bin/foo lib/a.rb]
+    end
+    write_file File.join(@tempdir, 'lib', 'a.rb') do |fp|
+      fp.puts "puts __FILE__"
+    end
+    write_file File.join(@tempdir, 'bin', 'foo') do |fp|
+      fp.puts "#!/usr/bin/ruby"
+    end
+
+    install_gem a
+
+    gem_lib  = File.join @gemhome, 'gems', a.full_name, 'lib', 'a.rb'
+    gem_exec = File.join @gemhome, 'bin', 'foo'
+
+    FileUtils.rm gem_exec
+    FileUtils.rm gem_lib
+
+    @cmd.handle_options %w[--all --only-executables]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert File.exist? gem_exec
+    refute File.exist? gem_lib
+  end
+
+  def test_execute_default_gem
+    default_gem_spec = new_default_spec("default", "2.0.0.0",
+                                        nil, "default/gem.rb")
+    install_default_specs(default_gem_spec)
+
+    @cmd.options[:args] = %w[default]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_equal([
+                   "Restoring gems to pristine condition...",
+                   "Skipped default-2.0.0.0, it is a default gem",
+                 ],
+                 @ui.output.split("\n"))
+    assert_empty(@ui.error)
+  end
 end
 

data/test/rubygems/test_gem_commands_push_command.rb

@@ -13,6 +13,9 @@ class TestGemCommandsPushCommand < Gem::TestCase
 
   def setup
     super
+    ENV["RUBYGEMS_HOST"] = nil
+    Gem.host = Gem::DEFAULT_HOST
+    Gem.configuration.disable_default_gem_server = false
 
     @gems_dir  = File.join @tempdir, 'gems'
     @cache_dir = File.join @gemhome, "cache"
@@ -23,6 +26,8 @@ class TestGemCommandsPushCommand < Gem::TestCase
       "ed244fbf2b1a52e012da8616c512fa47f9aa5250"
 
     @spec, @path = util_gem "freewill", "1.0.0"
+    @host = Gem.host
+    @api_key = Gem.configuration.rubygems_api_key
 
     @fetcher = Gem::FakeFetcher.new
     Gem::RemoteFetcher.fetcher = @fetcher
@@ -35,35 +40,84 @@ class TestGemCommandsPushCommand < Gem::TestCase
       @cmd.send_gem(@path)
     end
 
-    assert_match %r{Pushing gem to #{Gem.host}...}, @ui.output
+    assert_match %r{Pushing gem to #{@host}...}, @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_equal @api_key, @fetcher.last_request["Authorization"]
 
     assert_match @response, @ui.output
   end
 
+  def test_sending_when_default_host_disabled
+    Gem.configuration.disable_default_gem_server = true
+    response = "You must specify a gem server"
+
+    assert_raises Gem::MockGemUi::TermError do
+      use_ui @ui do
+        @cmd.send_gem(@path)
+      end
+    end
+
+    assert_match response, @ui.error
+  end
+
+  def test_sending_when_default_host_disabled_with_override
+    ENV["RUBYGEMS_HOST"] = @host
+    Gem.configuration.disable_default_gem_server = true
+    @response = "Successfully registered gem: freewill (1.0.0)"
+    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+
+    send_battery
+  end
+
+  def test_sending_gem_to_metadata_host
+    @host = "http://rubygems.engineyard.com"
+
+    @spec, @path = util_gem "freebird", "1.0.1" do |spec|
+      spec.metadata['default_gem_server'] = @host
+    end
+
+    @api_key = "EYKEY"
+
+    keys = {
+      :rubygems_api_key => 'KEY',
+      @host => @api_key
+    }
+
+    FileUtils.mkdir_p File.dirname Gem.configuration.credentials_path
+    open Gem.configuration.credentials_path, 'w' do |f|
+      f.write keys.to_yaml
+    end
+    Gem.configuration.load_api_keys
+
+    FileUtils.rm Gem.configuration.credentials_path
+
+    @response = "Successfully registered gem: freebird (1.0.1)"
+    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
+    send_battery
+  end
+
   def test_sending_gem_default
     @response = "Successfully registered gem: freewill (1.0.0)"
-    @fetcher.data["#{Gem.host}/api/v1/gems"]  = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"]  = [@response, 200, 'OK']
 
     send_battery
   end
 
   def test_sending_gem_host
     @response = "Successfully registered gem: freewill (1.0.0)"
-    @fetcher.data["#{Gem.host}/api/v1/gems"] = [@response, 200, 'OK']
-    @cmd.options[:host] = "#{Gem.host}"
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
+    @cmd.options['host'] = "#{Gem.host}"
 
     send_battery
   end
 
   def test_sending_gem_ENV
     @response = "Successfully registered gem: freewill (1.0.0)"
-    @fetcher.data["#{Gem.host}/api/v1/gems"] = [@response, 200, 'OK']
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, 'OK']
     ENV["RUBYGEMS_HOST"] = "#{Gem.host}"
 
     send_battery
@@ -78,7 +132,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
 
   def test_sending_gem_denied
     response = "You don't have permission to push to this gem"
-    @fetcher.data["#{Gem.host}/api/v1/gems"] = [response, 403, 'Forbidden']
+    @fetcher.data["#{@host}/api/v1/gems"] = [response, 403, 'Forbidden']
 
     assert_raises Gem::MockGemUi::TermError do
       use_ui @ui do
@@ -91,7 +145,7 @@ class TestGemCommandsPushCommand < Gem::TestCase
 
   def test_sending_gem_key
     @response = "Successfully registered gem: freewill (1.0.0)"
-    @fetcher.data["#{Gem.host}/api/v1/gems"] = [@response, 200, "OK"]
+    @fetcher.data["#{@host}/api/v1/gems"] = [@response, 200, "OK"]
     File.open Gem.configuration.credentials_path, 'a' do |f|
       f.write ':other: 701229f217cdf23b1344c7b4b54ca97'
     end

data/test/rubygems/test_gem_commands_query_command.rb

@@ -349,5 +349,56 @@ pl (1 i386-linux)
     assert_equal "WARNING:  prereleases are always shown locally\n", @ui.error
   end
 
+  def test_execute_local_details
+    @a1.platform = 'x86-linux'
+
+    @a2.summary = 'This is a lot of text. ' * 4
+    @a2.authors = ['Abraham Lincoln', 'Hirohito']
+    @a2.homepage = 'http://a.example.com/'
+    @a2.rubyforge_project = 'rubygems'
+    @a2.platform = 'universal-darwin'
+
+    util_clear_gems
+    util_setup_spec_fetcher @a1, @a2, @pl1
+
+    @cmd.handle_options %w[-l -d]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    str = @ui.output
+
+    str.gsub!(/\(\d\): [^\n]*/, "-")
+    str.gsub!(/at: [^\n]*/, "at: -")
+
+    expected = <<-EOF
+*** LOCAL GEMS ***
+
+a (2, 1)
+    Platforms:
+        1: x86-linux
+        2: universal-darwin
+    Authors: Abraham Lincoln, Hirohito
+    Rubyforge: http://rubyforge.org/projects/rubygems
+    Homepage: http://a.example.com/
+    Installed at -
+                 -
+
+    This is a lot of text. This is a lot of text. This is a lot of text.
+    This is a lot of text.
+
+pl \(1\)
+    Platform: i386-linux
+    Author: A User
+    Homepage: http://example.com
+    Installed at: -
+
+    this is a summary
+    EOF
+
+    assert_match expected, @ui.output
+  end
+
 end
 

data/test/rubygems/test_gem_commands_search_command.rb

@@ -0,0 +1,25 @@
+require 'rubygems/test_case'
+require 'rubygems/commands/search_command'
+
+class TestGemCommandsSearchCommand < Gem::TestCase
+
+  def setup
+    super
+
+    @cmd = Gem::Commands::SearchCommand.new
+  end
+
+  def test_execute
+    @cmd.handle_options %w[a]
+
+    use_ui @ui do
+      @cmd.execute
+    end
+
+    assert_match %r%REMOTE GEMS%, @ui.output
+
+    assert_empty @ui.error
+  end
+
+end
+

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -0,0 +1,45 @@
+require 'rubygems/test_case'
+require 'rubygems/commands/setup_command'
+
+class TestGemCommandsSetupCommand < Gem::TestCase
+
+  def setup
+    super
+
+    @install_dir = File.join @tempdir, 'install'
+    @cmd = Gem::Commands::SetupCommand.new
+    @cmd.options[:prefix] = @install_dir
+
+    FileUtils.mkdir_p 'bin'
+    FileUtils.mkdir_p 'lib/rubygems'
+
+    open 'bin/gem',                   'w' do |io| io.puts '# gem'          end
+    open 'lib/rubygems.rb',           'w' do |io| io.puts '# rubygems.rb'  end
+    open 'lib/rubygems/test_case.rb', 'w' do |io| io.puts '# test_case.rb' end
+  end
+
+  def test_rb_files_in
+    assert_equal %w[rubygems.rb rubygems/test_case.rb],
+                 @cmd.rb_files_in('lib').sort
+  end
+
+  def test_remove_old_lib_files
+    lib            = File.join @install_dir, 'lib'
+    lib_rubygems   = File.join lib, 'rubygems'
+
+    old_builder_rb = File.join lib_rubygems, 'builder.rb'
+    old_format_rb  = File.join lib_rubygems, 'format.rb'
+
+    FileUtils.mkdir_p lib_rubygems
+
+    open old_builder_rb, 'w' do |io| io.puts '# builder.rb' end
+    open old_format_rb,  'w' do |io| io.puts '# format.rb'  end
+
+    @cmd.remove_old_lib_files lib
+
+    refute_path_exists old_builder_rb
+    refute_path_exists old_format_rb
+  end
+
+end
+