rubygems-update 0.8.10 → 0.8.11

data/test/test_installer.rb

@@ -0,0 +1,214 @@
+$TESTING = true
+require 'fileutils'
+require 'tmpdir'
+require 'test/unit'
+require 'rubygems'
+require 'test/gemutilities'
+Gem::manage_gems
+
+class Gem::Installer
+  attr_accessor :options, :directory
+end
+  
+class TestInstaller < RubyGemTestCase
+
+  def setup
+    super
+    @spec = quick_gem("a")
+    @installer = Gem::Installer.new false, {}
+  end
+
+  def util_gem_dir(version = '0.0.2')
+    File.join "gems", "a-#{version}" # HACK
+  end
+
+  def util_gem_bindir(version = '0.0.2')
+    File.join util_gem_dir(version), "bin"
+  end
+
+  def util_inst_bindir
+    File.join @gemhome, "bin"
+  end
+
+  def util_make_exec(version = '0.0.2')
+    @spec.executables = ["my_exec"]
+    write_file(File.join(util_gem_bindir(version), "my_exec")) do |f|
+      f.puts "#!/bin/ruby"
+    end
+  end
+
+  def test_generate_bin_scripts
+    @installer.options[:wrappers] = true
+    util_make_exec
+
+    @installer.generate_bin @spec, @gemhome
+    assert_equal true, File.directory?(util_inst_bindir)
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal true, File.exist?(installed_exec)
+    assert_equal 0100755, File.stat(installed_exec).mode
+
+    wrapper = File.read installed_exec
+    assert_match(/generated by RubyGems/, wrapper)
+  end
+
+  def test_generate_bin_scripts_no_execs
+    @installer.options[:wrappers] = true
+    @installer.generate_bin @spec, @gemhome
+    assert_equal false, File.exist?(util_inst_bindir)
+  end
+
+  def test_generate_bin_scripts_no_perms
+    @installer.options[:wrappers] = true
+    util_make_exec
+
+    Dir.mkdir util_inst_bindir
+    File.chmod 0000, util_inst_bindir
+
+    assert_raises Gem::FilePermissionError do
+      @installer.generate_bin @spec, @gemhome
+    end
+
+  ensure
+    File.chmod 0700, util_inst_bindir unless $DEBUG
+  end
+
+  def test_generate_bin_symlinks
+    @installer.options[:wrappers] = false
+    util_make_exec
+    @installer.directory = util_gem_dir
+
+    @installer.generate_bin @spec, @gemhome
+    assert_equal true, File.directory?(util_inst_bindir)
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal true, File.symlink?(installed_exec)
+    assert_equal(File.join(util_gem_dir, "bin", "my_exec"),
+                 File.readlink(installed_exec))
+  end
+
+  def test_generate_bin_symlinks_no_execs
+    @installer.options[:wrappers] = false
+    @installer.generate_bin @spec, @gemhome
+    assert_equal false, File.exist?(util_inst_bindir)
+  end
+
+  def test_generate_bin_symlinks_no_perms
+    @installer.options[:wrappers] = false
+    util_make_exec
+    @installer.directory = util_gem_dir
+
+    Dir.mkdir util_inst_bindir
+    File.chmod 0000, util_inst_bindir
+
+    assert_raises Gem::FilePermissionError do
+      @installer.generate_bin @spec, @gemhome
+    end
+
+  ensure
+    File.chmod 0700, util_inst_bindir unless $DEBUG
+  end
+
+  def test_generate_bin_symlinks_update_newer
+    @installer.options[:wrappers] = false
+    util_make_exec
+    @installer.directory = File.join @gemhome, util_gem_dir
+
+    @installer.generate_bin @spec, @gemhome
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal(File.join(@gemhome, util_gem_dir, "bin", "my_exec"),
+                 File.readlink(installed_exec))
+
+    @spec = Gem::Specification.new do |s|
+      s.files = ['lib/code.rb']
+      s.name = "a"
+      s.version = "0.0.3"
+      s.summary = "summary"
+      s.description = "desc"
+      s.require_path = 'lib'
+    end
+
+    util_make_exec '0.0.3'
+    @installer.directory = File.join @gemhome, util_gem_dir('0.0.3')
+    @installer.generate_bin @spec, @gemhome
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal(File.join(@gemhome, util_gem_dir('0.0.3'), "bin", "my_exec"),
+                 File.readlink(installed_exec),
+                 "Ensure symlink moved to latest version")
+  end
+
+  def test_generate_bin_symlinks_update_older
+    @installer.options[:wrappers] = false
+    util_make_exec
+    @installer.directory = File.join @gemhome, util_gem_dir
+
+    @installer.generate_bin @spec, @gemhome
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal(File.join(@gemhome, util_gem_dir, "bin", "my_exec"),
+                 File.readlink(installed_exec))
+
+    @spec = Gem::Specification.new do |s|
+      s.files = ['lib/code.rb']
+      s.name = "a"
+      s.version = "0.0.1"
+      s.summary = "summary"
+      s.description = "desc"
+      s.require_path = 'lib'
+    end
+
+    util_make_exec '0.0.1'
+    @installer.directory = File.join @gemhome, util_gem_dir('0.0.1')
+    @installer.generate_bin @spec, @gemhome
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal(File.join(@gemhome, util_gem_dir('0.0.2'), "bin", "my_exec"),
+                 File.readlink(installed_exec),
+                 "Ensure symlink not moved")
+  end
+
+  def test_generate_bin_symlinks_update_remove_wrapper
+    @installer.options[:wrappers] = true
+    util_make_exec
+    @installer.directory = util_gem_dir
+
+    @installer.generate_bin @spec, @gemhome
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal true, File.exists?(installed_exec)
+
+    @spec = Gem::Specification.new do |s|
+      s.files = ['lib/code.rb']
+      s.name = "a"
+      s.version = "0.0.3"
+      s.summary = "summary"
+      s.description = "desc"
+      s.require_path = 'lib'
+    end
+
+    @installer.options[:wrappers] = false
+    util_make_exec '0.0.3'
+    @installer.directory = util_gem_dir '0.0.3'
+    @installer.generate_bin @spec, @gemhome
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal(File.join(util_gem_dir('0.0.3'), "bin", "my_exec"),
+                 File.readlink(installed_exec),
+                 "Ensure symlink moved to latest version")
+  end
+
+  def test_generate_bin_symlinks_win32
+    old_arch = Config::CONFIG["arch"]
+    Config::CONFIG["arch"] = "win32"
+    @installer.options[:wrappers] = false
+    util_make_exec
+    @installer.directory = util_gem_dir
+
+    @installer.generate_bin @spec, @gemhome
+    assert_equal true, File.directory?(util_inst_bindir)
+    installed_exec = File.join(util_inst_bindir, "my_exec")
+    assert_equal true, File.exist?(installed_exec)
+    assert_equal 0100755, File.stat(installed_exec).mode
+
+    wrapper = File.read installed_exec
+    assert_match(/generated by RubyGems/, wrapper)
+  ensure
+    Config::CONFIG["arch"] = old_arch
+  end
+
+end
+

