rubygems-update 1.0.1 → 1.1.0

data/lib/rubygems/builder.rb

@@ -65,13 +65,20 @@ EOM
     end
 
     def write_package
-      Package.open(@spec.file_name, "w", @signer) do |pkg|
-        pkg.metadata = @spec.to_yaml
-        @spec.files.each do |file|
-          next if File.directory? file
-          pkg.add_file_simple(file, File.stat(@spec.file_name).mode & 0777,
-                              File.size(file)) do |os|
-              os.write File.open(file, "rb"){|f|f.read}
+      open @spec.file_name, 'wb' do |gem_io|
+        Gem::Package.open gem_io, 'w', @signer do |pkg|
+          pkg.metadata = @spec.to_yaml
+
+          @spec.files.each do |file|
+            next if File.directory? file
+
+            stat = File.stat file
+            mode = stat.mode & 0777
+            size = stat.size
+
+            pkg.add_file_simple file, mode, size do |tar_io|
+              tar_io.write open(file, "rb") { |f| f.read }
+            end
           end
         end
       end

data/lib/rubygems/command.rb

@@ -136,7 +136,7 @@ module Gem
         execute
       end
     end
-    
+
     # Call the given block when invoked.
     #
     # Normal command invocations just executes the +execute+ method of
@@ -146,7 +146,7 @@ module Gem
     def when_invoked(&block)
       @when_invoked = block
     end
-    
+
     # Add a command-line option and handler to the command.
     #
     # See OptionParser#make_switch for an explanation of +opts+.
