rubygems-update 2.4.8 → 2.5.0

data/lib/rubygems/stub_specification.rb

@@ -15,35 +15,34 @@ class Gem::StubSpecification < Gem::BasicSpecification
     end
 
   class StubLine # :nodoc: all
-    attr_reader :parts
+    attr_reader :name, :version, :platform, :require_paths
 
     def initialize(data)
-      @parts = data[PREFIX.length..-1].split(" ")
-    end
-
-    def name
-      @parts[0]
-    end
-
-    def version
-      Gem::Version.new @parts[1]
+      parts          = data[PREFIX.length..-1].split(" ")
+      @name          = parts[0].freeze
+      @version       = Gem::Version.new parts[1]
+      @platform      = Gem::Platform.new parts[2]
+      @require_paths = parts.drop(3).join(" ").split("\0")
     end
+  end
 
-    def platform
-      Gem::Platform.new @parts[2]
-    end
+  def self.default_gemspec_stub filename
+    new filename, true
+  end
 
-    def require_paths
-      @parts[3..-1].join(" ").split("\0")
-    end
+  def self.gemspec_stub filename
+    new filename, false
   end
 
-  def initialize(filename)
+  def initialize filename, default_gem
+    filename.untaint
+
     self.loaded_from = filename
     @data            = nil
     @extensions      = nil
     @name            = nil
     @spec            = nil
+    @default_gem     = default_gem
   end
 
   ##
@@ -57,6 +56,10 @@ class Gem::StubSpecification < Gem::BasicSpecification
     end
   end
 
+  def default_gem?
+    @default_gem
+  end
+
   def build_extensions # :nodoc:
     return if default_gem?
     return if extensions.empty?
@@ -72,18 +75,23 @@ class Gem::StubSpecification < Gem::BasicSpecification
     unless @data
       @extensions = []
 
-      open loaded_from, OPEN_MODE do |file|
-        begin
-          file.readline # discard encoding line
-          stubline = file.readline.chomp
-          if stubline.start_with?(PREFIX) then
-            @data = StubLine.new stubline
-
-            @extensions = $'.split "\0" if
-              /\A#{PREFIX}/ =~ file.readline.chomp
+      begin
+        saved_lineno = $.
+        open loaded_from, OPEN_MODE do |file|
+          begin
+            file.readline # discard encoding line
+            stubline = file.readline.chomp
+            if stubline.start_with?(PREFIX) then
+              @data = StubLine.new stubline
+
+              @extensions = $'.split "\0" if
+                /\A#{PREFIX}/ =~ file.readline.chomp
+            end
+          rescue EOFError
           end
-        rescue EOFError
         end
+      ensure
+        $. = saved_lineno
       end
     end
 
@@ -135,14 +143,14 @@ class Gem::StubSpecification < Gem::BasicSpecification
   # Name of the gem
 
   def name
-    @name ||= data.name
+    data.name
   end
 
   ##
   # Platform of the gem
 
   def platform
-    @platform ||= data.platform
+    data.platform
   end
 
   ##

data/lib/rubygems/test_case.rb

@@ -36,9 +36,7 @@ require 'shellwords'
 require 'tmpdir'
 require 'uri'
 require 'zlib'
-
-Gem.load_yaml
-
+require 'benchmark' # stdlib
 require 'rubygems/mock_gem_ui'
 
 module Gem
@@ -221,6 +219,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     @orig_gem_home   = ENV['GEM_HOME']
     @orig_gem_path   = ENV['GEM_PATH']
     @orig_gem_vendor = ENV['GEM_VENDOR']
+    @orig_gem_spec_cache = ENV['GEM_SPEC_CACHE']
+    @orig_rubygems_gemdeps = ENV['RUBYGEMS_GEMDEPS']
+    @orig_rubygems_host = ENV['RUBYGEMS_HOST']
 
     ENV['GEM_VENDOR'] = nil
 
