rubygems-update 1.6.2 → 1.7.0

data/lib/rubygems/commands/fetch_command.rb

@@ -35,19 +35,22 @@ class Gem::Commands::FetchCommand < Gem::Command
     version = options[:version] || Gem::Requirement.default
     all = Gem::Requirement.default != version
 
+    platform  = Gem.platforms.last
     gem_names = get_all_gem_names
 
     gem_names.each do |gem_name|
       dep = Gem::Dependency.new gem_name, version
       dep.prerelease = options[:prerelease]
 
-      specs_and_sources = Gem::SpecFetcher.fetcher.fetch(dep, all, true,
-                                                         dep.prerelease?)
-
       specs_and_sources, errors =
         Gem::SpecFetcher.fetcher.fetch_with_errors(dep, all, true,
                                                    dep.prerelease?)
 
+      if platform then
+        filtered = specs_and_sources.select { |s,| s.platform == platform }
+        specs_and_sources = filtered unless filtered.empty?
+      end
+
       spec, source_uri = specs_and_sources.sort_by { |s,| s.version }.last
 
       if spec.nil? then

data/lib/rubygems/commands/outdated_command.rb

@@ -16,7 +16,8 @@ class Gem::Commands::OutdatedCommand < Gem::Command
   end
 
   def execute
-    locals = Gem::SourceIndex.from_installed_gems
+    # FIX: this should be able to be Gem.source_index but our test fails :(
+    locals = Gem::SourceIndex.new Gem::SourceIndex.installed_spec_directories
 
     locals.outdated.sort.each do |name|
       local   = locals.find_name(name).last

data/lib/rubygems/commands/pristine_command.rb

@@ -51,13 +51,12 @@ revert the gem.
     gem_name = nil
 
     specs = if options[:all] then
-              Gem::SourceIndex.from_installed_gems.map do |name, spec|
+              Gem.source_index.map do |name, spec|
                 spec
               end
             else
               gem_name = get_one_gem_name
-              Gem::SourceIndex.from_installed_gems.find_name(gem_name,
-                                                          options[:version])
+              Gem.source_index.find_name(gem_name, options[:version])
             end
 
     if specs.empty? then
@@ -76,6 +75,8 @@ revert the gem.
       gem = spec.cache_gem
 
       if gem.nil? then
+        require 'rubygems/remote_fetcher'
+
         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

data/lib/rubygems/commands/unpack_command.rb

@@ -19,6 +19,10 @@ class Gem::Commands::UnpackCommand < Gem::Command
       options[:target] = value
     end
 
+    add_option('--spec', 'unpack the gem specification') do |value, options|
+      options[:spec] = true
+    end
+
     add_version_option
   end
 
@@ -44,14 +48,28 @@ class Gem::Commands::UnpackCommand < Gem::Command
       dependency = Gem::Dependency.new name, options[:version]
       path = get_path dependency
 
-      if path then
+      unless path then
+        alert_error "Gem '#{name}' not installed nor fetchable."
+        next
+      end
+
+      if @options[:spec] then
+        spec, metadata = get_metadata path
+
+        if metadata.nil? then
+          alert_error "--spec is unsupported on '#{name}' (old format gem)"
+          next
+        end
+
+        open spec.spec_name, 'w' do |io|
+          io.write metadata
+        end
+      else
         basename = File.basename path, '.gem'
         target_dir = File.expand_path basename, options[:target]
         FileUtils.mkdir_p target_dir
         Gem::Installer.new(path, :unpack => true).unpack target_dir
         say "Unpacked gem: '#{target_dir}'"
-      else
-        alert_error "Gem '#{name}' not installed."
       end
     end
   end
@@ -64,7 +82,6 @@ class Gem::Commands::UnpackCommand < Gem::Command
   # TODO: see comments in get_path() about general service.
 
   def find_in_cache(filename)
-
     Gem.path.each do |path|
       this_path = Gem.cache_gem(filename, path)
       return this_path if File.exist? this_path
@@ -112,5 +129,30 @@ class Gem::Commands::UnpackCommand < Gem::Command
     path
   end
 
