rubygems-update 2.4.1 → 2.4.2

data/test/rubygems/test_gem_dependency_installer.rb

@@ -126,6 +126,27 @@ class TestGemDependencyInstaller < Gem::TestCase
     assert_equal [p1a], inst.installed_gems
   end
 
+  def test_install_prerelease_bug_990
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', '1.b' do |s|
+        s.add_dependency 'b', '~> 1.a'
+      end
+
+      fetcher.gem 'b', '1.b' do |s|
+        s.add_dependency 'c', '>= 1'
+      end
+
+      fetcher.gem 'c', '1.1.b'
+    end
+
+    dep = Gem::Dependency.new 'a'
+
+    inst = Gem::DependencyInstaller.new :prerelease => true
+    inst.install dep
+
+    assert_equal %w[a-1.b b-1.b c-1.1.b], Gem::Specification.map(&:full_name)
+  end
+
   def test_install_when_only_prerelease
     p1a, gem = util_gem 'p', '1.a'
 

data/test/rubygems/test_gem_ext_builder.rb

@@ -245,7 +245,7 @@ install:
     refute_path_exists @spec.gem_build_complete_path
 
     skip "Gem.ruby is not the name of the binary being run in the end" \
-      unless File.read(gem_make_out).include? "#{Regexp.escape Gem.ruby}:"
+      unless File.read(gem_make_out).include? "#{Gem.ruby}:"
 
     assert_match %r%#{Regexp.escape Gem.ruby}: No such file%,
                  File.read(gem_make_out)

data/test/rubygems/test_gem_impossible_dependencies_error.rb

@@ -32,24 +32,24 @@ rye-0.9.8 requires net-ssh (>= 2.0.13) but it conflicted:
   which does not match conflicting dependency (~> 2.2.2)
 
   Conflicting dependency chains:
-    rye (= 0.9.8), 0.9.8 activated depends on
+    rye (= 0.9.8), 0.9.8 activated, depends on
     net-ssh (>= 2.0.13), 2.6.5 activated
 
   versus:
-    rye (= 0.9.8), 0.9.8 activated depends on
-    net-ssh (>= 2.0.13), 2.6.5 activated depends on
+    rye (= 0.9.8), 0.9.8 activated, depends on
+    net-ssh (>= 2.0.13), 2.6.5 activated, depends on
     net-ssh (~> 2.2.2)
 
   Activated net-ssh-2.2.2
   which does not match conflicting dependency (>= 2.6.5)
 
   Conflicting dependency chains:
-    rye (= 0.9.8), 0.9.8 activated depends on
+    rye (= 0.9.8), 0.9.8 activated, depends on
     net-ssh (>= 2.0.13), 2.2.2 activated
 
   versus:
-    rye (= 0.9.8), 0.9.8 activated depends on
-    net-ssh (>= 2.0.13), 2.2.2 activated depends on
+    rye (= 0.9.8), 0.9.8 activated, depends on
+    net-ssh (>= 2.0.13), 2.2.2 activated, depends on
     net-ssh (>= 2.6.5)
 
     EXPECTED

data/test/rubygems/test_gem_installer.rb

@@ -189,8 +189,14 @@ gem 'other', version
   end unless Gem.win_platform?
 
   def test_check_that_user_bin_dir_is_in_path
+    bin_dir = @installer.bin_dir
+
+    if Gem.win_platform?
+      bin_dir = bin_dir.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+    end
+
     orig_PATH, ENV['PATH'] =
-      ENV['PATH'], [ENV['PATH'], @installer.bin_dir].join(File::PATH_SEPARATOR)
+      ENV['PATH'], [ENV['PATH'], bin_dir].join(File::PATH_SEPARATOR)
 
     use_ui @ui do
       @installer.check_that_user_bin_dir_is_in_path
@@ -202,6 +208,8 @@ gem 'other', version
   end
 
   def test_check_that_user_bin_dir_is_in_path_tilde
+    skip "Tilde is PATH is not supported under MS Windows" if win_platform?
+
     orig_PATH, ENV['PATH'] =
       ENV['PATH'], [ENV['PATH'], '~/bin'].join(File::PATH_SEPARATOR)
 
@@ -213,7 +221,7 @@ gem 'other', version
 
     assert_empty @ui.error
   ensure
