rubygems-update 2.2.5 → 2.3.0

data/test/rubygems/test_gem_resolver_lock_specification.rb

@@ -9,7 +9,7 @@ class TestGemResolverLockSpecification < Gem::TestCase
     @LS = Gem::Resolver::LockSpecification
 
     @source = Gem::Source.new @gem_repo
-    @set    = Gem::Resolver::LockSet.new @source
+    @set    = Gem::Resolver::LockSet.new [@source]
   end
 
   def test_initialize

data/test/rubygems/test_gem_resolver_specification.rb

@@ -3,6 +3,7 @@ require 'rubygems/test_case'
 class TestGemResolverSpecification < Gem::TestCase
 
   class TestSpec < Gem::Resolver::Specification
+    attr_writer :source
     attr_reader :spec
 
     def initialize spec
@@ -12,6 +13,26 @@ class TestGemResolverSpecification < Gem::TestCase
     end
   end
 
+  def test_install
+    gemhome = "#{@gemhome}2"
+    spec_fetcher do |fetcher|
+      fetcher.gem 'a', 1
+    end
+
+    a = util_spec 'a', 1
+
+    a_spec = TestSpec.new a
+    a_spec.source = Gem::Source.new @gem_repo
+
+    a_spec.install :install_dir => gemhome
+
+    assert_path_exists File.join gemhome, 'gems', a.full_name
+
+    expected = File.join gemhome, 'specifications', a.spec_name
+
+    assert_equal expected, a_spec.spec.loaded_from
+  end
+
   def test_installable_platform_eh
     a = util_spec 'a', 1
 
@@ -28,5 +49,16 @@ class TestGemResolverSpecification < Gem::TestCase
     refute b_spec.installable_platform?
   end
 
+  def test_source
+    a = util_spec 'a', 1
+
+    source = Gem::Source.new @gem_repo
+
+    a_spec = TestSpec.new a
+    a_spec.source = source
+
+    assert_equal source, a_spec.source
+  end
+
 end
 

data/test/rubygems/test_gem_resolver_vendor_set.rb

@@ -55,6 +55,20 @@ class TestGemResolverVendorSet < Gem::TestCase
     assert_equal expected, found
   end
 
+  def test_find_all_prerelease
+    name, _, directory = vendor_gem 'a', '1.a'
+
+    @set.add_vendor_gem name, directory
+
+    req = Gem::Resolver::DependencyRequest.new dep('a'), nil
+
+    assert_empty @set.find_all req
+
+    req = Gem::Resolver::DependencyRequest.new dep('a', '>= 0.a'), nil
+
+    refute_empty @set.find_all req
+  end
+
   def test_load_spec
     error = Object.const_defined?(:KeyError) ? KeyError : IndexError
 

data/test/rubygems/test_gem_security_policy.rb

@@ -347,7 +347,7 @@ class TestGemSecurityPolicy < Gem::TestCase
     assert_match "WARNING:  some_gem is not signed\n", @ui.error
 
     assert_raises Gem::Security::Exception do
-      @almost_no.verify [PUBLIC_CERT], nil, digests, {}
+      @high.verify [PUBLIC_CERT], nil, digests, {}
     end
   end
 
@@ -513,7 +513,7 @@ class TestGemSecurityPolicy < Gem::TestCase
     digests['SHA1']['data.tar.gz'] = OpenSSL::Digest.new 'SHA1', 'hello'
 
     assert_raises Gem::Security::Exception do
-      @almost_no.verify_signatures @spec, digests, {}
+      @high.verify_signatures @spec, digests, {}
     end
   end
 

data/test/rubygems/test_gem_server.rb

@@ -10,8 +10,9 @@ class TestGemServer < Gem::TestCase
   def setup
     super
 