@@ -165,7 +165,7 @@ module Gem
         option_list.reject! { |args, _| args.any? { |x| x =~ /^#{name}/ } }
       end
     end
-    
+
     # Merge a set of command options with the set of default options
     # (without modifying the default option hash).
     def merge_options(new_options)
@@ -191,7 +191,7 @@ module Gem
       parser.parse!(args)
       @options[:args] = args
     end
-    
+
     def add_extra_args(args)
       result = []
       s_extra = Command.specific_extra_args(@command)
@@ -291,7 +291,7 @@ module Gem
       def common_options
         @common_options ||= []
       end
-    
+
       def add_common_option(*args, &handler)
         Gem::Command.common_options << [args, handler]
       end
@@ -315,7 +315,7 @@ module Gem
       def specific_extra_args(cmd)
         specific_extra_args_hash[cmd]
       end
-      
+
       # Add a list of extra arguments for the given command.  +args+
       # may be an array or a string to be split on white space.
       def add_specific_extra_args(cmd,args)
@@ -334,7 +334,7 @@ module Gem
     # ----------------------------------------------------------------
     # Add the options common to all commands.
 
-    add_common_option('-h', '--help', 
+    add_common_option('-h', '--help',
       'Get help on this command') do
       |value, options|
       options[:help] = true
@@ -358,11 +358,11 @@ module Gem
     # commands.  Both options are actually handled before the other
     # options get parsed.
 
-    add_common_option('--config-file FILE', 
+    add_common_option('--config-file FILE',
       "Use this config file instead of default") do
     end
 
-    add_common_option('--backtrace', 
+    add_common_option('--backtrace',
       'Show stack backtrace on errors') do
     end
 

data/lib/rubygems/command_manager.rb

@@ -123,6 +123,7 @@ module Gem
     end
     
     private
+
     def load_and_instantiate(command_name)
       command_name = command_name.to_s
       retried = false

data/lib/rubygems/commands/cleanup_command.rb

@@ -2,92 +2,90 @@ require 'rubygems/command'
 require 'rubygems/source_index'
 require 'rubygems/dependency_list'
 
-module Gem
-  module Commands
-    class CleanupCommand < Command
-      def initialize
-        super(
-          'cleanup',
+class Gem::Commands::CleanupCommand < Gem::Command
+
+  def initialize
+    super 'cleanup',
           'Clean up old versions of installed gems in the local repository',
-          {
-            :force => false, 
-            :test => false, 
-            :install_dir => Gem.dir
-          })
-        add_option('-d', '--dryrun', "") do |value, options|
-          options[:dryrun] = true
-        end
-      end
+          :force => false, :test => false, :install_dir => Gem.dir
 
-      def arguments # :nodoc:
-        "GEMNAME       name of gem to cleanup"
-      end
+    add_option('-d', '--dryrun', "") do |value, options|
+      options[:dryrun] = true
+    end
+  end
 
-      def defaults_str # :nodoc:
-        "--no-dryrun"
-      end
+  def arguments # :nodoc:
+    "GEMNAME       name of gem to cleanup"
+  end
+
+  def defaults_str # :nodoc:
+    "--no-dryrun"
+  end
+
+  def usage # :nodoc:
+    "#{program_name} [GEMNAME ...]"
+  end
+
+  def execute
+    say "Cleaning up installed gems..."
+    primary_gems = {}
 
-      def usage # :nodoc:
-        "#{program_name} [GEMNAME ...]"
+    Gem.source_index.each do |name, spec|
+      if primary_gems[spec.name].nil? or
+         primary_gems[spec.name].version < spec.version then
+        primary_gems[spec.name] = spec
       end
+    end
 
-      def execute
-        say "Cleaning up installed gems..."
-        srcindex = Gem::SourceIndex.from_installed_gems
-        primary_gems = {}
+    gems_to_cleanup = []
 
-        srcindex.each do |name, spec|
-          if primary_gems[spec.name].nil? or primary_gems[spec.name].version < spec.version
-            primary_gems[spec.name] = spec
-          end
+    unless options[:args].empty? then
+      options[:args].each do |gem_name|
+        specs = Gem.cache.search(/^#{gem_name}$/i)
+        specs.each do |spec|
+          gems_to_cleanup << spec
         end
+      end
+    else
+      Gem.source_index.each do |name, spec|
+        gems_to_cleanup << spec
+      end
+    end
 
-        gems_to_cleanup = []
-
-        unless options[:args].empty? then
-          options[:args].each do |gem_name|
-            specs = Gem.cache.search(/^#{gem_name}$/i)
-            specs.each do |spec|
-              gems_to_cleanup << spec
-            end
-          end
-        else
-          srcindex.each do |name, spec|
-              gems_to_cleanup << spec
-          end
-        end
+    gems_to_cleanup = gems_to_cleanup.select { |spec|
+      primary_gems[spec.name].version != spec.version
+    }
 
-        gems_to_cleanup = gems_to_cleanup.select { |spec|
-          primary_gems[spec.name].version != spec.version
-        }
+    uninstall_command = Gem::CommandManager.instance['uninstall']
+    deplist = Gem::DependencyList.new
+    gems_to_cleanup.uniq.each do |spec| deplist.add spec end
 
-        uninstall_command = Gem::CommandManager.instance['uninstall']
-        deplist = DependencyList.new
-        gems_to_cleanup.uniq.each do |spec| deplist.add(spec) end
+    deps = deplist.strongly_connected_components.flatten.reverse
 
-        deplist.dependency_order.each do |spec|
-          if options[:dryrun] then
-            say "Dry Run Mode: Would uninstall #{spec.full_name}"
-          else
-            say "Attempting uninstall on #{spec.full_name}"
+    deps.each do |spec|
+      if options[:dryrun] then
+        say "Dry Run Mode: Would uninstall #{spec.full_name}"
+      else
+        say "Attempting to uninstall #{spec.full_name}"
 
-            options[:args] = [spec.name]
-            options[:version] = "= #{spec.version}"
-            options[:executables] = true
+        options[:args] = [spec.name]
+        options[:version] = "= #{spec.version}"
+        options[:executables] = false
 
-            uninstall_command.merge_options(options)
+        uninstaller = Gem::Uninstaller.new spec.name, options
 
-            begin
-              uninstall_command.execute
-            rescue Gem::DependencyRemovalException => ex
-              say "Unable to uninstall #{spec.full_name} ... continuing with remaining gems"
-            end
-          end
+        begin
+          uninstaller.uninstall
+        rescue Gem::DependencyRemovalException,
+               Gem::GemNotInHomeException => e
+          say "Unable to uninstall #{spec.full_name}:"
+          say "\t#{e.class}: #{e.message}"
         end
-
-        say "Clean Up Complete"
       end
     end
-      
+
+    say "Clean Up Complete"
   end
+
 end
+

data/lib/rubygems/commands/environment_command.rb

@@ -25,19 +25,18 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
   def execute
     out = ''
     arg = options[:args][0]
-    if begins?("packageversion", arg) then
+    case arg
+    when /^packageversion/ then
       out << Gem::RubyGemsPackageVersion
-    elsif begins?("version", arg) then
+    when /^version/ then
       out << Gem::RubyGemsVersion
-    elsif begins?("gemdir", arg) then
+    when /^gemdir/, /^gemhome/, /^home/, /^GEM_HOME/ then
       out << Gem.dir
-    elsif begins?("gempath", arg) then
-      out << Gem.path.join("\n")
-    elsif begins?("remotesources", arg) then
+    when /^gempath/, /^path/, /^GEM_PATH/ then
+      out << Gem.path.join(File::PATH_SEPARATOR)
+    when /^remotesources/ then
       out << Gem.sources.join("\n")
-    elsif arg then
-      fail Gem::CommandLineError, "Unknown enviroment option [#{arg}]"
-    else
+    when nil then
       out = "RubyGems Environment:\n"
 
       out << "  - RUBYGEMS VERSION: #{Gem::RubyGemsVersion} (#{Gem::RubyGemsPackageVersion})\n"
@@ -58,7 +57,11 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
       end
 
       out << "  - GEM PATHS:\n"
-      Gem.path.each do |p|
+      out << "     - #{Gem.dir}\n"
+
+      path = Gem.path.dup
+      path.delete Gem.dir
+      path.each do |p|
         out << "     - #{p}\n"
       end
 
@@ -71,6 +74,9 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
       Gem.sources.each do |s|
         out << "     - #{s}\n"
       end
+
+    else
+      fail Gem::CommandLineError, "Unknown enviroment option [#{arg}]"
     end
     say out
     true

data/lib/rubygems/commands/fetch_command.rb

@@ -44,17 +44,15 @@ class Gem::Commands::FetchCommand < Gem::Command
 
       spec, source_uri = specs_and_sources.last
 
-      gem_file = "#{spec.full_name}.gem"
-
-      gem_path = File.join source_uri, 'gems', gem_file
-
-      gem = Gem::RemoteFetcher.fetcher.fetch_path gem_path
-
-      File.open gem_file, 'wb' do |fp|
-        fp.write gem
+      if spec.nil? then
+        alert_error "Could not find #{gem_name} in any repository"
+        next
       end
 
-      say "Downloaded #{gem_file}"
+      path = Gem::RemoteFetcher.fetcher.download spec, source_uri
+      FileUtils.mv path, "#{spec.full_name}.gem"
+
+      say "Downloaded #{spec.full_name}"
     end
   end
 

data/lib/rubygems/commands/install_command.rb

@@ -62,13 +62,15 @@ class Gem::Commands::InstallCommand < Gem::Command
       :install_dir => options[:install_dir],
       :security_policy => options[:security_policy],
       :wrappers => options[:wrappers],
+      :bin_dir => options[:bin_dir]
     }
 
+    exit_code = 0
+
     get_all_gem_names.each do |gem_name|
       begin
-        inst = Gem::DependencyInstaller.new gem_name, options[:version],
-                                            install_options
-        inst.install
+        inst = Gem::DependencyInstaller.new install_options
+        inst.install gem_name, options[:version]
 
         inst.installed_gems.each do |spec|
           say "Successfully installed #{spec.full_name}"
@@ -77,8 +79,10 @@ class Gem::Commands::InstallCommand < Gem::Command
         installed_gems.push(*inst.installed_gems)
       rescue Gem::InstallError => e
         alert_error "Error installing #{gem_name}:\n\t#{e.message}"
+        exit_code |= 1
       rescue Gem::GemNotFoundException => e
         alert_error e.message
+        exit_code |= 2
 #      rescue => e
 #        # TODO: Fix this handle to allow the error to propagate to
 #        # the top level handler.  Examine the other errors as
@@ -121,6 +125,8 @@ class Gem::Commands::InstallCommand < Gem::Command
         end
       end
     end
+
+    raise Gem::SystemExitException, exit_code
   end
 
 end

data/lib/rubygems/commands/list_command.rb

@@ -6,10 +6,8 @@ module Gem
     class ListCommand < QueryCommand
 
       def initialize
-        super(
-          'list',
-          'Display all gems whose name starts with STRING'
-        )
+        super 'list', 'Display gems whose name starts with STRING'
+
         remove_option('--name-matches')
       end
 

data/lib/rubygems/commands/mirror_command.rb

@@ -2,7 +2,7 @@ require 'yaml'
 require 'zlib'
 
 require 'rubygems/command'
-require 'rubygems/gem_open_uri'
+require 'open-uri'
 
 class Gem::Commands::MirrorCommand < Gem::Command
 

data/lib/rubygems/commands/query_command.rb

@@ -1,15 +1,25 @@
 require 'rubygems/command'
 require 'rubygems/local_remote_options'
 require 'rubygems/source_info_cache'
+require 'rubygems/version_option'
 
 class Gem::Commands::QueryCommand < Gem::Command
 
   include Gem::LocalRemoteOptions
+  include Gem::VersionOption
 
   def initialize(name = 'query',
                  summary = 'Query gem information in local or remote repositories')
     super name, summary,
-         :name => /.*/, :domain => :local, :details => false, :versions => true
+         :name => //, :domain => :local, :details => false, :versions => true,
+         :installed => false, :version => Gem::Requirement.default
+
+    add_option('-i', '--[no-]installed',
+               'Check for installed gem') do |value, options|
+      options[:installed] = value
+    end
+
+    add_version_option
 
     add_option('-n', '--name-matches REGEXP',
                'Name of gem(s) to query on matches the',
@@ -28,33 +38,70 @@ class Gem::Commands::QueryCommand < Gem::Command
       options[:details] = false unless value
     end
 
+    add_option('-a', '--all',
+               'Display all gem versions') do |value, options|
+      options[:all] = value
+    end
+
     add_local_remote_options
   end
 
   def defaults_str # :nodoc:
-    "--local --name-matches '.*' --no-details --versions"
+    "--local --name-matches // --no-details --versions --no-installed"
   end
 
   def execute
+    exit_code = 0
+
     name = options[:name]
 
+    if options[:installed] then
+      if name.source.empty? then
+        alert_error "You must specify a gem name"
+        exit_code |= 4
+      elsif installed? name.source, options[:version] then
+        say "true"
+      else
+        say "false"
+        exit_code |= 1
+      end
+
+      raise Gem::SystemExitException, exit_code
+    end
+
     if local? then
       say
       say "*** LOCAL GEMS ***"
       say
-      output_query_results Gem.cache.search(name)
+
+      output_query_results Gem.source_index.search(name)
     end
 
     if remote? then
       say
       say "*** REMOTE GEMS ***"
       say
-      output_query_results Gem::SourceInfoCache.search(name)
+
+      begin
+        Gem::SourceInfoCache.cache options[:all]
+      rescue Gem::RemoteFetcher::FetchError
+        # no network
+      end
+
+      output_query_results Gem::SourceInfoCache.search(name, false, true)
     end
   end
 
   private
 
+  ##
+  # Check if gem +name+ version +version+ is installed.
+
+  def installed?(name, version = Gem::Requirement.default)
+    dep = Gem::Dependency.new name, version
+    !Gem.source_index.search(dep).empty?
+  end
+
   def output_query_results(gemspecs)
     output = []
     gem_list_with_version = {}
@@ -98,7 +145,7 @@ class Gem::Commands::QueryCommand < Gem::Command
 
   ##
   # Used for wrapping and indenting text
-  #
+
   def format_text(text, wrap, indent=0)
     result = []
     work = text.dup