rubygems-update 0.9.4 → 0.9.5

data/test/bogussources.rb

@@ -5,5 +5,4 @@
 #++
 
 require 'rubygems'
-Gem::manage_gems
 Gem.use_paths("test/mock/gems")

data/test/data/gem-private_key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAz0tTOtsJuHDKAEXrQx0f6DUEzBEUTSLR1fk0iEHsY9rDCQxm
+sw5Bf2UnVhdD03B4/XzIK+pat2CMQc37/vLIBuVgS7g/fzatGiM0m5rAHtycr0XU
+8Ek6zjx4iSv70OLjybY+/utHCEc838awGDMCFR21jYxgATPVwqAIyasvwbKh/Vhw
+uErFPqT9G8BKTHsaX+H+ADIRH001OmWkjB6EyjF05114kNMa0+2C7daV9hoBL3md
+hCt6zOGcapl/9LkGxhcNEUB/So16V1ZQldg9macGyWktyNTSfctlF+f8okAmicG3
+XIwaW8UTmjFCmvDs/h1R/uKpe2IOHz87n29d2QIDAQABAoIBAQCR6n/nyg+JmTtX
+/d+hGns/RTLfQpZ7xarXZ9gmoeD4WSE42VXhbIOGXXnXDAFecKl6Jb/xycGZm4if
+OZPM3rEWyZeDNWrc7WvkHiwF7GSYVMqmRg2iJqoSSla+mAtl+pBFiNfHMW6K0Tp0
+erOyFRW+L2+A9/MMZaRun6AP9URkn0jz2kwmMFf+6szmzVn6fPFzZDRI+hEeaDmi
+LBzSrfrddrIBX+xGEoBj6RmfnKBCSUVSSxOauYjd4mVjVYxvMH4SV1hXDUS5GPl5
+MbCiBb7bpNIg/8ljMoRrQiqk0XwwS7MaCqPtMhUtpSmC/zSjAfmoN7AOc/Xh69cQ
+OCMNZH9BAoGBAPBlsuuU6fg0gVTKDdR12jHx03uRRt8/nPxHnpJkZCIh9XKh1LtY
+bkumi9HZpp3mzDiaGg/rwfCwNckKx8NLhICLgkric6ClrKftxTu6C8tBAb5YDi6u
+74KYnV8lMY/unzBtIloPgM3uluS292POmrWZpKwhvHLD71MewzMor5HFAoGBANy/
+mwsBs8i3Gzk8Twjq8effhPpE7kpxhC7bhwmjX3q41EjQWDT8M6xb1P9dRSsCIebi
+kqP1yhl27dJpA8r5WqE/z89xhBvObAGRv41eXxOI0LaH2k5lJQrUeSC+51dy+BEB
+T3GXD4C5ezZHQ8Wz/oL73uikrfhD+AqOZT2YbMEFAoGBAJvWEWpOGm3f+4bvhI+Z
+5lxCG4oa3wqRvj58XvsfQRovUWGCLtlTtgwsZq8enLf3iaOXohV4Czzvva4Z4u1i
+4v5BcbEBo1scixRBOn5BWKvl9C9j/a2dkX3jWQD4p2xaj69gz8f6DNFyPTb+tNhq
+cjgO5YUASZ1MDrSfWIKteULRAoGAZkZv8x2KyofrmQ0UITGZerDYz4t4TA1kDMGx
+QwnqhtVzpXjCJWpkFotFmDsCfPaz9mErR8PtKvcrIL1/AF+fWe5Sve3+I1P0PpXk
+hf8fVdGhwbAXuRKrouTmagGI9b9Sp65PvHUcvasyJufFwqeuV8mScX87CzeSiHGI
+/ozMdnECgYEAq4+losrhe0DEmiC9zVPvwRXjbSixDsSJxHfOcqIsZqhUgBiZ4TJD
+SrkuukrMZib6BAD+PtCJS1TBbJyyvL3QecizhHSIh3ZnT0HnaRPatLEYmU65+3kE
+kTqL4ik92bJnnWowy677sydl1lzBJDVa9ZlTs7BFSd8y/0DZaUxGg2I=
+-----END RSA PRIVATE KEY-----

