rubygems-update 0.9.4 → 0.9.5

data/lib/rubygems/commands/which_command.rb

@@ -0,0 +1,86 @@
+require 'rubygems/command'
+require 'rubygems/gem_path_searcher'
+
+class Gem::Commands::WhichCommand < Gem::Command
+
+  EXT = %w[.rb .rbw .so .dll] # HACK
+
+  def initialize
+    super 'which', 'Find the location of a library',
+          :search_gems_first => false, :show_all => false
+
+    add_option '-a', '--[no-]all', 'show all matching files' do |show_all, options|
+      options[:show_all] = show_all
+    end
+
+    add_option '-g', '--[no-]gems-first',
+               'search gems before non-gems' do |gems_first, options|
+      options[:search_gems_first] = gems_first
+    end
+  end
+
+  def arguments # :nodoc:
+    "FILE          name of file to find"
+  end
+
+  def defaults_str # :nodoc:
+    "--no-gems-first --no-all"
+  end
+
+  def usage # :nodoc:
+    "#{program_name} FILE [FILE ...]"
+  end
+
+  def execute
+    searcher = Gem::GemPathSearcher.new
+
+    options[:args].each do |arg|
+      dirs = $LOAD_PATH
+      spec = searcher.find arg
+
+      if spec then
+        if options[:search_gems_first] then
+          dirs = gem_paths(spec) + $LOAD_PATH
+        else
+          dirs = $LOAD_PATH + gem_paths(spec)
+        end
+
+        say "(checking gem #{spec.full_name} for #{arg})" if
+          Gem.configuration.verbose
+      end
+
+      paths = find_paths arg, dirs
+
+      if paths.empty? then
+        say "Can't find #{arg}"
+      else
+        say paths
+      end
+    end
+  end
+
+  def find_paths(package_name, dirs)
+    result = []
+
+    dirs.each do |dir|
+      EXT.each do |ext|
+        full_path = File.join dir, "#{package_name}#{ext}"
+        if File.exist? full_path then
+          result << full_path
+          return result unless options[:show_all]
+        end
+      end
+    end
+
+    result
+  end
+
+  def gem_paths(spec)
+    spec.require_paths.collect { |d| File.join spec.full_gem_path, d }
+  end
+
+  def usage # :nodoc:
+    "#{program_name} FILE [...]"
+  end
+
+end

data/lib/rubygems/config_file.rb

@@ -1,4 +1,3 @@
-#!/usr/bin/env ruby
 #--
 # Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
 # All rights reserved.
@@ -8,93 +7,218 @@
 require 'yaml'
 require 'rubygems'
 
-module Gem
+# Store the gem command options specified in the configuration file.  The
+# config file object acts much like a hash.
 
-  ####################################################################
-  # Store the gem command options specified in the configuration file.
-  # The config file object acts much like a hash.
+class Gem::ConfigFile
+
+  DEFAULT_BACKTRACE = false
+  DEFAULT_BENCHMARK = false
+  DEFAULT_BULK_THRESHOLD = 1000
+  DEFAULT_VERBOSITY = true
+  DEFAULT_UPDATE_SOURCES = true
+
+  # List of arguments supplied to the config file object.
+  attr_reader :args
+
+  # True if we print backtraces on errors.
+  attr_writer :backtrace
+
+  # True if we are benchmarking this run.
+  attr_accessor :benchmark
+
+  # Bulk threshold value.  If the number of missing gems are above
+  # this threshold value, then a bulk download technique is used.
+  attr_accessor :bulk_threshold
+
+  # Verbose level of output:
+  # * false -- No output
+  # * true -- Normal output
+  # * :loud -- Extra output
+  attr_accessor :verbose
+
+  # True if we want to update the SourceInfoCache every time, false otherwise
+  attr_accessor :update_sources
+
+  # Create the config file object.  +args+ is the list of arguments
+  # from the command line.
+  #
+  # The following command line options are handled early here rather
+  # than later at the time most command options are processed.
+  #
+  # * --config-file and --config-file==NAME -- Obviously these need
+  #   to be handled by the ConfigFile object to ensure we get the
+  #   right config file.
+  #
+  # * --backtrace -- Backtrace needs to be turned on early so that
+  #   errors before normal option parsing can be properly handled.
+  #
+  # * --debug -- Enable Ruby level debug messages.  Handled early
+  #   for the same reason as --backtrace.
   #