@@ -265,13 +266,16 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     Gem.ensure_gem_subdirectories @gemhome
 
     @orig_LOAD_PATH = $LOAD_PATH.dup
-    $LOAD_PATH.map! { |s| File.expand_path(s).untaint }
+    $LOAD_PATH.map! { |s|
+      (expand_path = File.expand_path(s)) == s ? s : expand_path.untaint
+    }
 
     Dir.chdir @tempdir
 
     @orig_ENV_HOME = ENV['HOME']
     ENV['HOME'] = @userhome
     Gem.instance_variable_set :@user_home, nil
+    Gem.instance_variable_set :@gemdeps, nil
     Gem.send :remove_instance_variable, :@ruby_version if
       Gem.instance_variables.include? :@ruby_version
 
@@ -326,6 +330,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     end
 
     @marshal_version = "#{Marshal::MAJOR_VERSION}.#{Marshal::MINOR_VERSION}"
+    @orig_LOADED_FEATURES = $LOADED_FEATURES.dup
   end
 
   ##
@@ -334,6 +339,18 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
   def teardown
     $LOAD_PATH.replace @orig_LOAD_PATH if @orig_LOAD_PATH
+    if @orig_LOADED_FEATURES
+      if @orig_LOAD_PATH
+        paths = @orig_LOAD_PATH.map {|path| File.join(File.expand_path(path), "/")}
+        ($LOADED_FEATURES - @orig_LOADED_FEATURES).each do |feat|
+          unless paths.any? {|path| feat.start_with?(path)}
+            $LOADED_FEATURES.delete(feat)
+          end
+        end
+      else
+        $LOADED_FEATURES.replace @orig_LOADED_FEATURES
+      end
+    end
 
     if @orig_BASERUBY
       RbConfig::CONFIG['BASERUBY'] = @orig_BASERUBY
@@ -353,6 +370,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     ENV['GEM_HOME']   = @orig_gem_home
     ENV['GEM_PATH']   = @orig_gem_path
     ENV['GEM_VENDOR'] = @orig_gem_vendor
+    ENV['GEM_SPEC_CACHE'] = @orig_gem_spec_cache
+    ENV['RUBYGEMS_GEMDEPS'] = @orig_rubygems_gemdeps
+    ENV['RUBYGEMS_HOST'] = @orig_rubygems_host
 
     Gem.ruby = @orig_ruby if @orig_ruby
 
@@ -367,6 +387,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
     ENV['GEM_PRIVATE_KEY_PASSPHRASE'] = @orig_gem_private_key_passphrase
 
     Gem::Specification._clear_load_cache
+    Gem::Specification.unresolved_deps.clear
   end
 
   def common_installer_setup
@@ -482,7 +503,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       gem = File.join(@tempdir, File.basename(spec.cache_file)).untaint
     end
 
-    Gem::Installer.new(gem, options.merge({:wrappers => true})).install
+    Gem::Installer.at(gem, options.merge({:wrappers => true})).install
   end
 
   ##
@@ -497,8 +518,11 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   def uninstall_gem spec
     require 'rubygems/uninstaller'
 
-    Gem::Uninstaller.new(spec.name,
-                         :executables => true, :user_install => true).uninstall
+    Class.new(Gem::Uninstaller) {
+      def ask_if_ok spec
+        true
+      end
+    }.new(spec.name, :executables => true, :user_install => true).uninstall
   end
 
   ##
@@ -592,7 +616,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     spec.loaded_from = spec.loaded_from = written_path
 
-    Gem::Specification.add_spec spec.for_cache
+    Gem::Specification.reset
 
     return spec
   end
@@ -648,7 +672,10 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # Install the provided specs
 
   def install_specs(*specs)
-    Gem::Specification.add_specs(*specs)
+    specs.each do |spec|
+      Gem::Installer.for_spec(spec).install
+    end
+
     Gem.searcher = nil
   end
 
@@ -669,8 +696,9 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   # Install the provided default specs
 
   def install_default_specs(*specs)
-    install_specs(*specs)
     specs.each do |spec|
