rubygems-update 1.3.1 → 1.3.2

data/test/test_gem_install_update_options.rb

@@ -1,4 +1,3 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
 require File.join(File.expand_path(File.dirname(__FILE__)),
                   'gem_installer_test_case')
 require 'rubygems/install_update_options'
@@ -21,6 +20,11 @@ class TestGemInstallUpdateOptions < GemInstallerTestCase
     assert @cmd.handles?(args)
   end
 
+  def test_prerelease
+    @cmd.handle_options %w[--prerelease]
+    assert_equal true, @cmd.options[:prerelease]
+  end
+
   def test_security_policy
     @cmd.handle_options %w[-P HighSecurity]
 
@@ -38,6 +42,8 @@ class TestGemInstallUpdateOptions < GemInstallerTestCase
   def test_user_install_enabled
     @cmd.handle_options %w[--user-install]
 
+    assert @cmd.options[:user_install]
+
     @installer = Gem::Installer.new @gem, @cmd.options
     @installer.install
     assert File.exist?(File.join(Gem.user_dir, 'gems'))
@@ -46,15 +52,23 @@ class TestGemInstallUpdateOptions < GemInstallerTestCase
   end
 
   def test_user_install_disabled_read_only
-    @cmd.handle_options %w[--no-user-install]
+    if win_platform?
+      skip('test_user_install_disabled_read_only test skipped on MS Windows')
+    else
+      @cmd.handle_options %w[--no-user-install]
 
-    File.chmod 0755, @userhome
-    FileUtils.chmod 0000, @gemhome
+      refute @cmd.options[:user_install]
 
-    assert_raises(Gem::FilePermissionError) do
-      @installer = Gem::Installer.new @gem, @cmd.options
+      File.chmod 0755, @userhome
+      FileUtils.chmod 0000, @gemhome
+
+      assert_raises(Gem::FilePermissionError) do
+        @installer = Gem::Installer.new @gem, @cmd.options
+      end
     end
   ensure
     FileUtils.chmod 0755, @gemhome
   end
+
 end
+

data/test/test_gem_installer.rb

@@ -31,7 +31,7 @@ if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
 end
 
 gem 'a', version
-load 'my_exec'
+load Gem.bin_path('a', 'my_exec', version)
     EOF
 
     wrapper = @installer.app_script_text 'my_exec'
@@ -46,7 +46,7 @@ load 'my_exec'
     assert_equal '', @ui.output
     assert_equal '', @ui.error
 
-    assert !File.exist?('gem_make.out')
+    refute File.exist?('gem_make.out')
   end
 
   def test_build_extensions_extconf_bad
@@ -288,12 +288,16 @@ load 'my_exec'
     util_make_exec
 
     Dir.mkdir util_inst_bindir
-    File.chmod 0000, util_inst_bindir
 
-    assert_raises Gem::FilePermissionError do
-      @installer.generate_bin
-    end
+    if win_platform?
+      skip('test_generate_bin_script_no_perms skipped on MS Windows')
+    else
+      File.chmod 0000, util_inst_bindir
 
+      assert_raises Gem::FilePermissionError do
+        @installer.generate_bin
+      end
+    end
   ensure
     File.chmod 0700, util_inst_bindir unless $DEBUG
   end
@@ -373,12 +377,16 @@ load 'my_exec'
     @installer.gem_dir = util_gem_dir
 
     Dir.mkdir util_inst_bindir
-    File.chmod 0000, util_inst_bindir
 
-    assert_raises Gem::FilePermissionError do
-      @installer.generate_bin
-    end
+    if win_platform?
+      skip('test_generate_bin_symlink_no_perms skipped on MS Windows')
+    else
+      File.chmod 0000, util_inst_bindir
 
+      assert_raises Gem::FilePermissionError do
+        @installer.generate_bin
+      end
+    end
   ensure
     File.chmod 0700, util_inst_bindir unless $DEBUG
   end
@@ -535,7 +543,7 @@ load 'my_exec'
     cache_file = File.join @gemhome, 'cache', "#{@spec.full_name}.gem"
 
     Gem.pre_install do |installer|
-      assert !File.exist?(cache_file), 'cache file should not exist yet'
+      refute File.exist?(cache_file), 'cache file should not exist yet'
     end
 
     Gem.post_install do |installer|
@@ -771,7 +779,7 @@ load 'my_exec'
     assert @installer.installation_satisfies_dependency?(dep)
 
     dep = Gem::Dependency.new 'a', '> 2'
-    assert ! @installer.installation_satisfies_dependency?(dep)
+    refute @installer.installation_satisfies_dependency?(dep)
   end
 
   def test_shebang
@@ -818,7 +826,7 @@ load 'my_exec'
     @installer.env_shebang = true
 
     shebang = @installer.shebang 'my_exec'
