rubygems-update 2.4.1 → 2.4.2

data/lib/rubygems/request_set/lockfile.rb

@@ -168,8 +168,12 @@ class Gem::RequestSet::Lockfile
     dest = File.expand_path(dest)
     base = File.expand_path(base)
 
-    if dest.index(base) == 0
-      return dest[base.size+1..-1]
+    if dest.index(base) == 0 then
+      offset = dest[base.size+1..-1]
+
+      return '.' unless offset
+
+      offset
     else
       dest
     end
@@ -387,6 +391,8 @@ class Gem::RequestSet::Lockfile
     skip :newline
 
     set = Gem::Resolver::GitSet.new
+    set.root_dir = @set.install_dir
+
     last_spec = nil
 
     while not @tokens.empty? and :text == peek.first do
@@ -448,7 +454,7 @@ class Gem::RequestSet::Lockfile
         else
           dependency = parse_dependency name, data
 
-          last_spec.spec.dependencies << dependency
+          last_spec.dependencies << dependency
         end
 
         get :r_paren
@@ -477,7 +483,7 @@ class Gem::RequestSet::Lockfile
   # the first token of the requirements and returns a Gem::Dependency object.
 
   def parse_dependency name, op # :nodoc:
-    return Gem::Dependency.new name unless peek[0] == :text
+    return Gem::Dependency.new name, op unless peek[0] == :text
 
     _, version, = get :text
 
@@ -620,8 +626,10 @@ class Gem::RequestSet::Lockfile
   # Writes the lock file alongside the gem dependencies file
 
   def write
+    content = to_s
+
     open "#{@gem_deps_file}.lock", 'w' do |io|
-      io.write to_s
+      io.write content
     end
   end
 

data/lib/rubygems/resolver.rb

@@ -210,8 +210,9 @@ class Gem::Resolver
 
     if (skip_dep_gems = skip_gems[dependency.name]) && !skip_dep_gems.empty?
       matching = all.select do |api_spec|
-        skip_dep_gems.any?{|s| api_spec.version == s.version}
+        skip_dep_gems.any? { |s| api_spec.version == s.version }
       end
+
       all = matching unless matching.empty?
     end
 

data/lib/rubygems/resolver/composed_set.rb

@@ -21,6 +21,18 @@ class Gem::Resolver::ComposedSet < Gem::Resolver::Set
     @sets = sets
   end
 
+  ##
+  # When +allow_prerelease+ is set to +true+ prereleases gems are allowed to
+  # match dependencies.
+
+  def prerelease= allow_prerelease
+    super
+
+    sets.each do |set|
+      set.prerelease = allow_prerelease
+    end
+  end
+
   ##
   # Sets the remote network access for all composed sets.
 

data/lib/rubygems/resolver/conflict.rb

@@ -83,8 +83,8 @@ class Gem::Resolver::Conflict
 
     explanation % [
       activated, requirement,
-      request_path(@activated).reverse.join(" depends on\n    "),
-      request_path(@failed_dep).reverse.join(" depends on\n    "),
+      request_path(@activated).reverse.join(", depends on\n    "),
+      request_path(@failed_dep).reverse.join(", depends on\n    "),
       matching,
     ]
   end

data/lib/rubygems/resolver/dependency_request.rb

@@ -47,8 +47,8 @@ class Gem::Resolver::DependencyRequest
   # NOTE:  #match? only matches prerelease versions when #dependency is a
   # prerelease dependency.
 
-  def match? spec
-    @dependency.match? spec
+  def match? spec, allow_prerelease = false
+    @dependency.match? spec, nil, allow_prerelease
   end
 
   ##

data/lib/rubygems/resolver/index_set.rb

@@ -43,7 +43,7 @@ class Gem::Resolver::IndexSet < Gem::Resolver::Set
     name = req.dependency.name
 
     @all[name].each do |uri, n|
-      if req.dependency.match? n then
+      if req.match? n, @prerelease then
         res << Gem::Resolver::IndexSpecification.new(
           self, n.name, n.version, uri, n.platform)
       end

data/lib/rubygems/resolver/installer_set.rb

@@ -157,6 +157,12 @@ class Gem::Resolver::InstallerSet < Gem::Resolver::Set
     @remote_set.prefetch(reqs)
   end
 
+  def prerelease= allow_prerelease
+    super
+
+    @remote_set.prerelease = allow_prerelease
+  end
+
   def inspect # :nodoc:
     always_install = @always_install.map { |s| s.full_name }
 

data/lib/rubygems/resolver/lock_specification.rb

@@ -67,6 +67,10 @@ class Gem::Resolver::LockSpecification < Gem::Resolver::Specification
   # A specification constructed from the lockfile is returned
 
   def spec
+    @spec ||= Gem::Specification.find { |spec|
+      spec.name == @name and spec.version == @version
+    }
+
     @spec ||= Gem::Specification.new do |s|
       s.name     = @name
       s.version  = @version