-    @a1 = quick_gem 'a', '1'
-    @a2 = quick_gem 'a', '2'
+    @a1   = quick_gem 'a', '1'
+    @a2   = quick_gem 'a', '2'
+    @a3_p = quick_gem 'a', '3.a'
 
     @server = Gem::Server.new Gem.dir, process_based_port, false
     @req = WEBrick::HTTPRequest.new :Logger => nil
@@ -144,6 +145,36 @@ class TestGemServer < Gem::TestCase
     assert_equal 2, @server.server.listeners.length
   end
 
+  def test_prerelease_specs
+    data = StringIO.new "GET /prerelease_specs.#{Gem.marshal_version} HTTP/1.0\r\n\r\n"
+    @req.parse data
+
+    Gem::Deprecate.skip_during do
+      @server.prerelease_specs @req, @res
+    end
+
+    assert_equal 200, @res.status, @res.body
+    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_equal 'application/octet-stream', @res['content-type']
+    assert_equal [['a', v('3.a'), Gem::Platform::RUBY]],
+                 Marshal.load(@res.body)
+  end
+
+  def test_prerelease_specs_gz
+    data = StringIO.new "GET /prerelease_specs.#{Gem.marshal_version}.gz HTTP/1.0\r\n\r\n"
+    @req.parse data
+
+    Gem::Deprecate.skip_during do
+      @server.prerelease_specs @req, @res
+    end
+
+    assert_equal 200, @res.status, @res.body
+    assert_match %r| \d\d:\d\d:\d\d |, @res['date']
+    assert_equal 'application/x-gzip', @res['content-type']
+    assert_equal [['a', v('3.a'), Gem::Platform::RUBY]],
+                 Marshal.load(Gem.gunzip(@res.body))
+  end
+
   def test_quick_gemdirs
     data = StringIO.new "GET /quick/Marshal.4.8/z-9.gemspec.rz HTTP/1.0\r\n\r\n"
     dir = "#{@gemhome}2"
@@ -223,6 +254,38 @@ class TestGemServer < Gem::TestCase
     assert_equal Gem::Platform.local, spec.platform
   end
 
+  def test_quick_marshal_a_3_a_gemspec_rz
+    data = StringIO.new "GET /quick/Marshal.#{Gem.marshal_version}/a-3.a.gemspec.rz HTTP/1.0\r\n\r\n"
+    @req.parse data
+
+    @server.quick @req, @res
+
+    assert_equal 200, @res.status, @res.body
+    assert @res['date']
+    assert_equal 'application/x-deflate', @res['content-type']
+
+    spec = Marshal.load Gem.inflate(@res.body)
+    assert_equal 'a', spec.name
+    assert_equal v('3.a'), spec.version
+  end
+
+  def test_quick_marshal_a_b_3_a_gemspec_rz
+    quick_gem 'a-b', '3.a'
+
+    data = StringIO.new "GET /quick/Marshal.#{Gem.marshal_version}/a-b-3.a.gemspec.rz HTTP/1.0\r\n\r\n"
+    @req.parse data
+
+    @server.quick @req, @res
+
+    assert_equal 200, @res.status, @res.body
+    assert @res['date']
+    assert_equal 'application/x-deflate', @res['content-type']
+
+    spec = Marshal.load Gem.inflate(@res.body)
+    assert_equal 'a-b', spec.name
+    assert_equal v('3.a'), spec.version
+  end
+
   def test_rdoc
     data = StringIO.new "GET /rdoc?q=a HTTP/1.0\r\n\r\n"
     @req.parse data
@@ -279,7 +342,8 @@ class TestGemServer < Gem::TestCase
     assert_equal 'application/octet-stream', @res['content-type']
 
     assert_equal [['a', Gem::Version.new(1), Gem::Platform::RUBY],
-                  ['a', Gem::Version.new(2), Gem::Platform::RUBY]],
+                  ['a', Gem::Version.new(2), Gem::Platform::RUBY],
+                  ['a', v('3.a'), Gem::Platform::RUBY]],
                  Marshal.load(@res.body)
   end
 