data/test/data/gem-public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDNjCCAh6gAwIBAgIBADANBgkqhkiG9w0BAQUFADBBMREwDwYDVQQDDAhydWJ5
+Z2VtczEXMBUGCgmSJomT8ixkARkWB2V4YW1wbGUxEzARBgoJkiaJk/IsZAEZFgNj
+b20wHhcNMDcwODAyMDMyNTQyWhcNMDgwODAxMDMyNTQyWjBBMREwDwYDVQQDDAhy
+dWJ5Z2VtczEXMBUGCgmSJomT8ixkARkWB2V4YW1wbGUxEzARBgoJkiaJk/IsZAEZ
+FgNjb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPS1M62wm4cMoA
+RetDHR/oNQTMERRNItHV+TSIQexj2sMJDGazDkF/ZSdWF0PTcHj9fMgr6lq3YIxB
+zfv+8sgG5WBLuD9/Nq0aIzSbmsAe3JyvRdTwSTrOPHiJK/vQ4uPJtj7+60cIRzzf
+xrAYMwIVHbWNjGABM9XCoAjJqy/BsqH9WHC4SsU+pP0bwEpMexpf4f4AMhEfTTU6
+ZaSMHoTKMXTnXXiQ0xrT7YLt1pX2GgEveZ2EK3rM4ZxqmX/0uQbGFw0RQH9KjXpX
+VlCV2D2ZpwbJaS3I1NJ9y2UX5/yiQCaJwbdcjBpbxROaMUKa8Oz+HVH+4ql7Yg4f
+Pzufb13ZAgMBAAGjOTA3MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+BBRYTAoj4cn8CWZMHFnHGQgoO5jyFTANBgkqhkiG9w0BAQUFAAOCAQEATRrJC05l
+dOmx67Sy3bU+AVXkOr7B9nn2Myqo9uSIAncPoElN6aHr/Q8wOOjtok4r0JcHPe1e
+eotDCZUE1Jkl13Tpv26rOfOOUHtGlyAIAtpsUGOraaJkSut4WKLr1/KckyAAEtgP
+c13A0s0mEiWFRuYxIdEi54561pTT2qQBE/DUPGoYD5rUg9XYAlSovMMwG99Oca7L
+cI6vCymr1bzzddExoywBNOy0fbBT62I3ICBGbH5yOVVKVmlxeo2Zp10FCj0kDrnq
+OuMJSDr5I2XPYqoC+W4YSbwn55o2jGIUX1lOq2Hvj4tFgSxlnJZn0tUhBfR3gSOn
+IFnrqu8PlZsLFw==
+-----END CERTIFICATE-----

data/test/functional.rb

@@ -5,14 +5,11 @@
 # See LICENSE.txt for permissions.
 #++
 
-
 require 'test/unit'
 require 'rubygems'
-Gem.manage_gems
-require 'yaml'
-require 'fileutils'
 require 'test/insure_session'
-require 'test/onegem'
+require 'rubygems/format'
+require 'rubygems/command_manager'
 
 class FunctionalTest < Test::Unit::TestCase
   def setup
@@ -24,7 +21,7 @@ class FunctionalTest < Test::Unit::TestCase
 
   def test_gem_help_options
     gem_nossl 'help options'
-    assert_match(/Usage:/, @out)
+    assert_match(/Usage:/, @out, @err)
     assert_status
   end
 
@@ -40,60 +37,6 @@ class FunctionalTest < Test::Unit::TestCase
     assert_status 1
   end
 
