rubygems-update 0.9.4 → 0.9.5

data/lib/rubygems/commands/query_command.rb

@@ -1,86 +1,118 @@
-module Gem
-  module Commands
-    class QueryCommand < Command
-      include LocalRemoteOptions
-      
-      def initialize(name='query', summary='Query gem information in local or remote repositories')
-        super(name,
-          summary,
-          {:name=>/.*/, :domain=>:local, :details=>false}
-          )
-        add_option('-n', '--name-matches REGEXP', 'Name of gem(s) to query on matches the provided REGEXP') do |value, options|
-          options[:name] = /#{value}/i
-        end
-        add_option('-d', '--[no-]details', 'Display detailed information of gem(s)') do |value, options|
-          options[:details] = value
+require 'rubygems/command'
+require 'rubygems/local_remote_options'
+require 'rubygems/source_info_cache'
+
+class Gem::Commands::QueryCommand < Gem::Command
+
+  include Gem::LocalRemoteOptions
+
+  def initialize(name = 'query',
+                 summary = 'Query gem information in local or remote repositories')
+    super name, summary,
+         :name => /.*/, :domain => :local, :details => false, :versions => true
+
+    add_option('-n', '--name-matches REGEXP',
+               'Name of gem(s) to query on matches the',
+               'provided REGEXP') do |value, options|
+      options[:name] = /#{value}/i
+    end
+
+    add_option('-d', '--[no-]details',
+               'Display detailed information of gem(s)') do |value, options|
+      options[:details] = value
+    end
+
+    add_option(      '--[no-]versions',
+               'Display only gem names') do |value, options|
+      options[:versions] = value
+      options[:details] = false unless value
+    end
+
+    add_local_remote_options
+  end
+
+  def defaults_str # :nodoc:
+    "--local --name-matches '.*' --no-details --versions"
+  end
+
+  def execute
+    name = options[:name]
+
+    if local? then
+      say
+      say "*** LOCAL GEMS ***"
+      say
+      output_query_results Gem.cache.search(name)
+    end
+
+    if remote? then
+      say
+      say "*** REMOTE GEMS ***"
+      say
+      output_query_results Gem::SourceInfoCache.search(name)
+    end
+  end
+
+  private
+
+  def output_query_results(gemspecs)
+    output = []
+    gem_list_with_version = {}
+
+    gemspecs.flatten.each do |gemspec|
+      gem_list_with_version[gemspec.name] ||= []
+      gem_list_with_version[gemspec.name] << gemspec
+    end
+
+    gem_list_with_version = gem_list_with_version.sort_by do |name, spec|
+      name.downcase
+    end
+
+    gem_list_with_version.each do |gem_name, list_of_matching|
+      list_of_matching = list_of_matching.sort_by { |x| x.version.to_ints }.reverse
+      seen_versions = {}
+
+      list_of_matching.delete_if do |item|
+        if seen_versions[item.version] then
+          true
+        else
+          seen_versions[item.version] = true
+          false
         end
-        add_local_remote_options
       end
 
-      def defaults_str
-        "--local --name-matches '.*' --no-details"
-      end
-    
-      def execute
-        if local?
-          say
-          say "*** LOCAL GEMS ***"
-          output_query_results(Gem::cache.search(options[:name]))
-        end
-        if remote?
-          say
-          say "*** REMOTE GEMS ***"
-          output_query_results(Gem::SourceInfoCache.search(options[:name]))
-        end
+      entry = gem_name.dup
+      if options[:versions] then
+        entry << " (#{list_of_matching.map{|gem| gem.version.to_s}.join(", ")})"
       end
 
-      private
+      entry << "\n" << format_text(list_of_matching[0].summary, 68, 4) if
+        options[:details]
+      output << entry
+    end
 
