rubygems-update 2.4.4 → 2.4.5

data/test/rubygems/test_gem_remote_fetcher.rb

@@ -108,6 +108,7 @@ gems:
   end
 
   def teardown
+    @fetcher.close_all
     self.class.stop_servers
     super
     Gem.configuration[:http_proxy] = nil
@@ -134,6 +135,7 @@ gems:
 
   def test_fetch_size_bad_uri
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     e = assert_raises ArgumentError do
       fetcher.fetch_size 'gems.example.com/yaml'
@@ -144,6 +146,7 @@ gems:
 
   def test_fetch_size_socket_error
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
     def fetcher.request(uri, request_class, last_modified = nil)
       raise SocketError, "tarded"
     end
@@ -172,6 +175,7 @@ gems:
     dns.expect :getresource, target, [String, Object]
 
     fetch = Gem::RemoteFetcher.new nil, dns
+    @fetcher = fetcher
     assert_equal URI.parse("http://blah.com/foo"), fetch.api_endpoint(uri)
 
     target.verify
@@ -435,6 +439,7 @@ gems:
 
   def test_fetch_path_gzip
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     def fetcher.fetch_http(uri, mtime, head = nil)
       Gem.gzip 'foo'
@@ -445,6 +450,7 @@ gems:
 
   def test_fetch_path_gzip_unmodified
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     def fetcher.fetch_http(uri, mtime, head = nil)
       nil
@@ -455,6 +461,7 @@ gems:
 
   def test_fetch_path_io_error
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     def fetcher.fetch_http(*)
       raise EOFError
@@ -472,6 +479,7 @@ gems:
 
   def test_fetch_path_socket_error
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     def fetcher.fetch_http(uri, mtime, head = nil)
       raise SocketError
@@ -489,6 +497,7 @@ gems:
 
   def test_fetch_path_system_call_error
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     def fetcher.fetch_http(uri, mtime = nil, head = nil)
       raise Errno::ECONNREFUSED, 'connect(2)'
@@ -507,6 +516,7 @@ gems:
 
   def test_fetch_path_unmodified
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     def fetcher.fetch_http(uri, mtime, head = nil)
       nil
@@ -519,6 +529,7 @@ gems:
     use_ui @ui do
       ENV['http_proxy'] = 'http://fakeurl:12345'
       fetcher = Gem::RemoteFetcher.new :no_proxy
+      @fetcher = fetcher
       assert_data_from_server fetcher.fetch_path(@server_uri)
     end
   end
@@ -527,6 +538,7 @@ gems:
     use_ui @ui do
       ENV['http_proxy'] = @proxy_uri
       fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
   end
@@ -535,6 +547,7 @@ gems:
     use_ui @ui do
       ENV['HTTP_PROXY'] = @proxy_uri
       fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
       assert_data_from_proxy fetcher.fetch_path(@server_uri)
     end
   end
@@ -542,12 +555,14 @@ gems:
   def test_implicit_proxy_no_env
     use_ui @ui do
       fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
       assert_data_from_server fetcher.fetch_path(@server_uri)
     end
   end
 
   def test_fetch_http
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
     url = 'http://gems.example.com/redirect'
 
     def fetcher.request(uri, request_class, last_modified = nil)
@@ -571,6 +586,7 @@ gems:
 
   def test_fetch_http_redirects
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
     url = 'http://gems.example.com/redirect'
 
     def fetcher.request(uri, request_class, last_modified = nil)
@@ -589,6 +605,7 @@ gems:
 
   def test_fetch_s3
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
     url = 's3://testuser:testpass@my-bucket/gems/specs.4.8.gz'
     $fetched_uri = nil
 
@@ -613,6 +630,7 @@ gems:
 
   def test_fetch_s3_no_creds
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
     url = 's3://my-bucket/gems/specs.4.8.gz'
     e = assert_raises Gem::RemoteFetcher::FetchError do
       fetcher.fetch_s3 URI.parse(url)
@@ -626,6 +644,7 @@ gems:
       ENV["http_proxy"] = @proxy_uri
       ENV["no_proxy"] = URI::parse(@server_uri).host
       fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
       assert_data_from_server fetcher.fetch_path(@server_uri)
     end
   end
@@ -635,12 +654,14 @@ gems:
       ENV["http_proxy"] = @proxy_uri
       ENV["no_proxy"] = "fakeurl.com, #{URI::parse(@server_uri).host}"
       fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
       assert_data_from_server fetcher.fetch_path(@server_uri)
     end
   end
 
   def test_request_block
     fetcher = Gem::RemoteFetcher.new nil
+    @fetcher = fetcher
 
     assert_throws :block_called do
       fetcher.request URI('http://example'), Net::HTTP::Get do |req|
@@ -654,6 +675,7 @@ gems:
     use_ui @ui do
       self.class.enable_yaml = false
       fetcher = Gem::RemoteFetcher.new nil
+      @fetcher = fetcher
       assert_error { fetcher.size }
     end
   end
