rubygems-update 2.4.8 → 2.5.0

data/lib/rubygems/basic_specification.rb

@@ -22,13 +22,17 @@ class Gem::BasicSpecification
   ##
   # The path this gemspec was loaded from.  This attribute is not persisted.
 
-  attr_reader :loaded_from
+  attr_accessor :loaded_from
 
   ##
   # Allows correct activation of git: and path: gems.
 
   attr_writer :full_gem_path # :nodoc:
 
+  def initialize
+    internal_init
+  end
+
   def self.default_specifications_dir
     File.join(Gem.default_dir, "specifications", "default")
   end
@@ -141,7 +145,7 @@ class Gem::BasicSpecification
     @full_require_paths ||=
     begin
       full_paths = raw_require_paths.map do |path|
-        File.join full_gem_path, path
+        File.join full_gem_path, path.untaint
       end
 
       full_paths << extension_dir unless @extensions.nil? || @extensions.empty?
@@ -189,13 +193,7 @@ class Gem::BasicSpecification
     @gems_dir ||= File.join(loaded_from && base_dir || Gem.dir, "gems")
   end
 
-  ##
-  # Set the path the Specification was loaded from. +path+ is converted to a
-  # String.
-
-  def loaded_from= path
-    @loaded_from   = path && path.to_s
-
+  def internal_init # :nodoc:
     @extension_dir = nil
     @extensions_dir = nil
     @full_gem_path         = nil
@@ -263,6 +261,30 @@ class Gem::BasicSpecification
     paths.uniq
   end
 
+  ##
+  # Return all files in this gem that match for +glob+.
+
+  def matches_for_glob glob # TODO: rename?
+    # TODO: do we need these?? Kill it
+    glob = File.join(self.lib_dirs_glob, glob)
+
+    Dir[glob].map { |f| f.untaint } # FIX our tests are broken, run w/ SAFE=1
+  end
+
+  ##
+  # Returns a string usable in Dir.glob to match all requirable paths
+  # for this spec.
+
+  def lib_dirs_glob
+    dirs = if self.require_paths.size > 1 then
+             "{#{self.require_paths.join(',')}}"
+           else
+             self.require_paths.first
+           end
+
+    "#{self.full_gem_path}/#{dirs}".untaint
+  end
+
   ##
   # Return a Gem::Specification from this gem
 

data/lib/rubygems/commands/dependency_command.rb

@@ -61,10 +61,16 @@ use with other commands.
     ss.map { |spec, _| spec }
   end
 
-  def fetch_specs dependency # :nodoc:
+  def fetch_specs name_pattern, dependency # :nodoc:
     specs = []
 
-    specs.concat dependency.matching_specs     if local?
+    if local?
+      specs.concat Gem::Specification.stubs.find_all { |spec|
+        name_pattern =~ spec.name and
+          dependency.requirement.satisfied_by? spec.version
+      }.map(&:to_spec)
+    end
+
     specs.concat fetch_remote_specs dependency if remote?
 
     ensure_specs specs
@@ -72,16 +78,7 @@ use with other commands.
     specs.uniq.sort
   end
 
-  def gem_dependency args, version, prerelease # :nodoc:
-    args << '' if args.empty?
-
-    pattern = if args.length == 1 and args.first =~ /\A\/(.*)\/(i)?\z/m then
-                flags = $2 ? Regexp::IGNORECASE : nil
-                Regexp.new $1, flags
-              else
-                /\A#{Regexp.union(*args)}/
-              end
-
+  def gem_dependency pattern, version, prerelease # :nodoc:
     dependency = Gem::Deprecate.skip_during {
       Gem::Dependency.new pattern, version
     }
@@ -121,10 +118,12 @@ use with other commands.
   def execute
     ensure_local_only_reverse_dependencies
 
+    pattern = name_pattern options[:args]
+
     dependency =
-      gem_dependency options[:args], options[:version], options[:prerelease]
+      gem_dependency pattern, options[:version], options[:prerelease]
 
-    specs = fetch_specs dependency
+    specs = fetch_specs pattern, dependency
 
     reverse = reverse_dependencies specs
 
@@ -203,5 +202,16 @@ use with other commands.
     result
   end
 
-end
+  private
 
+  def name_pattern args
+    args << '' if args.empty?
+
+    if args.length == 1 and args.first =~ /\A\/(.*)\/(i)?\z/m then
+      flags = $2 ? Regexp::IGNORECASE : nil
+      Regexp.new $1, flags
+    else
+      /\A#{Regexp.union(*args)}/
+    end
+  end
+end

data/lib/rubygems/commands/environment_command.rb

@@ -113,6 +113,8 @@ lib/rubygems/defaults/operating_system.rb
 
     out << "  - INSTALLATION DIRECTORY: #{Gem.dir}\n"
 
+    out << "  - USER INSTALLATION DIRECTORY: #{Gem.user_dir}\n"
+
     out << "  - RUBYGEMS PREFIX: #{Gem.prefix}\n" unless Gem.prefix.nil?
 
     out << "  - RUBY EXECUTABLE: #{Gem.ruby}\n"

data/lib/rubygems/commands/help_command.rb

@@ -370,15 +370,5 @@ platform.
     end
   end
 
-  def show_help # :nodoc:
-    command = @command_manager[options[:help]]
-    if command then
-      # help with provided command
-      command.invoke("--help")
-    else
-      alert_error "Unknown command #{options[:help]}.  Try 'gem help commands'"
-    end
-  end
-
 end
 

data/lib/rubygems/commands/install_command.rb

@@ -275,7 +275,7 @@ to write the specification by hand.  For example:
       gem = fetcher.download_to_cache dependency
     end
 
-    inst = Gem::Installer.new gem, options
+    inst = Gem::Installer.at gem, options
     inst.install
 
     require 'rubygems/dependency_installer'

data/lib/rubygems/commands/list_command.rb

@@ -33,7 +33,7 @@ To search for remote gems use the search command.
   end
 
   def usage # :nodoc:
-    "#{program_name} [STRING ...]"
+    "#{program_name} [REGEXP ...]"
   end
 
 end

data/lib/rubygems/commands/pristine_command.rb

@@ -21,6 +21,11 @@ class Gem::Commands::PristineCommand < Gem::Command
       options[:all] = value
     end
 
+    add_option('--skip=gem_name',
+               'used on --all, skip if name == gem_name') do |value, options|
+      options[:skip] = value
+    end
+
     add_option('--[no-]extensions',
                'Restore gems with extensions',
                'in addition to regular gems') do |value, options|
@@ -109,6 +114,11 @@ extensions will be restored.
         next
       end
 
+      if spec.name == options[:skip]
+        say "Skipped #{spec.full_name}, it was given through options"
+        next
+      end
+
       if spec.bundled_gem_in_old_ruby?
         say "Skipped #{spec.full_name}, it is bundled with old Ruby"
         next
@@ -146,7 +156,7 @@ extensions will be restored.
           install_defaults.to_s['--env-shebang']
         end
 
-      installer = Gem::Installer.new(gem,
+      installer = Gem::Installer.at(gem,
                                      :wrappers => true,
                                      :force => true,
                                      :install_dir => spec.base_dir,

data/lib/rubygems/commands/query_command.rb

@@ -227,7 +227,7 @@ is too hard to use.
 
     name_tuple, spec = detail_tuple
 
-    spec = spec.fetch_spec name_tuple unless Gem::Specification === spec
+    spec = spec.fetch_spec name_tuple if spec.respond_to? :fetch_spec
 
     entry << "\n"
 

data/lib/rubygems/commands/sources_command.rb

@@ -102,7 +102,7 @@ Do you want to add this insecure source?
 RubyGems fetches gems from the sources you have configured (stored in your
 ~/.gemrc).
 
-The default source is https://rubygems.org, but you may have older sources
+The default source is https://rubygems.org, but you may have other sources
 configured.  This guide will help you update your sources or configure
 yourself to use your own gem server.
 

data/lib/rubygems/commands/update_command.rb

@@ -47,7 +47,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
   end
 
   def arguments # :nodoc:
-    "REGEXP        regexp to search for in gem name"
+    "GEMNAME       name of gem to update"
   end
 
   def defaults_str # :nodoc:
@@ -64,7 +64,7 @@ command to remove old versions.
   end
 
   def usage # :nodoc:
-    "#{program_name} REGEXP [REGEXP ...]"
+    "#{program_name} GEMNAME [GEMNAME ...]"
   end
 
   def check_latest_rubygems version # :nodoc:

data/lib/rubygems/config_file.rb

@@ -321,12 +321,12 @@ if you believe they were disclosed to a third party.
     @rubygems_api_key = api_key
   end
 
-  YAMLErrors = [ArgumentError]
-  YAMLErrors << Psych::SyntaxError if defined?(Psych::SyntaxError)
-
   def load_file(filename)
     Gem.load_yaml
 
+    yaml_errors = [ArgumentError]
+    yaml_errors << Psych::SyntaxError if defined?(Psych::SyntaxError)
+
     return {} unless filename and File.exist? filename
 
     begin
@@ -336,7 +336,7 @@ if you believe they were disclosed to a third party.
         return {}
       end
       return content
-    rescue *YAMLErrors => e
+    rescue *yaml_errors => e
       warn "Failed to load #{filename}, #{e}"
     rescue Errno::EACCES
       warn "Failed to load #{filename} due to permissions problem."

data/lib/rubygems/core_ext/kernel_require.rb

@@ -66,7 +66,7 @@ module Kernel
 
     begin
       RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(spec.to_fullpath(path) || path)
+      return gem_original_require(path)
     end if spec
 
     # Attempt to find +path+ in any unresolved gems...
@@ -105,7 +105,7 @@ module Kernel
 
       # Ok, now find a gem that has no conflicts, starting
       # at the highest version.
-      valid = found_specs.select { |s| s.conflicts.empty? }.last
+      valid = found_specs.reject { |s| s.has_conflicts? }.last
 
       unless valid then
         le = Gem::LoadError.new "unable to find a version of '#{names.first}' to activate"

data/lib/rubygems/dependency.rb

@@ -164,6 +164,10 @@ class Gem::Dependency
     @type ||= :runtime
   end
 
+  def runtime?
+    @type == :runtime || !@type
+  end
+
   def == other # :nodoc:
     Gem::Dependency === other &&
       self.name        == other.name &&
@@ -270,14 +274,13 @@ class Gem::Dependency
   end
 
   def matching_specs platform_only = false
-    matches = Gem::Specification.stubs.find_all { |spec|
-      self.name === spec.name and # TODO: == instead of ===
-        requirement.satisfied_by? spec.version
+    matches = Gem::Specification.stubs_for(name).find_all { |spec|
+      requirement.satisfied_by? spec.version
     }.map(&:to_spec)
 
     if platform_only
       matches.reject! { |spec|
-        not Gem::Platform.match spec.platform
+        spec.nil? || !Gem::Platform.match(spec.platform)
       }
     end
 
@@ -323,11 +326,11 @@ class Gem::Dependency
   def to_spec
     matches = self.to_specs
 
-    active = matches.find { |spec| spec.activated? }
+    active = matches.find { |spec| spec && spec.activated? }
 
     return active if active
 
-    matches.delete_if { |spec| spec.version.prerelease? } unless prerelease?
+    matches.delete_if { |spec| spec.nil? || spec.version.prerelease? } unless prerelease?
 
     matches.last
   end

data/lib/rubygems/dependency_list.rb

@@ -141,6 +141,9 @@ class Gem::DependencyList
   def ok_to_remove?(full_name, check_dev=true)
     gem_to_remove = find_name full_name
 
+    # If the state is inconsistent, at least don't crash
+    return true unless gem_to_remove
+
     siblings = @specs.find_all { |s|
       s.name == gem_to_remove.name &&
         s.full_name != gem_to_remove.full_name

data/lib/rubygems/ext/builder.rb

@@ -66,9 +66,11 @@ class Gem::Ext::Builder
       # TODO use Process.spawn when ruby 1.8 support is dropped.
       rubygems_gemdeps, ENV['RUBYGEMS_GEMDEPS'] = ENV['RUBYGEMS_GEMDEPS'], nil
       if verbose
+        puts("current directory: #{Dir.pwd}")
         puts(command)
         system(command)
       else
+        results << "current directory: #{Dir.pwd}"
         results << command
         results << `#{command} #{redirector}`
       end

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -35,7 +35,12 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         begin
           run cmd, results
         ensure
-          FileUtils.mv 'mkmf.log', dest_path if File.exist? 'mkmf.log'
+          if File.exist? 'mkmf.log'
+            results << "To see why this extension failed to compile, please check" \
+              " the mkmf.log which can be found here:\n"
+            results << "  " + File.join(dest_path, 'mkmf.log') + "\n"
+            FileUtils.mv 'mkmf.log', dest_path
+          end
           siteconf.unlink
         end
 

data/lib/rubygems/indexer.rb

@@ -93,40 +93,22 @@ class Gem::Indexer
   end
 
   ##
-  # Abbreviate the spec for downloading.  Abbreviated specs are only used for
-  # searching, downloading and related activities and do not need deployment
-  # specific information (e.g. list of files).  So we abbreviate the spec,
-  # making it much smaller for quicker downloads.
-  #--
-  # TODO move to Gem::Specification
-
-  def abbreviate(spec)
-    spec.files = []
-    spec.test_files = []
-    spec.rdoc_options = []
-    spec.extra_rdoc_files = []
-    spec.cert_chain = []
-    spec
-  end
-
-  ##
-  # Build various indicies
-
-  def build_indicies
-    Gem::Specification.dirs = []
-    Gem::Specification.add_specs(*map_gems_to_specs(gem_file_list))
+  # Build various indices
 
-    build_marshal_gemspecs
-    build_modern_indicies if @build_modern
+  def build_indices
+    specs = map_gems_to_specs gem_file_list
+    Gem::Specification._resort! specs
+    build_marshal_gemspecs specs
+    build_modern_indices specs if @build_modern
 
-    compress_indicies
+    compress_indices
   end
 
   ##
   # Builds Marshal quick index gemspecs.
 
-  def build_marshal_gemspecs
-    count = Gem::Specification.count { |s| not s.default_gem? }
+  def build_marshal_gemspecs specs
+    count = specs.count
     progress = ui.progress_reporter count,
                                     "Generating Marshal quick index gemspecs for #{count} gems",
                                     "Complete"
@@ -134,7 +116,7 @@ class Gem::Indexer
     files = []
 
     Gem.time 'Generated Marshal quick index gemspecs' do
-      Gem::Specification.each do |spec|
+      specs.each do |spec|
         next if spec.default_gem?
         spec_file_name = "#{spec.original_name}.gemspec.rz"
         marshal_name = File.join @quick_marshal_dir, spec_file_name
@@ -186,16 +168,14 @@ class Gem::Indexer
   end
 
   ##
-  # Builds indicies for RubyGems 1.2 and newer. Handles full, latest, prerelease
-
-  def build_modern_indicies
-    specs = Gem::Specification.reject { |s| s.default_gem? }
+  # Builds indices for RubyGems 1.2 and newer. Handles full, latest, prerelease
 
+  def build_modern_indices specs
     prerelease, released = specs.partition { |s|
       s.version.prerelease?
     }
     latest_specs =
-      Gem::Specification.latest_specs.reject { |s| s.default_gem? }
+      Gem::Specification._latest_specs specs
 
     build_modern_index(released.sort, @specs_index, 'specs')
     build_modern_index(latest_specs.sort, @latest_specs_index, 'latest specs')
@@ -221,18 +201,8 @@ class Gem::Indexer
         spec = Gem::Package.new(gemfile).spec
         spec.loaded_from = gemfile
 
-        # HACK: fuck this shit - borks all tests that use pl1
-        # if File.basename(gemfile, ".gem") != spec.original_name then
-        #   exp = spec.full_name
-        #   exp << " (#{spec.original_name})" if
-        #     spec.original_name != spec.full_name
-        #   msg = "Skipping misnamed gem: #{gemfile} should be named #{exp}"
-        #   alert_warning msg
-        #   next
-        # end
-
-        abbreviate spec
-        sanitize spec
+        spec.abbreviate
+        spec.sanitize
 
         spec
       rescue SignalException
@@ -248,14 +218,14 @@ class Gem::Indexer
   end
 
   ##
-  # Compresses indicies on disk
+  # Compresses indices on disk
   #--
   # All future files should be compressed using gzip, not deflate
 
-  def compress_indicies
-    say "Compressing indicies"
+  def compress_indices
+    say "Compressing indices"
 
-    Gem.time 'Compressed indicies' do
+    Gem.time 'Compressed indices' do
       if @build_modern then
         gzip @specs_index
         gzip @latest_specs_index
@@ -303,12 +273,12 @@ class Gem::Indexer
   end
 
   ##
-  # Builds and installs indicies.
+  # Builds and installs indices.
 
   def generate_index
     make_temp_directories
-    build_indicies
-    install_indicies
+    build_indices
+    install_indices
   rescue SignalException
   ensure
     FileUtils.rm_rf @directory
@@ -324,9 +294,9 @@ class Gem::Indexer
   end
 
   ##
-  # Install generated indicies into the destination directory.
+  # Install generated indices into the destination directory.
 
-  def install_indicies
+  def install_indices
     verbose = Gem.configuration.really_verbose
 
     say "Moving index into production dir #{@dest_directory}" if verbose
@@ -380,38 +350,6 @@ class Gem::Indexer
     end
   end
 
-  ##
-  # Sanitize the descriptive fields in the spec.  Sometimes non-ASCII
-  # characters will garble the site index.  Non-ASCII characters will
-  # be replaced by their XML entity equivalent.
-
-  def sanitize(spec)
-    spec.summary              = sanitize_string(spec.summary)
-    spec.description          = sanitize_string(spec.description)
-    spec.post_install_message = sanitize_string(spec.post_install_message)
-    spec.authors              = spec.authors.collect { |a| sanitize_string(a) }
-
-    spec
-  end
-
-  ##
-  # Sanitize a single string.
-
-  def sanitize_string(string)
-    return string unless string
-
-    # HACK the #to_s is in here because RSpec has an Array of Arrays of
-    # Strings for authors.  Need a way to disallow bad values on gemspec
-    # generation.  (Probably won't happen.)
-    string = string.to_s
-
-    begin
-      Builder::XChar.encode string
-    rescue NameError, NoMethodError
-      string.to_xs
-    end
-  end
-
   ##
   # Perform an in-place update of the repository from newly added gems.
 
@@ -435,10 +373,7 @@ class Gem::Indexer
     specs = map_gems_to_specs updated_gems
     prerelease, released = specs.partition { |s| s.version.prerelease? }
 
-    Gem::Specification.dirs = []
-    Gem::Specification.add_specs(*specs)
-
-    files = build_marshal_gemspecs
+    files = build_marshal_gemspecs specs
 
     Gem.time 'Updated indexes' do
       update_specs_index released, @dest_specs_index, @specs_index
@@ -448,7 +383,7 @@ class Gem::Indexer
                          @prerelease_specs_index)
     end
 
-    compress_indicies
+    compress_indices
 
     verbose = Gem.configuration.really_verbose