data/test/test_local_cache.rb

@@ -1,157 +1,100 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
-require 'rubygems/remote_installer'
 require 'test/gemutilities'
+require 'rubygems/remote_installer'
+require 'test/unit'
 
-class TestLocalCache < Test::Unit::TestCase
-  GEMHOME = "test/temp/gemhome"
-  GEMCACHE = File.join(GEMHOME, "source_cache")
-  USRCACHE = "test/temp/.gem/user_cache"
+class TestLocalCache < RubyGemTestCase
 
   def setup
-    ENV['GEMCACHE'] = USRCACHE
-    Gem.use_paths("test/temp/gemhome")
-  end
-
-  def teardown
-    FileUtils.chmod(0644, GEMCACHE) if File.exist? GEMCACHE
-    FileUtils.chmod(0644, USRCACHE) if File.exist? USRCACHE
-    ENV['GEMCACHE'] = nil
-    Gem.clear_paths
+    super
+    @lc = Gem::LocalSourceInfoCache.new
+    prep_cache_files(@lc)
   end
 
   def test_file_names
-    lc = Gem::LocalSourceInfoCache.new
-    assert_equal File.join(Gem.dir, "source_cache"), lc.system_cache_file
-    assert_equal USRCACHE, lc.user_cache_file
+    assert_equal File.join(Gem.dir, "source_cache"), @lc.system_cache_file
+    assert_equal @usrcache, @lc.user_cache_file
   end
 
   def test_gem_cache_env_variable
