rubygems-update 2.1.11 → 2.2.0.rc.1

data/test/rubygems/test_gem_ext_cmake_builder.rb

@@ -57,13 +57,7 @@ install (FILES test.txt DESTINATION bin)
     shell_error_msg = %r{(CMake Error: .*)}
     sh_prefix_cmake = "cmake . -DCMAKE_INSTALL_PREFIX="
 
-    expected = %r(cmake failed:
-
-#{Regexp.escape sh_prefix_cmake}#{Regexp.escape @dest_path}
-#{shell_error_msg}
-)
-
-    assert_match expected, error.message
+    assert_match 'cmake failed', error.message
 
     assert_match %r%^#{sh_prefix_cmake}#{Regexp.escape @dest_path}%, output
     assert_match %r%#{shell_error_msg}%, output

data/test/rubygems/test_gem_ext_configure_builder.rb

@@ -6,7 +6,8 @@ class TestGemExtConfigureBuilder < Gem::TestCase
   def setup
     super
 
-    @makefile_body =  "all:\n\t@echo ok\ninstall:\n\t@echo ok"
+    @makefile_body =
+      "clean:\n\t@echo ok\nall:\n\t@echo ok\ninstall:\n\t@echo ok"
 
     @ext = File.join @tempdir, 'ext'
     @dest_path = File.join @tempdir, 'prefix'
@@ -30,6 +31,8 @@ class TestGemExtConfigureBuilder < Gem::TestCase
 
     assert_equal "sh ./configure --prefix=#{@dest_path}", output.shift
     assert_equal "", output.shift
+    assert_contains_make_command 'clean', output.shift
+    assert_match(/^ok$/m, output.shift)
     assert_contains_make_command '', output.shift
     assert_match(/^ok$/m, output.shift)
     assert_contains_make_command 'install', output.shift
