rubygems-update 2.3.0 → 2.4.0

data/test/rubygems/test_gem_installer.rb

@@ -188,6 +188,42 @@ gem 'other', version
     assert_match %r|generated by RubyGems|, wrapper
   end unless Gem.win_platform?
 
+  def test_check_that_user_bin_dir_is_in_path
+    orig_PATH, ENV['PATH'] =
+      ENV['PATH'], [ENV['PATH'], @installer.bin_dir].join(File::PATH_SEPARATOR)
+
+    use_ui @ui do
+      @installer.check_that_user_bin_dir_is_in_path
+    end
+
+    assert_empty @ui.error
+  ensure
+    ENV['PATH'] = orig_PATH
+  end
+
+  def test_check_that_user_bin_dir_is_in_path_tilde
+    orig_PATH, ENV['PATH'] =
+      ENV['PATH'], [ENV['PATH'], '~/bin'].join(File::PATH_SEPARATOR)
+
+    @installer.bin_dir.replace File.join @userhome, 'bin'
+
+    use_ui @ui do
+      @installer.check_that_user_bin_dir_is_in_path
+    end
+
+    assert_empty @ui.error
+  ensure
+    ENV['PATH'] = orig_PATH
+  end
+
+  def test_check_that_user_bin_dir_is_in_path_not_in_path
+    use_ui @ui do
+      @installer.check_that_user_bin_dir_is_in_path
+    end
+
+    assert_match @installer.bin_dir, @ui.error
+  end
+
   def test_ensure_dependency
     util_spec 'a'
 
@@ -1162,6 +1198,22 @@ gem 'other', version
     assert_equal "#!#{Gem.ruby}", shebang
   end
 
+  def test_process_options
+    assert_nil @installer.build_root
+    assert_equal File.join(@gemhome, 'bin'), @installer.bin_dir
+    assert_equal @gemhome, @installer.gem_home
+  end
+
+  def test_process_options_build_root
+    build_root = File.join @tempdir, 'build_root'
+
+    @installer = Gem::Installer.new @gem, :build_root => build_root
+
+    assert_equal Pathname(build_root), @installer.build_root
+    assert_equal File.join(build_root, @gemhome, 'bin'), @installer.bin_dir
+    assert_equal File.join(build_root, @gemhome), @installer.gem_home
+  end
+
   def test_shebang_arguments
     util_make_exec @spec, "#!/usr/bin/ruby -ws"
 

data/test/rubygems/test_gem_local_remote_options.rb

@@ -90,6 +90,19 @@ class TestGemLocalRemoteOptions < Gem::TestCase
     assert_equal original_sources, Gem.sources
   end
 