@@ -736,8 +758,10 @@ gems:
       end
       Gem.configuration = Gem::ConfigFile.new %W[--config-file #{temp_conf}]
     end
-    yield Gem::RemoteFetcher.new
+    fetcher = Gem::RemoteFetcher.new
+    yield fetcher
   ensure
+    fetcher.close_all
     Gem.configuration = nil
   end
 

data/test/rubygems/test_gem_request_set_lockfile.rb

@@ -303,6 +303,34 @@ DEPENDENCIES
     assert_equal expected, @set.dependencies
   end
 
+  def test_parse_DEPENDENCIES_git_version
+    write_lockfile <<-LOCKFILE
+GIT
+  remote: git://github.com/progrium/ruby-jwt.git
+  revision: 8d74770c6cd92ea234b428b5d0c1f18306a4f41c
+  specs:
+    jwt (1.1)
+
+GEM
+  remote: http://gems.example/
+  specs:
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  jwt (= 1.1)!
+    LOCKFILE
+
+    @lockfile.parse
+
+    expected = [
+      dep('jwt', '= 1.1'),
+    ]
+
+    assert_equal expected, @set.dependencies
+  end
+
   def test_parse_GEM
     write_lockfile <<-LOCKFILE
 GEM

data/test/rubygems/test_gem_resolver_api_specification.rb

@@ -7,7 +7,7 @@ class TestGemResolverAPISpecification < Gem::TestCase
     data = {
       :name     => 'rails',
       :number   => '3.0.3',
-      :platform => 'ruby',
+      :platform => Gem::Platform.local.to_s,
       :dependencies => [
         ['bundler',  '~> 1.0'],
         ['railties', '= 3.0.3'],
@@ -18,7 +18,7 @@ class TestGemResolverAPISpecification < Gem::TestCase
 
     assert_equal 'rails',                   spec.name
     assert_equal Gem::Version.new('3.0.3'), spec.version
-    assert_equal Gem::Platform::RUBY,       spec.platform
+    assert_equal Gem::Platform.local,       spec.platform
 
     expected = [
       Gem::Dependency.new('bundler',  '~> 1.0'),

data/test/rubygems/test_gem_resolver_installer_set.rb

@@ -189,6 +189,20 @@ class TestGemResolverInstallerSet < Gem::TestCase
     assert_equal specs["a-2-#{Gem::Platform.local}"].full_name, spec.full_name
   end
 
+  def test_prefetch
+    set = Gem::Resolver::InstallerSet.new :remote
+    def (set.remote_set).prefetch(_)
+      raise "called"
+    end
+    assert_raises(RuntimeError){ set.prefetch(nil) }
+
+    set = Gem::Resolver::InstallerSet.new :local
+    def (set.remote_set).prefetch(_)
+      raise "called"
+    end
+    assert_equal nil, set.prefetch(nil)
+  end
+
   def test_prerelease_equals
     set = Gem::Resolver::InstallerSet.new :remote
 

data/test/rubygems/test_gem_source.rb

@@ -21,6 +21,20 @@ class TestGemSource < Gem::TestCase
     @source = Gem::Source.new(@gem_repo)
   end
 
+  def test_initialize_invalid_uri
+    assert_raises URI::InvalidURIError do
+      Gem::Source.new 'git@example:a.git'
+    end
+  end
+
+  def test_initialize_git
+    repository = 'git@example:a.git'
+
+    source = Gem::Source::Git.new 'a', repository, 'master', false
+
+    assert_equal repository, source.uri
+  end
+
   def test_api_uri
     assert_equal @source.api_uri, @source.uri
   end

data/test/rubygems/test_gem_specification.rb

@@ -1353,7 +1353,7 @@ dependencies: []
     end
 
     expected = "Ignoring ext-1 because its extensions are not built.  " +
-               "Try: gem pristine ext-1\n"
+               "Try: gem pristine ext --version 1\n"
 
     assert_equal expected, err
   end
@@ -1863,6 +1863,43 @@ dependencies: []
     assert_equal expected, @ext.full_require_paths
   end
 
+  def test_to_fullpath
+    ext_spec
+
+    @ext.require_paths = 'lib'
+
+    dir = File.join(@gemhome, 'gems', @ext.original_name, 'lib')
+    expected_rb = File.join(dir, 'code.rb')
+    FileUtils.mkdir_p dir
+    FileUtils.touch expected_rb
+
+    dir = @ext.extension_dir
+    ext = RbConfig::CONFIG["DLEXT"]
+    expected_so = File.join(dir, "ext.#{ext}")
+    FileUtils.mkdir_p dir
+    FileUtils.touch expected_so
+
+    assert_nil @ext.to_fullpath("code")
+    assert_nil @ext.to_fullpath("code.rb")
+    assert_nil @ext.to_fullpath("code.#{ext}")
+
+    assert_nil @ext.to_fullpath("ext")
+    assert_nil @ext.to_fullpath("ext.rb")
+    assert_nil @ext.to_fullpath("ext.#{ext}")
+
+    @ext.activate
+
+    assert_equal expected_rb, @ext.to_fullpath("code")
+    assert_equal expected_rb, @ext.to_fullpath("code.rb")
+    assert_nil @ext.to_fullpath("code.#{ext}")
+
+    assert_equal expected_so, @ext.to_fullpath("ext")
+    assert_nil @ext.to_fullpath("ext.rb")
+    assert_equal expected_so, @ext.to_fullpath("ext.#{ext}")
+
+    assert_nil @ext.to_fullpath("notexist")
+  end
+
   def test_require_already_activated
     save_loaded_features do
       a1 = new_spec "a", "1", nil, "lib/d.rb"
@@ -3010,6 +3047,18 @@ end
     assert_equal ["default-2.0.0.0"], Gem::Specification.map(&:full_name)
   end
 
+  def test_detect_bundled_gem_in_old_ruby
+    util_set_RUBY_VERSION '1.9.3', 551
+
+    spec = new_spec 'bigdecimal', '1.1.0' do |s|
+      s.summary = "This bigdecimal is bundled with Ruby"
+    end
+
+    assert spec.bundled_gem_in_old_ruby?
+  ensure
+    util_restore_RUBY_VERSION
+  end
+
   def util_setup_deps
     @gem = util_spec "awesome", "1.0" do |awesome|
       awesome.add_runtime_dependency "bonobo", []

data/test/rubygems/test_gem_stub_specification.rb

@@ -55,7 +55,7 @@ class TestStubSpecification < Gem::TestCase
       end
 
       expected = "Ignoring stub_e-2 because its extensions are not built.  " +
-                 "Try: gem pristine stub_e-2\n"
+                 "Try: gem pristine stub_e --version 2\n"
 
       assert_equal expected, err
     end
@@ -122,6 +122,14 @@ class TestStubSpecification < Gem::TestCase
     assert_same real_foo, @foo.to_spec
   end
 
+  def test_to_spec_with_other_specs_loaded_does_not_warn
+    real_foo = util_spec @foo.name, @foo.version
+    real_foo.activate
+    bar = Gem::StubSpecification.new BAR
+    refute_predicate Gem.loaded_specs, :empty?
+    assert bar.to_spec
+  end
+
   def test_to_spec_activated
     assert @foo.to_spec.is_a?(Gem::Specification)
     assert_equal "foo", @foo.to_spec.name

data/test/rubygems/test_gem_text.rb

@@ -35,6 +35,22 @@ Without the wrapping, the text might not look good in the RSS feed.
     assert_equal expected, format_text(text, 78)
   end
 
+  def test_min3
+    assert_equal 1, min3(1, 1, 1)
+    assert_equal 1, min3(1, 1, 2)
+    assert_equal 1, min3(1, 2, 1)
+    assert_equal 1, min3(2, 1, 1)
+    assert_equal 1, min3(1, 2, 2)
+    assert_equal 1, min3(2, 1, 2)
+    assert_equal 1, min3(2, 2, 1)
+    assert_equal 1, min3(1, 2, 3)
+    assert_equal 1, min3(1, 3, 2)
+    assert_equal 1, min3(2, 1, 3)
+    assert_equal 1, min3(2, 3, 1)
+    assert_equal 1, min3(3, 1, 2)
+    assert_equal 1, min3(3, 2, 1)
+  end
+
   def test_levenshtein_distance_add
     assert_equal 2, levenshtein_distance("zentest", "zntst")
     assert_equal 2, levenshtein_distance("zntst", "zentest")

data/test/rubygems/test_kernel.rb

@@ -21,6 +21,30 @@ class TestKernel < Gem::TestCase
     assert $:.any? { |p| %r{a-1/lib} =~ p }
   end
 
+  def test_gem_default
+    assert gem('a', '>= 0')
+
+    assert_equal @a2, Gem.loaded_specs['a']
+  end
+
+  def test_gem_default_re_gem
+    assert gem('a', '=1')
+
+    refute gem('a', '>= 0')
+
+    assert_equal @a1, Gem.loaded_specs['a']
+  end
+
+  def test_gem_re_gem_mismatch
+    assert gem('a', '=1')
+
+    assert_raises Gem::LoadError do
+      gem('a', '= 2')
+    end
+
+    assert_equal @a1, Gem.loaded_specs['a']
+  end
+
   def test_gem_redundant
     assert gem('a', '= 1'), "Should load"
     refute gem('a', '= 1'), "Should not load"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubygems-update
 version: !ruby/object:Gem::Version
-  version: 2.4.4
+  version: 2.4.5
 platform: ruby
 authors:
 - Jim Weirich
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-14 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -141,6 +141,7 @@ executables:
 - update_rubygems
 extensions: []
 extra_rdoc_files:
+- CONTRIBUTING.rdoc
 - CVE-2013-4287.txt
 - CVE-2013-4363.txt
 - History.txt
@@ -154,7 +155,7 @@ files:
 - ".autotest"
 - ".document"
 - ".gemtest"
-- CONTRIBUTING
+- CONTRIBUTING.rdoc
 - CVE-2013-4287.txt
 - CVE-2013-4363.txt
 - History.txt