rubygems-update 0.9.4 → 0.9.5

data/lib/rubygems/commands/specification_command.rb

@@ -1,58 +1,72 @@
-module Gem
-  module Commands
-    class SpecificationCommand < Command
-      include VersionOption
-      include LocalRemoteOptions
-      include CommandAids
-    
-      def initialize
-        super('specification', 'Display gem specification (in yaml)',
-              {:domain=>:local, :version=>"> 0.0.0"})
-        add_version_option('examine')
-        add_local_remote_options
-        add_option('--all', 'Output specifications for all versions of',
-                   'the gem') do |value, options|
-          options[:all] = true
-        end
-      end
+require 'yaml'
+require 'rubygems/command'
+require 'rubygems/local_remote_options'
+require 'rubygems/version_option'
+require 'rubygems/source_info_cache'
 
-      def defaults_str
-        "--local --version '(latest)'"
-      end
+class Gem::Commands::SpecificationCommand < Gem::Command
 
-      def usage
-        "#{program_name} GEMFILE"
-      end
+  include Gem::LocalRemoteOptions
+  include Gem::VersionOption
 
-      def arguments
-        "GEMFILE       Name of a .gem file to examine"
-      end
+  def initialize
+    super 'specification', 'Display gem specification (in yaml)',
+          :domain => :local, :version => Gem::Requirement.default
+
+    add_version_option('examine')
+    add_platform_option
+
+    add_option('--all', 'Output specifications for all versions of',
+               'the gem') do |value, options|
+      options[:all] = true
+    end
+
+    add_local_remote_options
+  end
+
+  def arguments # :nodoc:
+    "GEMFILE       name of gem to show the gemspec for"
+  end
+
+  def defaults_str # :nodoc:
+    "--local --version '#{Gem::Requirement.default}'"
+  end
 