+      installer = Gem::Installer.for_spec(spec, :install_as_default => true)
+      installer.install
       Gem.register_default_spec(spec)
     end
   end
@@ -782,9 +810,7 @@ class Gem::TestCase < MiniTest::Unit::TestCase
       end
     end
 
-    spec.loaded_from = spec.spec_file
-
-    Gem::Specification.add_spec spec
+    Gem::Specification.reset
 
     return spec
   end
@@ -971,14 +997,13 @@ Also, a list:
   # Best used with +@all_gems+ from #util_setup_fake_fetcher.
 
   def util_setup_spec_fetcher(*specs)
-    specs -= Gem::Specification._all
-    Gem::Specification.add_specs(*specs)
+    all_specs = Gem::Specification.to_a + specs
+    Gem::Specification._resort! all_specs
 
     spec_fetcher = Gem::SpecFetcher.fetcher
 
-    prerelease, all = Gem::Specification.partition { |spec|
-      spec.version.prerelease?
-    }
+    prerelease, all = all_specs.partition { |spec| spec.version.prerelease?  }
+    latest = Gem::Specification._latest_specs all_specs
 
     spec_fetcher.specs[@uri] = []
     all.each do |spec|
@@ -986,7 +1011,7 @@ Also, a list:
     end
 
     spec_fetcher.latest_specs[@uri] = []
-    Gem::Specification.latest_specs.each do |spec|
+    latest.each do |spec|
       spec_fetcher.latest_specs[@uri] << spec.name_tuple
     end
 
@@ -1002,7 +1027,7 @@ Also, a list:
       specs = all.map { |spec| spec.name_tuple }
       s_zip = util_gzip Marshal.dump Gem::NameTuple.to_basic specs
 
-      latest_specs = Gem::Specification.latest_specs.map do |spec|
+      latest_specs = latest.map do |spec|
         spec.name_tuple
       end
 
@@ -1017,7 +1042,7 @@ Also, a list:
 
       v = Gem.marshal_version
 
-      Gem::Specification.each do |spec|
+      all_specs.each do |spec|
         path = "#{@gem_repo}quick/Marshal.#{v}/#{spec.original_name}.gemspec.rz"
         data = Marshal.dump spec
         data_deflate = Zlib::Deflate.deflate data
@@ -1102,7 +1127,7 @@ Also, a list:
   # other platforms, including Cygwin, it will return 'make'.
 
   def self.make_command
-    ENV["make"] || (vc_windows? ? 'nmake' : 'make')
+    ENV["make"] || ENV["MAKE"] || (vc_windows? ? 'nmake' : 'make')
   end
 
   ##
@@ -1111,7 +1136,7 @@ Also, a list:
   # other platforms, including Cygwin, it will return 'make'.
 
   def make_command
-    ENV["make"] || (vc_windows? ? 'nmake' : 'make')
+    ENV["make"] || ENV["MAKE"] || (vc_windows? ? 'nmake' : 'make')
   end
 
   ##
@@ -1194,8 +1219,8 @@ Also, a list:
   end
 
   @@ruby = rubybin
-  @@good_rake = "#{rubybin} #{File.expand_path('../../../test/rubygems/good_rake.rb', __FILE__)}"
-  @@bad_rake = "#{rubybin} #{File.expand_path('../../../test/rubygems/bad_rake.rb', __FILE__)}"
+  @@good_rake = "#{rubybin} \"#{File.expand_path('../../../test/rubygems/good_rake.rb', __FILE__)}\""
+  @@bad_rake = "#{rubybin} \"#{File.expand_path('../../../test/rubygems/bad_rake.rb', __FILE__)}\""
 
   ##
   # Construct a new Gem::Dependency.
@@ -1433,7 +1458,10 @@ begin
 rescue Gem::LoadError
 end
 
-require 'rake/packagetask'
+begin
+  require 'rake/packagetask'
+rescue LoadError
+end
 
 begin
   gem 'rdoc'
