rubygems-update 1.2.0 → 1.3.0

data/lib/rubygems/commands/contents_command.rb

@@ -51,7 +51,7 @@ class Gem::Commands::ContentsCommand < Gem::Command
 
     si = Gem::SourceIndex.from_gems_in(*s)
 
-    gem_spec = si.search(/\A#{gem}\z/, version).last
+    gem_spec = si.find_name(gem, version).last
 
     unless gem_spec then
       say "Unable to find gem '#{gem}' in #{path_kind}"

data/lib/rubygems/commands/environment_command.rb

@@ -18,6 +18,46 @@ class Gem::Commands::EnvironmentCommand < Gem::Command
     return args.gsub(/^\s+/, '')
   end
 
+  def description # :nodoc:
+    <<-EOF
+The RubyGems environment can be controlled through command line arguments,
+gemrc files, environment variables and built-in defaults.
+
+Command line argument defaults and some RubyGems defaults can be set in
+~/.gemrc file for individual users and a /etc/gemrc for all users.  A gemrc
+is a YAML file with the following YAML keys:
+
+  :sources: A YAML array of remote gem repositories to install gems from
+  :verbose: Verbosity of the gem command.  false, true, and :really are the
+            levels
+  :update_sources: Enable/disable automatic updating of repository metadata
+  :backtrace: Print backtrace when RubyGems encounters an error
+  :bulk_threshold: Switch to a bulk update when this many sources are out of
+                   date (legacy setting)
+  :gempath: The paths in which to look for gems
+  gem_command: A string containing arguments for the specified gem command
+
+Example:
+
+  :verbose: false
+  install: --no-wrappers
+  update: --no-wrappers
+
+RubyGems' default local repository can be overriden with the GEM_PATH and
+GEM_HOME environment variables.  GEM_HOME sets the default repository to
+install into.  GEM_PATH allows multiple local repositories to be searched for
+gems.
+
+If you are behind a proxy server, RubyGems uses the HTTP_PROXY,
+HTTP_PROXY_USER and HTTP_PROXY_PASS environment variables to discover the
+proxy server.
+
+If you are packaging RubyGems all of RubyGems' defaults are in
+lib/rubygems/defaults.rb.  You may override these in
+lib/rubygems/defaults/operating_system.rb
+    EOF
+  end
+
   def usage # :nodoc:
     "#{program_name} [arg]"
   end

data/lib/rubygems/commands/help_command.rb

@@ -20,9 +20,9 @@ Some examples of 'gem' usage.
     gem install --remote rake --test --rdoc --ri
 
 * Install 'rake', but only version 0.3.1, even if dependencies
-  are not met, and into a specific directory:
+  are not met, and into a user-specific directory:
 
-    gem install rake --version 0.3.1 --force --install-dir $HOME/.gems
+    gem install rake --version 0.3.1 --force --user-install
 
 * List local gems whose name begins with 'D':
 

data/lib/rubygems/commands/install_command.rb

@@ -38,6 +38,19 @@ class Gem::Commands::InstallCommand < Gem::Command
     "--no-test --install-dir #{Gem.dir}"
   end
 
+  def description # :nodoc:
+    <<-EOF
+The install command installs local or remote gem into a gem repository.
+
+For gems with executables ruby installs a wrapper file into the executable
+directory by deault.  This can be overridden with the --no-wrappers option.
+The wrapper allows you to choose among alternate gem versions using _version_.
+
+For example `rake _0.7.3_ --version` will run rake version 0.7.3 if a newer
+version is also installed.
+    EOF
+  end
+
   def usage # :nodoc:
     "#{program_name} GEMNAME [GEMNAME ...] [options] -- --build-flags"
   end
@@ -106,6 +119,8 @@ class Gem::Commands::InstallCommand < Gem::Command
       installed_gems.each do |gem|
         Gem::DocManager.new(gem, options[:rdoc_args]).generate_ri
       end
+
+      Gem::DocManager.update_ri_cache
     end
 
     if options[:generate_rdoc] then

data/lib/rubygems/commands/lock_command.rb

@@ -58,15 +58,15 @@ lock it down to the exact version.
   end
 
   def complain(message)
-    if options.strict then
-      raise message
+    if options[:strict] then
+      raise Gem::Exception, message
     else
       say "# #{message}"
     end
   end
 
   def execute
-    say 'require "rubygems"'
+    say "require 'rubygems'"
 
     locked = {}
 
@@ -77,15 +77,20 @@ lock it down to the exact version.
 
       spec = Gem::SourceIndex.load_specification spec_path(full_name)
 
+      if spec.nil? then
+        complain "Could not find gem #{full_name}, try using the full name"
+        next
+      end
+
       say "gem '#{spec.name}', '= #{spec.version}'" unless locked[spec.name]
       locked[spec.name] = true
 
       spec.runtime_dependencies.each do |dep|
         next if locked[dep.name]
-        candidates = Gem.source_index.search dep.name, dep.requirement_list
+        candidates = Gem.source_index.search dep
 
         if candidates.empty? then
-          complain "Unable to satisfy '#{dep}' from currently installed gems."
+          complain "Unable to satisfy '#{dep}' from currently installed gems"
         else
           pending << candidates.last.full_name
         end
@@ -94,7 +99,11 @@ lock it down to the exact version.
   end
 
   def spec_path(gem_full_name)
-    File.join Gem.path, "specifications", "#{gem_full_name }.gemspec"
+    gemspecs = Gem.path.map do |path|
+      File.join path, "specifications", "#{gem_full_name}.gemspec"
+    end
+
+    gemspecs.find { |gemspec| File.exist? gemspec }
   end
 
 end

data/lib/rubygems/commands/outdated_command.rb

@@ -19,7 +19,7 @@ class Gem::Commands::OutdatedCommand < Gem::Command
     locals = Gem::SourceIndex.from_installed_gems
 
     locals.outdated.sort.each do |name|
-      local = locals.search(/^#{name}$/).last
+      local = locals.find_name(name).last
 
       dep = Gem::Dependency.new local.name, ">= #{local.version}"
       remotes = Gem::SpecFetcher.fetcher.fetch dep

data/lib/rubygems/commands/pristine_command.rb

@@ -57,7 +57,7 @@ revert the gem.
               end
             else
               gem_name = get_one_gem_name
-              Gem::SourceIndex.from_installed_gems.search(gem_name,
+              Gem::SourceIndex.from_installed_gems.find_name(gem_name,
                                                           options[:version])
             end
 

data/lib/rubygems/commands/query_command.rb

@@ -59,7 +59,7 @@ class Gem::Commands::QueryCommand < Gem::Command
       if name.source.empty? then
         alert_error "You must specify a gem name"
         exit_code |= 4
-      elsif installed? name.source, options[:version] then
+      elsif installed? name, options[:version] then
         say "true"
       else
         say "false"
@@ -69,12 +69,16 @@ class Gem::Commands::QueryCommand < Gem::Command
       raise Gem::SystemExitException, exit_code
     end
 
+    dep = Gem::Dependency.new name, Gem::Requirement.default
+
     if local? then
-      say
-      say "*** LOCAL GEMS ***"
-      say
+      if ui.outs.tty? or both? then
+        say
+        say "*** LOCAL GEMS ***"
+        say
+      end
 
-      specs = Gem.source_index.search name
+      specs = Gem.source_index.search dep
 
       spec_tuples = specs.map do |spec|
         [[spec.name, spec.version, spec.original_platform, spec], :local]
@@ -84,13 +88,14 @@ class Gem::Commands::QueryCommand < Gem::Command
     end
 
     if remote? then
-      say
-      say "*** REMOTE GEMS ***"
-      say
+      if ui.outs.tty? or both? then
+        say
+        say "*** REMOTE GEMS ***"
+        say
+      end
 
       all = options[:all]
 
-      dep = Gem::Dependency.new name, Gem::Requirement.default
       begin
         fetcher = Gem::SpecFetcher.fetcher
         spec_tuples = fetcher.find_matching dep, all, false

data/lib/rubygems/commands/rdoc_command.rb

@@ -59,11 +59,15 @@ module Gem
         if specs.empty?
           fail "Failed to find gem #{gem_name} to generate RDoc for #{options[:version]}"
         end
+
         if options[:include_ri]
           specs.each do |spec|
             Gem::DocManager.new(spec).generate_ri
           end
+
+          Gem::DocManager.update_ri_cache
         end
+
         if options[:include_rdoc]
           specs.each do |spec|
             Gem::DocManager.new(spec).generate_rdoc
@@ -73,6 +77,6 @@ module Gem
         true
       end
     end
-    
+
   end
 end

data/lib/rubygems/commands/specification_command.rb

@@ -40,6 +40,7 @@ class Gem::Commands::SpecificationCommand < Gem::Command
   def execute
     specs = []
     gem = get_one_gem_name
+    dep = Gem::Dependency.new gem, options[:version]
 
     if local? then
       if File.exist? gem then
@@ -47,12 +48,11 @@ class Gem::Commands::SpecificationCommand < Gem::Command
       end
 
       if specs.empty? then
-        specs.push(*Gem.source_index.search(/\A#{gem}\z/, options[:version]))
+        specs.push(*Gem.source_index.search(dep))
       end
     end
 
     if remote? then
-      dep = Gem::Dependency.new gem, options[:version]
       found = Gem::SpecFetcher.fetcher.fetch dep
 
       specs.push(*found.map { |spec,| spec })

data/lib/rubygems/commands/unpack_command.rb

@@ -68,7 +68,7 @@ class Gem::Commands::UnpackCommand < Gem::Command
   def get_path(gemname, version_req)
     return gemname if gemname =~ /\.gem$/i
 
-    specs = Gem::source_index.search(/\A#{gemname}\z/, version_req)
+    specs = Gem::source_index.find_name gemname, version_req
 
     selected = specs.sort_by { |s| s.version }.last
 

data/lib/rubygems/commands/update_command.rb

@@ -45,6 +45,8 @@ class Gem::Commands::UpdateCommand < Gem::Command
   end
 
   def execute
+    hig = {}
+
     if options[:system] then
       say "Updating RubyGems"
 
@@ -52,16 +54,22 @@ class Gem::Commands::UpdateCommand < Gem::Command
         fail "No gem names are allowed with the --system option"
       end
 
-      options[:args] = ["rubygems-update"]
+      spec = Gem::Specification.new
+      spec.name = 'rubygems-update'
+      spec.version = Gem::Version.new Gem::RubyGemsVersion
+      spec.version = Gem::Version.new '1.1.1'
+      hig['rubygems-update'] = spec
+
+      options[:user_install] = false
     else
       say "Updating installed gems"
-    end
 
-    hig = {} # highest installed gems
+      hig = {} # highest installed gems
 
-    Gem.source_index.each do |name, spec|
-      if hig[spec.name].nil? or hig[spec.name].version < spec.version then
-        hig[spec.name] = spec
+      Gem.source_index.each do |name, spec|
+        if hig[spec.name].nil? or hig[spec.name].version < spec.version then
+          hig[spec.name] = spec
+        end
       end
     end
 
@@ -84,14 +92,14 @@ class Gem::Commands::UpdateCommand < Gem::Command
     end
 
     if gems_to_update.include? "rubygems-update" then
-      latest_ruby_gem = remote_gemspecs.select do |s|
-        s.name == 'rubygems-update'
-      end
+      Gem.source_index.refresh!
+
+      update_gems = Gem.source_index.search 'rubygems-update'
 
-      latest_ruby_gem = latest_ruby_gem.sort_by { |s| s.version }.last
+      latest_update_gem = update_gems.sort_by { |s| s.version }.last
 
-      say "Updating version of RubyGems to #{latest_ruby_gem.version}"
-      installed = do_rubygems_update latest_ruby_gem.version
+      say "Updating RubyGems to #{latest_update_gem.version}"
+      installed = do_rubygems_update latest_update_gem.version
 
       say "RubyGems system software updated" if installed
     else
@@ -103,6 +111,9 @@ class Gem::Commands::UpdateCommand < Gem::Command
     end
   end
 
+  ##
+  # Update the RubyGems software to +version+.
+
   def do_rubygems_update(version)
     args = []
     args.push '--prefix', Gem.prefix unless Gem.prefix.nil?
@@ -112,8 +123,6 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     update_dir = File.join Gem.dir, 'gems', "rubygems-update-#{version}"
 
-    success = false
-
     Dir.chdir update_dir do
       say "Installing RubyGems #{version}"
       setup_cmd = "#{Gem.ruby} setup.rb #{args.join ' '}"

data/lib/rubygems/commands/which_command.rb

@@ -3,10 +3,10 @@ require 'rubygems/gem_path_searcher'
 
 class Gem::Commands::WhichCommand < Gem::Command
 
-  EXT = %w[.rb .rbw .so .dll] # HACK
+  EXT = %w[.rb .rbw .so .dll .bundle] # HACK
 
   def initialize
-    super 'which', 'Find the location of a library',
+    super 'which', 'Find the location of a library file you can require',
           :search_gems_first => false, :show_all => false
 
     add_option '-a', '--[no-]all', 'show all matching files' do |show_all, options|
@@ -52,7 +52,7 @@ class Gem::Commands::WhichCommand < Gem::Command
       paths = find_paths arg, dirs
 
       if paths.empty? then
-        say "Can't find #{arg}"
+        say "Can't find ruby library file or shared library #{arg}"
       else
         say paths
       end
@@ -84,3 +84,4 @@ class Gem::Commands::WhichCommand < Gem::Command
   end
 
 end
+

data/lib/rubygems/config_file.rb

@@ -18,6 +18,18 @@ class Gem::ConfigFile
   DEFAULT_VERBOSITY = true
   DEFAULT_UPDATE_SOURCES = true
 
+  ##
+  # For Ruby packagers to set configuration defaults.  Set in
+  # rubygems/defaults/operating_system.rb
+
+  OPERATING_SYSTEM_DEFAULTS = {}
+
+  ##
+  # For Ruby implementers to set configuration defaults.  Set in
+  # rubygems/defaults/#{RUBY_ENGINE}.rb
+
+  PLATFORM_DEFAULTS = {}
+
   system_config_path = 
     begin
       require 'Win32API'
@@ -37,6 +49,9 @@ class Gem::ConfigFile
   # List of arguments supplied to the config file object.
   attr_reader :args
 
+  # Where to look for gems
+  attr_accessor :path
+
   # True if we print backtraces on errors.
   attr_writer :backtrace
 
@@ -98,16 +113,23 @@ class Gem::ConfigFile
     @verbose = DEFAULT_VERBOSITY
     @update_sources = DEFAULT_UPDATE_SOURCES
 
-    @hash = load_file(SYSTEM_WIDE_CONFIG_FILE)
-    @hash.merge!(load_file(config_file_name.dup.untaint))
+    operating_system_config = Marshal.load Marshal.dump(OPERATING_SYSTEM_DEFAULTS)
+    platform_config = Marshal.load Marshal.dump(PLATFORM_DEFAULTS)
+    system_config = load_file SYSTEM_WIDE_CONFIG_FILE
+    user_config = load_file config_file_name.dup.untaint
+
+    @hash = operating_system_config.merge platform_config
+    @hash = @hash.merge system_config
+    @hash = @hash.merge user_config
 
     # HACK these override command-line args, which is bad
     @backtrace = @hash[:backtrace] if @hash.key? :backtrace
     @benchmark = @hash[:benchmark] if @hash.key? :benchmark
     @bulk_threshold = @hash[:bulk_threshold] if @hash.key? :bulk_threshold
-    Gem.sources.replace @hash[:sources] if @hash.key? :sources
+    Gem.sources = @hash[:sources] if @hash.key? :sources
     @verbose = @hash[:verbose] if @hash.key? :verbose
     @update_sources = @hash[:update_sources] if @hash.key? :update_sources
+    @path = @hash[:gempath]
 
     handle_arguments arg_list
   end

data/lib/rubygems/defaults.rb

@@ -1,36 +1,52 @@
 module Gem
 
-  # An Array of the default sources that come with RubyGems.
+  ##
+  # An Array of the default sources that come with RubyGems
+
   def self.default_sources
     %w[http://gems.rubyforge.org/]
   end
 
+  ##
   # Default home directory path to be used if an alternate value is not
-  # specified in the environment.
+  # specified in the environment
+
   def self.default_dir
     if defined? RUBY_FRAMEWORK_VERSION then
       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
                 ConfigMap[:ruby_version]
-    elsif defined? RUBY_ENGINE then
-      File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',
-                ConfigMap[:ruby_version]
     else
-      File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
+      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+                ConfigMap[:ruby_version])
     end
   end
 
-  # Default gem path.
+  ##
+  # Path for gems in the user's home directory
+
+  def self.user_dir
+    File.join(Gem.user_home, '.gem', ruby_engine,
+              ConfigMap[:ruby_version])
+  end
+
+  ##
+  # Default gem load path
+
   def self.default_path
-    default_dir
+    [user_dir, default_dir]
   end
 
-  # Deduce Ruby's --program-prefix and --program-suffix from its install name.
+  ##
+  # Deduce Ruby's --program-prefix and --program-suffix from its install name
+
   def self.default_exec_format
     baseruby = ConfigMap[:BASERUBY] || 'ruby'
     ConfigMap[:RUBY_INSTALL_NAME].sub(baseruby, '%s') rescue '%s'
   end
 
+  ##
   # The default directory for binaries
+
   def self.default_bindir
     if defined? RUBY_FRAMEWORK_VERSION then # mac framework support
       '/usr/bin'
@@ -39,15 +55,30 @@ module Gem
     end
   end
 
-  # The default system-wide source info cache directory.
+  ##
+  # The default system-wide source info cache directory
+
   def self.default_system_source_cache_dir
     File.join Gem.dir, 'source_cache'
   end
 
-  # The default user-specific source info cache directory.
+  ##
+  # The default user-specific source info cache directory
+
   def self.default_user_source_cache_dir
     File.join Gem.user_home, '.gem', 'source_cache'
   end
 
+  ##
+  # A wrapper around RUBY_ENGINE const that may not be defined
+
+  def self.ruby_engine
+    if defined? RUBY_ENGINE then
+      RUBY_ENGINE
+    else
+      'ruby'
+    end
+  end
+
 end