@@ -49,13 +52,7 @@ class TestGemExtConfigureBuilder < Gem::TestCase
     shell_error_msg = %r{(\./configure: .*)|((?:Can't|cannot) open \./configure(?:: No such file or directory)?)}
     sh_prefix_configure = "sh ./configure --prefix="
 
-    expected = %r(configure failed:
-
-#{Regexp.escape sh_prefix_configure}#{Regexp.escape @dest_path}
-(?:.*?: )?#{shell_error_msg}
-)
-
-    assert_match expected, error.message
+    assert_match 'configure failed', error.message
 
     assert_equal "#{sh_prefix_configure}#{@dest_path}", output.shift
     assert_match %r(#{shell_error_msg}), output.shift
@@ -76,8 +73,9 @@ class TestGemExtConfigureBuilder < Gem::TestCase
       Gem::Ext::ConfigureBuilder.build nil, nil, @dest_path, output
     end
 
-    assert_contains_make_command '', output[0]
-    assert_contains_make_command 'install', output[2]
+    assert_contains_make_command 'clean', output[0]
+    assert_contains_make_command '', output[2]
+    assert_contains_make_command 'install', output[4]
   end
 
 end

data/test/rubygems/test_gem_ext_ext_conf_builder.rb

@@ -35,8 +35,9 @@ class TestGemExtExtConfBuilder < Gem::TestCase
 
     assert_match(/^#{Gem.ruby} extconf.rb/, output[0])
     assert_equal "creating Makefile\n", output[1]
-    assert_contains_make_command '', output[2]
-    assert_contains_make_command 'install', output[4]
+    assert_contains_make_command 'clean', output[2]
+    assert_contains_make_command '', output[4]
+    assert_contains_make_command 'install', output[6]
     assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
   end
 
@@ -54,8 +55,9 @@ class TestGemExtExtConfBuilder < Gem::TestCase
     end
 
     assert_equal "creating Makefile\n", output[1]
-    assert_contains_make_command '', output[2]
-    assert_contains_make_command 'install', output[4]
+    assert_contains_make_command 'clean', output[2]
+    assert_contains_make_command '', output[4]
+    assert_contains_make_command 'install', output[6]
   ensure
     RbConfig::CONFIG['configure_args'] = configure_args
   end
@@ -77,8 +79,8 @@ class TestGemExtExtConfBuilder < Gem::TestCase
       end
     end
 
-    assert_equal "creating Makefile\n", output[1]
-    assert_contains_make_command '', output[2]
+    assert_equal "creating Makefile\n",   output[1]
+    assert_contains_make_command 'clean', output[2]
   ensure
     RbConfig::CONFIG['configure_args'] = configure_args
     ENV['make'] = env_make
@@ -103,10 +105,7 @@ class TestGemExtExtConfBuilder < Gem::TestCase
       end
     end
 
-    assert_match(/\Aextconf failed:
-
-#{Gem.ruby} extconf.rb.*
-checking for main\(\) in .*?nonexistent/m, error.message)
+    assert_equal 'extconf failed, exit code 1', error.message
 
     assert_equal("#{Gem.ruby} extconf.rb", output[0])
   end
@@ -130,6 +129,7 @@ ruby =
 
 open 'Makefile', 'w' do |io|
   io.write <<-Makefile
+clean: ruby
 all: ruby
 install: ruby
 
@@ -147,8 +147,9 @@ end
       Gem::Ext::ExtConfBuilder.build 'extconf.rb', nil, @dest_path, output
     end
 
-    assert_contains_make_command '', output[2]
-    assert_contains_make_command 'install', output[4]
+    assert_contains_make_command 'clean', output[2]
+    assert_contains_make_command '', output[4]
+    assert_contains_make_command 'install', output[6]
     assert_empty Dir.glob(File.join(@ext, 'siteconf*.rb'))
   end
 
@@ -163,6 +164,7 @@ end
       makefile.puts "# π"
       makefile.puts "RUBYARCHDIR = $(foo)$(target_prefix)"
       makefile.puts "RUBYLIBDIR = $(bar)$(target_prefix)"
+      makefile.puts "clean:"
       makefile.puts "all:"
       makefile.puts "install:"
     end
@@ -171,8 +173,9 @@ end
       Gem::Ext::ExtConfBuilder.make @ext, output
     end
 
-    assert_contains_make_command '', output[0]
-    assert_contains_make_command 'install', output[2]
+    assert_contains_make_command 'clean', output[0]
+    assert_contains_make_command '', output[2]
+    assert_contains_make_command 'install', output[4]
   end
 
   def test_class_make_no_Makefile
@@ -182,13 +185,7 @@ end
       end
     end
 
-    expected = <<-EOF.strip
-Makefile not found:
-
-output
-    EOF
-
-    assert_equal expected, error.message
+    assert_equal 'Makefile not found', error.message
   end
 
 end

data/test/rubygems/test_gem_ext_rake_builder.rb

@@ -56,9 +56,7 @@ class TestGemExtRakeBuilder < Gem::TestCase
         end
       end
 
-      assert_match %r%^rake failed:%, error.message
-      assert_match %r%^#{Regexp.escape @@ruby} mkrf_conf\.rb%, error.message
-      assert_match %r%^#{Regexp.escape rake} RUBYARCHDIR=#{Regexp.escape @dest_path} RUBYLIBDIR=#{Regexp.escape @dest_path}%, error.message
+      assert_match %r%^rake failed%, error.message
     end
   end
 

data/test/rubygems/test_gem_impossible_dependencies_error.rb

@@ -15,10 +15,10 @@ class TestGemImpossibleDependenciesError < Gem::TestCase
     net_ssh_2_6_5 =
       dependency_request dep('net-ssh', '~> 2.2.2'), 'net-ssh', '2.6.5', request
 
-    conflict1 = Gem::DependencyResolver::DependencyConflict.new \
+    conflict1 = Gem::Resolver::Conflict.new \
       net_ssh_2_6_5, net_ssh_2_6_5.requester
 
-    conflict2 = Gem::DependencyResolver::DependencyConflict.new \
+    conflict2 = Gem::Resolver::Conflict.new \
       net_ssh_2_2_2, net_ssh_2_2_2.requester
 
     conflicts << [net_ssh_2_6_5.requester.spec, conflict1]
@@ -28,10 +28,14 @@ class TestGemImpossibleDependenciesError < Gem::TestCase
 
     expected = <<-EXPECTED
 rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
-  Activated net-ssh-2.6.5 instead of (~> 2.2.2) via:
-    net-ssh-2.6.5, rye-0.9.8
-  Activated net-ssh-2.2.2 instead of (>= 2.6.5) via:
-    net-ssh-2.2.2, rye-0.9.8
+  Activated net-ssh-2.6.5 via:
+    net-ssh-2.6.5 (>= 2.0.13), rye-0.9.8 (= 0.9.8)
+  instead of (~> 2.2.2) via:
+    net-ssh-2.6.5 (>= 2.0.13), rye-0.9.8 (= 0.9.8)
+  Activated net-ssh-2.2.2 via:
+    net-ssh-2.2.2 (>= 2.0.13), rye-0.9.8 (= 0.9.8)
+  instead of (>= 2.6.5) via:
+    net-ssh-2.2.2 (>= 2.0.13), rye-0.9.8 (= 0.9.8)
     EXPECTED
 
     assert_equal expected, error.message

data/test/rubygems/test_gem_indexer.rb

@@ -13,15 +13,15 @@ class TestGemIndexer < Gem::TestCase
     util_clear_gems
     util_make_gems
 
-    @d2_0 = quick_spec 'd', '2.0' do |s|
+    @d2_0 = util_spec 'd', '2.0' do |s|
       s.date = Gem::Specification::TODAY - 86400 * 3
     end
     util_build_gem @d2_0
 
-    @d2_0_a = quick_spec 'd', '2.0.a'
+    @d2_0_a = util_spec 'd', '2.0.a'
     util_build_gem @d2_0_a
 
-    @d2_0_b = quick_spec 'd', '2.0.b'
+    @d2_0_b = util_spec 'd', '2.0.b'
     util_build_gem @d2_0_b
 
     @default = new_default_spec 'default', 2
@@ -292,7 +292,7 @@ class TestGemIndexer < Gem::TestCase
   def with_system_gems
     Gem::Specification.reset
 
-    sys_gem = quick_spec 'systemgem', '1.0'
+    sys_gem = util_spec 'systemgem', '1.0'
     util_build_gem sys_gem
     Gem::Specification.add_spec sys_gem
     yield
@@ -311,11 +311,11 @@ class TestGemIndexer < Gem::TestCase
     assert File.directory?(quickdir)
     assert File.directory?(marshal_quickdir)
 
-    @d2_1 = quick_spec 'd', '2.1'
+    @d2_1 = util_spec 'd', '2.1'
     util_build_gem @d2_1
     @d2_1_tuple = [@d2_1.name, @d2_1.version, @d2_1.original_platform]
 
-    @d2_1_a = quick_spec 'd', '2.2.a'
+    @d2_1_a = util_spec 'd', '2.2.a'
     util_build_gem @d2_1_a
     @d2_1_a_tuple = [@d2_1_a.name, @d2_1_a.version, @d2_1_a.original_platform]
 

data/test/rubygems/test_gem_installer.rb

@@ -185,7 +185,7 @@ gem 'other', version
   end unless Gem.win_platform?
 
   def test_ensure_dependency
-    quick_spec 'a'
+    util_spec 'a'
 
     dep = Gem::Dependency.new 'a', '>= 2'
     assert @installer.ensure_dependency(@spec, dep)
@@ -606,7 +606,7 @@ gem 'other', version
   end
 
   def test_initialize
-    spec = quick_spec 'a' do |s| s.platform = Gem::Platform.new 'mswin32' end
+    spec = util_spec 'a' do |s| s.platform = Gem::Platform.new 'mswin32' end
     gem = File.join @tempdir, spec.file_name
 
     Dir.mkdir util_inst_bindir
@@ -645,9 +645,11 @@ gem 'other', version
     cache_file = File.join @gemhome, 'cache', @spec.file_name
     stub_exe   = File.join @gemhome, 'bin', 'executable'
     rakefile   = File.join gemdir, 'ext', 'a', 'Rakefile'
+    spec_file  = File.join @gemhome, 'specifications', @spec.spec_name
 
     Gem.pre_install do |installer|
       refute_path_exists cache_file, 'cache file must not exist yet'
+      refute_path_exists spec_file,  'spec file must not exist yet'
       true
     end
 
@@ -655,11 +657,13 @@ gem 'other', version
       assert_path_exists gemdir, 'gem install dir must exist'
       assert_path_exists rakefile, 'gem executable must exist'
       refute_path_exists stub_exe, 'gem executable must not exist'
+      refute_path_exists spec_file, 'spec file must not exist yet'
       true
     end
 
     Gem.post_install do |installer|
       assert_path_exists cache_file, 'cache file must exist'
+      assert_path_exists spec_file,  'spec file must exist'
     end
 
     @newspec = nil
@@ -937,7 +941,7 @@ gem 'other', version
     assert_match %r|I am a shiny gem!|, @ui.output
   end
 
-  def test_install_extension_install_dir
+  def test_install_extension_dir
     gemhome2 = "#{@gemhome}2"
 
     @spec.extensions << "extconf.rb"
@@ -1004,6 +1008,10 @@ gem 'other', version
     skip '1.9.2 and earlier mkmf.rb does not create TOUCH' if
       RUBY_VERSION < '1.9.3'
 
+    if RUBY_VERSION == "1.9.3" and RUBY_PATCHLEVEL <= 194
+      skip "TOUCH was introduced into 1.9.3 after p194"
+    end
+
     @spec.require_paths = ["."]
 
     @spec.extensions << "extconf.rb"
@@ -1038,13 +1046,19 @@ gem 'other', version
     puts '-' * 78
     puts File.read File.join(@gemhome, 'gems', 'a-2', 'Makefile')
     puts '-' * 78
-    puts File.read File.join(@gemhome, 'gems', 'a-2', 'gem_make.out')
-    puts '-' * 78
+
+    path = File.join(@gemhome, 'gems', 'a-2', 'gem_make.out')
+
+    if File.exists?(path)
+      puts File.read(path)
+      puts '-' * 78
+    end
+
     raise
   end
 
   def test_installation_satisfies_dependency_eh
-    quick_spec 'a'
+    util_spec 'a'
 
     dep = Gem::Dependency.new 'a', '>= 2'
     assert @installer.installation_satisfies_dependency?(dep)
@@ -1113,7 +1127,7 @@ gem 'other', version
   end
 
   def test_pre_install_checks_wrong_rubygems_version
-    spec = quick_spec 'old_rubygems_required', '1' do |s|
+    spec = util_spec 'old_rubygems_required', '1' do |s|
       s.required_rubygems_version = '< 0'
     end
 
@@ -1346,7 +1360,12 @@ gem 'other', version
     @installer.write_spec
 
     assert_path_exists @spec.spec_file
-    assert_equal @spec, eval(File.read(@spec.spec_file))
+
+    loaded = Gem::Specification.load @spec.spec_file
+
+    assert_equal @spec, loaded
+
+    assert_equal Gem.rubygems_version, @spec.installed_by_version
   end
 
   def test_write_spec_writes_cached_spec
@@ -1395,7 +1414,7 @@ gem 'other', version
   end
 
   def old_ruby_required
-    spec = quick_spec 'old_ruby_required', '1' do |s|
+    spec = util_spec 'old_ruby_required', '1' do |s|
       s.required_ruby_version = '= 1.4.6'
     end
 
@@ -1405,7 +1424,7 @@ gem 'other', version
   end
 
   def util_execless
-    @spec = quick_spec 'z'
+    @spec = util_spec 'z'
     util_build_gem @spec
 
     @installer = util_installer @spec, @gemhome

data/test/rubygems/test_gem_local_remote_options.rb

@@ -40,7 +40,7 @@ class TestGemLocalRemoteOptions < Gem::TestCase
   end
 
   def test_clear_sources_option_idiot_proof
-    util_setup_fake_fetcher
+    spec_fetcher
 
     @cmd.add_local_remote_options
     @cmd.handle_options %W[--clear-sources]

data/test/rubygems/test_gem_package.rb

@@ -396,6 +396,24 @@ class TestGemPackage < Gem::Package::TarTestCase
                  "#{@destination} is not allowed", e.message)
   end
 
+  def test_extract_tar_gz_directory
+    package = Gem::Package.new @gem
+
+    tgz_io = util_tar_gz do |tar|
+      tar.mkdir    'lib',        0755
+      tar.add_file 'lib/foo.rb', 0644 do |io| io.write 'hi' end
+      tar.mkdir    'lib/foo',    0755
+    end
+
+    package.extract_tar_gz tgz_io, @destination
+
+    extracted = File.join @destination, 'lib/foo.rb'
+    assert_path_exists extracted
+
+    extracted = File.join @destination, 'lib/foo'
+    assert_path_exists extracted
+  end
+
   def test_extract_tar_gz_dot_slash
     package = Gem::Package.new @gem
 

data/test/rubygems/test_gem_rdoc.rb

@@ -9,7 +9,7 @@ class TestGemRDoc < Gem::TestCase
   def setup
     super
 
-    @a = quick_spec 'a' do |s|
+    @a = util_spec 'a' do |s|
       s.rdoc_options = %w[--main MyTitle]
       s.extra_rdoc_files = %w[README]
     end

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -165,7 +165,7 @@ gems:
   def test_api_endpoint
     uri = URI.parse "http://gems.example.com/foo"
     target = MiniTest::Mock.new
-    target.expect :target, "http://blah.com"
+    target.expect :target, "blah.com"
 
     dns = MiniTest::Mock.new
     dns.expect :getresource, target, [String, Object]

data/test/rubygems/test_gem_request.rb

@@ -12,8 +12,9 @@ class TestGemRequest < Gem::TestCase
     super
 
     @proxy_uri = "http://localhost:1234"
+    @uri = URI('http://example')
 
-    @request = Gem::Request.new nil, nil, nil, nil
+    @request = Gem::Request.new @uri, nil, nil, nil
   end
 
   def teardown
@@ -25,7 +26,7 @@ class TestGemRequest < Gem::TestCase
   def test_initialize_proxy
     proxy_uri = 'http://proxy.example.com'
 
-    request = Gem::Request.new nil, nil, nil, proxy_uri
+    request = Gem::Request.new @uri, nil, nil, proxy_uri
 
     assert_equal proxy_uri, request.proxy_uri.to_s
   end
@@ -33,7 +34,7 @@ class TestGemRequest < Gem::TestCase
   def test_initialize_proxy_URI
     proxy_uri = 'http://proxy.example.com'
 
-    request = Gem::Request.new nil, nil, nil, URI(proxy_uri)
+    request = Gem::Request.new @uri, nil, nil, URI(proxy_uri)
 
     assert_equal proxy_uri, request.proxy_uri.to_s
   end
@@ -43,7 +44,7 @@ class TestGemRequest < Gem::TestCase
     ENV['http_proxy_user'] = 'foo'
     ENV['http_proxy_pass'] = 'bar'
 
-    request = Gem::Request.new nil, nil, nil, nil
+    request = Gem::Request.new @uri, nil, nil, nil
 
     proxy = request.proxy_uri
 
@@ -51,6 +52,32 @@ class TestGemRequest < Gem::TestCase
     assert_equal 'bar', proxy.password
   end
 
+  def test_initialize_proxy_ENV_https
+    ENV['https_proxy'] = @proxy_uri
+
+    request = Gem::Request.new URI('https://example'), nil, nil, nil
+
+    proxy = request.proxy_uri
+
+    assert_equal URI(@proxy_uri), proxy
+  end
+
+  def test_get_proxy_from_env_fallback
+    ENV['http_proxy'] = @proxy_uri
+
+    proxy = @request.get_proxy_from_env 'https'
+
+    assert_equal URI(@proxy_uri), proxy
+  end
+
+  def test_get_proxy_from_env_https
+    ENV['https_proxy'] = @proxy_uri
+
+    proxy = @request.get_proxy_from_env 'https'
+
+    assert_equal URI(@proxy_uri), proxy
+  end
+
   def test_get_proxy_from_env_domain
     ENV['http_proxy'] = @proxy_uri
     ENV['http_proxy_user'] = 'foo\user'
@@ -125,7 +152,7 @@ class TestGemRequest < Gem::TestCase
   end
 
   def test_user_agent
-    ua = Gem::Request.new(nil, nil, nil, nil).user_agent
+    ua = Gem::Request.new(@uri, nil, nil, nil).user_agent
 
     assert_match %r%^RubyGems/\S+ \S+ Ruby/\S+ \(.*?\)%,          ua
     assert_match %r%RubyGems/#{Regexp.escape Gem::VERSION}%,      ua
@@ -140,7 +167,7 @@ class TestGemRequest < Gem::TestCase
     Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE)
     Object.send :const_set,    :RUBY_ENGINE, 'vroom'
 
-    ua = Gem::Request.new(nil, nil, nil, nil).user_agent
+    ua = Gem::Request.new(@uri, nil, nil, nil).user_agent
 
     assert_match %r%\) vroom%, ua
   ensure
@@ -153,7 +180,7 @@ class TestGemRequest < Gem::TestCase
     Object.send :remove_const, :RUBY_ENGINE if defined?(RUBY_ENGINE)
     Object.send :const_set,    :RUBY_ENGINE, 'ruby'
 
-    ua = Gem::Request.new(nil, nil, nil, nil).user_agent
+    ua = Gem::Request.new(@uri, nil, nil, nil).user_agent
 
     assert_match %r%\)%, ua
   ensure
@@ -166,7 +193,7 @@ class TestGemRequest < Gem::TestCase
     Object.send :remove_const, :RUBY_PATCHLEVEL
     Object.send :const_set,    :RUBY_PATCHLEVEL, 5
 
-    ua = Gem::Request.new(nil, nil, nil, nil).user_agent
+    ua = Gem::Request.new(@uri, nil, nil, nil).user_agent
 
     assert_match %r% patchlevel 5\)%, ua
   ensure
@@ -181,7 +208,7 @@ class TestGemRequest < Gem::TestCase
     Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
     Object.send :const_set,    :RUBY_REVISION, 6
 
-    ua = Gem::Request.new(nil, nil, nil, nil).user_agent
+    ua = Gem::Request.new(@uri, nil, nil, nil).user_agent
 
     assert_match %r% revision 6\)%, ua
     assert_match %r%Ruby/#{Regexp.escape RUBY_VERSION}dev%, ua
@@ -196,7 +223,7 @@ class TestGemRequest < Gem::TestCase
     Object.send :const_set,    :RUBY_PATCHLEVEL, -1
     Object.send :remove_const, :RUBY_REVISION if defined?(RUBY_REVISION)
 
-    ua = Gem::Request.new(nil, nil, nil, nil).user_agent
+    ua = Gem::Request.new(@uri, nil, nil, nil).user_agent
 
     assert_match %r%\(#{Regexp.escape RUBY_RELEASE_DATE}\)%, ua
   ensure