-    lc = Gem::LocalSourceInfoCache.new
-    assert_equal USRCACHE, lc.user_cache_file
+    assert_equal @usrcache, @lc.user_cache_file
   end
 
   def test_use_system_by_default
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-    assert_equal "sys", lc.cache_data['key']
+    assert_equal "sys", @lc.cache_data['key']
   end
 
   def test_use_user_cache_when_sys_no_writable
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-    FileUtils.chmod 0544, lc.system_cache_file
+    FileUtils.chmod 0544, @lc.system_cache_file
 
-    lc = Gem::LocalSourceInfoCache.new
-    assert_equal "usr", lc.cache_data['key']
+    @lc = Gem::LocalSourceInfoCache.new
+    assert_equal "usr", @lc.cache_data['key']
   end
 
   def test_write_system_cache
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-
-    lc.cache_data['key'] = 'new'
-    lc.write_cache
+    @lc.cache_data['key'] = 'new'
+    @lc.write_cache
 
-    assert_equal [['key', 'new']].sort, read_cache(lc.system_cache_file).to_a.sort
-    assert_equal [['key', 'usr']].sort, read_cache(lc.user_cache_file).to_a.sort
+    assert_equal [['key', 'new']].sort, read_cache(@lc.system_cache_file).to_a.sort
+    assert_equal [['key', 'usr']].sort, read_cache(@lc.user_cache_file).to_a.sort
   end
 
   def test_flush
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
+    @lc.cache_data['key'] = 'new'
+    @lc.update
+    @lc.flush
 
-    lc.cache_data['key'] = 'new'
-    lc.update
-    lc.flush
-
-    assert_equal [['key','new']].sort, read_cache(lc.system_cache_file).to_a.sort
+    assert_equal [['key','new']].sort, read_cache(@lc.system_cache_file).to_a.sort
   end
 
   def test_write_user_cache
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-    FileUtils.chmod 0544, lc.system_cache_file
-    lc.cache_data['key'] = 'new'
-    lc.write_cache
-
-    assert_equal [['key', 'sys']].sort, read_cache(lc.system_cache_file).to_a.sort
-    assert_equal [['key', 'new']].sort, read_cache(lc.user_cache_file).to_a.sort
+    FileUtils.chmod 0544, @lc.system_cache_file
+    @lc.cache_data['key'] = 'new'
+    @lc.write_cache
+
+    assert_equal [['key', 'sys']].sort, read_cache(@lc.system_cache_file).to_a.sort
+    assert_equal [['key', 'new']].sort, read_cache(@lc.user_cache_file).to_a.sort
   end
 
   def test_write_user_cache_from_scratch
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-    FileUtils.rm_rf lc.user_cache_file
-    FileUtils.chmod 0544, lc.system_cache_file
+    FileUtils.rm_rf @lc.user_cache_file
+    FileUtils.chmod 0544, @lc.system_cache_file
 
-    lc.cache_data['key'] = 'new'
-    lc.write_cache
+    @lc.cache_data['key'] = 'new'
+    @lc.write_cache
 
-    assert_equal [['key', 'sys']].sort, read_cache(lc.system_cache_file).to_a.sort
-    assert_equal [['key', 'new']].sort, read_cache(lc.user_cache_file).to_a.sort
+    assert_equal [['key', 'sys']].sort, read_cache(@lc.system_cache_file).to_a.sort
+    assert_equal [['key', 'new']].sort, read_cache(@lc.user_cache_file).to_a.sort
   end
 
   def test_write_user_directory_and_cache_from_scratch
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-    FileUtils.rm_rf File.dirname(lc.user_cache_file)
-    FileUtils.chmod 0544, lc.system_cache_file
+    FileUtils.rm_rf File.dirname(@lc.user_cache_file)
+    FileUtils.chmod 0544, @lc.system_cache_file
 
-    lc.cache_data['key'] = 'new'
-    lc.write_cache
+    @lc.cache_data['key'] = 'new'
+    @lc.write_cache
 