-  def test_environment
-    gem_nossl 'environment'
-    
-    assert_match(/VERSION:\s+(\d+\.)*\d+/, @out)
-    assert_match(/INSTALLATION DIRECTORY:/, @out)
-    assert_match(/GEM PATH:/, @out)
-    assert_match(/REMOTE SOURCES:/, @out)
-    assert_status
-  end
-
-  def test_env_version
-    gem_nossl 'environment version'
-    assert_match(/\d+\.\d+$/, @out)
-  end
-
-  def test_env_gemdir
-    gem_nossl 'environment gemdir'
-    assert_equal Gem.dir, @out.chomp
-  end
-
-  def test_env_gempath
-    gem_nossl 'environment gempath'
-    assert_equal Gem.path, @out.chomp.split("\n")
-  end
-
-  def test_env_remotesources
-    gem_nossl 'environment remotesources'
-    assert_equal Gem.sources, @out.chomp.split("\n")
-  end
-
-  def test_build
-    OneGem.rebuild(self)
-    assert File.exist?(OneGem::ONEGEM), "Gem file (#{OneGem::ONEGEM}) should exist"
-    assert_match(/Successfully built RubyGem/, @out)
-    assert_match(/Name: one$/, @out)
-    assert_match(/Version: 0.0.1$/, @out)
-    assert_match(/File: #{OneGem::ONENAME}/, @out)
-    spec = read_gem_file(OneGem::ONEGEM)
-    assert_equal "one", spec.name
-    assert_equal "Test GEM One", spec.summary
-  end
-
-  def test_build_from_yaml
-    OneGem.rebuild(self)
-    assert File.exist?(OneGem::ONEGEM), "Gem file (#{OneGem::ONEGEM}) should exist"
-    assert_match(/Successfully built RubyGem/, @out)
-    assert_match(/Name: one$/, @out)
-    assert_match(/Version: 0.0.1$/, @out)
-    assert_match(/File: #{OneGem::ONENAME}/, @out)
-    spec = read_gem_file(OneGem::ONEGEM)
-    assert_equal "one", spec.name
-    assert_equal "Test GEM One", spec.summary
-  end
-
   # This test is disabled because of the insanely long time it takes
   # to time out.
   def xtest_bogus_source_hoses_up_remote_install_but_gem_command_gives_decent_error_message
@@ -112,47 +55,6 @@ class FunctionalTest < Test::Unit::TestCase
     end
   end
 
-  def test_gemrc_paths
-    gem_nossl "env --config-file test/testgem.rc"
-    assert_match %{/usr/local/rubygems}, @out
-    assert_match %{/another/spot/for/rubygems}, @out
-    assert_match %{test/data/gemhome}, @out
-  end
-
-  def test_gemrc_args
-    gem_nossl "help --config-file test/testgem.rc"
-    assert_match %{gem build}, @out
-    assert_match %{gem install}, @out
-  end
-
-  SIGN_FILES = %w(gem-private_key.pem gem-public_cert.pem)
-
-  def test_cert_build
-    begin
-      require 'openssl'
-    rescue LoadError => ex
-      puts "WARNING: openssl is not availble, " +
-        "unable to test the cert functions"
-      return
-    end
-
-    SIGN_FILES.each do |fn| FileUtils.rm_f fn end
-    gem_withssl "cert --build x@y.z"
-    SIGN_FILES.each do |fn| 
-      assert File.exist?(fn),
-        "Signing key/cert file '#{fn}' should exist"
-    end
-  ensure
-    SIGN_FILES.each do |fn| FileUtils.rm_f fn end
-  end
-
-  def test_nossl_cert
-    gem_nossl "cert --build x@y.z"
-    assert_not_equal 0, @status
-    assert_match(/not installed/, @err, 
-                 "Should have a not installed error for openssl")
-  end
-
   # :section: Help Methods
 
   # Run a gem command without the SSL library.
@@ -190,8 +92,4 @@ class FunctionalTest < Test::Unit::TestCase
     assert_equal expected_status, @status
   end
 
-  def read_gem_file(filename)
-    Gem::Format.from_file_by_path(filename).spec
-  end
-
 end

data/test/gemutilities.rb

@@ -5,47 +5,50 @@
 # See LICENSE.txt for permissions.
 #++
 
+at_exit { $SAFE = 1 }
+
 require 'fileutils'
 require 'test/unit/testcase'
 require 'tmpdir'
 require 'uri'
 require 'rubygems/gem_open_uri'
+require 'rubygems/source_info_cache'
 
-require 'test/yaml_data'
-require 'test/mockgemui'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'mockgemui')
 
-module Utilities
-  def make_cache_area(path, *uris)
-    fn = File.join(path, 'source_cache')
-    open(fn, 'wb') do |f| f.write Marshal.dump(cache_hash(*uris)) end
+module Gem
+  def self.source_index=(si)
+    @@source_index = si
   end
-
-  module_function :make_cache_area
 end
 
 class FakeFetcher
 
   attr_reader :data
   attr_accessor :uri
+  attr_accessor :paths
 
   def initialize
     @data = {}
+    @paths = []
     @uri = nil
   end
 
   def fetch_path(path)
     path = path.to_s
+    @paths << path
     raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
     data = @data[path]
-    raise OpenURI::HTTPError.new("no data for #{path}", nil) if data.nil?
+    raise Gem::RemoteFetcher::FetchError, "no data for #{path}" if data.nil?
     data.respond_to?(:call) ? data.call : data
   end
 
   def fetch_size(path)
     path = path.to_s
+    @paths << path
     raise ArgumentError, 'need full URI' unless path =~ %r'^http://'
     data = @data[path]
-    raise OpenURI::HTTPError.new("no data for #{path}", nil) if data.nil?
+    raise Gem::RemoteFetcher::FetchError, "no data for #{path}" if data.nil?
     data.respond_to?(:call) ? data.call : data.length
   end
 
@@ -59,7 +62,12 @@ class RubyGemTestCase < Test::Unit::TestCase
 
   def setup
     super
-    @tempdir = File.join Dir.tmpdir, "test_rubygems_#{$$}"    
+
+    @ui = MockGemUi.new
+    tmpdir = nil
+    Dir.chdir Dir.tmpdir do tmpdir = Dir.pwd end # HACK OSX /private/tmp
+    @tempdir = File.join tmpdir, "test_rubygems_#{$$}"
+    @tempdir.untaint
     @gemhome = File.join @tempdir, "gemhome"
     @gemcache = File.join(@gemhome, "source_cache")
     @usrcache = File.join(@gemhome, ".gem", "user_cache")
@@ -68,30 +76,66 @@ class RubyGemTestCase < Test::Unit::TestCase
 
     ENV['GEMCACHE'] = @usrcache
     Gem.use_paths(@gemhome)
+    Gem.loaded_specs.clear
+
+    Gem.configuration.verbose = true
+    Gem.configuration.update_sources = true
+
+    @gem_repo = "http://gems.example.com"
+    Gem.sources.replace [@gem_repo]
+
+    @orig_arch = Config::CONFIG['arch']
+
+    if win_platform?
+      util_set_arch 'i386-mswin32'
+    else
+      util_set_arch 'i686-darwin8.10.1'
+    end
+
+    @marshal_version = "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
   end
 
   def teardown
+    Config::CONFIG['arch'] = @orig_arch
+
     if defined? Gem::RemoteFetcher then
       Gem::RemoteFetcher.instance_variable_set :@fetcher, nil
     end
 
     FileUtils.rm_rf @tempdir
-    ENV['GEMCACHE'] = nil
+
+    ENV.delete 'GEMCACHE'
+    ENV.delete 'GEM_HOME'
+    ENV.delete 'GEM_PATH'
+
     Gem.clear_paths
     Gem::SourceInfoCache.instance_variable_set :@cache, nil
   end
 
+  def install_gem gem
+    require 'rubygems/installer'
+
+    use_ui MockGemUi.new do
+      Dir.chdir @tempdir do
+        Gem::Builder.new(gem).build
+      end
+    end
+
+    gem = File.join(@tempdir, "#{gem.full_name}.gem").untaint
+    Gem::Installer.new(gem).install
+  end
+
   def prep_cache_files(lc)
     [ [lc.system_cache_file, 'sys'],
       [lc.user_cache_file, 'usr'],
     ].each do |fn, data|
-      FileUtils.mkdir_p File.dirname(fn)
-      open(fn, "wb") { |f| f.write(Marshal.dump({'key' => data})) }
+      FileUtils.mkdir_p File.dirname(fn).untaint
+      open(fn.dup.untaint, "wb") { |f| f.write(Marshal.dump({'key' => data})) }
     end
   end
 
   def read_cache(fn)
-    open(fn) { |f| Marshal.load(f) }
+    open(fn.dup.untaint) { |f| Marshal.load f.read }
   end
 
   def write_file(path)
@@ -101,9 +145,12 @@ class RubyGemTestCase < Test::Unit::TestCase
     File.open(path, "w") { |io|
       yield(io)
     }
+    path
   end
 
   def quick_gem(gemname, version='0.0.2')
+    require 'rubygems/specification'
+
     spec = Gem::Specification.new do |s|
       s.platform = Gem::Platform::RUBY
       s.name = gemname
@@ -117,15 +164,85 @@ class RubyGemTestCase < Test::Unit::TestCase
       yield(s) if block_given?
     end
 
-    write_file(File.join("specifications", spec.full_name + ".gemspec")) do |io|
+    path = File.join "specifications", "#{spec.full_name}.gemspec"
+    written_path = write_file path do |io|
       io.write(spec.to_ruby)
     end
 
+    spec.loaded_from = written_path
+
     return spec
   end
 
+  def util_build_gem(spec)
+    dir = File.join(@gemhome, 'gems', spec.full_name)
+    FileUtils.mkdir_p dir
+
+    Dir.chdir dir do
+      spec.files.each do |file|
+        next if File.exist? file
+        FileUtils.mkdir_p File.dirname(file)
+        File.open file, 'w' do |fp| fp.puts "# #{file}" end
+      end
+
+      use_ui MockGemUi.new do
+        Gem::Builder.new(spec).build
+      end
+
+      FileUtils.mv "#{spec.full_name}.gem",
+                   File.join(@gemhome, 'cache', "#{spec.original_name}.gem")
+    end
+  end
+
+  def util_make_gems
+    spec = proc do |s|
+      s.files = %w[lib/code.rb]
+      s.require_paths = %w[lib]
+    end
+
+    @a0_0_1 = quick_gem('a', '0.0.1', &spec)
+    @a0_0_2 = quick_gem('a', '0.0.2', &spec)
+    @b0_0_2 = quick_gem('b', '0.0.2', &spec)
+    @c1_2   = quick_gem('c', '1.2',   &spec)
+    @pl1     = quick_gem 'pl', '1' do |s| # l for legacy
+      s.files = %w[lib/code.rb]
+      s.require_paths = %w[lib]
+      s.platform = Gem::Platform.new 'i386-linux'
+      s.instance_variable_set :@original_platform, 'i386-linux'
+    end
+
+    write_file File.join(*%W[gems #{@a0_0_1.original_name} lib code.rb]) do end
+    write_file File.join(*%W[gems #{@a0_0_2.original_name} lib code.rb]) do end
+    write_file File.join(*%W[gems #{@b0_0_2.original_name} lib code.rb]) do end
+    write_file File.join(*%W[gems #{@c1_2.original_name} lib code.rb]) do end
+    write_file File.join(*%W[gems #{@pl1.original_name} lib code.rb]) do end
+
+    [@a0_0_1, @a0_0_2, @b0_0_2, @c1_2, @pl1].each { |spec| util_build_gem spec }
+
+    FileUtils.rm_r File.join(@gemhome, 'gems', @pl1.original_name)
+
+    Gem.source_index = nil
+  end
+
+  ##
+  # Set the platform to +cpu+ and +os+
+
+  def util_set_arch(arch)
+    Config::CONFIG['arch'] = arch
+    platform = Gem::Platform.new arch
+
+    Gem.instance_variable_set :@platforms, nil
+    Gem::Platform.instance_variable_set :@local, nil
+
+    platform
+  end
+
   def util_setup_fake_fetcher
-    @uri = URI.parse 'http://gems.example.com'
+    require 'zlib'
+    require 'socket'
+    require 'rubygems/remote_fetcher'
+
+    @uri = URI.parse @gem_repo
     @fetcher = FakeFetcher.new
     @fetcher.uri = @uri
 
@@ -146,6 +263,9 @@ class RubyGemTestCase < Test::Unit::TestCase
       gem.files = %w[Rakefile lib/gem_one.rb]
     end
 
+    @all_gems = [@gem1, @gem2, @gem3, @gem4].sort
+    @all_gem_names = @all_gems.map { |gem| gem.full_name }
+
     gem_names = [@gem1.full_name, @gem2.full_name, @gem4.full_name]
     @gem_names = gem_names.sort.join("\n")
 
@@ -157,12 +277,14 @@ class RubyGemTestCase < Test::Unit::TestCase
   end
 
   def util_setup_source_info_cache(*specs)
+    require 'rubygems/source_info_cache_entry'
+
     specs = Hash[*specs.map { |spec| [spec.full_name, spec] }.flatten]
     si = Gem::SourceIndex.new specs
 
     sice = Gem::SourceInfoCacheEntry.new si, 0
     sic = Gem::SourceInfoCache.new
-    sic.set_cache_data( { 'http://gems.example.com' => sice } )
+    sic.set_cache_data( { @gem_repo => sice } )
     Gem::SourceInfoCache.instance_variable_set :@cache, sic
     si
   end
@@ -171,13 +293,12 @@ class RubyGemTestCase < Test::Unit::TestCase
     Zlib::Deflate.deflate data
   end
 
-  @@win_platform = nil
+  def self.win_platform?
+    Gem.win_platform?
+  end
+
   def win_platform?
-    if @@win_platform.nil?
-      patterns = [/mswin/i, /mingw/i, /bccwin/i, /wince/i]
-      @@win_platform = patterns.find{|r| RUBY_PLATFORM =~ r} ? true : false
-    end
-    @@win_platform
+    Gem.win_platform?
   end
 
 end