+  ##
+  # Extracts the Gem::Specification and raw metadata from the .gem file at
+  # +path+.
+
+  def get_metadata path
+    format = Gem::Format.from_file_by_path path
+    spec = format.spec
+
+    metadata = nil
+
+    open path, Gem.binary_mode do |io|
+      tar = Gem::Package::TarReader.new io
+      tar.each_entry do |entry|
+        case entry.full_name
+        when 'metadata' then
+          metadata = entry.read
+        when 'metadata.gz' then
+          metadata = Gem.gunzip entry.read
+        end
+      end
+    end
+
+    return spec, metadata
+  end
+
 end
 

data/lib/rubygems/commands/update_command.rb

@@ -72,7 +72,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
       end
     end
 
-    gems_to_update = which_to_update hig, options[:args]
+    gems_to_update = which_to_update hig, options[:args].uniq
 
     updated = update_gems gems_to_update
 
@@ -117,8 +117,8 @@ class Gem::Commands::UpdateCommand < Gem::Command
   end
 
   def update_gems gems_to_update
-    gems_to_update.uniq.sort.each do |name|
-      update_gem name
+    gems_to_update.uniq.sort.each do |(name, version)|
+      update_gem name, version
     end
 
     @updated
@@ -135,6 +135,9 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     options[:user_install] = false
 
+    # TODO: rename version and other variable name conflicts
+    # TODO: get rid of all this indirection on name and other BS
+
     version = options[:system]
     if version == true then
       version     = Gem::Version.new     Gem::VERSION
@@ -152,14 +155,23 @@ class Gem::Commands::UpdateCommand < Gem::Command
       'rubygems-update' => rubygems_update
     }
 
-    gems_to_update = which_to_update hig, options[:args]
+    gems_to_update = which_to_update hig, options[:args], :system
+    name, up_ver   = gems_to_update.first
+    current_ver    = Gem::Version.new Gem::VERSION
+
+    target = if options[:system] == true then
+               up_ver
+             else
+               version
+             end
 
-    if gems_to_update.empty? then
+    if current_ver == target then
+      # if options[:system] != true and version == current_ver then
       say "Latest version currently installed. Aborting."
       terminate_interaction
     end
 
-    update_gem gems_to_update.first, requirement
+    update_gem name, target
 
     Gem.source_index.refresh!
 
@@ -187,7 +199,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
     end
   end
 
-  def which_to_update(highest_installed_gems, gem_names)
+  def which_to_update highest_installed_gems, gem_names, system = false
     result = []
 
     highest_installed_gems.each do |l_name, l_spec|
@@ -207,9 +219,11 @@ class Gem::Commands::UpdateCommand < Gem::Command
         version
       end.last
 
-      if highest_remote_gem and
-         l_spec.version < highest_remote_gem.first[1] then
-        result << l_name
+      highest_remote_gem ||= [[nil, Gem::Version.new(0), nil]] # "null" object
+      highest_remote_ver = highest_remote_gem.first[1]
+
+      if system or (l_spec.version < highest_remote_ver) then
+        result << [l_spec.name, [l_spec.version, highest_remote_ver].max]
       end
     end
 

data/lib/rubygems/custom_require.rb

@@ -46,8 +46,7 @@ module Kernel
         end
 
         found_specs.each do |found_spec|
-          # FIX: this is dumb, activate a spec instead of name/version
-          Gem.activate found_spec.name, found_spec.version
+          Gem.activate_spec found_spec
         end
       end
 

data/lib/rubygems/dependency_installer.rb

@@ -46,7 +46,7 @@ class Gem::DependencyInstaller
   def initialize(options = {})
     if options[:install_dir] then
       spec_dir = options[:install_dir], 'specifications'
-      @source_index = Gem::SourceIndex.from_gems_in spec_dir
+      @source_index = Gem::SourceIndex.new [spec_dir]
     else
       @source_index = Gem.source_index
     end

data/lib/rubygems/ext/rake_builder.rb

@@ -22,7 +22,7 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
     rake = ENV['rake']
 
     rake ||= begin
