rubygems-update 0.9.5 → 1.0.0

data/test/gemutilities.rb

@@ -8,7 +8,7 @@
 at_exit { $SAFE = 1 }
 
 require 'fileutils'
-require 'test/unit/testcase'
+require 'test/unit'
 require 'tmpdir'
 require 'uri'
 require 'rubygems/gem_open_uri'
@@ -20,6 +20,10 @@ module Gem
   def self.source_index=(si)
     @@source_index = si
   end
+
+  def self.win_platform=(val)
+    @@win_platform = val
+  end
 end
 
 class FakeFetcher
@@ -58,7 +62,8 @@ class RubyGemTestCase < Test::Unit::TestCase
 
   include Gem::DefaultUserInteraction
 
-  undef_method :default_test
+  undef_method :default_test if instance_methods.include? 'default_test' or
+                                instance_methods.include? :default_test
 
   def setup
     super
@@ -84,7 +89,10 @@ class RubyGemTestCase < Test::Unit::TestCase
     @gem_repo = "http://gems.example.com"
     Gem.sources.replace [@gem_repo]
 
-    @orig_arch = Config::CONFIG['arch']
+    @orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
+    Gem::ConfigMap[:BASERUBY] = Gem::ConfigMap[:RUBY_INSTALL_NAME]
+
+    @orig_arch = Gem::ConfigMap[:arch]
 
     if win_platform?
       util_set_arch 'i386-mswin32'
@@ -96,7 +104,8 @@ class RubyGemTestCase < Test::Unit::TestCase
   end
 
   def teardown
-    Config::CONFIG['arch'] = @orig_arch
+    Gem::ConfigMap[:BASERUBY] = @orig_BASERUBY
+    Gem::ConfigMap[:arch] = @orig_arch
 
     if defined? Gem::RemoteFetcher then
       Gem::RemoteFetcher.instance_variable_set :@fetcher, nil
@@ -148,7 +157,7 @@ class RubyGemTestCase < Test::Unit::TestCase
     path
   end
 
-  def quick_gem(gemname, version='0.0.2')
+  def quick_gem(gemname, version='2')
     require 'rubygems/specification'
 
     spec = Gem::Specification.new do |s|
@@ -161,6 +170,7 @@ class RubyGemTestCase < Test::Unit::TestCase
       s.has_rdoc = true
       s.summary = "this is a summary"
       s.description = "This is a test description"
+
       yield(s) if block_given?
     end
 
@@ -200,9 +210,9 @@ class RubyGemTestCase < Test::Unit::TestCase
       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)
