rubygems-update 2.0.3 → 2.0.4

data/test/rubygems/test_gem_gemcutter_utilities.rb

@@ -15,6 +15,13 @@ class TestGemGemcutterUtilities < Gem::TestCase
     @cmd.extend Gem::GemcutterUtilities
   end
 
+  def teardown
+    ENV['RUBYGEMS_HOST'] = nil
+    Gem.configuration.rubygems_api_key = nil
+
+    super
+  end
+
   def test_alternate_key_alternate_host
     keys = {
       :rubygems_api_key => 'KEY',
@@ -63,6 +70,22 @@ class TestGemGemcutterUtilities < Gem::TestCase
     assert_equal 'OTHER', @cmd.api_key
   end
 
+  def test_host
+    assert_equal 'https://rubygems.org', @cmd.host
+  end
+
+  def test_host_RUBYGEMS_HOST
+    ENV['RUBYGEMS_HOST'] = 'https://other.example'
+
+    assert_equal 'https://other.example', @cmd.host
+  end
+
+  def test_host_RUBYGEMS_HOST_empty
+    ENV['RUBYGEMS_HOST'] = ''
+
+    assert_equal 'https://rubygems.org', @cmd.host
+  end
+
   def test_sign_in
     api_key     = 'a5fdbb6ba150cbb83aad2bb2fede64cf040453903'
     util_sign_in [api_key, 200, 'OK']

data/test/rubygems/test_gem_installer.rb

@@ -1073,6 +1073,7 @@ gem 'other', version
 
         CONFIG['CC'] = '$(TOUCH) $@ ||'
         CONFIG['LDSHARED'] = '$(TOUCH) $@ ||'
+        $ruby = '#{Gem.ruby}'
 
         create_makefile("#{@spec.name}")
       RUBY
@@ -1364,6 +1365,20 @@ gem 'other', version
     refute_path_exists @spec.build_info_file
   end
 
+  def test_write_build_info_file_install_dir
+    installer = Gem::Installer.new @gem, :install_dir => "#{@gemhome}2"
+
+    installer.build_args = %w[
+      --with-libyaml-dir /usr/local/Cellar/libyaml/0.1.4
+    ]
+
+    installer.write_build_info_file
+
+    refute_path_exists @spec.build_info_file
+    assert_path_exists \
+      File.join("#{@gemhome}2", 'build_info', "#{@spec.full_name}.info")
+  end
+
   def test_write_cache_file
     cache_file = File.join @gemhome, 'cache', @spec.file_name
     gem = File.join @gemhome, @spec.file_name

data/test/rubygems/test_gem_package.rb

@@ -335,6 +335,7 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_install_location_extra_slash
+    skip 'no File.realpath on 1.8' if RUBY_VERSION < '1.9'
     package = Gem::Package.new @gem
 
     file = 'foo//file.rb'
@@ -511,7 +512,8 @@ class TestGemPackage < Gem::Package::TarTestCase
       package.verify
     end
 
-    assert_equal 'No such file or directory - nonexistent.gem', e.message
+    assert_match %r%^No such file or directory%, e.message
+    assert_match %r%nonexistent.gem$%,           e.message
   end
 
   def test_verify_security_policy

data/test/rubygems/test_gem_spec_fetcher.rb

@@ -132,8 +132,10 @@ class TestGemSpecFetcher < Gem::TestCase
 
     assert_equal 0, specs_and_sources.size
     assert_equal 1, errors.size
+    pmm = errors.first
 
-    assert_equal "i386-linux", errors[0].platforms.first
+    assert_equal "i386-linux", pmm.platforms.first
+    assert_equal "Found pl (1), but was for platform i386-linux", pmm.wordy
   end
 
   def test_spec_for_dependency_bad_fetch_spec

data/test/rubygems/test_gem_specification.rb

@@ -434,6 +434,21 @@ dependencies: []
     assert_equal expected, Gem::Specification.normalize_yaml_input(input)
   end
 
+  def test_self_outdated
+    util_clear_gems
+    util_setup_fake_fetcher true
+
+    a4 = quick_gem @a1.name, '4'
+    util_build_gem a4
+    util_setup_spec_fetcher @a1, @a2, @a3a, a4
+
+    Gem::Specification.remove_spec @a1
+    Gem::Specification.remove_spec @a2
+    Gem::Specification.remove_spec a4
+
+    assert_equal %w[a], Gem::Specification.outdated
+  end
+
   DATA_PATH = File.expand_path "../data", __FILE__
 
   def test_handles_private_null_type
@@ -597,7 +612,16 @@ dependencies: []
     assert @a2.activated?
   end
 
-  def test_add_dependency_with_explicit_type
+  def test_add_dependency_with_type
+    gem = quick_spec "awesome", "1.0" do |awesome|
+      awesome.add_dependency true
+      awesome.add_dependency :gem_name
+    end
+
+    assert_equal %w[true gem_name], gem.dependencies.map { |dep| dep.name }
+  end
+
+  def test_add_dependency_with_type_explicit
     gem = quick_spec "awesome", "1.0" do |awesome|
       awesome.add_development_dependency "monkey"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Jim Weirich
@@ -32,7 +32,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2013-03-12 00:00:00.000000000 Z
+date: 2013-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -40,14 +40,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -90,20 +90,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: session
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: ZenTest
   requirement: !ruby/object:Gem::Requirement
@@ -329,7 +315,6 @@ files:
 - test/rubygems/grandchild_cert.pem
 - test/rubygems/grandchild_cert_32.pem
 - test/rubygems/grandchild_key.pem
-- test/rubygems/insure_session.rb
 - test/rubygems/invalid_issuer_cert.pem
 - test/rubygems/invalid_issuer_cert_32.pem
 - test/rubygems/invalid_key.pem
@@ -376,7 +361,6 @@ files:
 - test/rubygems/test_gem_commands_pristine_command.rb
 - test/rubygems/test_gem_commands_push_command.rb
 - test/rubygems/test_gem_commands_query_command.rb
-- test/rubygems/test_gem_commands_search_command.rb
 - test/rubygems/test_gem_commands_server_command.rb
 - test/rubygems/test_gem_commands_setup_command.rb
 - test/rubygems/test_gem_commands_sources_command.rb
@@ -449,7 +433,7 @@ post_install_message:
 rdoc_options:
 - --main
 - README.rdoc
-- --title=RubyGems 2.0.3 Documentation
+- --title=RubyGems 2.0.4 Documentation
 require_paths:
 - hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -464,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubygems
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby
@@ -494,7 +478,6 @@ test_files:
 - test/rubygems/test_gem_commands_pristine_command.rb
 - test/rubygems/test_gem_commands_push_command.rb
 - test/rubygems/test_gem_commands_query_command.rb
-- test/rubygems/test_gem_commands_search_command.rb
 - test/rubygems/test_gem_commands_server_command.rb
 - test/rubygems/test_gem_commands_setup_command.rb
 - test/rubygems/test_gem_commands_sources_command.rb

data/test/rubygems/insure_session.rb

@@ -1,43 +0,0 @@
-require 'rubygems'
-
-def install_session
-  path_to_gem = File.join("redist", "session.gem")
-  begin
-    Gem::Installer.new(path_to_gem).install
-  rescue Errno::EACCES => ex
-    puts
-    puts "*****************************************************************"
-    puts "Unable to install Gem 'Session'."
-    puts "Reason:  #{ex.message}"
-    puts "Try running:"
-    puts
-    puts "   gem -Li #{path_to_gem}"
-    puts
-    puts "with the appropriate admin privileges."
-    puts "*****************************************************************"
-    puts
-    exit
-  end
-  gem 'session'
-end
-
-begin
-  require 'session'
-rescue LoadError => e
-  puts
-  puts "Required Gem 'Session' missing."
-  puts "We can attempt to install from the RubyGems Distribution,"
-  puts "but installation may require admin privileges on your system."
-  puts
-  print "Install now from RubyGems distribution? [Yn]"
-  answer = gets
-  if(answer =~ /^y/i || answer =~ /^[^a-zA-Z0-9]$/) then
-    install_session
-    puts
-    puts "Retry running the functional tests."
-    exit(0)
-  else
-    puts "Test cancelled...quitting"
-    exit(1)
-  end
-end

data/test/rubygems/test_gem_commands_search_command.rb

@@ -1,25 +0,0 @@
-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
-