rubygems-update 1.8.30 → 2.0.0.preview2

data/lib/rubygems/test_utilities.rb

@@ -24,11 +24,17 @@ class Gem::FakeFetcher
 
   attr_reader :data
   attr_reader :last_request
+  attr_reader :api_endpoints
   attr_accessor :paths
 
   def initialize
     @data = {}
     @paths = []
+    @api_endpoints = {}
+  end
+
+  def api_endpoint(uri)
+    @api_endpoints[uri] || uri
   end
 
   def find_data(path)
@@ -57,6 +63,15 @@ class Gem::FakeFetcher
     end
   end
 
+  def cache_update_path uri, path = nil
+    if data = fetch_path(uri)
+      open(path, 'wb') { |io| io.write data } if path
+      data
+    else
+      Gem.read_binary(path) if path
+    end
+  end
+
   # Thanks, FakeWeb!
   def open_uri_or_path(path)
     data = find_data(path)
@@ -98,7 +113,13 @@ class Gem::FakeFetcher
 
   def download spec, source_uri, install_dir = Gem.dir
     name = File.basename spec.cache_file
-    path = File.join install_dir, "cache", name
+    path = if Dir.pwd == install_dir then # see fetch_command
+             install_dir
+           else
+             File.join install_dir, "cache"
+           end
+
+    path = File.join path, name
 
     Gem.ensure_gem_subdirectories install_dir
 
@@ -114,14 +135,13 @@ class Gem::FakeFetcher
   end
 
   def download_to_cache dependency
-    found = Gem::SpecFetcher.fetcher.fetch dependency, true, true,
-                                           dependency.prerelease?
+    found, _ = Gem::SpecFetcher.fetcher.spec_for_dependency dependency
 
     return if found.empty?
 
-    spec, source_uri = found.first
+    spec, source = found.first
 
-    download spec, source_uri
+    download spec, source.uri.to_s
   end
 
 end

data/lib/rubygems/uninstaller.rb

@@ -7,7 +7,7 @@
 require 'fileutils'
 require 'rubygems'
 require 'rubygems/dependency_list'
-require 'rubygems/doc_manager'
+require 'rubygems/rdoc'
 require 'rubygems/user_interaction'
 
 ##
@@ -42,6 +42,7 @@ class Gem::Uninstaller
   # Constructs an uninstaller that will uninstall +gem+
 
   def initialize(gem, options = {})
+    # TODO document the valid options
     @gem               = gem
     @version           = options[:version] || Gem::Requirement.default
     @gem_home          = File.expand_path(options[:install_dir] || Gem.dir)
@@ -51,15 +52,19 @@ class Gem::Uninstaller
     @bin_dir           = options[:bin_dir]
     @format_executable = options[:format_executable]
 
+    # Indicate if development dependencies should be checked when
+    # uninstalling. (default: false)
+    #
+    @check_dev         = options[:check_dev]
+
+    if options[:force]
+      @force_all = true
+      @force_ignore = true
+    end
+
     # only add user directory if install_dir is not set
     @user_install = false
     @user_install = options[:user_install] unless options[:install_dir]
-
-    if @user_install then
-      Gem.use_paths Gem.user_dir, @gem_home
-    else
-      Gem.use_paths @gem_home
-    end
   end
 
   ##
@@ -69,10 +74,36 @@ class Gem::Uninstaller
   def uninstall
     list = Gem::Specification.find_all_by_name(@gem, @version)
 
+    default_specs, list = list.partition do |spec|
+      spec.default_gem?
+    end
+
+    list, other_repo_specs = list.partition do |spec|
+      @gem_home == spec.base_dir or
+      (@user_install and spec.base_dir == Gem.user_dir)
+    end
+
     if list.empty? then
-      raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
+      if other_repo_specs.empty?
+        if default_specs.empty?
+          raise Gem::InstallError, "gem #{@gem.inspect} is not installed"
+        else
+          message =
+            "gem #{@gem.inspect} cannot be uninstalled " +
+            "because it is a default gem"
+          raise Gem::InstallError, message
+        end
+      end
+
+      other_repos = other_repo_specs.map { |spec| spec.base_dir }.uniq
 