-               "\"#{Gem.ruby}\" -rubygems #{Gem.bin_path('rake')}"
+               "\"#{Gem.ruby}\" -rubygems #{Gem.bin_path('rake', 'rake')}"
              rescue Gem::Exception
              end
 

data/lib/rubygems/gem_runner.rb

@@ -25,6 +25,7 @@ Gem.load_env_plugins rescue nil
 class Gem::GemRunner
 
   def initialize(options={})
+    # TODO: nuke these options
     @command_manager_class = options[:command_manager] || Gem::CommandManager
     @config_file_class = options[:config_file] || Gem::ConfigFile
     @doc_manager_class = options[:doc_manager] || Gem::DocManager

data/lib/rubygems/mock_gem_ui.rb

@@ -7,6 +7,7 @@ require 'rubygems/user_interaction'
 
 class Gem::MockGemUi < Gem::StreamUI
   class TermError < RuntimeError; end
+  class SystemExitException < RuntimeError; end
 
   module TTY
 
@@ -56,7 +57,7 @@ class Gem::MockGemUi < Gem::StreamUI
     @terminated = true
 
     raise TermError unless status == 0
-    raise Gem::SystemExitException, status
+    raise SystemExitException, status
   end
 
 end

data/lib/rubygems/package/tar_input.rb

@@ -49,6 +49,7 @@ class Gem::Package::TarInput
             sio.rewind
           end
 
+          # TODO use Gem.gunzip
           gzis = Zlib::GzipReader.new(sio || entry)
           # YAML wants an instance of IO
           @metadata = load_gemspec(gzis)

data/lib/rubygems/remote_fetcher.rb

@@ -69,6 +69,7 @@ class Gem::RemoteFetcher
       when URI::HTTP then proxy
       else URI.parse(proxy)
       end
+    @user_agent = user_agent
   end
 
   ##
@@ -186,19 +187,55 @@ class Gem::RemoteFetcher
     local_gem_path
   end
 
+  ##
+  # File Fetcher. Dispatched by +fetch_path+. Use it instead.
+
+  def fetch_file uri, *_
+    Gem.read_binary correct_for_windows_path uri.path
+  end
+
+  ##
+  # HTTP Fetcher. Dispatched by +fetch_path+. Use it instead.
+
+  def fetch_http uri, last_modified = nil, head = false, depth = 0
+    fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
+    response   = request uri, fetch_type, last_modified
+
+    case response
+    when Net::HTTPOK, Net::HTTPNotModified then
+      head ? response : response.body
+    when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
+         Net::HTTPTemporaryRedirect then
+      raise FetchError.new('too many redirects', uri) if depth > 10
+
+      location = URI.parse response['Location']
+      fetch_http(location, last_modified, head, depth + 1)
+    else
+      raise FetchError.new("bad response #{response.message} #{response.code}", uri)
+    end
+  end
+
+  alias :fetch_https :fetch_http
+
   ##
   # Downloads +uri+ and returns it as a String.
 
   def fetch_path(uri, mtime = nil, head = false)
-    data = open_uri_or_path uri, mtime, head
+    uri = URI.parse uri unless URI::Generic === uri
+
+    raise ArgumentError, "bad uri: #{uri}" unless uri
+    raise ArgumentError, "uri scheme is invalid: #{uri.scheme.inspect}" unless
+      uri.scheme
+
+    data = send "fetch_#{uri.scheme}", uri, mtime, head
     data = Gem.gunzip data if data and not head and uri.to_s =~ /gz$/
     data
   rescue FetchError
     raise
   rescue Timeout::Error
-    raise FetchError.new('timed out', uri)
+    raise FetchError.new('timed out', uri.to_s)
   rescue IOError, SocketError, SystemCallError => e
-    raise FetchError.new("#{e.class}: #{e}", uri)
+    raise FetchError.new("#{e.class}: #{e}", uri.to_s)
   end
 
   ##
@@ -300,36 +337,8 @@ class Gem::RemoteFetcher
   # read from the filesystem instead.
 
   def open_uri_or_path(uri, last_modified = nil, head = false, depth = 0)