+    @a1 = quick_gem('a', '1', &spec)
+    @a2 = quick_gem('a', '2', &spec)
+    @b2 = quick_gem('b', '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]
@@ -211,13 +221,13 @@ class RubyGemTestCase < Test::Unit::TestCase
       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 #{@a1.original_name} lib code.rb]) do end
+    write_file File.join(*%W[gems #{@a2.original_name} lib code.rb]) do end
+    write_file File.join(*%W[gems #{@b2.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 }
+    [@a1, @a2, @b2, @c1_2, @pl1].each { |spec| util_build_gem spec }
 
     FileUtils.rm_r File.join(@gemhome, 'gems', @pl1.original_name)
 
@@ -228,7 +238,7 @@ class RubyGemTestCase < Test::Unit::TestCase
   # Set the platform to +cpu+ and +os+
 
   def util_set_arch(arch)
-    Config::CONFIG['arch'] = arch
+    Gem::ConfigMap[:arch] = arch
     platform = Gem::Platform.new arch
 
     Gem.instance_variable_set :@platforms, nil

data/test/test_gem.rb

@@ -2,6 +2,7 @@ require 'test/unit'
 require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require 'rubygems'
 require 'rubygems/gem_openssl'
+require 'rubygems/installer'
 require 'pathname'
 
 class TestGem < RubyGemTestCase
@@ -17,9 +18,9 @@ class TestGem < RubyGemTestCase
     util_make_gems
 
     expected = [
-      File.join(@gemhome, *%W[gems #{@a0_0_1.full_name} lib]),
-      File.join(@gemhome, *%W[gems #{@a0_0_2.full_name} lib]),
-      File.join(@gemhome, *%W[gems #{@b0_0_2.full_name} lib]),
+      File.join(@gemhome, *%W[gems #{@a1.full_name} lib]),
+      File.join(@gemhome, *%W[gems #{@a2.full_name} lib]),
+      File.join(@gemhome, *%W[gems #{@b2.full_name} lib]),
       File.join(@gemhome, *%W[gems #{@c1_2.full_name} lib]),
       File.join(@gemhome, *%W[gems #{@pl1.full_name} lib]),
     ]
@@ -89,6 +90,42 @@ class TestGem < RubyGemTestCase
     assert_match @default_dir_re, Gem.default_dir
   end
 
+  def test_self_default_exec_format
+    orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
+    orig_RUBY_INSTALL_NAME = Gem::ConfigMap[:RUBY_INSTALL_NAME]
+    Gem::ConfigMap[:BASERUBY] = 'ruby'
+    Gem::ConfigMap[:RUBY_INSTALL_NAME] = 'ruby'
+
+    assert_equal '%s', Gem.default_exec_format
+  ensure
+    Gem::ConfigMap[:BASERUBY] = orig_BASERUBY
+    Gem::ConfigMap[:RUBY_INSTALL_NAME] = orig_RUBY_INSTALL_NAME
+  end
+
+  def test_self_default_exec_format_18
+    orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
+    orig_RUBY_INSTALL_NAME = Gem::ConfigMap[:RUBY_INSTALL_NAME]
+    Gem::ConfigMap[:BASERUBY] = 'ruby'
+    Gem::ConfigMap[:RUBY_INSTALL_NAME] = 'ruby18'
+
+    assert_equal '%s18', Gem.default_exec_format
+  ensure
+    Gem::ConfigMap[:BASERUBY] = orig_BASERUBY
+    Gem::ConfigMap[:RUBY_INSTALL_NAME] = orig_RUBY_INSTALL_NAME
+  end
+
+  def test_self_default_exec_format_jruby
+    orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
+    orig_RUBY_INSTALL_NAME = Gem::ConfigMap[:RUBY_INSTALL_NAME]
+    Gem::ConfigMap[:BASERUBY] = 'ruby'
+    Gem::ConfigMap[:RUBY_INSTALL_NAME] = 'jruby'
+
+    assert_equal 'j%s', Gem.default_exec_format
+  ensure
+    Gem::ConfigMap[:BASERUBY] = orig_BASERUBY
+    Gem::ConfigMap[:RUBY_INSTALL_NAME] = orig_RUBY_INSTALL_NAME
+  end
+
   def test_self_default_sources
     assert_equal %w[http://gems.rubyforge.org], Gem.default_sources
   end
@@ -174,8 +211,8 @@ class TestGem < RubyGemTestCase
     util_make_gems
 
     expected = [
-      File.join(@gemhome, *%W[gems #{@a0_0_2.full_name} lib]),
-      File.join(@gemhome, *%W[gems #{@b0_0_2.full_name} lib]),
+      File.join(@gemhome, *%W[gems #{@a2.full_name} lib]),
+      File.join(@gemhome, *%W[gems #{@b2.full_name} lib]),
       File.join(@gemhome, *%W[gems #{@c1_2.full_name} lib]),
       File.join(@gemhome, *%W[gems #{@pl1.full_name} lib]),
     ]
@@ -251,10 +288,10 @@ class TestGem < RubyGemTestCase
 
     assert_equal File.join(@tempdir, *%w[gemhome gems c-1.2 lib code.rb]),
                  Gem.required_location("c", "code.rb")
-    assert_equal File.join(@tempdir, *%w[gemhome gems a-0.0.1 lib code.rb]),
-                 Gem.required_location("a", "code.rb", "<0.0.2")
-    assert_equal File.join(@tempdir, *%w[gemhome gems a-0.0.2 lib code.rb]),
-                 Gem.required_location("a", "code.rb", "=0.0.2")
+    assert_equal File.join(@tempdir, *%w[gemhome gems a-1 lib code.rb]),
+                 Gem.required_location("a", "code.rb", "< 2")
+    assert_equal File.join(@tempdir, *%w[gemhome gems a-2 lib code.rb]),
+                 Gem.required_location("a", "code.rb", "= 2")
   end
 
   def test_self_searcher
@@ -298,73 +335,6 @@ class TestGem < RubyGemTestCase
     end
   end
 
-  def test_require_gem_autorequire
-    name = "AutorequireArray"
-    files = %w(a.rb b.rb)
-    gem = quick_gem(name) do |s|
-      s.files = files.map { |f| File.join("lib", f) }
-      s.autorequire = files
-    end
-
-    fullname = gem.full_name
-
-    write_file "gems/#{fullname}/lib/a.rb" do |io|
-      io.puts "$LOADED_A = true"
-    end
-
-    write_file "gems/#{fullname}/lib/b.rb" do |io|
-      io.puts "$LOADED_B = true"
-    end
-
-    Gem.source_index = nil
-
-    old_loaded = $".dup
-    old_verbose = $VERBOSE
-    $VERBOSE = nil
-    require_gem name
-    $VERBOSE = old_verbose
-    new_loaded = $".dup
-
-    if RUBY_VERSION > "1.9" then
-      files = files.map do |file|
-        File.join @gemhome, 'gems', gem.full_name, 'lib', file
-      end
-    end
-
-    assert_equal files, (new_loaded - old_loaded)
-    assert defined?($LOADED_A)
-    assert defined?($LOADED_B)
-  end
-
-  def test_require_gem_autorequire_string
-    name = "AutorequireString"
-    file = "c.rb"
-    gem = quick_gem(name) do |s|
-      s.files = File.join("lib", file)
-      s.autorequire = file
-    end
-
-    fullname = gem.full_name
-
-    write_file("gems/#{fullname}/lib/c.rb") do |io|
-      io.puts "$LOADED_C = true"
-    end
-
-    old_loaded = $".dup
-    old_verbose = $VERBOSE
-    $VERBOSE = nil
-    require_gem name
-    $VERBOSE = old_verbose
-    new_loaded = $".dup
-
-    if RUBY_VERSION > "1.9" then
-      file = File.join @gemhome, 'gems', gem.full_name, 'lib', file
-    end
-
-    assert_equal(Array(file), (new_loaded - old_loaded))
-    assert(defined? $LOADED_C)
-  end
-
   def util_ensure_gem_dirs
     Gem.ensure_gem_subdirectories @gemhome
     @additional.each do |dir|

data/test/test_gem_commands_build_command.rb

@@ -8,31 +8,31 @@ class TestGemCommandsBuildCommand < RubyGemTestCase
   def setup
     super
 
+    @gem = quick_gem 'some_gem' do |s|
+      s.rubyforge_project = 'example'
+    end
+
     @cmd = Gem::Commands::BuildCommand.new
   end
 
   def test_execute
-    gem = quick_gem 'some_gem'
-
-    gemspec_file = File.join(@tempdir, "#{gem.full_name}.gemspec")
+    gemspec_file = File.join(@tempdir, "#{@gem.full_name}.gemspec")
 
     File.open gemspec_file, 'w' do |gs|
-      gs.write gem.to_ruby
+      gs.write @gem.to_ruby
     end
 
-    util_test_build_gem gem, gemspec_file
+    util_test_build_gem @gem, gemspec_file
   end
 
   def test_execute_yaml
-    gem = quick_gem 'some_gem'
-
-    gemspec_file = File.join(@tempdir, "#{gem.full_name}.gemspec")
+    gemspec_file = File.join(@tempdir, "#{@gem.full_name}.gemspec")
 
     File.open gemspec_file, 'w' do |gs|
-      gs.write gem.to_yaml
+      gs.write @gem.to_yaml
     end
 
-    util_test_build_gem gem, gemspec_file
+    util_test_build_gem @gem, gemspec_file
   end
 
   def test_execute_bad_gem
@@ -57,8 +57,8 @@ class TestGemCommandsBuildCommand < RubyGemTestCase
     output = @ui.output.split "\n"
     assert_equal "  Successfully built RubyGem", output.shift
     assert_equal "  Name: some_gem", output.shift
-    assert_equal "  Version: 0.0.2", output.shift
-    assert_equal "  File: some_gem-0.0.2.gem", output.shift
+    assert_equal "  Version: 2", output.shift
+    assert_equal "  File: some_gem-2.gem", output.shift
     assert_equal [], output
     assert_equal '', @ui.error
 

data/test/test_gem_commands_dependency_command.rb

@@ -13,7 +13,7 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
 
   def test_execute
     quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1.0.0'
+      gem.add_dependency 'bar', '> 1'
     end
 
     @cmd.options[:args] = %w[foo]
@@ -22,7 +22,7 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_equal "Gem foo-0.0.2\n  bar (> 1.0.0)\n\n", @ui.output
+    assert_equal "Gem foo-2\n  bar (> 1)\n\n", @ui.output
     assert_equal '', @ui.error
   end
 
@@ -41,7 +41,7 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
 
   def test_execute_pipe_format
     quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1.0.0'
+      gem.add_dependency 'bar', '> 1'
     end
 
     @cmd.options[:args] = %w[foo]
@@ -51,13 +51,13 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert_equal "bar --version '> 1.0.0'\n", @ui.output
+    assert_equal "bar --version '> 1'\n", @ui.output
     assert_equal '', @ui.error
   end
 
   def test_execute_reverse
     quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1.0.0'
+      gem.add_dependency 'bar', '> 1'
     end
 
     quick_gem 'baz' do |gem|
@@ -72,10 +72,10 @@ class TestGemCommandsDependencyCommand < RubyGemTestCase
     end
 
     expected = <<-EOF
-Gem foo-0.0.2
-  bar (> 1.0.0)
+Gem foo-2
+  bar (> 1)
   Used by
-    baz-0.0.2 (foo (>= 0))
+    baz-2 (foo (>= 0))
 
     EOF
 
@@ -85,7 +85,7 @@ Gem foo-0.0.2
 
   def test_execute_remote
     foo = quick_gem 'foo' do |gem|
-      gem.add_dependency 'bar', '> 1.0.0'
+      gem.add_dependency 'bar', '> 1'
     end
 
     util_setup_source_info_cache foo
@@ -100,7 +100,7 @@ Gem foo-0.0.2
       @cmd.execute
     end
 
-    assert_equal "Gem foo-0.0.2\n  bar (> 1.0.0)\n\n", @ui.output
+    assert_equal "Gem foo-2\n  bar (> 1)\n\n", @ui.output
     assert_equal '', @ui.error
   end
 

data/test/test_gem_commands_mirror_command.rb

@@ -34,7 +34,12 @@ class TestGemCommandsMirrorCommand < RubyGemTestCase
 
     File.open File.join(Gem.user_home, '.gemmirrorrc'), 'w' do |fp|
       fp.puts "---"
-      fp.puts "- from: file://#{@tempdir}"
+      # tempdir could be a drive+path (under windows)
+      if @tempdir.match(/[a-z]:/i)
+        fp.puts "- from: file:///#{@tempdir}"
+      else
+        fp.puts "- from: file://#{@tempdir}"
+      end
       fp.puts "  to: #{mirror}"
     end
 
@@ -42,9 +47,9 @@ class TestGemCommandsMirrorCommand < RubyGemTestCase
       @cmd.execute
     end
 
-    assert File.exist?(File.join(mirror, 'gems', "#{@a0_0_1.full_name}.gem"))
-    assert File.exist?(File.join(mirror, 'gems', "#{@a0_0_2.full_name}.gem"))
-    assert File.exist?(File.join(mirror, 'gems', "#{@b0_0_2.full_name}.gem"))
+    assert File.exist?(File.join(mirror, 'gems', "#{@a1.full_name}.gem"))
+    assert File.exist?(File.join(mirror, 'gems', "#{@a2.full_name}.gem"))
+    assert File.exist?(File.join(mirror, 'gems', "#{@b2.full_name}.gem"))
     assert File.exist?(File.join(mirror, 'gems', "#{@c1_2.full_name}.gem"))
     assert File.exist?(File.join(mirror, "Marshal.#{@marshal_version}"))
   ensure

data/test/test_gem_commands_query_command.rb

@@ -10,13 +10,17 @@ class TestGemCommandsQueryCommand < RubyGemTestCase
     @foo_gem = quick_gem 'foo' do |spec|
       spec.summary = 'This is a lot of text.  ' * 5
     end
+    @foo_gem_p = quick_gem 'foo' do |spec|
+      spec.summary = 'This is a lot of text.  ' * 5
+      spec.platform = Gem::Platform::CURRENT
+    end
     @bar_gem = quick_gem 'bar'
 
     @cmd = Gem::Commands::QueryCommand.new
   end
 
   def test_execute
-    util_setup_source_info_cache @foo_gem
+    util_setup_source_info_cache @foo_gem, @foo_gem_p
 
     @cmd.handle_options %w[-r]
 
@@ -28,7 +32,7 @@ class TestGemCommandsQueryCommand < RubyGemTestCase
 
 *** REMOTE GEMS ***
 
-foo (0.0.2)
+foo (2)
     EOF
 
     assert_equal expected, @ui.output
@@ -48,7 +52,7 @@ foo (0.0.2)
 
 *** REMOTE GEMS ***
 
-foo (0.0.2)
+foo (2)
     This is a lot of text.  This is a lot of text.  This is a lot of
     text.  This is a lot of text.  This is a lot of text.
     EOF