@@ -318,7 +382,8 @@ class TestGemServer < Gem::TestCase
     assert_equal 'application/x-gzip', @res['content-type']
 
     assert_equal [['a', Gem::Version.new(1), Gem::Platform::RUBY],
-                  ['a', Gem::Version.new(2), Gem::Platform::RUBY]],
+                  ['a', Gem::Version.new(2), Gem::Platform::RUBY],
+                  ['a', v('3.a'), Gem::Platform::RUBY]],
                  Marshal.load(Gem.gunzip(@res.body))
   end
 

data/test/rubygems/test_gem_source.rb

@@ -40,7 +40,10 @@ class TestGemSource < Gem::TestCase
   end
 
   def test_dependency_resolver_set_bundler_api
-    @fetcher.data["#{@gem_repo}api/v1/dependencies"] = 'data'
+    response = Net::HTTPResponse.new '1.1', 200, 'OK'
+    response.uri = URI('http://example') if response.respond_to? :uri
+
+    @fetcher.data["#{@gem_repo}api/v1/dependencies"] = response
 
     set = @source.dependency_resolver_set
 

data/test/rubygems/test_gem_source_git.rb

@@ -27,6 +27,21 @@ class TestGemSourceGit < Gem::TestCase
     assert_path_exists File.join @source.install_dir, 'a.gemspec'
   end
 
+  def test_checkout_master
+    Dir.chdir @repository do
+      system @git, 'checkout', '-q', '-b', 'other'
+      system @git, 'mv',             'a.gemspec', 'b.gemspec'
+      system @git, 'commit',   '-q', '-a', '-m', 'rename gemspec'
+      system @git, 'checkout', '-q', 'master'
+    end
+
+    @source = Gem::Source::Git.new @name, @repository, 'other', false
+
+    @source.checkout
+
+    assert_path_exists File.join @source.install_dir, 'b.gemspec'
+  end
+
   def test_checkout_local
     @source.remote = false
 

data/test/rubygems/test_gem_source_specific_file.rb

@@ -9,6 +9,10 @@ class TestGemSourceSpecificFile < Gem::TestCase
     @sf = Gem::Source::SpecificFile.new(@a_gem)
   end
 
+  def test_path
+    assert_equal @a_gem, @sf.path
+  end
+
   def test_spec
     assert_equal @a, @sf.spec
   end

data/test/rubygems/test_gem_specification.rb

@@ -226,7 +226,7 @@ end
             util_spec 'b', '2.0'
     c,  _ = util_spec 'c', '1.0', 'b' => '= 2.0'
 
-    e = assert_raises Gem::LoadError do
+    e = assert_raises Gem::ConflictError do
       assert_activate nil, a, c, "b"
     end
 
@@ -1232,14 +1232,11 @@ dependencies: []
     FileUtils.chmod 0555, @ext.base_dir
     FileUtils.chmod 0555, File.join(@ext.base_dir, 'extensions')
 
-    assert_raises Errno::EACCES do
-      @ext.build_extensions
-    end
+    @ext.build_extensions
+    refute_path_exists @ext.extension_dir
   ensure
-    unless Gem.win_platform? then
-      FileUtils.chmod 0755, File.join(@ext.base_dir, 'extensions')
-      FileUtils.chmod 0755, @ext.base_dir
-    end
+    FileUtils.chmod 0755, File.join(@ext.base_dir, 'extensions')
+    FileUtils.chmod 0755, @ext.base_dir
   end
 
   def test_build_extensions_no_extensions_dir_unwritable
@@ -1332,22 +1329,14 @@ dependencies: []
   def test_contains_requirable_file_eh_extension
     ext_spec
 
-    extconf_rb = File.join @ext.gem_dir, @ext.extensions.first
-    FileUtils.mkdir_p File.dirname extconf_rb
-
-    open extconf_rb, 'w' do |f|
-      f.write <<-'RUBY'
-        open 'Makefile', 'w' do |f|
-          f.puts "clean:\n\techo cleaned"
-          f.puts "default:\n\techo built"
-          f.puts "install:\n\techo installed"
-        end
-      RUBY
+    _, err = capture_io do
+      refute @ext.contains_requirable_file? 'nonexistent'
     end
 
-    refute @ext.contains_requirable_file? 'nonexistent'
+    expected = "Ignoring ext-1 because its extensions are not built.  " +
+               "Try: gem pristine ext-1\n"
 
-    assert_path_exists @ext.extension_dir
+    assert_equal expected, err
   end
 
   def test_date
@@ -1792,13 +1781,33 @@ dependencies: []
     enable_shared 'no' do
       ext_spec
 
-      @ext.require_path = 'lib'
+      @ext.require_paths = 'lib'
 
-      ext_install_dir = Pathname(@ext.extension_dir)
-      full_gem_path = Pathname(@ext.full_gem_path)
-      relative_install_dir = ext_install_dir.relative_path_from full_gem_path
+      assert_equal [@ext.extension_dir, 'lib'], @ext.require_paths
+    end
+  end
+
+  def test_require_paths_default_ext_dir_for
+    class << Gem
+      send :alias_method, :orig_default_ext_dir_for, :default_ext_dir_for
+    end
+
+    def Gem.default_ext_dir_for base_dir
+      '/foo'
+    end
+
+    enable_shared 'no' do
+      ext_spec
 
-      assert_equal [relative_install_dir.to_s, 'lib'], @ext.require_paths
+      @ext.require_paths = 'lib'
+
+      assert_equal ['/foo/ext-1', 'lib'], @ext.require_paths
+    end
+  ensure
+    class << Gem
+      send :remove_method, :default_ext_dir_for
+      send :alias_method,  :default_ext_dir_for, :orig_default_ext_dir_for
+      send :remove_method, :orig_default_ext_dir_for
     end
   end
 
@@ -1825,7 +1834,7 @@ dependencies: []
   def test_full_require_paths
     ext_spec
 
-    @ext.require_path = 'lib'
+    @ext.require_paths = 'lib'
 
     expected = [
       @ext.extension_dir,
@@ -2875,6 +2884,52 @@ end
     assert_equal @m1.to_ruby, valid_ruby_spec
   end
 
+  def test_missing_extensions_eh
+    ext_spec
+
+    assert @ext.missing_extensions?
+
+    extconf_rb = File.join @ext.gem_dir, @ext.extensions.first
+    FileUtils.mkdir_p File.dirname extconf_rb
+
+    open extconf_rb, 'w' do |f|
+      f.write <<-'RUBY'
+        open 'Makefile', 'w' do |f|
+          f.puts "clean:\n\techo clean"
+          f.puts "default:\n\techo built"
+          f.puts "install:\n\techo installed"
+        end
+      RUBY
+    end
+
+    @ext.build_extensions
+
+    refute @ext.missing_extensions?
+  end
+
+  def test_missing_extensions_eh_default_gem
+    spec = new_default_spec 'default', 1
+    spec.extensions << 'extconf.rb'
+
+    refute spec.missing_extensions?
+  end
+
+  def test_missing_extensions_eh_legacy
+    ext_spec
+
+    @ext.installed_by_version = v '2.2.0.preview.2'
+
+    assert @ext.missing_extensions?
+
+    @ext.installed_by_version = v '2.2.0.preview.1'
+
+    refute @ext.missing_extensions?
+  end
+
+  def test_missing_extensions_eh_none
+    refute @a1.missing_extensions?
+  end
+
   def test_find_by_name
     util_make_gems
     assert(Gem::Specification.find_by_name("a"))

data/test/rubygems/test_gem_stub_specification.rb

@@ -23,16 +23,11 @@ class TestStubSpecification < Gem::TestCase
   def test_initialize_extension
     stub = stub_with_extension
 
-    ext_install_dir = Pathname(stub.extension_dir)
-    full_gem_path = Pathname(stub.full_gem_path)
-    relative_install_dir = ext_install_dir.relative_path_from full_gem_path
-    relative_install_dir = relative_install_dir.to_s
-
-    assert_equal 'stub_e',                      stub.name
-    assert_equal v(2),                          stub.version
-    assert_equal Gem::Platform::RUBY,           stub.platform
-    assert_equal [relative_install_dir, 'lib'], stub.require_paths
-    assert_equal %w[ext/stub_e/extconf.rb],     stub.extensions
+    assert_equal 'stub_e',                    stub.name
+    assert_equal v(2),                        stub.version
+    assert_equal Gem::Platform::RUBY,         stub.platform
+    assert_equal [stub.extension_dir, 'lib'], stub.require_paths
+    assert_equal %w[ext/stub_e/extconf.rb],   stub.extensions
   end
 
   def test_initialize_missing_stubline
@@ -55,22 +50,14 @@ class TestStubSpecification < Gem::TestCase
 
   def test_contains_requirable_file_eh_extension
     stub_with_extension do |stub|
-      extconf_rb = File.join stub.gem_dir, stub.extensions.first
-      FileUtils.mkdir_p File.dirname extconf_rb
-
-      open extconf_rb, 'w' do |f|
-        f.write <<-'RUBY'
-          open 'Makefile', 'w' do |f|
-            f.puts "clean:\n\techo cleaned"
-            f.puts "default:\n\techo built"
-            f.puts "install:\n\techo installed"
-          end
-        RUBY
+      _, err = capture_io do
+        refute stub.contains_requirable_file? 'nonexistent'
       end
 
-      refute stub.contains_requirable_file? 'nonexistent'
+      expected = "Ignoring stub_e-2 because its extensions are not built.  " +
+                 "Try: gem pristine stub_e-2\n"
 
-      assert_path_exists stub.extension_dir
+      assert_equal expected, err
     end
   end
 
@@ -85,9 +72,60 @@ class TestStubSpecification < Gem::TestCase
     assert_equal expected, stub.full_require_paths
   end
 
+  def test_missing_extensions_eh
+    stub = stub_with_extension do |s|
+      extconf_rb = File.join s.gem_dir, s.extensions.first
+      FileUtils.mkdir_p File.dirname extconf_rb
+
+      open extconf_rb, 'w' do |f|
+        f.write <<-'RUBY'
+        open 'Makefile', 'w' do |f|
+          f.puts "clean:\n\techo clean"
+          f.puts "default:\n\techo built"
+          f.puts "install:\n\techo installed"
+        end
+        RUBY
+      end
+    end
+
+    assert stub.missing_extensions?
+
+    stub.build_extensions
+
+    refute stub.missing_extensions?
+  end
+
+  def test_missing_extensions_eh_default_gem
+    spec = new_default_spec 'default', 1
+    spec.extensions << 'extconf.rb'
+
+    open spec.loaded_from, 'w' do |io|
+      io.write spec.to_ruby_for_cache
+    end
+
+    default_spec = Gem::StubSpecification.new spec.loaded_from
+
+    refute default_spec.missing_extensions?
+  end
+
+  def test_missing_extensions_eh_none
+    refute @foo.missing_extensions?
+  end
+
   def test_to_spec
     assert @foo.to_spec.is_a?(Gem::Specification)
     assert_equal "foo", @foo.to_spec.name
+    refute @foo.to_spec.instance_variable_defined? :@ignored
+  end
+
+  def test_to_spec_missing_extensions
+    stub = stub_with_extension
+
+    capture_io do
+      stub.contains_requirable_file? 'nonexistent'
+    end
+
+    assert stub.to_spec.instance_variable_get :@ignored
   end
 
   def stub_with_extension