-    raise "block is dead" if block_given?
-
-    uri = URI.parse uri unless URI::Generic === uri
-
-    # This check is redundant unless Gem::RemoteFetcher is likely
-    # to be used directly, since the scheme is checked elsewhere.
-    # - Daniel Berger
-    unless ['http', 'https', 'file'].include?(uri.scheme)
-     raise ArgumentError, 'uri scheme is invalid'
-    end
-
-    if uri.scheme == 'file'
-      path = correct_for_windows_path(uri.path)
-      return Gem.read_binary(path)
-    end
-
-    fetch_type = head ? Net::HTTP::Head : Net::HTTP::Get
-    response   = request uri, fetch_type, last_modified
-
-    case response
-    when Net::HTTPOK, Net::HTTPNotModified then
-      head ? response : response.body
-    when Net::HTTPMovedPermanently, Net::HTTPFound, Net::HTTPSeeOther,
-         Net::HTTPTemporaryRedirect then
-      raise FetchError.new('too many redirects', uri) if depth > 10
-
-      open_uri_or_path(response['Location'], last_modified, head, depth + 1)
-    else
-      raise FetchError.new("bad response #{response.message} #{response.code}", uri)
-    end
+    raise "NO: Use fetch_path instead"
+    # TODO: deprecate for fetch_path
   end
 
   ##
@@ -344,12 +353,7 @@ class Gem::RemoteFetcher
       request.basic_auth uri.user, uri.password
     end
 
-    ua = "RubyGems/#{Gem::VERSION} #{Gem::Platform.local}"
-    ua << " Ruby/#{RUBY_VERSION} (#{RUBY_RELEASE_DATE}"
-    ua << " patchlevel #{RUBY_PATCHLEVEL}" if defined? RUBY_PATCHLEVEL
-    ua << ")"
-
-    request.add_field 'User-Agent', ua
+    request.add_field 'User-Agent', @user_agent
     request.add_field 'Connection', 'keep-alive'
     request.add_field 'Keep-Alive', '30'
 
@@ -441,5 +445,24 @@ class Gem::RemoteFetcher
     connection.start
   end
 
+  def user_agent
+    ua = "RubyGems/#{Gem::VERSION} #{Gem::Platform.local}"
+
+    ruby_version = RUBY_VERSION
+    ruby_version += 'dev' if RUBY_PATCHLEVEL == -1
+
+    ua << " Ruby/#{ruby_version} (#{RUBY_RELEASE_DATE}"
+    if RUBY_PATCHLEVEL >= 0 then
+      ua << " patchlevel #{RUBY_PATCHLEVEL}"
+    elsif defined?(RUBY_REVISION) then
+      ua << " revision #{RUBY_REVISION}"
+    end
+    ua << ")"
+
+    ua << " #{RUBY_ENGINE}" if defined?(RUBY_ENGINE) and RUBY_ENGINE != 'ruby'
+
+    ua
+  end
+
 end
 

data/lib/rubygems/server.rb

@@ -454,7 +454,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; }
       spec_dir
     end
 
-    @source_index = Gem::SourceIndex.from_gems_in(*@spec_dirs)
+    @source_index = Gem::SourceIndex.new(@spec_dirs)
   end
 
   def Marshal(req, res)

data/lib/rubygems/source_index.rb

@@ -5,6 +5,7 @@
 #++
 
 require 'rubygems/specification'
+require 'rubygems/deprecate'
 
 ##
 # The SourceIndex object indexes all the gems available from a
@@ -28,53 +29,52 @@ class Gem::SourceIndex
 
   attr_accessor :spec_dirs
 