-  class ConfigFile
-    # True if the backtrace option has been specified.
-    attr_reader :backtrace
-    
-    # List of arguments supplied to the config file object.
-    attr_reader :args
-
-    # Verbose level of output:
-    # * false -- No output
-    # * true -- Normal output
-    # * :loud -- Extra output
-    attr_accessor :verbose
-
-    # Create the config file object.  +args+ is the list of arguments
-    # from the command line.
-    #
-    # The following command line options are handled early here rather
-    # than later at the time most command options are processed.
-    #
-    # * --config-file and --config-file==NAME -- Obviously these need
-    #   to be handled by the ConfigFile object to ensure we get the
-    #   right config file.
-    #   
-    # * --backtrace -- Backtrace needs to be turned on early so that
-    #   errors before normal option parsing can be properly handled.
-    #
-    # * --debug -- Enable Ruby level debug messages.  Handled early
-    #   for the same reason as --backtrace.
-    #
-    def initialize(arg_list)
-      @config_file_name = nil
-      @verbose = true
-      handle_arguments(arg_list)
-      begin
-        @hash = open(config_file_name) {|f| YAML.load(f) }
-      rescue ArgumentError
-        warn "Failed to load #{config_file_name}"
-      rescue Errno::ENOENT
-        # Ignore missing config file error.
-      rescue Errno::EACCES                 
-        warn "Failed to load #{config_file_name} due to permissions problem."
+  def initialize(arg_list)
+    @config_file_name = nil
+    need_config_file_name = false
+
+    arg_list = arg_list.map do |arg|
+      if need_config_file_name then
+        @config_file_name = arg
+        nil
+      elsif arg =~ /^--config-file=(.*)/ then
+        @config_file_name = $1
+        nil
+      elsif arg =~ /^--config-file$/ then
+        need_config_file_name = true
+        nil
+      else
+        arg
+      end
+    end.compact
+
+    @backtrace = DEFAULT_BACKTRACE
+    @benchmark = DEFAULT_BENCHMARK
+    @bulk_threshold = DEFAULT_BULK_THRESHOLD
+    @verbose = DEFAULT_VERBOSITY
+    @update_sources = DEFAULT_UPDATE_SOURCES
+
+    begin
+      # HACK $SAFE ok?
+      @hash = open(config_file_name.dup.untaint) {|f| YAML.load(f) }
+    rescue ArgumentError
+      warn "Failed to load #{config_file_name}"
+    rescue Errno::ENOENT
+      # Ignore missing config file error.
+    rescue Errno::EACCES
+      warn "Failed to load #{config_file_name} due to permissions problem."
+    end
+
+    @hash ||= {}
+
+    # 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
+    @verbose = @hash[:verbose] if @hash.key? :verbose
+    @update_sources = @hash[:update_sources] if @hash.key? :update_sources
+
+    handle_arguments arg_list
+  end
+
+  # True if the backtrace option has been specified, or debug is on.
+  def backtrace
+    @backtrace or $DEBUG
+  end
+
+  # The name of the configuration file.
+  def config_file_name
+    @config_file_name || Gem.config_file
+  end
+
+  # Delegates to @hash
+  def each(&block)
+    hash = @hash.dup
+    hash.delete :update_sources
+    hash.delete :verbose
+    hash.delete :benchmark
+    hash.delete :backtrace
+    hash.delete :bulk_threshold
+
+    yield :update_sources, @update_sources
+    yield :verbose, @verbose
+    yield :benchmark, @benchmark
+    yield :backtrace, @backtrace
+    yield :bulk_threshold, @bulk_threshold
+
+    yield 'config_file_name', @config_file_name if @config_file_name
+
+    hash.each(&block)
+  end
+
+  # Handle the command arguments.
+  def handle_arguments(arg_list)
+    @args = []
+
+    arg_list.each do |arg|
+      case arg
+      when /^--(backtrace|traceback)$/ then
+        @backtrace = true
+      when /^--bench(mark)?$/ then
+        @benchmark = true
+      when /^--debug$/ then
+        $DEBUG = true
+      else
+        @args << arg
       end
-      @hash ||= {}
     end
+  end
 
-    # The name of the configuration file.
-    def config_file_name
-      @config_file_name || Gem.config_file
+  # Really verbose mode gives you extra output.
+  def really_verbose
+    case verbose
+    when true, false, nil then false
+    else true
     end
+  end
+
+  # to_yaml only overwrites things you can't override on the command line.
+  def to_yaml # :nodoc:
+    yaml_hash = {}
+    yaml_hash[:backtrace] = @hash.key?(:backtrace) ? @hash[:backtrace] :
+      DEFAULT_BACKTRACE
+    yaml_hash[:benchmark] = @hash.key?(:benchmark) ? @hash[:benchmark] :
+      DEFAULT_BENCHMARK
+    yaml_hash[:bulk_threshold] = @hash.key?(:bulk_threshold) ?
+      @hash[:bulk_threshold] : DEFAULT_BULK_THRESHOLD
+    yaml_hash[:sources] = Gem.sources
+    yaml_hash[:update_sources] = @hash.key?(:update_sources) ?
+      @hash[:update_sources] : DEFAULT_UPDATE_SOURCES
+    yaml_hash[:verbose] = @hash.key?(:verbose) ? @hash[:verbose] :
+      DEFAULT_VERBOSITY
+
+    keys = yaml_hash.keys.map { |key| key.to_s }
+    keys << 'debug'
+    re = Regexp.union(*keys)
 
-    # Return the configuration information for +key+.
-    def [](key)
-      @hash[key.to_s]
+    @hash.each do |key, value|
+      key = key.to_s
+      next if key =~ re
+      yaml_hash[key.to_s] = value
     end
 
