* lib/rubygems/commands/setup_command.rb: Don't delete non-rubygems

  files when installing RubyGems.
* test/rubygems/test_gem_commands_setup_command.rb:  Test for the
  above.

* lib/rubygems/ext/ext_conf_builder.rb:  Use full path to siteconf.rb
  in case the extconf.rb changes directories (like memcached does).

* lib/rubygems/package.rb:  Remove double slash from path.
* test/rubygems/test_gem_package.rb:  Test for the above.
* test/rubygems/test_gem_package_old.rb:  ditto.

* lib/rubygems/source.rb:  Revert automatic HTTPS upgrade
* lib/rubygems/spec_fetcher.rb:  ditto.
* test/rubygems/test_gem_remote_fetcher.rb:  ditto.
* test/rubygems/test_gem_source.rb:  ditto.
* test/rubygems/test_gem_spec_fetcher.rb:  ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 80 deletions

diff --git a/test/rubygems/test_gem_spec_fetcher.rb b/test/rubygems/test_gem_spec_fetcher.rb
index 41d0ce4e26..b4aff095c0 100644
--- a/test/rubygems/test_gem_spec_fetcher.rb
+++ b/test/rubygems/test_gem_spec_fetcher.rb
@@ -32,14 +32,13 @@ class TestGemSpecFetcher < Gem::TestCase
       Gem::NameTuple.new(spec.name, spec.version, spec.original_platform)
     }
 
-    @v = Gem.marshal_version
-    @s_zip = util_gzip(Marshal.dump(Gem::NameTuple.to_basic(@specs)))
-    @l_zip = util_gzip(Marshal.dump(Gem::NameTuple.to_basic(@latest_specs)))
-    @p_zip = util_gzip(Marshal.dump(Gem::NameTuple.to_basic(@prerelease_specs)))
-
-    @fetcher.data["#{@gem_repo}specs.#{@v}.gz"]            = @s_zip
-    @fetcher.data["#{@gem_repo}latest_specs.#{@v}.gz"]     = @l_zip
-    @fetcher.data["#{@gem_repo}prerelease_specs.#{@v}.gz"] = @p_zip
+    v = Gem.marshal_version
+    s_zip = util_gzip(Marshal.dump(Gem::NameTuple.to_basic(@specs)))
+    l_zip = util_gzip(Marshal.dump(Gem::NameTuple.to_basic(@latest_specs)))
+    p_zip = util_gzip(Marshal.dump(Gem::NameTuple.to_basic(@prerelease_specs)))
+    @fetcher.data["#{@gem_repo}specs.#{v}.gz"]            = s_zip
+    @fetcher.data["#{@gem_repo}latest_specs.#{v}.gz"]     = l_zip
+    @fetcher.data["#{@gem_repo}prerelease_specs.#{v}.gz"] = p_zip
 
     @sf = Gem::SpecFetcher.new
 
@@ -201,6 +200,7 @@ class TestGemSpecFetcher < Gem::TestCase
     assert_equal comp.sort, specs[@source].sort
   end
 
+
   def test_available_specs_cache
     specs, _ = @sf.available_specs(:latest)
 
@@ -240,77 +240,5 @@ class TestGemSpecFetcher < Gem::TestCase
     assert_kind_of Gem::SourceFetchProblem, errors.first
   end
 
-  def test_upgrade_http_source
-    Gem.configuration.verbose = :really
-
-    source       = Gem::Source.new URI 'http://example'
-    same_source  = nil
-
-    use_ui @ui do
-      same_source = @sf.upgrade_http_source source
-    end
-
-    assert_equal URI('http://example'), same_source.uri
-
-    assert_empty @ui.output
-    assert_empty @ui.error
-  end
-
-  def test_upgrade_http_source_rubygems
-    Gem.configuration.verbose = :really
-
-    source       = Gem::Source.new URI 'http://rubygems.org'
-    same_source  = nil
-    https_source = nil
-
-    use_ui @ui do
-      same_source = @sf.upgrade_http_source source
-    end
-
-    assert_equal URI('http://rubygems.org'), same_source.uri
-
-    @fetcher.data['https://rubygems.org/'] = 'hello'
-
-    use_ui @ui do
-      https_source = @sf.upgrade_http_source source
-    end
-
-    assert_equal URI('https://rubygems.org'), https_source.uri
-
-    assert_empty @ui.error
-
-    expected = <<-EXPECTED
-Upgrading http://rubygems.org to HTTPS failed, continuing
-Upgraded http://rubygems.org to HTTPS
-    EXPECTED
-
-    assert_equal expected, @ui.output
-  end
-
-  def test_upgrade_http_source_rubygems_405
-    Gem.configuration.verbose = :really
-
-    source       = Gem::Source.new URI 'http://rubygems.org'
-    https_source = nil
-
-    @fetcher.data['https://rubygems.org/'] = proc do
-      raise Gem::RemoteFetcher::FetchError.new ' Not Allowed 405 ', nil
-    end
-
-    use_ui @ui do
-      https_source = @sf.upgrade_http_source source
-    end
-
-    assert_equal URI('https://rubygems.org'), https_source.uri
-
-    assert_empty @ui.error
-
-    expected = <<-EXPECTED
-Upgraded http://rubygems.org to HTTPS
-    EXPECTED
-
-    assert_equal expected, @ui.output
-  end
-
 end