-  class << self
-    ##
-    # Factory method to construct a source index instance for a given
-    # path.
-    #
-    # deprecated::
-    #   If supplied, from_installed_gems will act just like
-    #   +from_gems_in+.  This argument is deprecated and is provided
-    #   just for backwards compatibility, and should not generally
-    #   be used.
-    #
-    # return::
-    #   SourceIndex instance
-
-    def from_installed_gems(*deprecated)
-      if deprecated.empty?
-        from_gems_in(*installed_spec_directories)
-      else
-        from_gems_in(*deprecated) # HACK warn
-      end
+  ##
+  # Factory method to construct a source index instance for a given
+  # path.
+  #
+  # deprecated::
+  #   If supplied, from_installed_gems will act just like
+  #   +from_gems_in+.  This argument is deprecated and is provided
+  #   just for backwards compatibility, and should not generally
+  #   be used.
+  #
+  # return::
+  #   SourceIndex instance
+
+  def self.from_installed_gems(*deprecated)
+    if deprecated.empty?
+      from_gems_in(*installed_spec_directories)
+    else
+      warn "NOTE: from_installed_gems(arg) is deprecated. From #{caller.first}"
+      from_gems_in(*deprecated) # HACK warn
     end
+  end
 
-    ##
-    # Returns a list of directories from Gem.path that contain specifications.
+  ##
+  # Returns a list of directories from Gem.path that contain specifications.
 
-    def installed_spec_directories
-      Gem.path.collect { |dir| File.join(dir, "specifications") }
-    end
+  def self.installed_spec_directories
+    # TODO: move to Gem::Utils
+    Gem.path.collect { |dir| File.join(dir, "specifications") }
+  end
 
-    ##
-    # Creates a new SourceIndex from the ruby format gem specifications in
-    # +spec_dirs+.
+  ##
+  # Creates a new SourceIndex from the ruby format gem specifications in
+  # +spec_dirs+.
 
-    def from_gems_in(*spec_dirs)
-      source_index = new
-      source_index.spec_dirs = spec_dirs
-      source_index.refresh!
-    end
+  def self.from_gems_in(*spec_dirs)
+    new spec_dirs
+  end
 
-    ##
-    # Loads a ruby-format specification from +file_name+ and returns the
-    # loaded spec.
+  ##
+  # Loads a ruby-format specification from +file_name+ and returns the
+  # loaded spec.
 
-    def load_specification(file_name)
+  def self.load_specification(file_name)
+    Deprecate.skip_during do
       Gem::Specification.load file_name
     end
-
   end
 
   ##
@@ -84,13 +84,23 @@ class Gem::SourceIndex
   # TODO merge @gems and @prerelease_gems and provide a separate method
   # #prerelease_gems
 
-  def initialize(specifications={})
+  def initialize specs_or_dirs = []
     @gems = {}
-    specifications.each{ |full_name, spec| add_spec spec }
     @spec_dirs = nil
+
+    case specs_or_dirs
+    when Hash then
+      warn "NOTE: SourceIndex.new(hash) is deprecated; From #{caller.first}."
+      specs_or_dirs.each{ |full_name, spec| add_spec spec }
+    when Array, String then
+      self.spec_dirs = Array(specs_or_dirs)
+      refresh!
+    else
+      arg = specs_or_dirs.inspect
+      warn "NOTE: SourceIndex.new(#{arg}) is deprecated; From #{caller.first}."
+    end
   end
 
-  # TODO: remove method
   def all_gems
     @gems
   end
@@ -113,7 +123,9 @@ class Gem::SourceIndex
       spec_files = Dir.glob File.join(spec_dir, '*.gemspec')
 
       spec_files.each do |spec_file|
-        gemspec = Gem::Specification.load spec_file
+        gemspec = Deprecate.skip_during do
+          Gem::Specification.load spec_file
+        end
         add_spec gemspec if gemspec
       end
     end
@@ -284,7 +296,7 @@ class Gem::SourceIndex
       requirement = Gem::Requirement.create requirement
     end
 
-    specs = all_gems.values.select do |spec|
+    specs = @gems.values.select do |spec|
       spec.name =~ gem_pattern and
         requirement.satisfied_by? spec.version
     end
@@ -338,6 +350,15 @@ class Gem::SourceIndex
     Marshal.dump(self)
   end
 
+  extend Deprecate
+  deprecate :all_gems, :none,  2011, 10
+
+  class << self
+    extend Deprecate
+    deprecate :from_installed_gems,        :none, 2011, 10
+    deprecate :from_gems_in,               :none, 2011, 10
+    deprecate :load_specification,         :none, 2011, 10
+  end
 end
 
 # :stopdoc: