rubygems-update 2.4.1 → 2.4.2

data/test/rubygems/test_gem_resolver_composed_set.rb

@@ -16,6 +16,19 @@ class TestGemResolverComposedSet < Gem::TestCase
     assert_includes set.errors, index_set.errors.first
   end
 
+  def test_prerelease_equals
+    best_set    = Gem::Resolver::BestSet.new
+    current_set = Gem::Resolver::CurrentSet.new
+
+    set = Gem::Resolver::ComposedSet.new best_set, current_set
+
+    set.prerelease = true
+
+    assert set.prerelease
+    assert best_set.prerelease
+    assert current_set.prerelease
+  end
+
   def test_remote_equals
     best_set    = Gem::Resolver::BestSet.new
     current_set = Gem::Resolver::CurrentSet.new

data/test/rubygems/test_gem_resolver_conflict.rb

@@ -29,8 +29,8 @@ class TestGemResolverConflict < Gem::TestCase
     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_resolver_dependency_request.rb

@@ -45,6 +45,15 @@ class TestGemResolverDependencyRequest < Gem::TestCase
     assert a_pre_dr.match? spec
   end
 
+  def test_match_eh_prerelease_allow_prerelease
+    spec = util_spec 'a', '2.a'
+
+    a_dep = dep 'a', '>= 1'
+    a_dr = @DR.new a_dep, nil
+
+    assert a_dr.match? spec, true
+  end
+
   def test_matches_spec_eh
     spec = util_spec 'a', 1
     dependency = dep 'a', '>= 1'

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -189,6 +189,18 @@ class TestGemResolverInstallerSet < Gem::TestCase
     assert_equal specs["a-2-#{Gem::Platform.local}"].full_name, spec.full_name
   end
 
+  def test_prerelease_equals
+    set = Gem::Resolver::InstallerSet.new :remote
+
+    refute set.prerelease
+    refute set.remote_set.prerelease
+
+    set.prerelease = true
+
+    assert set.prerelease
+    assert set.remote_set.prerelease
+  end
+
   def test_remote_equals_both
     set = Gem::Resolver::InstallerSet.new :both
     set.remote = true

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -83,5 +83,16 @@ class TestGemResolverLockSpecification < Gem::TestCase
     assert_equal [b_dep, c_dep], l_spec.spec.dependencies
   end
 
+  def test_spec_loaded
+    real_spec = util_spec 'a', 2
+    real_spec.activate
+
+    version = v(2)
+
+    l_spec = @LS.new @set, 'a', version, @source, Gem::Platform::RUBY
+
+    assert_same real_spec, l_spec.spec
+  end
+
 end
 

data/test/rubygems/test_gem_resolver_vendor_set.rb

@@ -11,10 +11,12 @@ class TestGemResolverVendorSet < Gem::TestCase
   def test_add_vendor_gem
     name, version, directory = vendor_gem
 
-    @set.add_vendor_gem name, directory
+    added = @set.add_vendor_gem name, directory
 
     spec = @set.load_spec name, version, Gem::Platform::RUBY, nil
 
+    assert_equal spec, added
+
     assert_equal "#{name}-#{version}", spec.full_name
 
     assert_equal File.expand_path(directory), spec.full_gem_path

data/test/rubygems/test_gem_silent_ui.rb

@@ -9,6 +9,11 @@ class TestGemSilentUI < Gem::TestCase
     @sui = Gem::SilentUI.new
   end
 
+  def teardown
+    @sui.close
+    super
+  end
+
   def test_ask
     value = nil
     out, err = capture_io do

data/test/rubygems/test_gem_source.rb

@@ -1,5 +1,6 @@
 require 'rubygems/test_case'
 require 'rubygems/source'
+require 'rubygems/indexer'
 
 class TestGemSource < Gem::TestCase
 
@@ -50,6 +51,18 @@ class TestGemSource < Gem::TestCase
     assert_kind_of Gem::Resolver::APISet, set
   end
 
+  def test_dependency_resolver_set_file_uri
+    skip 'install builder gem' unless defined? Builder::XChar
+
+    Gem::Indexer.new(@tempdir).generate_index
+
+    source = Gem::Source.new "file://#{@tempdir}/"
+
+    set = source.dependency_resolver_set
+
+    assert_kind_of Gem::Resolver::IndexSet, set
+  end
+
   def test_dependency_resolver_set_marshal_api
     set = @source.dependency_resolver_set
 

data/test/rubygems/test_gem_source_git.rb

@@ -180,6 +180,17 @@ class TestGemSourceGit < Gem::TestCase
     source.cache
 
     refute_equal master_head, source.rev_parse
+
+    source = Gem::Source::Git.new @name, @repository, 'nonexistent', false
+
+    source.cache
+
+    e = assert_raises Gem::Exception do
+      source.rev_parse
+    end
+
+    assert_equal "unable to find reference nonexistent in #{@repository}",
+                   e.message
   end
 
   def test_root_dir