-      def execute
-        if local?
-          gem = get_one_gem_name
-          gem_specs = Gem::SourceIndex.from_installed_gems.search(gem, options[:version])
-          unless gem_specs.empty?
-            require 'yaml'
-            output = lambda { |spec| say spec.to_yaml; say "\n" }
-            if options[:all]
-              gem_specs.each(&output)
-            else
-              spec = gem_specs.sort_by { |spec| spec.version }.last
-              output[spec]
-            end
-          else
-            alert_error "Unknown gem #{gem}"
-          end
-        end
-      
-        if remote?
-          say "(Remote 'info' operation is not yet implemented.)"
-          # NOTE: when we do implement remote info, make sure we don't
-          # duplicate huge swabs of local data.  If it's the same, just
-          # say it's the same.
-        end
+  def usage # :nodoc:
+    "#{program_name} [GEMFILE]"
+  end
+
+  def execute
+    specs = []
+    gem = get_one_gem_name
+
+    if local? then
+      source_index = Gem::SourceIndex.from_installed_gems
+      specs.push(*source_index.search(/\A#{gem}\z/, options[:version]))
+    end
+
+    if remote? then
+      alert_warning "Remote information is not complete\n\n"
+
+      Gem::SourceInfoCache.cache_data.each do |_,sice|
+        specs.push(*sice.source_index.search(gem, options[:version]))
       end
     end
+
+    if specs.empty? then
+      alert_error "Unknown gem '#{gem}'"
+      terminate_interaction 1
+    end
+
+    output = lambda { |spec| say spec.to_yaml; say "\n" }
+
+    if options[:all] then
+      specs.each(&output)
+    else
+      spec = specs.sort_by { |spec| spec.version }.last
+      output[spec]
+    end
   end
-end
+
+end
+

data/lib/rubygems/commands/uninstall_command.rb

@@ -1,12 +1,16 @@
+require 'rubygems/command'
+require 'rubygems/version_option'
+require 'rubygems/uninstaller'
+
 module Gem
   module Commands
     class UninstallCommand < Command
+
       include VersionOption
-      include CommandAids
 
       def initialize
-        super('uninstall', 'Uninstall gems from the local repository',
-              { :version => "> 0" })
+        super 'uninstall', 'Uninstall gems from the local repository',
+              :version => Gem::Requirement.default
 
         add_option('-a', '--[no-]all',
           'Uninstall all matching versions'
@@ -26,19 +30,20 @@ module Gem
           options[:executables] = value
         end
 
-        add_version_option('uninstall')
+        add_version_option
+        add_platform_option
       end
 
-      def defaults_str
-        "--version '> 0' --no-force"
+      def arguments # :nodoc:
+        "GEMNAME       name of gem to uninstall"
       end
-    
-      def usage
-        "#{program_name} GEMNAME [GEMNAME ...]"
+
+      def defaults_str # :nodoc:
+        "--version '#{Gem::Requirement.default}' --no-force"
       end
 
-      def arguments
-        "GEMNAME   name of gem to uninstall"
+      def usage # :nodoc:
+        "#{program_name} GEMNAME [GEMNAME ...]"
       end
 
       def execute
@@ -48,4 +53,4 @@ module Gem
       end
     end
   end
-end
+end

data/lib/rubygems/commands/unpack_command.rb

@@ -1,76 +1,76 @@
-module Gem
-  module Commands
-    class UnpackCommand < Command
-      include VersionOption
-      include CommandAids
+require 'fileutils'
+require 'rubygems/command'
+require 'rubygems/installer'
+require 'rubygems/version_option'
 
-      def initialize
-        super(
-          'unpack',
-          'Unpack an installed gem to the current directory',
-          { :version => '> 0' }
-        )
-        add_version_option('unpack')
-      end
+class Gem::Commands::UnpackCommand < Gem::Command
 
-      def defaults_str
-        "--version '> 0'"
-      end
+  include Gem::VersionOption
 
-      def usage
-        "#{program_name} GEMNAME"
-      end
+  def initialize
+    super 'unpack', 'Unpack an installed gem to the current directory',
+          :version => Gem::Requirement.default
+    add_version_option
+  end
+
+  def arguments # :nodoc:
+    "GEMNAME       name of gem to unpack"
+  end
+
+  def defaults_str # :nodoc:
+    "--version '#{Gem::Requirement.default}'"
+  end
 
-      def arguments
-        "GEMNAME       Name of the gem to unpack"
-      end
+  def usage # :nodoc:
+    "#{program_name} GEMNAME"
+  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 at the same time.)
-      def execute
-        gemname = get_one_gem_name
-        path = get_path(gemname, options[:version])
-        if path
-          require 'fileutils'
-          target_dir = File.basename(path).sub(/\.gem$/, '')
-          FileUtils.mkdir_p target_dir
-          Installer.new(path).unpack(File.expand_path(target_dir))
-          say "Unpacked gem: '#{target_dir}'"
-        else
-          alert_error "Gem '#{gemname}' not installed."
-        end
-      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
+  # at the same time.)
+  def execute
+    gemname = get_one_gem_name
+    path = get_path(gemname, options[:version])
+    if path
+      target_dir = File.basename(path).sub(/\.gem$/, '')
+      FileUtils.mkdir_p target_dir
+      Gem::Installer.new(path).unpack(File.expand_path(target_dir))
+      say "Unpacked gem: '#{target_dir}'"
+    else
+      alert_error "Gem '#{gemname}' not installed."
+    end
+  end
 
-      # Return the full path to the cached gem file matching the given
-      # name and version requirement.  Returns 'nil' if no match.
-      # Example:
-      #
-      #  get_path('rake', '> 0.4')   # -> '/usr/lib/ruby/gems/1.8/cache/rake-0.4.2.gem'
-      #  get_path('rake', '< 0.1')   # -> nil
-      #  get_path('rak')             # -> nil (exact name required)
-      #
-      # TODO: This should be refactored so that it's a general service.
-      # I don't think any of our existing classes are the right place
-      # though.  Just maybe 'Cache'?
-      #
-      # TODO: It just uses Gem.dir for now.  What's an easy way to get
-      # the list of source directories?
-      #
-      def get_path(gemname, version_req)
-        return gemname if gemname =~ /\.gem$/i
-        specs = SourceIndex.from_installed_gems.search(gemname, version_req)
-        selected = specs.sort_by { |s| s.version }.last
-        return nil if selected.nil?
-        # We expect to find (basename).gem in the 'cache' directory.
-        # Furthermore, the name match must be exact (ignoring case).
-        if gemname =~ /^#{selected.name}$/i
-          filename = selected.full_name + '.gem'
-          return File.join(Gem.dir, 'cache', filename)
-        else
-          return nil
-        end
-      end
+  # Return the full path to the cached gem file matching the given
+  # name and version requirement.  Returns 'nil' if no match.
+  #
+  # Example:
+  #
+  #   get_path('rake', '> 0.4')   # -> '/usr/lib/ruby/gems/1.8/cache/rake-0.4.2.gem'
+  #   get_path('rake', '< 0.1')   # -> nil
+  #   get_path('rak')             # -> nil (exact name required)
+  #--
+  # TODO: This should be refactored so that it's a general service. I don't
+  # think any of our existing classes are the right place though.  Just maybe
+  # 'Cache'?
+  #
+  # TODO: It just uses Gem.dir for now.  What's an easy way to get the list of
+  # source directories?
+  def get_path(gemname, version_req)
+    return gemname if gemname =~ /\.gem$/i
+    specs = Gem::SourceIndex.from_installed_gems.search(/\A#{gemname}\z/, version_req)
+    selected = specs.sort_by { |s| s.version }.last
+    return nil if selected.nil?
+    # We expect to find (basename).gem in the 'cache' directory.
+    # Furthermore, the name match must be exact (ignoring case).
+    if gemname =~ /^#{selected.name}$/i
+      filename = selected.full_name + '.gem'
+      return File.join(Gem.dir, 'cache', filename)
+    else
+      return nil
     end
   end
-end    
+
+end
+

data/lib/rubygems/commands/update_command.rb

@@ -1,12 +1,21 @@
+require 'rubygems/command'
+require 'rubygems/install_update_options'
+require 'rubygems/local_remote_options'
+require 'rubygems/source_info_cache'
+require 'rubygems/version_option'
+
 module Gem
   module Commands
     class UpdateCommand < Command
-      include InstallUpdateOptions
+
+      include Gem::InstallUpdateOptions
+      include Gem::LocalRemoteOptions
+      include Gem::VersionOption
 
       def initialize
         super(
           'update',
-          'Update the named gem (or all installed gems) in the local repository',
+          'Update the named gems (or all installed gems) in the local repository',
           {
             :generate_rdoc => true, 
             :generate_ri => true, 
@@ -14,73 +23,111 @@ module Gem
             :test => false,
             :install_dir => Gem.dir
           })
+
         add_install_update_options
+
         add_option('--system',
           'Update the RubyGems system software') do |value, options|
           options[:system] = value
         end
+
+        add_local_remote_options
+
+        add_platform_option
+      end
+
+      def arguments # :nodoc:
+        "GEMNAME       name of gem to update"
       end
-    
-      def defaults_str
+
+      def defaults_str # :nodoc:
         "--rdoc --ri --no-force --no-test\n" +
         "--install-dir #{Gem.dir}"
       end
 
-      def arguments
-        "GEMNAME(s)   name of gem(s) to update"
+      def usage # :nodoc:
+        "#{program_name} GEMNAME [GEMNAME ...]"
       end
 
       def execute
-        if options[:system]
+        if options[:system] then
           say "Updating RubyGems..."
-          if ! options[:args].empty?
+
+          unless options[:args].empty? then
             fail "No gem names are allowed with the --system option"
           end
+
           options[:args] = ["rubygems-update"]
         else
           say "Updating installed gems..."
         end
+
         hig = highest_installed_gems = {}
+
         Gem::SourceIndex.from_installed_gems.each do |name, spec|
           if hig[spec.name].nil? or hig[spec.name].version < spec.version
             hig[spec.name] = spec
           end
         end
+
         remote_gemspecs = Gem::SourceInfoCache.search(//)
-        gems_to_update =  if(options[:args].empty?) then
-                            which_to_update(highest_installed_gems, remote_gemspecs)
-                          else
-                            options[:args]
-                          end
+
+        gems_to_update = if options[:args].empty? then
+                           which_to_update(highest_installed_gems, remote_gemspecs)
+                         else
+                           options[:args]
+                         end
+
         options[:domain] = :remote # install from remote source
-        install_command = command_manager['install']
+
+        # HACK use the real API
+        install_command = Gem::CommandManager.instance['install']
+
         gems_to_update.uniq.sort.each do |name|
           say "Attempting remote update of #{name}"
           options[:args] = [name]
+          options[:ignore_dependencies] = true # HACK skip seen gems instead
           install_command.merge_options(options)
           install_command.execute
         end
-        if gems_to_update.include?("rubygems-update")
+
+        if gems_to_update.include?("rubygems-update") then
           latest_ruby_gem = remote_gemspecs.select { |s|
-            s.name == 'rubygems-update' 
+            s.name == 'rubygems-update'
           }.sort_by { |s|
             s.version
           }.last
+
           say "Updating version of RubyGems to #{latest_ruby_gem.version}"
-          do_rubygems_update(latest_ruby_gem.version.to_s)
-        end
-        if(options[:system]) then
-          say "RubyGems system software updated"
+          installed = do_rubygems_update(latest_ruby_gem.version.to_s)
+
+          say "RubyGems system software updated" if installed
         else
           say "Gems: [#{gems_to_update.uniq.sort.collect{|g| g.to_s}.join(', ')}] updated"
         end
       end
 
       def do_rubygems_update(version_string)
-        update_dir = File.join(Gem.dir, "gems", "rubygems-update-#{version_string}")
-        Dir.chdir(update_dir) do
-          puts "Installing RubyGems #{version_string}"
-          system "#{Gem.ruby} setup.rb"
+        args = []
+        args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
+        args << '--no-rdoc' unless options[:generate_rdoc]
+        args << '--no-ri' unless options[:generate_ri]
+
+        update_dir = File.join(Gem.dir, 'gems',
+                               "rubygems-update-#{version_string}")
+
+        success = false
+
+        Dir.chdir update_dir do
+          say "Installing RubyGems #{version_string}"
+          setup_cmd = "#{Gem.ruby} setup.rb #{args.join ' '}"
+
+          # Make sure old rubygems isn't loaded
+          if Gem.win_platform? then
+            system "set RUBYOPT= & #{setup_cmd}"
+          else
+            system "RUBYOPT=\"\" #{setup_cmd}"
+          end
         end
       end
 
@@ -99,4 +146,4 @@ module Gem
       end
     end
   end
-end
+end