@@ -1441,7 +1469,16 @@ begin
 rescue LoadError, Gem::LoadError
 end
 
+begin
+  gem 'builder'
+  require 'builder/xchar'
+rescue LoadError, Gem::LoadError
+end
+
 require 'rubygems/test_utilities'
-ENV['GEM_HOME'] = Dir.mktmpdir "home"
-ENV['GEM_PATH'] = Dir.mktmpdir "path"
+tmpdirs = []
+tmpdirs << (ENV['GEM_HOME'] = Dir.mktmpdir("home"))
+tmpdirs << (ENV['GEM_PATH'] = Dir.mktmpdir("path"))
+pid = $$
+END {tmpdirs.each {|dir| Dir.rmdir(dir)} if $$ == pid}
 Gem.clear_paths

data/lib/rubygems/test_utilities.rb

@@ -186,7 +186,6 @@ end
 #     f.gem  'a', 1
 #     f.spec 'a', 2
 #     f.gem  'b', 1' 'a' => '~> 1.0'
-#     f.clear
 #   end
 #
 # The above declaration creates two gems, a-1 and b-1, with a dependency from
@@ -214,18 +213,11 @@ class Gem::TestCase::SpecFetcherSetup
     @repository = repository
 
     @gems       = {}
+    @downloaded = []
     @installed  = []
     @operations = []
   end
 
-  ##
-  # Removes any created gems or specifications from Gem.dir (the default
-  # install location).
-
-  def clear
-    @operations << [:clear]
-  end
-
   ##
   # Returns a Hash of created Specification full names and the corresponding
   # Specification.
@@ -254,9 +246,6 @@ class Gem::TestCase::SpecFetcherSetup
   def execute_operations # :nodoc:
     @operations.each do |operation, *arguments|
       case operation
-      when :clear then
-        @test.util_clear_gems
-        @installed.clear
       when :gem then
         spec, gem = @test.util_gem(*arguments, &arguments.pop)
 
@@ -264,6 +253,11 @@ class Gem::TestCase::SpecFetcherSetup
 
         @gems[spec] = gem
         @installed << spec
+      when :download then
+        spec, gem = @test.util_gem(*arguments, &arguments.pop)
+
+        @gems[spec] = gem
+        @downloaded << spec
       when :spec then
         spec = @test.util_spec(*arguments, &arguments.pop)
 
@@ -286,6 +280,17 @@ class Gem::TestCase::SpecFetcherSetup
     @operations << [:gem, name, version, dependencies, block]
   end
 
+  ##
+  # Creates a gem with +name+, +version+ and +deps+.  The created gem is
+  # downloaded in to the cache directory but is not installed
+  #
+  # The specification will be yielded before gem creation for customization,
+  # but only the block or the dependencies may be set, not both.
+
+  def download name, version, dependencies = nil, &block
+    @operations << [:download, name, version, dependencies, block]
+  end
+
   ##
   # Creates a legacy platform spec with the name 'pl' and version 1
 
@@ -312,17 +317,12 @@ class Gem::TestCase::SpecFetcherSetup
       gem_repo, @test.gem_repo = @test.gem_repo, @repository
       @test.uri = URI @repository
 
-      @test.util_setup_spec_fetcher(*@gems.keys)
+      @test.util_setup_spec_fetcher(*@downloaded)
     ensure
       @test.gem_repo = gem_repo
       @test.uri = URI gem_repo
     end
 
-    # This works around util_setup_spec_fetcher adding all created gems to the
-    # installed set.
-    Gem::Specification.reset
-    Gem::Specification.add_specs(*@installed)
-
     @gems.each do |spec, gem|
       next unless gem
 

data/lib/rubygems/text.rb

@@ -43,11 +43,9 @@ module Gem::Text
     t = str2
     n = s.length
     m = t.length
-    max = n/2
 
     return m if (0 == n)
     return n if (0 == m)
-    return n if (n - m).abs > max
 
     d = (0..m).to_a
     x = nil