rubygems-update 1.5.3 → 1.6.0

data/lib/rubygems/commands/owner_command.rb

@@ -17,6 +17,7 @@ class Gem::Commands::OwnerCommand < Gem::Command
   def initialize
     super 'owner', description
     add_proxy_option
+    add_key_option
     defaults.merge! :add => [], :remove => []
 
     add_option '-a', '--add EMAIL', 'Add an owner' do |value, options|
@@ -39,7 +40,7 @@ class Gem::Commands::OwnerCommand < Gem::Command
 
   def show_owners name
     response = rubygems_api_request :get, "api/v1/gems/#{name}/owners.yaml" do |request|
-      request.add_field "Authorization", Gem.configuration.rubygems_api_key
+      request.add_field "Authorization", api_key
     end
 
     with_response response do |resp|
@@ -64,7 +65,7 @@ class Gem::Commands::OwnerCommand < Gem::Command
     owners.each do |owner|
       response = rubygems_api_request method, "api/v1/gems/#{name}/owners" do |request|
         request.set_form_data 'email' => owner
-        request.add_field "Authorization", Gem.configuration.rubygems_api_key
+        request.add_field "Authorization", api_key
       end
 
       with_response response

data/lib/rubygems/commands/pristine_command.rb

@@ -73,11 +73,13 @@ revert the gem.
     say "Restoring gem(s) to pristine condition..."
 
     specs.each do |spec|
-      gem = Dir[File.join(Gem.dir, 'cache', spec.file_name)].first
+      gem = spec.cache_gem
 
       if gem.nil? then
-        alert_error "Cached gem for #{spec.full_name} not found, use `gem install` to restore"
-        next
+        say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
+        dep = Gem::Dependency.new spec.name, spec.version
+        Gem::RemoteFetcher.fetcher.download_to_cache dep
+        gem = spec.cache_gem
       end
 
       # TODO use installer options

data/lib/rubygems/commands/push_command.rb

@@ -21,7 +21,8 @@ class Gem::Commands::PushCommand < Gem::Command
   def initialize
     super 'push', description
     add_proxy_option