data/lib/rubygems/resolver/set.rb

@@ -14,9 +14,15 @@ class Gem::Resolver::Set
 
   attr_accessor :errors
 
+  ##
+  # When true, allows matching of requests to prerelease gems.
+
+  attr_accessor :prerelease
+
   def initialize # :nodoc:
-    @remote = true
-    @errors = []
+    @prerelease = false
+    @remote     = true
+    @errors     = []
   end
 
   ##

data/lib/rubygems/resolver/vendor_set.rb

@@ -43,6 +43,8 @@ class Gem::Resolver::VendorSet < Gem::Resolver::Set
 
     @specs[spec.name]  = spec
     @directories[spec] = directory
+
+    spec
   end
 
   ##

data/lib/rubygems/source.rb

@@ -78,6 +78,8 @@ class Gem::Source
   # Returns a Set that can fetch specifications from this source.
 
   def dependency_resolver_set # :nodoc:
+    return Gem::Resolver::IndexSet.new self if 'file' == api_uri.scheme
+
     bundler_api_uri = api_uri + './api/v1/dependencies'
 
     begin

data/lib/rubygems/source/git.rb

@@ -51,7 +51,7 @@ class Gem::Source::Git < Gem::Source
   # will be checked out when the gem is installed.
 
   def initialize name, repository, reference, submodules = false
-    super(nil)
+    super repository
 
     @name            = name
     @repository      = repository
@@ -178,9 +178,17 @@ class Gem::Source::Git < Gem::Source
   # Converts the git reference for the repository into a commit hash.
 
   def rev_parse # :nodoc:
+    hash = nil
+
     Dir.chdir repo_cache_dir do
-      Gem::Util.popen(@git, 'rev-parse', @reference).strip
+      hash = Gem::Util.popen(@git, 'rev-parse', @reference).strip
     end
+
+    raise Gem::Exception,
+          "unable to find reference #{@reference} in #{@repository}" unless
+            $?.success?
+
+    hash
   end
 
   ##

data/lib/rubygems/specification.rb

@@ -1421,7 +1421,10 @@ class Gem::Specification < Gem::BasicSpecification
 
   def build_args
     if File.exist? build_info_file
-      File.readlines(build_info_file).map { |x| x.strip }
+      build_info = File.readlines build_info_file
+      build_info = build_info.map { |x| x.strip }
+      build_info.delete ""
+      build_info
     else
       []
     end
@@ -1449,11 +1452,13 @@ class Gem::Specification < Gem::BasicSpecification
       require 'rubygems/ext'
       require 'rubygems/user_interaction'
 
-      Gem::DefaultUserInteraction.use_ui Gem::SilentUI.new do
+      ui = Gem::SilentUI.new
+      Gem::DefaultUserInteraction.use_ui ui do
         builder = Gem::Ext::Builder.new self
         builder.build_extensions
       end
     ensure
+      ui.close if ui
       Gem::Specification.unresolved_deps.replace unresolved_deps
     end
   end
@@ -2653,7 +2658,8 @@ duplicate dependency on #{dep}, (#{prev.requirement}) use:
         dep.requirement.requirements.any? do |op, version|
           op == '~>' and
             not version.prerelease? and
-            version.segments.length > 2
+            version.segments.length > 2 and
+            version.segments.first != 0
         end
 
       if overly_strict then

data/lib/rubygems/stub_specification.rb

@@ -154,8 +154,13 @@ class Gem::StubSpecification < Gem::BasicSpecification
   # The full Gem::Specification for this gem, loaded from evalling its gemspec
 
   def to_spec
+    @spec ||= Gem.loaded_specs.values.find { |spec|
+      spec.name == @name and spec.version == @version
+    }
+
     @spec ||= Gem::Specification.load(loaded_from)
     @spec.ignored = @ignored if instance_variable_defined? :@ignored
+
     @spec
   end
 

data/lib/rubygems/test_case.rb

@@ -1305,7 +1305,7 @@ Also, a list:
     # Finds all gems matching +dep+ in this set.
 
     def find_all(dep)
-      @specs.find_all { |s| dep.match? s }
+      @specs.find_all { |s| dep.match? s, @prerelease }
     end
 
     ##

data/lib/rubygems/test_utilities.rb

@@ -38,6 +38,8 @@ class Gem::FakeFetcher
   end
 
   def find_data(path)
+    return File.read path.path if URI === path and 'file' == path.scheme
+
     if URI === path and "URI::#{path.scheme.upcase}" != path.class.name then
       raise ArgumentError,
         "mismatch for scheme #{path.scheme} and class #{path.class}"

data/lib/rubygems/user_interaction.rb

@@ -386,9 +386,13 @@ class Gem::StreamUI
   # handlers that might have been defined.
 
   def terminate_interaction(status = 0)
+    close
     raise Gem::SystemExitException, status
   end
 
+  def close
+  end
+
   ##
   # Return a progress reporter object chosen from the current verbosity.
 
@@ -691,6 +695,12 @@ class Gem::SilentUI < Gem::StreamUI
     super reader, writer, writer, false
   end
 
+  def close
+    super
+    @ins.close
+    @outs.close
+  end
+
   def download_reporter(*args) # :nodoc:
     SilentDownloadReporter.new(@outs, *args)
   end

data/lib/rubygems/util.rb

@@ -66,15 +66,26 @@ module Gem::Util
     end
   end
 
+  NULL_DEVICE = defined?(IO::NULL) ? IO::NULL : Gem.win_platform? ? 'NUL' : '/dev/null'
+
   ##
   # Invokes system, but silences all output.
 
   def self.silent_system *command
+    opt = {:out => NULL_DEVICE, :err => [:child, :out]}
+    if Hash === command.last
+      opt.update(command.last)
+      cmds = command[0...-1]
+    else
+      cmds = command.dup
+    end
+    return system(*(cmds << opt))
+  rescue TypeError
     require 'thread'
 
     @silent_mutex ||= Mutex.new
 
-    null_device = Gem.win_platform? ? 'NUL' : '/dev/null'
+    null_device = NULL_DEVICE
 
     @silent_mutex.synchronize do
       begin
@@ -88,6 +99,8 @@ module Gem::Util
       ensure
         STDOUT.reopen stdout
         STDERR.reopen stderr
+        stdout.close
+        stderr.close
       end
     end
   end

data/test/rubygems/test_gem_commands_setup_command.rb

@@ -77,10 +77,10 @@ class TestGemCommandsSetupCommand < Gem::TestCase
 
   def test_show_release_notes
     @default_external = nil
-    capture_io do
-      @default_external, Encoding.default_external =
-        Encoding.default_external, Encoding::US_ASCII
-    end if Object.const_defined? :Encoding
+    if Object.const_defined? :Encoding
+      @default_external = @ui.outs.external_encoding
+      @ui.outs.set_encoding Encoding::US_ASCII
+    end
 
     @cmd.options[:previous_version] = Gem::Version.new '2.0.2'
 
@@ -127,11 +127,9 @@ class TestGemCommandsSetupCommand < Gem::TestCase
     output = @ui.output
     output.force_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
 
-    assert_equal expected, @ui.output
+    assert_equal expected, output
   ensure
-    capture_io do
-      Encoding.default_external = @default_external
-    end if @default_external
+    @ui.outs.set_encoding @default_external if @default_external
   end
 
 end

data/test/rubygems/test_gem_commands_uninstall_command.rb

@@ -256,7 +256,7 @@ class TestGemCommandsUninstallCommand < Gem::InstallerTestCase
 WARNING:  Use your OS package manager to uninstall vendor gems
     EXPECTED
 
-    assert_equal expected, @ui.error
+    assert_match expected, @ui.error
   end
 
   def test_handle_options_vendor_missing

data/test/rubygems/test_gem_commands_update_command.rb

@@ -485,6 +485,34 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
     assert_equal expected, @cmd.options
   end
 
+  def test_update_gem_prerelease
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', '1.a'
+      fetcher.gem  'a', '1.b'
+    end
+
+    @cmd.update_gem 'a', Gem::Requirement.new('= 1.b')
+
+    refute_empty @cmd.updated
+
+    assert @cmd.installer.instance_variable_get :@prerelease
+  end
+
+  def test_update_gem_unresolved_dependency
+    spec_fetcher do |fetcher|
+      fetcher.spec 'a', 1
+      fetcher.gem  'a', 2 do |s|
+        s.add_dependency 'b', '>= 2'
+      end
+
+      fetcher.spec 'b', 1
+    end
+
+    @cmd.update_gem 'a'
+
+    assert_empty @cmd.updated
+  end
+
   def test_update_rubygems_arguments
     @cmd.options[:system] = true
 

data/test/rubygems/test_gem_dependency.rb

@@ -153,6 +153,33 @@ class TestGemDependency < Gem::TestCase
     assert c_dep.match? c_tup
   end
 
+  def test_match_eh_allow_prerelease
+    a_dep = dep 'a'
+
+    a_tup = Gem::NameTuple.new 'a', 1
+    b_tup = Gem::NameTuple.new 'b', 2
+    c_tup = Gem::NameTuple.new 'c', '2.a'
+
+    assert a_dep.match? a_tup, nil, true
+    refute a_dep.match? b_tup, nil, true
+
+    b_dep = dep 'b', '>= 3'
+
+    refute b_dep.match? b_tup, nil, true
+
+    c_dep = dep 'c', '>= 1'
+
+    assert c_dep.match? c_tup, nil, true
+
+    c_dep = dep 'c'
+
+    assert c_dep.match? c_tup, nil, true
+
+    c_dep = dep 'c', '2.a'
+
+    assert c_dep.match? c_tup, nil, true
+  end
+
   def test_match_eh_specification
     a_dep = dep 'a'