-    elsif list.size > 1 and @force_all then
+      message = ["#{@gem} is not installed in GEM_HOME, try:"]
+      message.concat other_repos.map { |repo|
+        "\tgem uninstall -i #{repo} #{@gem}"
+      }
+
+      raise Gem::InstallError, message.join("\n")
+    elsif @force_all then
       remove_all list
 
     elsif list.size > 1 then
@@ -127,12 +158,15 @@ class Gem::Uninstaller
   def remove_executables(spec)
     return if spec.nil? or spec.executables.empty?
 
+    executables = spec.executables.clone
+
+    # Leave any executables created by other installed versions
+    # of this gem installed.
+
     list = Gem::Specification.find_all { |s|
       s.name == spec.name && s.version != spec.version
     }
 
-    executables = spec.executables.clone
-
     list.each do |s|
       s.executables.each do |exe_name|
         executables.delete exe_name
@@ -152,9 +186,7 @@ class Gem::Uninstaller
                @force_executables
              end
 
-    unless remove then
-      say "Executables and scripts will remain installed."
-    else
+    if remove then
       bin_dir = @bin_dir || Gem.bindir(spec.base_dir)
 
       raise Gem::FilePermissionError, bin_dir unless File.writable? bin_dir
@@ -167,6 +199,8 @@ class Gem::Uninstaller
         FileUtils.rm_f exe_file
         FileUtils.rm_f "#{exe_file}.bat"
       end
+    else
+      say "Executables and scripts will remain installed."
     end
   end
 
@@ -220,7 +254,7 @@ class Gem::Uninstaller
 
     FileUtils.rm_rf gem
 
-    Gem::DocManager.new(spec).uninstall_doc
+    Gem::RDoc.new(spec).remove
 
     say "Successfully uninstalled #{spec.full_name}"
 
@@ -241,26 +275,34 @@ class Gem::Uninstaller
     return true if @force_ignore
 
     deplist = Gem::DependencyList.from_specs
-    deplist.ok_to_remove?(spec.full_name)
+    deplist.ok_to_remove?(spec.full_name, @check_dev)
   end
 
   def ask_if_ok(spec)
     msg = ['']
     msg << 'You have requested to uninstall the gem:'
     msg << "\t#{spec.full_name}"
+    msg << ''
+
+    siblings = Gem::Specification.select do |s|
+                 s.name == spec.name && s.full_name != spec.full_name
+               end
 
     spec.dependent_gems.each do |dep_spec, dep, satlist|
-      msg <<
-        ("#{dep_spec.name}-#{dep_spec.version} depends on " +
-         "[#{dep.name} (#{dep.requirement})]")
+      unless siblings.any? { |s| s.satisfies_requirement? dep }
+        msg << "#{dep_spec.name}-#{dep_spec.version} depends on #{dep}"
+      end
     end
 
-    msg << 'If you remove this gems, one or more dependencies will not be met.'
+    msg << 'If you remove this gem, these dependencies will not be met.'
     msg << 'Continue with Uninstall?'
     return ask_yes_no(msg.join("\n"), true)
   end
 
   def formatted_program_filename(filename)
+    # TODO perhaps the installer should leave a small manifest
+    # of what it did for us to find rather than trying to recreate
+    # it again.
     if @format_executable then
       require 'rubygems/installer'
       Gem::Installer.exec_format % File.basename(filename)

data/lib/rubygems/user_interaction.rb

@@ -143,6 +143,16 @@ class Gem::StreamUI
     end
   end
 
+  ##
+  # Prints a formatted backtrace to the errors stream if backtraces are
+  # enabled.
+
+  def backtrace exception
+    return unless Gem.configuration.backtrace
+
+    @errs.puts "\t#{exception.backtrace.join "\n\t"}"
+  end
+
   ##
   # Choose from a list of options.  +question+ is a prompt displayed above
   # the list.  +list+ is a list of option strings.  Returns the pair