-    ENV['PATH'] = orig_PATH
+    ENV['PATH'] = orig_PATH unless win_platform?
   end
 
   def test_check_that_user_bin_dir_is_in_path_not_in_path
@@ -221,7 +229,13 @@ gem 'other', version
       @installer.check_that_user_bin_dir_is_in_path
     end
 
-    assert_match @installer.bin_dir, @ui.error
+    expected = @installer.bin_dir
+
+    if Gem.win_platform? then
+      expected = expected.downcase.gsub(File::SEPARATOR, File::ALT_SEPARATOR)
+    end
+
+    assert_match expected, @ui.error
   end
 
   def test_ensure_dependency
@@ -1112,6 +1126,16 @@ gem 'other', version
     refute @installer.installation_satisfies_dependency?(dep)
   end
 
+  def test_installation_satisfies_dependency_eh_development
+    @installer.options[:development] = true
+    @installer.options[:dev_shallow] = true
+
+    util_spec 'a'
+
+    dep = Gem::Dependency.new 'a', :development
+    assert @installer.installation_satisfies_dependency?(dep)
+  end
+
   def test_pre_install_checks_dependencies
     @spec.add_dependency 'b', '> 5'
     util_setup_gem

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -837,6 +837,8 @@ gems:
         rescue Exception => ex
           abort ex.message
           puts "ERROR during server thread: #{ex.message}"
+        ensure
+          server.shutdown
         end
       end
       while server.status != :Running
@@ -888,6 +890,8 @@ gems:
           s.start
         rescue Exception => ex
           abort "ERROR during server thread: #{ex.message}"
+        ensure
+          s.shutdown
         end
       end
       th[:server] = s

data/test/rubygems/test_gem_request_connection_pools.rb

@@ -35,6 +35,43 @@ class TestGemRequestConnectionPool < Gem::TestCase
     assert_equal conn, pool.checkout
   end
 
+  def test_to_proxy_eh
+    pools = Gem::Request::ConnectionPools.new nil, []
+
+    env_no_proxy = %w[
+      1.no-proxy.example
+      2.no-proxy.example
+    ]
+
+    no_proxy = pools.send :no_proxy?, '2.no-proxy.example', env_no_proxy
+
+    assert no_proxy, 'match'
+
+    no_proxy = pools.send :no_proxy?, 'proxy.example', env_no_proxy
+
+    refute no_proxy, 'mismatch'
+  end
+
+  def test_to_proxy_eh_wildcard
+    pools = Gem::Request::ConnectionPools.new nil, []
+
+    env_no_proxy = %w[
+      .no-proxy.example
+    ]
+
+    no_proxy = pools.send :no_proxy?, '2.no-proxy.example', env_no_proxy
+
+    assert no_proxy, 'wildcard matching subdomain'
+
+    no_proxy = pools.send :no_proxy?, 'no-proxy.example', env_no_proxy
+
+    assert no_proxy, 'wildcard matching dotless domain'
+
+    no_proxy = pools.send :no_proxy?, 'proxy.example', env_no_proxy
+
+    refute no_proxy, 'wildcard mismatch'
+  end
+
   def test_net_http_args
     pools = Gem::Request::ConnectionPools.new nil, []
 

data/test/rubygems/test_gem_request_set.rb

@@ -229,7 +229,7 @@ ruby "0"
   def test_load_gemdeps_installing
     rs = Gem::RequestSet.new
 
-    Tempfile.open 'gem.deps.rb' do |io|
+    tf = Tempfile.open 'gem.deps.rb' do |io|
       io.puts 'ruby "0"'
       io.puts 'gem "a"'
       io.flush
@@ -237,7 +237,9 @@ ruby "0"
       gem_deps = rs.load_gemdeps io.path, [], true
 
       assert_kind_of Gem::RequestSet::GemDependencyAPI, gem_deps
+      io
     end
+    tf.close! if tf.respond_to? :close!
 
     assert_equal [dep('a')], rs.dependencies
   end
@@ -276,6 +278,23 @@ ruby "0"
     refute_same orig_errors, rs.errors
   end
 