@@ -273,6 +284,10 @@ class TestGemSourceGit < Gem::TestCase
     end
   end
 
+  def test_uri
+    assert_equal URI(@repository), @source.uri
+  end
+
   def test_uri_hash
     assert_equal @hash, @source.uri_hash
 

data/test/rubygems/test_gem_specification.rb

@@ -1,4 +1,3 @@
-# -*- coding: UTF-8 -*-
 require 'rubygems/test_case'
 require 'pathname'
 require 'stringio'
@@ -1136,6 +1135,24 @@ dependencies: []
     assert_equal %w[lib/code.rb], @a2.files
   end
 
+  def test_build_args
+    ext_spec
+
+    assert_empty @ext.build_args
+
+    open @ext.build_info_file, 'w' do |io|
+      io.puts
+    end
+
+    assert_empty @ext.build_args
+
+    open @ext.build_info_file, 'w' do |io|
+      io.puts '--with-foo-dir=wherever'
+    end
+
+    assert_equal %w[--with-foo-dir=wherever], @ext.build_args
+  end
+
   def test_build_extensions
     ext_spec
 
@@ -1235,8 +1252,10 @@ dependencies: []
     @ext.build_extensions
     refute_path_exists @ext.extension_dir
   ensure
-    FileUtils.chmod 0755, File.join(@ext.base_dir, 'extensions')
-    FileUtils.chmod 0755, @ext.base_dir
+    unless ($DEBUG or win_platform?) then
+      FileUtils.chmod 0755, File.join(@ext.base_dir, 'extensions')
+      FileUtils.chmod 0755, @ext.base_dir
+    end
   end
 
   def test_build_extensions_no_extensions_dir_unwritable
@@ -1801,7 +1820,7 @@ dependencies: []
 
       @ext.require_paths = 'lib'
 
-      assert_equal ['/foo/ext-1', 'lib'], @ext.require_paths
+      assert_equal [File.expand_path('/foo/ext-1'), 'lib'], @ext.require_paths
     end
   ensure
     class << Gem
@@ -2278,6 +2297,7 @@ end
       @a1.add_runtime_dependency     'k', '> 1.2'
       @a1.add_runtime_dependency     'l', '> 1.2.3'
       @a1.add_runtime_dependency     'm', '~> 2.1.0'
+      @a1.add_runtime_dependency     'n', '~> 0.1.0'
 
       use_ui @ui do
         @a1.validate
@@ -2931,15 +2951,31 @@ end
   end
 
   def test_find_by_name
-    util_make_gems
-    assert(Gem::Specification.find_by_name("a"))
-    assert(Gem::Specification.find_by_name("a", "1"))
-    assert(Gem::Specification.find_by_name("a", ">1"))
-    assert_raises(Gem::LoadError) do
-      Gem::Specification.find_by_name("monkeys")
+    util_spec "a"
+
+    assert Gem::Specification.find_by_name "a"
+    assert Gem::Specification.find_by_name "a", "1"
+    assert Gem::Specification.find_by_name "a", ">1"
+
+    assert_raises Gem::LoadError do
+      Gem::Specification.find_by_name "monkeys"
     end
   end
 
+  def test_find_by_name_prerelease
+    b = util_spec "b", "2.a"
+
+    b.activate
+
+    assert Gem::Specification.find_by_name "b"
+
+    assert_raises Gem::LoadError do
+      Gem::Specification.find_by_name "b", "1"
+    end
+
+    assert Gem::Specification.find_by_name "b", ">1"
+  end
+
   def test_find_by_path
     a = new_spec "foo", "1", nil, "lib/foo.rb"
 

data/test/rubygems/test_gem_stub_specification.rb

@@ -113,6 +113,16 @@ class TestStubSpecification < Gem::TestCase
   end
 
   def test_to_spec
+    real_foo = util_spec @foo.name, @foo.version
+    real_foo.activate
+
+    assert_equal @foo.version, Gem.loaded_specs[@foo.name].version,
+                 'sanity check'
+
+    assert_same real_foo, @foo.to_spec
+  end
+
+  def test_to_spec_activated
     assert @foo.to_spec.is_a?(Gem::Specification)
     assert_equal "foo", @foo.to_spec.name
     refute @foo.to_spec.instance_variable_defined? :@ignored

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Jim Weirich
@@ -31,7 +31,7 @@ cert_chain:
   pfkQPF5Ezsi73pEpFN93Fy21NKCYQH1jCwWeKUF29MIMGd6kE3ZmHW/7fz5GwKIM
   Ls5SgY48a0l7Hw==
   -----END CERTIFICATE-----
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -548,7 +548,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubygems-update
-rubygems_version: 2.3.0
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: RubyGems is a package management framework for Ruby