-    assert_equal [['key','sys']].sort, read_cache(lc.system_cache_file).to_a.sort
-    assert_equal [['key','new']].sort, read_cache(lc.user_cache_file).to_a.sort
+    assert_equal [['key','sys']].sort, read_cache(@lc.system_cache_file).to_a.sort
+    assert_equal [['key','new']].sort, read_cache(@lc.user_cache_file).to_a.sort
   end
 
   def test_read_system_cache
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-
-    assert_equal [['key','sys']].sort, lc.cache_data.to_a.sort
+    assert_equal [['key','sys']].sort, @lc.cache_data.to_a.sort
   end
 
   def test_read_user_cache
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-    FileUtils.chmod 0544, lc.system_cache_file
+    FileUtils.chmod 0544, @lc.system_cache_file
 
-    assert_equal [['key','usr']].sort, lc.cache_data.to_a.sort
+    assert_equal [['key','usr']].sort, @lc.cache_data.to_a.sort
   end
 
   def test_no_writable_cache
-    lc = Gem::LocalSourceInfoCache.new
-    prep_cache_files(lc)
-    FileUtils.chmod 0544, lc.system_cache_file
-    FileUtils.chmod 0544, lc.user_cache_file
+    FileUtils.chmod 0544, @lc.system_cache_file
+    FileUtils.chmod 0544, @lc.user_cache_file
     assert_raise(RuntimeError) {
-      lc.cache_data
+      @lc.cache_data
     }
   end
-
-  private
-
-  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, "w") { |f| f.puts(Marshal.dump({'key' => data})) }
-    end
-  end
-
-  def age_file(file_to_age, ref_file)
-    while File.stat(file_to_age).mtime <= File.stat(ref_file).mtime
-      sleep 0.2
-      FileUtils.touch(file_to_age)
-    end
-  end
-
-  def read_cache(fn)
-    open(fn) { |f| Marshal.load(f) }
-  end
-
 end
 

data/test/test_parse_commands.rb

@@ -35,17 +35,19 @@ class TestParseCommands < Test::Unit::TestCase
       assert_equal true, check_options[:generate_rdoc]
       assert_equal false, check_options[:force]
       assert_equal :both, check_options[:domain]
+      assert_equal true, check_options[:wrappers]
       assert_equal "> 0", check_options[:version]
       assert_equal Gem.dir, check_options[:install_dir]
       
       #check settings
       check_options = nil
       @cmd_manager.process_args(
-	"install --force --test --local --rdoc --install-dir . --version 3.0")
+	"install --force --test --local --rdoc --install-dir . --version 3.0 --no-wrapper")
       assert_equal true, check_options[:test]
       assert_equal true, check_options[:generate_rdoc]
       assert_equal true, check_options[:force]
       assert_equal :local, check_options[:domain]
+      assert_equal false, check_options[:wrappers]
       assert_equal '3.0', check_options[:version]
       assert_equal '.', check_options[:install_dir]
       

data/test/test_remote_installer.rb

@@ -17,14 +17,24 @@ class MockFetcher
   def source_index
     if @uri =~ /non.existent.url/
       fail Gem::RemoteSourceException,
-	"Error fetching remote gem cache: Mock Socket Exception"
+        "Error fetching remote gem cache: Mock Socket Exception"
     end
     result = {
       'foo-1.2.3' => Gem::Specification.new do |s|
-	s.name = 'foo'
-	s.version = "1.2.3"
-	s.summary = "This is a cool package"
-      end
+        s.name = 'foo'
+        s.version = "1.2.3"
+        s.summary = "This is a cool package"
+      end,
+      'foo-tools-2.0.0' => Gem::Specification.new do |s|
+        s.name = 'foo-tools'
+        s.version = "2.0.0"
+        s.summary = "This is an even cooler package"
+      end,
+      'foo-2-2.0.0' => Gem::Specification.new do |s|
+        s.name = 'foo-2'
+        s.version = "2.0.0"
+        s.summary = "This is the coolest package evar!~!"
+      end,
     }
     result
   end
@@ -72,6 +82,15 @@ class TestRemoteInstaller < Test::Unit::TestCase
       info = @installer.source_index_hash
     }
   end
+
+  def test_find_gem_to_install
+    version = Gem::Version::Requirement.new "> 0.0.0"
+    gems = @installer.find_gem_to_install("foo", version,
+                                          @installer.source_index_hash)
+
+    assert_equal "foo-1.2.3", gems.first.full_name
+  end
+
 end
 
 # This test suite has a number of TODOs in the test cases.  The