+  def test_bug_bug_990
+    a = util_spec 'a', '1.b',  'b' => '~> 1.a'
+    b = util_spec 'b', '1.b',  'c' => '>= 1'
+    c = util_spec 'c', '1.1.b'
+
+    rs = Gem::RequestSet.new
+    rs.gem 'a'
+    rs.prerelease = true
+
+    res = rs.resolve StaticSet.new([a, b, c])
+    assert_equal 3, res.size
+
+    names = res.map { |s| s.full_name }.sort
+
+    assert_equal %w[a-1.b b-1.b c-1.1.b], names
+  end
+
   def test_resolve_development
     a = util_spec 'a', 1
     spec = Gem::Resolver::SpecSpecification.new nil, a

data/test/rubygems/test_gem_request_set_gem_dependency_api.rb

@@ -74,6 +74,18 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal expected, @gda.dependencies
   end
 
+  def test_gem_duplicate
+    @gda.gem 'a'
+
+    _, err = capture_io do
+      @gda.gem 'a'
+    end
+
+    expected = "Gem dependencies file gem.deps.rb requires a more than once."
+
+    assert_match expected, err
+  end
+
   def test_gem_git
     @gda.gem 'a', :git => 'git/a'
 
@@ -86,6 +98,32 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal expected, @gda.dependencies
   end
 