-    assert_equal "#!/usr/bin/env #{Gem::ConfigMap[:RUBY_INSTALL_NAME]}", shebang
+    assert_equal "#!/usr/bin/env #{Gem::ConfigMap[:ruby_install_name]}", shebang
   end
 
   def test_shebang_nested
@@ -884,7 +892,7 @@ load 'my_exec'
     spec_dir = File.join @gemhome, 'specifications'
     spec_file = File.join spec_dir, "#{@spec.full_name}.gemspec"
     FileUtils.rm spec_file
-    assert !File.exist?(spec_file)
+    refute File.exist?(spec_file)
 
     @installer.spec = @spec
     @installer.gem_home = @gemhome

data/test/test_gem_local_remote_options.rb

@@ -60,8 +60,9 @@ class TestGemLocalRemoteOptions < RubyGemTestCase
     s1 = URI.parse 'http://more-gems.example.com/'
     s2 = URI.parse 'http://even-more-gems.example.com/'
     s3 = URI.parse 'http://other-gems.example.com/some_subdir'
+    s4 = URI.parse 'http://more-gems.example.com/' # Intentional duplicate
 
-    @cmd.handle_options %W[--source #{s1} --source #{s2} --source #{s3}]
+    @cmd.handle_options %W[--source #{s1} --source #{s2} --source #{s3} --source #{s4}]
 
     assert_equal [s1.to_s, s2.to_s, "#{s3}/"], Gem.sources
   end

data/test/test_gem_package_tar_header.rb

@@ -58,7 +58,7 @@ class TestGemPackageTarHeader < TarTestCase
     assert_equal 'user',  @tar_header.uname,    'uname'
     assert_equal '00',    @tar_header.version,  'version'
 
-    assert !@tar_header.empty?, 'empty'
+    refute_empty @tar_header, 'empty'
   end
 
   def test_initialize_bad
@@ -80,13 +80,13 @@ class TestGemPackageTarHeader < TarTestCase
   end
 
   def test_empty_eh
-    assert !@tar_header.empty?
+    refute_empty @tar_header
 
     @tar_header = Gem::Package::TarHeader.new :name => 'x', :prefix => '',
                                               :mode => 0, :size => 0,
                                               :empty => true
 
-    assert @tar_header.empty?
+    assert_empty @tar_header
   end
 
   def test_equals2

data/test/test_gem_package_tar_input.rb

@@ -92,8 +92,8 @@ class TestGemPackageTarInput < TarTestCase
           tar_input.extract_entry @tempdir, entry
           name = File.join @tempdir, entry.header.name
 
-          if entry.directory?
-            assert File.dir?(name)
+          if entry.directory? then
+            assert File.directory?(name)
           else
             assert File.file?(name)
             assert_equal @entry_sizes[i], File.stat(name).size
@@ -111,7 +111,7 @@ class TestGemPackageTarInput < TarTestCase
 
     @entry_files.each_with_index do |x, i|
       assert File.file?(x)
-      assert_equal @entry_contents[i], File.read_b(x)
+      assert_equal @entry_contents[i], Gem.read_binary(x)
     end
   end
 

data/test/test_gem_package_tar_output.rb

@@ -49,7 +49,7 @@ class TestGemPackageTarOutput < TarTestCase
     gz = Zlib::GzipReader.new StringIO.new(data)
     assert_equal "This is some metadata\n", gz.read
 
-    assert files.empty?
+    assert_empty files
   ensure
     gz.close if gz
   end
@@ -82,7 +82,7 @@ class TestGemPackageTarOutput < TarTestCase
       name, data = files.shift
       assert_equal 'metadata.gz.sig', name
 
-      assert files.empty?
+      assert_empty files
     end
   end
 

data/test/test_gem_package_task.rb

@@ -0,0 +1,70 @@
+# Copyright (c) 2003, 2004 Jim Weirich, 2009 Eric Hodel
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require 'rubygems'
+require 'rubygems/package_task'
+
+class TestGemPackageTask < MiniTest::Unit::TestCase
+
+  def test_gem_package
+    gem = Gem::Specification.new do |g|
+      g.name = "pkgr"
+      g.version = "1.2.3"
+      g.files = Rake::FileList["x"].resolve
+    end
+    pkg = Gem::PackageTask.new(gem)  do |p|
+      p.package_files << "y"
+    end
+    assert_equal ["x", "y"], pkg.package_files
+    assert_equal "pkgr-1.2.3.gem", pkg.gem_file
+  end
+
+  def test_gem_package_with_current_platform
+    gem = Gem::Specification.new do |g|
+      g.name = "pkgr"
+      g.version = "1.2.3"
+      g.files = Rake::FileList["x"].resolve
+      g.platform = Gem::Platform::CURRENT
+    end
+    pkg = Gem::PackageTask.new(gem)  do |p|
+      p.package_files << "y"
+    end
+    assert_equal ["x", "y"], pkg.package_files
+    assert_match(/^pkgr-1\.2\.3-(\S+)\.gem$/, pkg.gem_file)
+  end
+
+  def test_gem_package_with_ruby_platform
+    gem = Gem::Specification.new do |g|
+      g.name = "pkgr"
+      g.version = "1.2.3"
+      g.files = Rake::FileList["x"].resolve
+      g.platform = Gem::Platform::RUBY
+    end
+    pkg = Gem::PackageTask.new(gem)  do |p|
+      p.package_files << "y"
+    end
+    assert_equal ["x", "y"], pkg.package_files
+    assert_equal "pkgr-1.2.3.gem", pkg.gem_file
+  end
+
+end
+

data/test/test_gem_platform.rb

@@ -133,6 +133,12 @@ class TestGemPlatform < RubyGemTestCase
     assert_equal '1', platform.version
   end
 
+  def test_empty
+    platform = Gem::Platform.new 'cpu-other_platform1'
+    assert_respond_to platform, :empty?
+    assert_equal false, platform.empty?
+  end
+
   def test_to_s
     if win_platform? then
       assert_equal 'x86-mswin32-60', Gem::Platform.local.to_s
@@ -155,8 +161,8 @@ class TestGemPlatform < RubyGemTestCase
     other = Gem::Platform.new %w[cpu other_platform 1]
 
     assert(my === my)
-    assert !(other === my)
-    assert !(my === other)
+    refute(other === my)
+    refute(my === other)
   end
 
   def test_equals3_cpu
@@ -167,10 +173,10 @@ class TestGemPlatform < RubyGemTestCase
     util_set_arch 'powerpc-darwin8'
     assert((ppc_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
     assert((uni_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
-    assert !(x86_darwin8 === Gem::Platform.local), 'powerpc =~ universal'
+    refute((x86_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
 
     util_set_arch 'i686-darwin8'
-    assert !(ppc_darwin8 === Gem::Platform.local), 'powerpc =~ universal'
+    refute((ppc_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
     assert((uni_darwin8 === Gem::Platform.local), 'x86 =~ universal')
     assert((x86_darwin8 === Gem::Platform.local), 'powerpc =~ universal')
 
@@ -191,8 +197,8 @@ class TestGemPlatform < RubyGemTestCase
     assert((x86_darwin  === Gem::Platform.local), 'x86_darwin === x86_darwin8')
     assert((x86_darwin8 === Gem::Platform.local), 'x86_darwin8 === x86_darwin8')
 
-    assert !(x86_darwin7 === Gem::Platform.local), 'x86_darwin7 === x86_darwin8'
-    assert !(x86_darwin9 === Gem::Platform.local), 'x86_darwin9 === x86_darwin8'
+    refute((x86_darwin7 === Gem::Platform.local), 'x86_darwin7 === x86_darwin8')
+    refute((x86_darwin9 === Gem::Platform.local), 'x86_darwin9 === x86_darwin8')
   end
 
   def test_equals_tilde

data/test/test_gem_remote_fetcher.rb

@@ -151,7 +151,7 @@ gems:
       fetcher.fetch_size 'gems.example.com/yaml'
     end
 
-    assert_equal 'uri is not an HTTP URI', e.message
+    assert_equal 'uri scheme is invalid', e.message
   end
 
   def test_fetch_size_socket_error
@@ -237,6 +237,21 @@ gems:
                  inst.download(@a1, local_path)
   end
 
+  def test_download_local_space
+    space_path = File.join @tempdir, 'space path'
+    FileUtils.mkdir space_path
+    FileUtils.mv @a1_gem, space_path
+    local_path = File.join space_path, "#{@a1.full_name}.gem"
+    inst = nil
+
+    Dir.chdir @tempdir do
+      inst = Gem::RemoteFetcher.fetcher
+    end
+
+    assert_equal File.join(@gemhome, 'cache', "#{@a1.full_name}.gem"),
+                 inst.download(@a1, local_path)
+  end
+
   def test_download_install_dir
     a1_data = nil
     File.open @a1_gem, 'rb' do |fp|
@@ -463,6 +478,13 @@ gems:
     assert_equal nil, fetcher.fetch_path(URI.parse(@gem_repo), Time.at(0))
   end
 
+  def test_get_proxy_from_env_auto_normalizes
+    fetcher = Gem::RemoteFetcher.new(nil)
+    ENV['HTTP_PROXY'] = 'fakeurl:12345'
+
+    assert_equal('http://fakeurl:12345', fetcher.get_proxy_from_env.to_s)
+  end
+
   def test_get_proxy_from_env_empty
     orig_env_HTTP_PROXY = ENV['HTTP_PROXY']
     orig_env_http_proxy = ENV['http_proxy']

data/test/test_gem_source_index.rb

@@ -222,7 +222,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     assert_equal "#{@gem_repo}Marshal.#{@marshal_version}.Z", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_bulk_index_error
@@ -244,7 +244,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}yaml.Z", paths.shift
     assert_equal "#{@gem_repo}yaml", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
 
     assert_equal 'Error fetching remote gem cache: SocketError',
                  e.message
@@ -272,7 +272,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}yaml.Z", paths.shift
     assert_equal "#{@gem_repo}yaml", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_bulk_index_marshal_mismatch
@@ -296,7 +296,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}yaml.Z", paths.shift
     assert_equal "#{@gem_repo}yaml", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_bulk_index_uncompressed
@@ -313,7 +313,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}Marshal.#{@marshal_version}.Z", paths.shift
     assert_equal "#{@gem_repo}Marshal.#{@marshal_version}", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_quick_index
@@ -331,7 +331,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     assert_equal "#{@gem_repo}quick/latest_index.rz", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_quick_index_all
@@ -349,7 +349,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     assert_equal "#{@gem_repo}quick/index.rz", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_quick_index_error
@@ -366,7 +366,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     assert_equal "#{@gem_repo}quick/index.rz", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_quick_index_fallback
@@ -382,7 +382,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}quick/latest_index.rz", paths.shift
     assert_equal "#{@gem_repo}quick/index.rz", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_quick_index_subdir
@@ -399,7 +399,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     assert_equal "#{repo}quick/latest_index.rz", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_single_spec
@@ -415,7 +415,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     assert_equal a1_spec_url, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_single_spec_subdir
@@ -432,7 +432,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     assert_equal a1_spec_url, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_single_spec_yaml
@@ -450,7 +450,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}quick/Marshal.#{Gem.marshal_version}/#{@a1.full_name}.gemspec.rz", paths.shift
     assert_equal a1_spec_url, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_fetch_single_spec_yaml_subdir
@@ -468,7 +468,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{repo}quick/Marshal.#{Gem.marshal_version}/#{@a1.full_name}.gemspec.rz", paths.shift
     assert_equal a1_spec_url, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_find_missing
@@ -593,6 +593,17 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal [updated_platform.name], @source_index.outdated
   end
 
+  def test_prerelease_specs_kept_in_right_place
+    gem_a1_alpha = quick_gem 'abba', '1.a'
+    @source_index.add_spec gem_a1_alpha
+
+    refute @source_index.latest_specs.include?(gem_a1_alpha)
+    assert_nil @source_index.specification(gem_a1_alpha.full_name)
+    assert @source_index.prerelease_specs.include?(gem_a1_alpha)
+
+    # TODO: don't think this tests writing prerelease index to disk
+  end
+
   def test_refresh_bang
     a1_spec = File.join @gemhome, "specifications", "#{@a1.full_name}.gemspec" 
 
@@ -600,7 +611,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
 
     source_index = Gem::SourceIndex.from_installed_gems
 
-    assert !source_index.gems.include?(@a1.full_name)
+    refute source_index.gems.include?(@a1.full_name)
 
     FileUtils.mv File.join(@tempdir, "#{@a1.full_name}.gemspec"), a1_spec
 
@@ -711,7 +722,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}quick/index.rz", paths.shift
     assert_equal "#{@gem_repo}Marshal.#{@marshal_version}.Z", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_update_incremental
@@ -736,7 +747,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}quick/latest_index.rz", paths.shift
     assert_equal marshal_uri, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   ensure
     Gem.configuration = old_gem_conf
   end
@@ -762,7 +773,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}quick/index.rz", paths.shift
     assert_equal marshal_uri, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   ensure
     Gem.configuration = old_gem_conf
   end
@@ -791,7 +802,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal marshal_uri, paths.shift
     assert_equal yaml_uri, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   ensure
     Gem.configuration = old_gem_conf
   end
@@ -823,7 +834,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal marshal_uri, paths.shift
     assert_equal yaml_uri, paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   ensure
     Gem.configuration = old_gem_conf
   end
@@ -851,7 +862,7 @@ WARNING:  Invalid .gemspec format in '#{spec_file}'
     assert_equal "#{@gem_repo}quick/index.rz", paths.shift
     assert_equal "#{@gem_repo}Marshal.#{@marshal_version}.Z", paths.shift
 
-    assert paths.empty?, paths.join(', ')
+    assert_empty paths, paths.join(', ')
   end
 
   def test_update_with_missing