+  def test_short_source_option
+    @cmd.add_source_option
+
+    original_sources = Gem.sources.dup
+
+    source = URI.parse 'http://more-gems.example.com/'
+    @cmd.handle_options %W[-s #{source}]
+
+    original_sources << source
+
+    assert_equal original_sources, Gem.sources
+  end
+
   def test_update_sources_option
     @cmd.add_update_sources_option
 

data/test/rubygems/test_gem_package.rb

@@ -621,7 +621,7 @@ class TestGemPackage < Gem::Package::TarTestCase
   end
 
   def test_verify_corrupt
-    Tempfile.open 'corrupt' do |io|
+    tf = Tempfile.open 'corrupt' do |io|
       data = Gem.gzip 'a' * 10
       io.write \
         tar_file_header('metadata.gz', "\000x", 0644, data.length, Time.now)
@@ -636,7 +636,9 @@ class TestGemPackage < Gem::Package::TarTestCase
 
       assert_equal "tar is corrupt, name contains null byte in #{io.path}",
                    e.message
+      io
     end
+    tf.close! if tf.respond_to? :close!
   end
 
   def test_verify_empty

data/test/rubygems/test_gem_package_tar_header.rb

@@ -31,6 +31,8 @@ class TestGemPackageTarHeader < Gem::Package::TarTestCase
     new_header = Gem::Package::TarHeader.from io
 
     assert_headers_equal @tar_header, new_header
+  ensure
+    io.close!
   end
 
   def test_initialize

data/test/rubygems/test_gem_package_tar_reader.rb

@@ -20,6 +20,8 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
     end
 
     assert_equal 2, entries
+  ensure
+    io.close!
   end
 
   def test_rewind
@@ -30,7 +32,9 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
         content + "\0" * (512 - content.size)
     str << "\0" * 1024
 
-    Gem::Package::TarReader.new(TempIO.new(str)) do |tar_reader|
+    io = TempIO.new(str)
+
+    Gem::Package::TarReader.new(io) do |tar_reader|
       3.times do
         tar_reader.rewind
         i = 0
@@ -41,6 +45,8 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
         assert_equal(1, i)
       end
     end
+  ensure
+    io.close!
   end
 
   def test_seek
@@ -58,6 +64,8 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
 
       assert_equal 0, io.pos
     end
+  ensure
+    io.close!
   end
 
   def test_seek_missing
@@ -73,6 +81,8 @@ class TestGemPackageTarReader < Gem::Package::TarTestCase
 
       assert_equal 0, io.pos
     end
+  ensure
+    io.close!
   end
 
 end

data/test/rubygems/test_gem_package_tar_reader_entry.rb

@@ -16,6 +16,15 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
     @entry = util_entry @tar
   end
 
+  def teardown
+    close_util_entry(@entry)
+    super
+  end
+
+  def close_util_entry(entry)
+    entry.instance_variable_get(:@io).close!
+  end
+
   def test_bytes_read
     assert_equal 0, @entry.bytes_read
 
@@ -77,12 +86,18 @@ class TestGemPackageTarReaderEntry < Gem::Package::TarTestCase
 
   def test_directory_eh
     assert_equal false, @entry.directory?
-    assert_equal true, util_dir_entry.directory?
+    dir_ent = util_dir_entry
+    assert_equal true, dir_ent.directory?
+  ensure
+    close_util_entry(dir_ent) if dir_ent
   end
 
   def test_file_eh
     assert_equal true, @entry.file?
-    assert_equal false, util_dir_entry.file?
+    dir_ent = util_dir_entry
+    assert_equal false, dir_ent.file?
+  ensure
+    close_util_entry(dir_ent) if dir_ent
   end
 
   def test_pos

data/test/rubygems/test_gem_package_tar_writer.rb

@@ -14,6 +14,7 @@ class TestGemPackageTarWriter < Gem::Package::TarTestCase
 
   def teardown
     @tar_writer.close unless @tar_writer.closed?
+    @io.close!
 
     super
   end

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -108,6 +108,7 @@ gems:
   end
 
   def teardown
+    self.class.stop_servers
     super
     Gem.configuration[:http_proxy] = nil
     @proxies.each_with_index {|k, i| ENV[k] = @old_proxies[i] }
@@ -774,6 +775,27 @@ gems:
       @proxy_server  ||= start_server(PROXY_DATA)
       @enable_yaml = true
       @enable_zip = false
+      @ssl_server = nil
+      @ssl_server_thread = nil
+    end
+
+    def stop_servers
+      if @normal_server
+        @normal_server.kill.join
+        @normal_server = nil
+      end
+      if @proxy_server
+        @proxy_server.kill.join
+        @proxy_server = nil
+      end
+      if @ssl_server
+        @ssl_server.stop
+        @ssl_server = nil
+      end
+      if @ssl_server_thread
+        @ssl_server_thread.kill.join
+        @ssl_server_thread = nil
+      end
     end
 
     def normal_server_port
@@ -824,6 +846,8 @@ gems:
           raise
         end
       end
+      @ssl_server = server
+      @ssl_server_thread = t
       server
     end
 

data/test/rubygems/test_gem_request_set.rb

@@ -70,6 +70,28 @@ class TestGemRequestSet < Gem::TestCase
     refute done_installing_ran
   end
 
+  def test_install_from_gemdeps_explain
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
+
+    rs = Gem::RequestSet.new
+
+    open 'gem.deps.rb', 'w' do |io|
+      io.puts 'gem "a"'
+      io.flush
+
+      expected = <<-EXPECTED
+Gems to install:
+  a-2
+      EXPECTED
+
+      assert_output expected do
+        rs.install_from_gemdeps :gemdeps => io.path, :explain => true
+      end
+    end
+  end
+
   def test_install_from_gemdeps_install_dir
     spec_fetcher do |fetcher|
       fetcher.gem 'a', 2
@@ -160,17 +182,43 @@ DEPENDENCIES
     assert_path_exists File.join @gemhome, 'specifications', 'b-1.gemspec'
   end
 
+  def test_install_from_gemdeps_version_mismatch
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 2
+    end
+
+    rs = Gem::RequestSet.new
+    installed = []
+
+    open 'gem.deps.rb', 'w' do |io|
+      io.puts <<-GEM_DEPS
+gem "a"
+ruby "0"
+      GEM_DEPS
+
+      io.flush
+
+      rs.install_from_gemdeps :gemdeps => io.path do |req, installer|
+        installed << req.full_name
+      end
+    end
+
+    assert_includes installed, 'a-2'
+  end
+
   def test_load_gemdeps
     rs = Gem::RequestSet.new
 
-    Tempfile.open 'gem.deps.rb' do |io|
+    tf = Tempfile.open 'gem.deps.rb' do |io|
       io.puts 'gem "a"'
       io.flush
 
       gem_deps = rs.load_gemdeps io.path
 
       assert_kind_of Gem::RequestSet::GemDependencyAPI, gem_deps
+      io
     end
+    tf.close! if tf.respond_to? :close!
 
     assert_equal [dep('a')], rs.dependencies
 
@@ -178,15 +226,33 @@ DEPENDENCIES
     assert rs.vendor_set
   end
 
-  def test_load_gemdeps_without_groups
+  def test_load_gemdeps_installing
     rs = Gem::RequestSet.new
 
     Tempfile.open 'gem.deps.rb' do |io|
+      io.puts 'ruby "0"'
+      io.puts 'gem "a"'
+      io.flush
+
+      gem_deps = rs.load_gemdeps io.path, [], true
+
+      assert_kind_of Gem::RequestSet::GemDependencyAPI, gem_deps
+    end
+
+    assert_equal [dep('a')], rs.dependencies
+  end
+
+  def test_load_gemdeps_without_groups
+    rs = Gem::RequestSet.new
+
+    tf = Tempfile.open 'gem.deps.rb' do |io|
       io.puts 'gem "a", :group => :test'
       io.flush
 
       rs.load_gemdeps io.path, [:test]
+      io
     end
+    tf.close! if tf.respond_to? :close!
 
     assert_empty rs.dependencies
   end
@@ -251,7 +317,7 @@ DEPENDENCIES
 
     rs = Gem::RequestSet.new
 
-    Tempfile.open 'gem.deps.rb' do |io|
+    tf = Tempfile.open 'gem.deps.rb' do |io|
       io.puts <<-gems_deps_rb
         gem "#{name}", :git => "#{repository}"
       gems_deps_rb
@@ -259,7 +325,9 @@ DEPENDENCIES
       io.flush
 
       rs.load_gemdeps io.path
+      io
     end
+    tf.close! if tf.respond_to? :close!
 
     res = rs.resolve
     assert_equal 1, res.size
@@ -312,7 +380,7 @@ DEPENDENCIES
 
     rs = Gem::RequestSet.new
 
-    Tempfile.open 'gem.deps.rb' do |io|
+    tf = Tempfile.open 'gem.deps.rb' do |io|
       io.puts <<-gems_deps_rb
         gem "#{a_name}", :path => "#{a_directory}"
         gem "#{b_name}", :path => "#{b_directory}"
@@ -321,7 +389,9 @@ DEPENDENCIES
       io.flush
 
       rs.load_gemdeps io.path
+      io
     end
+    tf.close! if tf.respond_to? :close!
 
     res = rs.resolve
     assert_equal 2, res.size

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -520,7 +520,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
   end
 
   def test_load
-    Tempfile.open 'gem.deps.rb' do |io|
+    tf = Tempfile.open 'gem.deps.rb' do |io|
       io.write <<-GEM_DEPS
 gem 'a'
 
@@ -535,7 +535,9 @@ end
       assert_equal gda, gda.load
 
       assert_equal [dep('a'), dep('b')], @set.dependencies
+      io
     end
+    tf.close! if tf.respond_to? :close!
   end
 
   def test_name_typo
@@ -690,6 +692,12 @@ end
     assert_equal "Your Ruby version is #{RUBY_VERSION}, but your gem.deps.rb requires 1.8.0", e.message
   end
 
+  def test_ruby_mismatch_installing
+    @gda.installing = true
+
+    assert @gda.ruby '1.8.0'
+  end
+
   def test_source
     sources = Gem.sources
 

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -368,6 +368,7 @@ GIT
   specs:
     a (2)
       b (>= 3)
+      c
 
 DEPENDENCIES
   a!
@@ -391,7 +392,8 @@ DEPENDENCIES
 
     assert_equal %w[a-2], git_set.specs.values.map { |s| s.full_name }
 
-    assert_equal [dep('b', '>= 3')], git_set.specs.values.first.dependencies
+    assert_equal [dep('b', '>= 3'), dep('c')],
+                 git_set.specs.values.first.dependencies
 
     expected = {
       'a' => %w[git://example/a.git master],

data/test/rubygems/test_gem_requirement.rb

@@ -207,6 +207,14 @@ class TestGemRequirement < Gem::TestCase
     end
   end
 
+  def test_satisfied_by_eh_tilde_gt_v0
+    r = req "~> 0.0.1"
+
+    refute_satisfied_by "0.1.1", r
+    assert_satisfied_by "0.0.2", r
+    assert_satisfied_by "0.0.1", r
+  end
+
   def test_satisfied_by_eh_good
     assert_satisfied_by "0.2.33",      "= 0.2.33"
     assert_satisfied_by "0.2.34",      "> 0.2.33"