-      def output_query_results(gemspecs)
-        gem_list_with_version = {}
-        gemspecs.flatten.each do |gemspec|
-          gem_list_with_version[gemspec.name] ||= []
-          gem_list_with_version[gemspec.name] << gemspec
-        end
-      
-        gem_list_with_version = gem_list_with_version.sort do |first, second|
-          first[0].downcase <=> second[0].downcase
-        end
-        gem_list_with_version.each do |gem_name, list_of_matching| 
-          say
-          list_of_matching = list_of_matching.sort_by { |x| x.version }.reverse
-          seen_versions = []
-          list_of_matching.delete_if do |item|
-            if(seen_versions.member?(item.version))           
-              true
-            else 
-              seen_versions << item.version
-              false
-            end
-          end
-          say "#{gem_name} (#{list_of_matching.map{|gem| gem.version.to_s}.join(", ")})"
-          say format_text(list_of_matching[0].summary, 68, 4)
-        end
-      end
-    
-      ##
-      # Used for wrapping and indenting text
-      #
-      def format_text(text, wrap, indent=0)
-        result = []
-        pattern = Regexp.new("^(.{0,#{wrap}})[ \n]")
-        work = text.dup
-        while work.length > wrap
-          if work =~ pattern
-            result << $1
-            work.slice!(0, $&.length)
-          else
-            result << work.slice!(0, wrap)
-          end
-        end
-        result << work if work.length.nonzero?
-        result.join("\n").gsub(/^/, " " * indent)
+    say output.join(options[:details] ? "\n\n" : "\n")
+  end
+
+  ##
+  # Used for wrapping and indenting text
+  #
+  def format_text(text, wrap, indent=0)
+    result = []
+    work = text.dup
+
+    while work.length > wrap
+      if work =~ /^(.{0,#{wrap}})[ \n]/o then
+        result << $1
+        work.slice!(0, $&.length)
+      else
+        result << work.slice!(0, wrap)
       end
     end
+
+    result << work if work.length.nonzero?
+    result.join("\n").gsub(/^/, " " * indent)
   end
-end
+
+end
+

data/lib/rubygems/commands/rdoc_command.rb

@@ -1,14 +1,17 @@
+require 'rubygems/command'
+require 'rubygems/version_option'
+require 'rubygems/doc_manager'
+
 module Gem
   module Commands
     class RdocCommand < Command
       include VersionOption
-      include CommandAids
 
       def initialize
         super('rdoc',
           'Generates RDoc for pre-installed gems',
           {
-            :version => "> 0.0.0",
+            :version => Gem::Requirement.default,
             :include_rdoc => true,
             :include_ri => true,
           })
@@ -27,19 +30,19 @@ module Gem
           ) do |value, options|
           options[:include_ri] = value
         end
-        add_version_option('rdoc')
+        add_version_option
       end
 
-      def defaults_str
-        "--version '> 0.0.0' --rdoc --ri"
+      def arguments # :nodoc:
+        "GEMNAME       gem to generate documentation for (unless --all)"
       end
 
-      def usage
-        "#{program_name} [args]"
+      def defaults_str # :nodoc:
+        "--version '#{Gem::Requirement.default}' --rdoc --ri"
       end
 
-      def arguments
-        "GEMNAME          The gem to generate RDoc for (unless --all)"
+      def usage # :nodoc:
+        "#{program_name} [args]"
       end
 
       def execute
@@ -72,4 +75,4 @@ module Gem
     end
     
   end
-end
+end

data/lib/rubygems/commands/search_command.rb

@@ -1,8 +1,10 @@
+require 'rubygems/command'
+require 'rubygems/commands/query_command'
+
 module Gem
   module Commands
 
     class SearchCommand < QueryCommand
-      include CommandAids
 
       def initialize
         super(
@@ -12,16 +14,16 @@ module Gem
         remove_option('--name-matches')
       end
 
-      def defaults_str
-        "--local --no-details"
+      def arguments # :nodoc:
+        "STRING        fragment of gem name to search for"
       end
 
-      def usage
-        "#{program_name} [STRING]"
+      def defaults_str # :nodoc:
+        "--local --no-details"
       end
 
-      def arguments
-        "STRING   fragment of gem name to look for"
+      def usage # :nodoc:
+        "#{program_name} [STRING]"
       end
 
       def execute
@@ -32,4 +34,4 @@ module Gem
     end
     
   end
-end
+end

data/lib/rubygems/commands/server_command.rb

@@ -0,0 +1,48 @@
+require 'rubygems/command'
+require 'rubygems/server'
+
+class Gem::Commands::ServerCommand < Gem::Command
+
+  def initialize
+    super 'server', 'Documentation and gem repository HTTP server',
+          :port => 8808, :gemdir => Gem.dir, :daemon => false
+
+    add_option '-p', '--port=PORT',
+               'port to listen on' do |port, options|
+      options[:port] = port
+    end
+
+    add_option '-d', '--dir=GEMDIR',
+               'directory from which to serve gems' do |gemdir, options|
+      options[:gemdir] = gemdir
+    end
+
+    add_option '--[no]-daemon', 'run as a daemon' do |daemon, options|
+      options[:daemon] = daemon
+    end
+  end
+
+  def defaults_str # :nodoc:
+    "--port 8808 --dir #{Gem.dir} --no-daemon"
+  end
+
+  def description # :nodoc:
+    <<-EOF
+The server command starts up a web server that hosts the RDoc for your
+installed gems and can operate as a server for installation of gems on other
+machines.
+
+The cache files for installed gems must exist to use the server as a source
+for gem installation.
+
+To install gems from a running server, use `gem install GEMNAME --source
+http://gem_server_host:8808`
+    EOF
+  end
+
+  def execute
+    Gem::Server.run options
+  end
+
+end
+

data/lib/rubygems/commands/sources_command.rb

@@ -1,94 +1,115 @@
-module Gem
-  module Commands
-  
-    class SourcesCommand < Command
+require 'rubygems/command'
+require 'rubygems/remote_fetcher'
+require 'rubygems/source_info_cache'
+require 'rubygems/source_info_cache_entry'
+
+class Gem::Commands::SourcesCommand < Gem::Command
+
+  def initialize
+    super 'sources',
+          'Manage the sources and cache file RubyGems uses to search for gems'
+
+    add_option '-a', '--add SOURCE_URI', 'Add source' do |value, options|
+      options[:add] = value
+    end
+
+    add_option '-l', '--list', 'List sources' do |value, options|
+      options[:list] = value
+    end
+
+    add_option '-r', '--remove SOURCE_URI', 'Remove source' do |value, options|
+      options[:remove] = value
+    end
+
+    add_option '-u', '--update', 'Update source cache' do |value, options|
+      options[:update] = value
+    end
+
+    add_option '-c', '--clear-all',
+               'Remove all sources (clear the cache)' do |value, options|
+      options[:clear_all] = value
+    end
+  end
+
+  def defaults_str
+    '--list'
+  end
+
+  def execute
+    options[:list] = !(options[:add] || options[:remove] || options[:clear_all] || options[:update])
+
+    if options[:clear_all] then
+      remove_cache_file("user", Gem::SourceInfoCache.user_cache_file)
+      remove_cache_file("system", Gem::SourceInfoCache.system_cache_file)
+    end
+
+    if options[:add] then
+      source_uri = options[:add]
+
+      sice = Gem::SourceInfoCacheEntry.new nil, nil
+      begin
+        sice.refresh source_uri
+
+        Gem::SourceInfoCache.cache_data[source_uri] = sice
+        Gem::SourceInfoCache.cache.update
+        Gem::SourceInfoCache.cache.flush
+
+        Gem.sources << source_uri
+        Gem.configuration.write
+
+        say "#{source_uri} added to sources"
+      rescue URI::Error, ArgumentError
+        say "#{source_uri} is not a URI"
+      rescue Gem::RemoteFetcher::FetchError => e
+        say "Error fetching #{source_uri}:\n\t#{e.message}"
+      end
+    end
 
-      def initialize
-        super 'sources', 'Manage the sources RubyGems will search forgems'
+    if options[:update] then
+      Gem::SourceInfoCache.cache.refresh
+      Gem::SourceInfoCache.cache.flush
 
-        add_option '-a', '--add SOURCE_URI', 'Add source' do |value, options|
-          options[:add] = value
-        end
+      say "source cache successfully updated"
+    end
 
-        add_option '-l', '--list', 'List sources' do |value, options|
-          options[:list] = value
-        end
+    if options[:remove] then
+      source_uri = options[:remove]
 
-        add_option '-r', '--remove SOURCE_URI', 'Remove source' do |value, options|
-          options[:remove] = value
-        end
+      unless Gem.sources.include? source_uri then
+        say "source #{source_uri} not present in cache"
+      else
+        Gem::SourceInfoCache.cache_data.delete source_uri
+        Gem::SourceInfoCache.cache.update
+        Gem::SourceInfoCache.cache.flush
+        Gem.sources.delete source_uri
+        Gem.configuration.write
 
-        add_option '-c', '--clear-all', 'Remove all sources' do |value, options|
-          options[:clear_all] = value
-        end
+        say "#{source_uri} removed from sources"
       end
+    end
 
-      def defaults_str
-        '--list'
-      end
+    if options[:list] then
+      say "*** CURRENT SOURCES ***"
+      say
 
-      def execute
-        options[:list] = ! (options[:add] || options[:remove] || options[:clear_all]) 
-
-        if options[:clear_all] then
-          remove_cache_file("user", Gem::SourceInfoCache.user_cache_file)
-          remove_cache_file("system", Gem::SourceInfoCache.system_cache_file)
-        end
-
-        if options[:add] then
-          source_uri = options[:add]
-
-          sice = Gem::SourceInfoCacheEntry.new nil, nil
-          begin
-            sice.refresh source_uri
-          rescue ArgumentError
-            say "#{source_uri} is not a URI"
-          rescue Gem::RemoteFetcher::FetchError => e
-            say "Error fetching #{source_uri}:\n\t#{e.message}"
-          else
-            Gem::SourceInfoCache.cache_data[source_uri] = sice
-            Gem::SourceInfoCache.cache.update
-            Gem::SourceInfoCache.cache.flush
-
-            say "#{source_uri} added to sources"
-          end
-        end
-
-        if options[:remove] then
-          source_uri = options[:remove]
-
-          unless Gem::SourceInfoCache.cache_data.include? source_uri then
-            say "source #{source_uri} not present in cache"
-          else
-            Gem::SourceInfoCache.cache_data.delete source_uri
-            Gem::SourceInfoCache.cache.update
-            Gem::SourceInfoCache.cache.flush
-            say "#{source_uri} removed from sources"
-          end
-        end
-
-        if options[:list] then
-          say "*** CURRENT SOURCES ***"
-          say
-
-          Gem::SourceInfoCache.cache_data.keys.each do |source_uri|
-            say source_uri
-          end
-        end
+      Gem.sources.each do |source_uri|
+        say source_uri
       end
+    end
+  end
 
-      def remove_cache_file(desc, fn)
-        FileUtils.rm_rf fn rescue nil
-        if ! File.exist?(fn)
-          say "*** Removed #{desc} source cache ***"
-        elsif ! File.writable?(fn)
-          say "*** Unable to remove #{desc} source cache (write protected) ***"
-        else
-          say "*** Unable to remove #{desc} source cache ***"
-        end
-      end
-      private :remove_cache_file
+  private
+
+  def remove_cache_file(desc, fn)
+    FileUtils.rm_rf fn rescue nil
+    if ! File.exist?(fn)
+      say "*** Removed #{desc} source cache ***"
+    elsif ! File.writable?(fn)
+      say "*** Unable to remove #{desc} source cache (write protected) ***"
+    else
+      say "*** Unable to remove #{desc} source cache ***"
+    end
+  end
+
+end
 
-    end # class SourcesCommand
-  end # module Commands
-end # module Gem