-    private
-
-    # Handle the command arguments.
-    def handle_arguments(arg_list)
-      need_cfg_name = false
-      @args = []
-      arg_list.each do |arg|
-        if need_cfg_name
-          @config_file_name = arg
-          need_cfg_name = false
-        else
-          case arg
-          when /^--(traceback|backtrace)$/
-            @backtrace = true
-          when /^--debug$/
-            $DEBUG = true
-          when /^--config-file$/
-            need_cfg_name = true
-          when /^--config-file=(.+)$/
-            @config_file_name = $1
-          else
-            @args << arg
-          end
-        end
-      end
+    yaml_hash.to_yaml
+  end
+
+  # Writes out this config file, replacing its source.
+  def write
+    File.open config_file_name, 'w' do |fp|
+      fp.write self.to_yaml
     end
   end
 
+  # Return the configuration information for +key+.
+  def [](key)
+    @hash[key.to_s]
+  end
+
+  # Set configuration option +key+ to +value+.
+  def []=(key, value)
+    @hash[key.to_s] = value
+  end
+
+  def ==(other) # :nodoc:
+    self.class === other and
+    @backtrace == other.backtrace and
+    @benchmark == other.benchmark and
+    @bulk_threshold == other.bulk_threshold and
+    @verbose == other.verbose and
+    @update_sources == other.update_sources and
+    @hash == other.hash
+  end
+
+  protected
+
+  attr_reader :hash
+
 end
+

data/lib/rubygems/custom_require.rb

@@ -4,7 +4,7 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'rubygems/source_index'
+require 'rubygems'
 
 module Kernel
   alias gem_original_require require # :nodoc:
@@ -26,94 +26,13 @@ module Kernel
   def require(path) # :nodoc:
     gem_original_require path
   rescue LoadError => load_error
-    begin
-      if spec = Gem.searcher.find(path)
-        Gem.activate(spec.name, false, "= #{spec.version}")
-        gem_original_require path
-      else
-        raise load_error
-      end
+    if load_error.message =~ /\A[Nn]o such file to load -- #{Regexp.escape path}\z/ and
+       spec = Gem.searcher.find(path) then
+      Gem.activate(spec.name, false, "= #{spec.version}")
+      gem_original_require path
+    else
+      raise load_error
     end
   end
 end  # module Kernel
 
-module Gem
-
-  #
-  # GemPathSearcher has the capability to find loadable files inside
-  # gems.  It generates data up front to speed up searches later.
-  #
-  class GemPathSearcher
-    
-    #
-    # Initialise the data we need to make searches later.
-    #
-    def initialize
-      # We want a record of all the installed gemspecs, in the order
-      # we wish to examine them.
-      @gemspecs = init_gemspecs
-      # Map gem spec to glob of full require_path directories.
-      # Preparing this information may speed up searches later.
-      @lib_dirs = {}
-      @gemspecs.each do |spec|
-        @lib_dirs[spec.object_id] = lib_dirs(spec)
-      end
-    end
-
-    # 
-    # Look in all the installed gems until a matching _path_ is found.
-    # Return the _gemspec_ of the gem where it was found.  If no match
-    # is found, return nil.
-    #
-    # The gems are searched in alphabetical order, and in reverse
-    # version order.
-    #
-    # For example:
-    #
-    #   find('log4r')              # -> (log4r-1.1 spec)
-    #   find('log4r.rb')           # -> (log4r-1.1 spec)
-    #   find('rake/rdoctask')      # -> (rake-0.4.12 spec)
-    #   find('foobarbaz')          # -> nil
-    #
-    # Matching paths can have various suffixes ('.rb', '.so', and
-    # others), which may or may not already be attached to _file_.
-    # This method doesn't care about the full filename that matches;
-    # only that there is a match.
-    # 
-    def find(path)
-      @gemspecs.each do |spec|
-        return spec if matching_file(spec, path)
-      end
-      nil
-    end
-
-    private
-
-    # Attempts to find a matching path using the require_paths of the
-    # given _spec_.
-    #
-    # Some of the intermediate results are cached in @lib_dirs for
-    # speed.
-    def matching_file(spec, path)  # :doc:
-      glob = File.join @lib_dirs[spec.object_id], "#{path}#{Gem.suffix_pattern}"
-      return true unless Dir[glob].select { |f| File.file?(f.untaint) }.empty?
-    end
-
-    # Return a list of all installed gemspecs, sorted by alphabetical
-    # order and in reverse version order.
-    def init_gemspecs
-      Gem.source_index.map { |_, spec| spec }.sort { |a,b|
-        (a.name <=> b.name).nonzero? || (b.version <=> a.version)
-      }
-    end
-
-    # Returns library directories glob for a gemspec.  For example,
-    #   '/usr/local/lib/ruby/gems/1.8/gems/foobar-1.0/{lib,ext}'
-    def lib_dirs(spec)
-      "#{spec.full_gem_path}/{#{spec.require_paths.join(',')}}"
-    end
-
-  end  # class Gem::GemPathLoader
-
-end  # module Gem
-