data/lib/rubygems/validator.rb

@@ -4,7 +4,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems/format'
+require 'rubygems/package'
 require 'rubygems/installer'
 
 ##
@@ -16,7 +16,6 @@ class Gem::Validator
 
   def initialize
     require 'find'
-    require 'digest'
   end
 
   ##
@@ -24,20 +23,8 @@ class Gem::Validator
   # gem_data:: [String] Contents of the gem file
 
   def verify_gem(gem_data)
-    raise Gem::VerificationError, 'empty gem file' if gem_data.size == 0
-
-    unless gem_data =~ /MD5SUM/ then
-      return # Don't worry about it...this sucks.  Need to fix MD5 stuff for
-      # new format
-      # FIXME
-    end
-
-    sum_data = gem_data.gsub(/MD5SUM = "([a-z0-9]+)"/,
-                             "MD5SUM = \"#{"F" * 32}\"")
-
-    unless Digest::MD5.hexdigest(sum_data) == $1.to_s then
-      raise Gem::VerificationError, 'invalid checksum for gem file'
-    end
+    # TODO remove me? The code here only validate an MD5SUM that was
+    # in some old formatted gems, but hasn't been for a long time.
   end
 
   ##
@@ -58,17 +45,27 @@ class Gem::Validator
 
   def find_files_for_gem(gem_directory)
     installed_files = []