-    
+    add_key_option
+
     add_option(
       '--host HOST',
       'Push to another gemcutter-compatible host'
@@ -36,17 +37,20 @@ class Gem::Commands::PushCommand < Gem::Command
   end
 
   def send_gem name
-    say "Pushing gem to #{options[:host] || Gem.host}..."
-
     args = [:post, "api/v1/gems"]
 
     args << options[:host] if options[:host]
 
+    if Gem.latest_rubygems_version < Gem::Version.new(Gem::VERSION) then
+      alert_error "Using beta/unreleased version of rubygems. Not pushing."
+      terminate_interaction 1
+    end
+
     response = rubygems_api_request(*args) do |request|
       request.body = Gem.read_binary name
       request.add_field "Content-Length", request.body.size
       request.add_field "Content-Type",   "application/octet-stream"
-      request.add_field "Authorization",  Gem.configuration.rubygems_api_key
+      request.add_field "Authorization",  api_key
     end
 
     with_response response

data/lib/rubygems/commands/setup_command.rb

@@ -329,8 +329,7 @@ abort "#{deprecation_message}"
 
     require 'rdoc/rdoc'
 
-    args << '--quiet'
-    args << '--main' << 'README.rdoc'
+    args << '--main' << 'README.rdoc' << '--quiet'
     args << '.'
     args << 'README.rdoc' << 'UPGRADING.rdoc'
     args << 'LICENSE.txt' << 'GPL.txt' << 'History.txt'

data/lib/rubygems/commands/uninstall_command.rb

@@ -49,6 +49,11 @@ class Gem::Commands::UninstallCommand < Gem::Command
       options[:user_install] = value
     end
 
+    add_option('--[no-]format-executable',
+               'Assume executable names match Ruby\'s prefix and suffix.') do |value, options|
+      options[:format_executable] = value
+    end
+
     add_version_option
     add_platform_option
   end

data/lib/rubygems/commands/unpack_command.rb

@@ -1,6 +1,7 @@
 require 'rubygems/command'
 require 'rubygems/installer'
 require 'rubygems/version_option'
+require 'rubygems/remote_fetcher'
 
 class Gem::Commands::UnpackCommand < Gem::Command
 
@@ -33,16 +34,6 @@ class Gem::Commands::UnpackCommand < Gem::Command
     "#{program_name} GEMNAME"
   end
 
-  def download dependency
-    found = Gem::SpecFetcher.fetcher.fetch dependency
-
-    return if found.empty?
-
-    spec, source_uri = found.first
-
-    Gem::RemoteFetcher.fetcher.download spec, source_uri
-  end
-
   #--
   # TODO: allow, e.g., 'gem unpack rake-0.3.1'.  Find a general solution for
   # this, so that it works for uninstall as well.  (And check other commands
@@ -73,8 +64,9 @@ class Gem::Commands::UnpackCommand < Gem::Command
   # TODO: see comments in get_path() about general service.
 
   def find_in_cache(filename)
-    Gem.path.each do |gem_dir|
-      this_path = File.join gem_dir, 'cache', filename
+
+    Gem.path.each do |path|
+      this_path = Gem.cache_gem(filename, path)
       return this_path if File.exist? this_path
     end
 
@@ -105,15 +97,17 @@ class Gem::Commands::UnpackCommand < Gem::Command
 
     selected = specs.sort_by { |s| s.version }.last
 
-    return download(dependency) if selected.nil?
+    return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless
+      selected
 
     return unless dependency.name =~ /^#{selected.name}$/i
 
     # We expect to find (basename).gem in the 'cache' directory.  Furthermore,
     # the name match must be exact (ignoring case).
-    
-    path = find_in_cache(selected.file_name)
-    return download(dependency) unless path
+
+    path = find_in_cache selected.file_name
+
+    return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless path
 
     path
   end

data/lib/rubygems/config_file.rb

@@ -123,6 +123,11 @@ class Gem::ConfigFile
 
   attr_reader :rubygems_api_key
 
+  ##
+  # Hash of RubyGems.org and alternate API keys
+
+  attr_reader :api_keys
+
   ##
   # Create the config file object.  +args+ is the list of arguments
   # from the command line.
@@ -186,7 +191,7 @@ class Gem::ConfigFile
     @update_sources   = @hash[:update_sources]   if @hash.key? :update_sources
     @verbose          = @hash[:verbose]          if @hash.key? :verbose
 
-    load_rubygems_api_key
+    load_api_keys
 
     Gem.sources = @hash[:sources] if @hash.key? :sources
     handle_arguments arg_list
@@ -199,10 +204,12 @@ class Gem::ConfigFile
     File.join(Gem.user_home, '.gem', 'credentials')
   end
 
-  def load_rubygems_api_key
-    api_key_hash = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
-
-    @rubygems_api_key = api_key_hash[:rubygems_api_key] if api_key_hash.key? :rubygems_api_key
+  def load_api_keys
+    @api_keys = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
+    if @api_keys.key? :rubygems_api_key then
+      @rubygems_api_key = @api_keys[:rubygems_api_key]
+      @api_keys[:rubygems] = @api_keys.delete :rubygems_api_key unless @api_keys.key? :rubygems
+    end
   end
 
   def rubygems_api_key=(api_key)

data/lib/rubygems/custom_require.rb

@@ -6,10 +6,16 @@
 
 module Kernel
 
-  ##
-  # The Kernel#require from before RubyGems was loaded.
-
-  alias gem_original_require require
+  if defined?(gem_original_require) then
+    # Ruby ships with a custom_require, override its require
+    remove_method :require
+  else
+    ##
+    # The Kernel#require from before RubyGems was loaded.
+
+    alias gem_original_require require
+    private :gem_original_require
+  end
 
   ##
   # When RubyGems is required, Kernel#require is replaced with our own which
@@ -25,8 +31,23 @@ module Kernel
   # The normal <tt>require</tt> functionality of returning false if
   # that file has already been loaded is preserved.
 
-  def require(path) # :doc:
-    gem_original_require path
+  def require path
+    if Gem.unresolved_deps.empty? or Gem.loaded_path? path then
+      gem_original_require path
+    else
+      specs = Gem.searcher.find_in_unresolved path
+      unless specs.empty? then
+        specs = [specs.last]
+      else
+        specs = Gem.searcher.find_in_unresolved_tree path
+      end
+
+      specs.each do |spec|
+        Gem.activate spec.name, spec.version # FIX: this is dumb
+      end
+
+      return gem_original_require path
+    end
   rescue LoadError => load_error
     if load_error.message.end_with?(path) and Gem.try_activate(path) then
       return gem_original_require(path)
@@ -36,7 +57,6 @@ module Kernel
   end
 
   private :require
-  private :gem_original_require
 
 end
 

data/lib/rubygems/dependency.rb

@@ -26,11 +26,6 @@ class Gem::Dependency
 
   attr_writer :prerelease
 
-  ##
-  # Dependency type.
-
-  attr_reader :type
-
   ##
   # Constructs a dependency with +name+ and +requirements+. The last
   # argument can optionally be the dependency type, which defaults to
@@ -66,7 +61,7 @@ class Gem::Dependency
 
   def inspect # :nodoc:
     "<%s type=%p name=%p requirements=%p>" %
-      [self.class, @type, @name, requirement.to_s]
+      [self.class, self.type, self.name, requirement.to_s]
   end
 
   ##
@@ -126,7 +121,18 @@ class Gem::Dependency
   end
 
   def to_s # :nodoc:
-    "#{name} (#{requirement}, #{type})"
+    if type != :runtime then
+      "#{name} (#{requirement}, #{type})"
+    else
+      "#{name} (#{requirement})"
+    end
+  end
+
+  ##
+  # Dependency type.
+
+  def type
+    @type ||= :runtime
   end
 
   def == other # :nodoc:
@@ -140,7 +146,7 @@ class Gem::Dependency
   # Dependencies are ordered by name.
 
   def <=> other
-    @name <=> other.name
+    self.name <=> other.name
   end
 
   ##
@@ -181,5 +187,24 @@ class Gem::Dependency
     requirement.satisfied_by?(spec.version)
   end
 
+  ##
+  # Merges the requirements of +other+ into this dependency
+
+  def merge other
+    unless name == other.name then
+      raise ArgumentError,
+            "#{self} and #{other} have different names"
+    end
+
+    default = Gem::Requirement.default
+    self_req  = self.requirement
+    other_req = other.requirement
+
+    return self.class.new name, self_req  if other_req == default
+    return self.class.new name, other_req if self_req  == default
+
+    self.class.new name, self_req.as_list.concat(other_req.as_list)
+  end
+
 end
 

data/lib/rubygems/dependency_installer.rb

@@ -68,7 +68,7 @@ class Gem::DependencyInstaller
     @installed_gems = []
 
     @install_dir = options[:install_dir] || Gem.dir
-    @cache_dir = options[:cache_dir] || @install_dir
+    @cache_dir = options[:cache_dir] || Gem.cache_dir(@install_dir)
 
     # Set with any errors that SpecFetcher finds while search through
     # gemspecs for a dep
@@ -130,17 +130,33 @@ class Gem::DependencyInstaller
   def gather_dependencies
     specs = @specs_and_sources.map { |spec,_| spec }
 
+    # these gems were listed by the user, always install them
+    keep_names = specs.map { |spec| spec.full_name }
+
     dependency_list = Gem::DependencyList.new @development
     dependency_list.add(*specs)
     to_do = specs.dup
 
     add_found_dependencies to_do, dependency_list unless @ignore_dependencies
 
+    dependency_list.specs.reject! { |spec|
+      ! keep_names.include? spec.full_name and
+        @source_index.any? { |n,_| n == spec.full_name }
+    }
+
+    unless dependency_list.ok? or @ignore_dependencies or @force then
+      reason = dependency_list.why_not_ok?.map { |k,v|
+        "#{k} requires #{v.join(", ")}"
+      }.join("; ")
+      raise Gem::DependencyError, "Unable to resolve dependencies: #{reason}"
+    end
+
     @gems_to_install = dependency_list.dependency_order.reverse
   end
 
   def add_found_dependencies to_do, dependency_list
     seen = {}
+    dependencies = Hash.new { |h, name| h[name] = Gem::Dependency.new name }
 
     until to_do.empty? do
       spec = to_do.shift
@@ -151,10 +167,10 @@ class Gem::DependencyInstaller
       deps |= spec.development_dependencies if @development
 
       deps.each do |dep|
+        dependencies[dep.name] = dependencies[dep.name].merge dep
+
         results = find_gems_with_sources(dep).reverse
 
-        # FIX: throw in everything that satisfies, and let
-        # FIX: dependencylist reduce to the chosen few
         results.reject! do |dep_spec,|
           to_do.push dep_spec
 
@@ -166,14 +182,14 @@ class Gem::DependencyInstaller
         end
 
         results.each do |dep_spec, source_uri|
-          next if seen[dep_spec.name]
           @specs_and_sources << [dep_spec, source_uri]
 
-          # FIX: this is the bug
           dependency_list.add dep_spec
         end
       end
     end
+
+    dependency_list.remove_specs_unsatisfied_by dependencies
   end
 
   ##
@@ -253,7 +269,6 @@ class Gem::DependencyInstaller
 
     @gems_to_install.each do |spec|
       last = spec == @gems_to_install.last
-      # HACK is this test for full_name acceptable?
       next if @source_index.any? { |n,_| n == spec.full_name } and not last
 
       # TODO: make this sorta_verbose so other users can benefit from it

data/lib/rubygems/dependency_list.rb

@@ -11,6 +11,7 @@ require 'tsort'
 # correct order to avoid conflicts.
 
 class Gem::DependencyList
+  attr_reader :specs
 
   include Enumerable
   include TSort
@@ -50,6 +51,10 @@ class Gem::DependencyList
     @specs.push(*gemspecs)
   end
 
+  def clear
+    @specs.clear
+  end
+
   ##
   # Return a list of the gem specifications in the dependency list, sorted in
   # order so that no gemspec in the list depends on a gemspec earlier in the
@@ -104,11 +109,26 @@ class Gem::DependencyList
   # Are all the dependencies in the list satisfied?
 
   def ok?
-    @specs.all? do |spec|
-      spec.runtime_dependencies.all? do |dep|
-        @specs.find { |s| s.satisfies_requirement? dep }
+    why_not_ok?(:quick).empty?
+  end
+
+  def why_not_ok? quick = false
+    unsatisfied = Hash.new { |h,k| h[k] = [] }
+    source_index = Gem.source_index
+    @specs.each do |spec|
+      spec.runtime_dependencies.each do |dep|
+        inst = source_index.any? { |_, installed_spec|
+          dep.name == installed_spec.name and
+            dep.requirement.satisfied_by? installed_spec.version
+        }
+
+        unless inst or @specs.find { |s| s.satisfies_requirement? dep } then
+          unsatisfied[spec.name] << dep
+          return unsatisfied if quick
+        end
       end
     end
+    unsatisfied
   end
 
   ##
@@ -140,6 +160,18 @@ class Gem::DependencyList
     }
   end
 
+  ##
+  # Remove everything in the DependencyList that matches but doesn't
+  # satisfy items in +dependencies+ (a hash of gem names to arrays of
+  # dependencies).
+
+  def remove_specs_unsatisfied_by dependencies
+    specs.reject! { |spec|
+      dep = dependencies[spec.name]
+      dep and not dep.requirement.satisfied_by? spec.version
+    }
+  end
+
   ##
   # Removes the gemspec matching +full_name+ from the dependency list