+  def test_gem_bitbucket
+    @gda.gem 'a', :bitbucket => 'example/repository'
+
+    assert_equal [dep('a')], @set.dependencies
+
+    assert_equal %w[https://example@bitbucket.org/example/repository.git master],
+                 @git_set.repositories['a']
+
+    expected = { 'a' => '!' }
+
+    assert_equal expected, @gda.dependencies
+  end
+
+  def test_gem_bitbucket_expand_path
+    @gda.gem 'a', :bitbucket => 'example'
+
+    assert_equal [dep('a')], @set.dependencies
+
+    assert_equal %w[https://example@bitbucket.org/example/example.git master],
+                 @git_set.repositories['a']
+
+    expected = { 'a' => '!' }
+
+    assert_equal expected, @gda.dependencies
+  end
+
   def test_gem_git_branch
     @gda.gem 'a', :git => 'git/a', :branch => 'other', :tag => 'v1'
 
@@ -141,6 +179,19 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal expected, @gda.dependencies
   end
 
+  def test_gem_github_expand_path
+    @gda.gem 'a', :github => 'example'
+
+    assert_equal [dep('a')], @set.dependencies
+
+    assert_equal %w[git://github.com/example/example.git master],
+                 @git_set.repositories['a']
+
+    expected = { 'a' => '!' }
+
+    assert_equal expected, @gda.dependencies
+  end
+
   def test_gem_group
     @gda.gem 'a', :group => :test
 
@@ -274,6 +325,18 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     Gem.win_platform = win_platform
   end
 
+  def test_gem_platforms_platform
+    win_platform, Gem.win_platform = Gem.win_platform?, false
+
+    with_engine_version 'ruby', '2.0.0' do
+      @gda.gem 'a', :platforms => :jruby, :platform => :ruby
+
+      refute_empty @set.dependencies
+    end
+  ensure
+    Gem.win_platform = win_platform
+  end
+
   def test_gem_platforms_version
     with_engine_version 'ruby', '2.0.0' do
       @gda.gem 'a', :platforms => :ruby_18
@@ -397,9 +460,18 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     @gda.gemspec
 
-    assert_equal [dep('b', '= 2'), dep('c', '=3')], @set.dependencies
+    assert_equal [dep('a', '= 1'), dep('b', '= 2'), dep('c', '=3')],
+                 @set.dependencies
 
     assert_equal %w[a], @gda.requires['a']
+
+    expected = {
+      'a' => '!',
+      'b' => req('= 2'),
+      'c' => req('= 3'),
+    }
+
+    assert_equal expected, @gda.dependencies
   end
 
   def test_gemspec_bad
@@ -426,7 +498,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     @gda.gemspec :development_group => :other
 
-    assert_equal [dep('b', '= 2')], @set.dependencies
+    assert_equal [dep('a', '= 1'), dep('b', '= 2')], @set.dependencies
 
     assert_equal %w[a], @gda.requires['a']
   end
@@ -462,7 +534,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     @gda.gemspec :name => 'b'
 
-    assert_equal [dep('c', '= 3')], @set.dependencies
+    assert_equal [dep('b', '= 2'), dep('c', '= 3')], @set.dependencies
   end
 
   def test_gemspec_named
@@ -474,7 +546,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     @gda.gemspec
 
-    assert_equal [dep('b', '= 2')], @set.dependencies
+    assert_equal [dep('a', '= 1'), dep('b', '= 2')], @set.dependencies
   end
 
   def test_gemspec_none
@@ -496,7 +568,7 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
 
     @gda.gemspec :path => 'other'
 
-    assert_equal [dep('b', '= 2')], @set.dependencies
+    assert_equal [dep('a', '= 1'), dep('b', '= 2')], @set.dependencies
   end
 
   def test_git
@@ -511,6 +583,16 @@ class TestGemRequestSetGemDependencyAPI < Gem::TestCase
     assert_equal %w[git://example/repo.git master], @git_set.repositories['b']
   end
 
+  def test_git_source
+    @gda.git_source :example do |repo_name|
+      "git://example/#{repo_name}.git"
+    end
+
+    @gda.gem 'a', :example => 'repo'
+
+    assert_equal %w[git://example/repo.git master], @git_set.repositories['a']
+  end
+
   def test_group
     @gda.group :test do
       @gda.gem 'a'
@@ -586,17 +668,21 @@ end
   def test_platform_multiple
     win_platform, Gem.win_platform = Gem.win_platform?, false
 
+    gda = @GDA.new @set, nil
+
     with_engine_version 'ruby', '1.8.7' do
-      @gda.platform :mri_19, :mri_20 do
-        @gda.gem 'a'
+      gda.platform :mri_19, :mri_20 do
+        gda.gem 'a'
       end
     end
 
     assert_empty @set.dependencies
 
+    gda = @GDA.new @set, nil
+
     with_engine_version 'ruby', '2.0.0' do
-      @gda.platform :mri_19, :mri_20 do
-        @gda.gem 'a'
+      gda.platform :mri_19, :mri_20 do
+        gda.gem 'a'
       end
     end
 

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -361,6 +361,8 @@ DEPENDENCIES
   end
 
   def test_parse_GIT
+    @set.instance_variable_set :@install_dir, 'install_dir'
+
     write_lockfile <<-LOCKFILE
 GIT
   remote: git://example/a.git
@@ -400,6 +402,7 @@ DEPENDENCIES
     }
 
     assert_equal expected, git_set.repositories
+    assert_equal 'install_dir', git_set.root_dir
   end
 
   def test_parse_GIT_branch
@@ -521,6 +524,7 @@ PATH
   remote: #{directory}
   specs:
     a (1)
+      b (2)
 
 DEPENDENCIES
   a!
@@ -543,6 +547,28 @@ DEPENDENCIES
     assert vendor_set, 'could not find a VendorSet'
 
     assert_equal %w[a-1], vendor_set.specs.values.map { |s| s.full_name }
+
+    spec = vendor_set.load_spec 'a', nil, nil, nil
+
+    assert_equal [dep('b', '= 2')], spec.dependencies
+  end
+
+  def test_parse_dependency
+    write_lockfile ' 1)'
+
+    @lockfile.tokenize
+
+    parsed = @lockfile.parse_dependency 'a', '='
+
+    assert_equal dep('a', '= 1'), parsed
+
+    write_lockfile ')'
+
+    @lockfile.tokenize
+
+    parsed = @lockfile.parse_dependency 'a', '2'
+
+    assert_equal dep('a', '= 2'), parsed
   end
 
   def test_parse_gem_specs_dependency
@@ -617,6 +643,16 @@ DEPENDENCIES
     assert_equal [:EOF], @lockfile.peek
   end
 
+  def test_relative_path_from
+    path = @lockfile.relative_path_from '/foo', '/foo/bar'
+
+    assert_equal '/foo', path
+
+    path = @lockfile.relative_path_from '/foo', '/foo'
+
+    assert_equal '.', path
+  end
+
   def test_skip
     tokens = [[:token]]
 
@@ -1190,5 +1226,23 @@ DEPENDENCIES
     refute_empty File.read gem_deps_lock_file
   end
 
+  def test_write_error
+    @set.gem 'nonexistent'
+
+    gem_deps_lock_file = "#{@gem_deps_file}.lock"
+
+    open gem_deps_lock_file, 'w' do |io|
+      io.write 'hello'
+    end
+
+    assert_raises Gem::UnsatisfiableDependencyError do
+      @lockfile.write
+    end
+
+    assert_path_exists gem_deps_lock_file
+
+    assert_equal 'hello', File.read(gem_deps_lock_file)
+  end
+
 end