+
     Find.find gem_directory do |file_name|
       fn = file_name[gem_directory.size..file_name.size-1].sub(/^\//, "")
       installed_files << fn unless
         fn =~ /CVS/ || fn.empty? || File.directory?(file_name)
     end
+
     installed_files
   end
 
   public
 
-  ErrorData = Struct.new :path, :problem
+  ErrorData = Struct.new :path, :problem do
+
+    def <=> other
+      return nil unless self.class === other
+
+      [path, problem] <=> [other.path, other.problem]
+    end
+
+  end
 
   ##
   # Checks the gem directory for the following potential
@@ -80,20 +77,22 @@ class Gem::Validator
   # * 1 cache - 1 spec - 1 directory.
   #
   # returns a hash of ErrorData objects, keyed on the problem gem's name.
+  #--
+  # TODO needs further cleanup
 
   def alien(gems=[])
     errors = Hash.new { |h,k| h[k] = {} }
 
-    Gem::SourceIndex.from_installed_gems.each do |gem_name, gem_spec|
-      next unless gems.include? gem_spec.name unless gems.empty?
+    Gem::Specification.each do |spec|
+      next unless gems.include? spec.name unless gems.empty?
 
-      install_dir = gem_spec.installation_path
-      gem_path = Gem.cache_gem(gem_spec.file_name, install_dir)
-      spec_path = File.join install_dir, "specifications", gem_spec.spec_name
-      gem_directory = gem_spec.full_gem_path
+      gem_name      = spec.file_name
+      gem_path      = spec.cache_file
+      spec_path     = spec.spec_file
+      gem_directory = spec.full_gem_path
 
       unless File.directory? gem_directory then
-        errors[gem_name][gem_spec.full_name] =
+        errors[gem_name][spec.full_name] =
           "Gem registered but doesn't exist at #{gem_directory}"
         next
       end
@@ -108,19 +107,18 @@ class Gem::Validator
         good, gone, unreadable = nil, nil, nil, nil
 
         open gem_path, Gem.binary_mode do |file|
-          format = Gem::Format.from_file_by_path(gem_path)
+          package = Gem::Package.new gem_path
 
-          good, gone = format.file_entries.partition { |entry, _|
-            File.exist? File.join(gem_directory, entry['path'])
+          good, gone = package.contents.partition { |file_name|
+            File.exist? File.join(gem_directory, file_name)
           }
 
-          gone.map! { |entry, _| entry['path'] }
           gone.sort.each do |path|
             errors[gem_name][path] = "Missing file"
           end
 
-          good, unreadable = good.partition { |entry, _|
-            File.readable? File.join(gem_directory, entry['path'])
+          good, unreadable = good.partition { |file_name|
+            File.readable? File.join(gem_directory, file_name)
           }
 
           unreadable.map! { |entry, _| entry['path'] }
@@ -132,9 +130,10 @@ class Gem::Validator
             begin
               next unless data # HACK `gem check -a mkrf`
 
-              open File.join(gem_directory, entry['path']), Gem.binary_mode do |f|
-                unless Digest::MD5.hexdigest(f.read).to_s ==
-                    Digest::MD5.hexdigest(data).to_s then
+              source = File.join gem_directory, entry['path']
+
+              open source, Gem.binary_mode do |f|
+                unless f.read == data then
                   errors[gem_name][entry['path']] = "Modified from original"
                 end
               end
@@ -143,7 +142,6 @@ class Gem::Validator
         end
 
         installed_files = find_files_for_gem(gem_directory)
-        good.map! { |entry, _| entry['path'] }
         extras = installed_files - good - unreadable
 
         extras.each do |extra|
@@ -155,15 +153,10 @@ class Gem::Validator
     end
 
     errors.each do |name, subhash|
-      errors[name] = subhash.map { |path, msg| ErrorData.new(path, msg) }
+      errors[name] = subhash.map { |path, msg| ErrorData.new(path, msg) }.sort
     end
 
     errors
   end
-
-  def remove_leading_dot_dir(path)
-    path.sub(/^\.\//, "")
-  end
-
 end
 

data/lib/rubygems/version.rb

@@ -129,8 +129,8 @@
 # specify your dependency as ">= 2.0.0" then, you're good, right? What
 # happens if fnord 3.0 comes out and it isn't backwards compatible
 # with 2.y.z? Your stuff will break as a result of using ">=". The
-# better route is to specify your dependency with a "spermy" version
-# specifier. They're a tad confusing, so here is how the dependency
+# better route is to specify your dependency with an "approximate" version
+# specifier ("~>"). They're a tad confusing, so here is how the dependency
 # specifiers work:
 #
 #   Specification From  ... To (exclusive)
@@ -145,8 +145,10 @@ class Gem::Version
 
   include Comparable
 
-  VERSION_PATTERN = '[0-9]+(?>\.[0-9a-zA-Z]+)*' # :nodoc:
-  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
+  # FIX: These are only used once, in .correct?. Do they deserve to be
+  # constants?
+  VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc:
+  ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
 
   ##
   # A string representation of this Version.
@@ -169,6 +171,8 @@ class Gem::Version
   #   ver2 = Version.create(ver1)       # -> (ver1)
   #   ver3 = Version.create(nil)        # -> nil
 
+  # REFACTOR: There's no real reason this should be separate from #initialize.
+
   def self.create input
     if input.respond_to? :version then
       input
@@ -187,8 +191,7 @@ class Gem::Version
     raise ArgumentError, "Malformed version number string #{version}" unless
       self.class.correct?(version)
 
-    @version = version.to_s.dup
-    @version.strip!
+    @version = version.to_s.dup.strip
   end
 
   ##
@@ -248,11 +251,19 @@ class Gem::Version
     @hash = nil
   end
 
+  def to_yaml_properties
+    ["@version"]
+  end
+
+  def encode_with coder
+    coder.add 'version', @version
+  end
+
   ##
   # A version is considered a prerelease if it contains a letter.
 
   def prerelease?
-    @prerelease ||= @version =~ /[a-zA-Z]/
+    @prerelease ||= !!(@version =~ /[a-zA-Z]/)
   end
 
   def pretty_print q # :nodoc:
@@ -284,7 +295,7 @@ class Gem::Version
   ##
   # A recommended version for use with a ~> Requirement.
 
-  def spermy_recommendation
+  def approximate_recommendation
     segments = self.segments.dup
 
     segments.pop    while segments.any? { |s| String === s }