rubygems-update 1.7.2 → 1.8.0

data/lib/rubygems/commands/query_command.rb

@@ -74,10 +74,12 @@ class Gem::Commands::QueryCommand < Gem::Command
         exit_code |= 1
       end
 
-      raise Gem::SystemExitException, exit_code
+      terminate_interaction exit_code
     end
 
-    dep = Gem::Dependency.new name, Gem::Requirement.default
+    req = Gem::Requirement.default
+    # TODO: deprecate for real
+    dep = Deprecate.skip_during { Gem::Dependency.new name, req }
 
     if local? then
       if prerelease and not both? then
@@ -90,7 +92,9 @@ class Gem::Commands::QueryCommand < Gem::Command
         say
       end
 
-      specs = Gem.source_index.search dep
+      specs = Gem::Specification.find_all { |s|
+        s.name =~ name and req =~ s.version
+      }
 
       spec_tuples = specs.map do |spec|
         [[spec.name, spec.version, spec.original_platform, spec], :local]
@@ -123,9 +127,8 @@ class Gem::Commands::QueryCommand < Gem::Command
   ##
   # 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?
+  def installed?(name, req = Gem::Requirement.default)
+    Gem::Specification.any? { |s| s.name =~ name and req =~ s.version }
   end
 
   def output_query_results(spec_tuples)

data/lib/rubygems/commands/setup_command.rb

@@ -332,7 +332,7 @@ abort "#{deprecation_message}"
     args << '--main' << 'README.rdoc' << '--quiet'
     args << '.'
     args << 'README.rdoc' << 'UPGRADING.rdoc'
-    args << 'LICENSE.txt' << 'GPL.txt' << 'History.txt'
+    args << 'LICENSE.txt' << 'MIT.txt' << 'History.txt'
 
     r = RDoc::RDoc.new
     r.document args

data/lib/rubygems/commands/specification_command.rb

@@ -66,18 +66,8 @@ FIELD         name of gemspec field to show
 
     field = get_one_optional_argument
 
-    if field then
-      field = field.intern
-
-      if options[:format] == :ruby then
-        raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive"
-      end
-
-      unless Gem::Specification.attribute_names.include? field then
-        raise Gem::CommandLineError,
-              "no field %p on Gem::Specification" % field.to_s
-      end
-    end
+    raise Gem::CommandLineError, "--ruby and FIELD are mutually exclusive" if
+      field and options[:format] == :ruby
 
     if local? then
       if File.exist? gem then
@@ -85,7 +75,7 @@ FIELD         name of gemspec field to show
       end
 
       if specs.empty? then
-        specs.push(*Gem.source_index.search(dep))
+        specs.push(*dep.matching_specs)
       end
     end
 
@@ -100,7 +90,11 @@ FIELD         name of gemspec field to show
       terminate_interaction 1
     end
 
-    output = lambda do |s|
+    unless options[:all] then
+      specs = [specs.sort_by { |s| s.version }.last]
+    end
+
+    specs.each do |s|
       s = s.send field if field
 
       say case options[:format]
@@ -111,14 +105,5 @@ FIELD         name of gemspec field to show
 
       say "\n"
     end
-
-    if options[:all] then
-      specs.each(&output)
-    else
-      spec = specs.sort_by { |s| s.version }.last
-      output[spec]
-    end
   end
-
 end
-

data/lib/rubygems/commands/stale_command.rb

@@ -11,7 +11,8 @@ class Gem::Commands::StaleCommand < Gem::Command
 
   def execute
     gem_to_atime = {}
-    Gem.source_index.each do |name, spec|
+    Gem::Specification.each do |spec|
+      name = spec.full_name
       Dir["#{spec.full_gem_path}/**/*.*"].each do |file|
         next if File.directory?(file)
         stat = File.stat(file)

data/lib/rubygems/commands/unpack_command.rb

@@ -61,7 +61,9 @@ class Gem::Commands::UnpackCommand < Gem::Command
           next
         end
 
-        open spec.spec_name, 'w' do |io|
+        spec_file = File.basename spec.spec_file
+
+        open spec_file, 'w' do |io|
           io.write metadata
         end
       else
@@ -83,7 +85,7 @@ class Gem::Commands::UnpackCommand < Gem::Command
 
   def find_in_cache(filename)
     Gem.path.each do |path|
-      this_path = Gem.cache_gem(filename, path)
+      this_path = File.join(path, "cache", filename)
       return this_path if File.exist? this_path
     end
 
@@ -110,9 +112,9 @@ class Gem::Commands::UnpackCommand < Gem::Command
   def get_path dependency
     return dependency.name if dependency.name =~ /\.gem$/i
 
-    specs = Gem.source_index.search dependency
+    specs = dependency.matching_specs
 
-    selected = specs.sort_by { |s| s.version }.last
+    selected = specs.sort_by { |s| s.version }.last # HACK: hunt last down
 
     return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless
       selected
@@ -122,7 +124,7 @@ class Gem::Commands::UnpackCommand < Gem::Command
     # We expect to find (basename).gem in the 'cache' directory.  Furthermore,
     # the name match must be exact (ignoring case).
 
-    path = find_in_cache selected.file_name
+    path = find_in_cache File.basename selected.cache_file
 
     return Gem::RemoteFetcher.fetcher.download_to_cache(dependency) unless path
 

data/lib/rubygems/commands/update_command.rb

@@ -65,7 +65,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
       hig = {} # highest installed gems
 
-      Gem.source_index.each do |name, spec|
+      Gem::Specification.each do |spec|
         if hig[spec.name].nil? or hig[spec.name].version < spec.version then
           hig[spec.name] = spec
         end
@@ -173,9 +173,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     update_gem name, target
 
-    Gem.source_index.refresh!
-
-    installed_gems = Gem.source_index.find_name 'rubygems-update', requirement
+    installed_gems = Gem::Specification.find_all_by_name 'rubygems-update', requirement
     version        = installed_gems.last.version
 
     args = []

data/lib/rubygems/commands/which_command.rb

@@ -1,10 +1,6 @@
 require 'rubygems/command'
-require 'rubygems/gem_path_searcher'
 
 class Gem::Commands::WhichCommand < Gem::Command
-
-  EXT = %w[.rb .rbw .so .dll .bundle] # HACK
-
   def initialize
     super 'which', 'Find the location of a library file you can require',
           :search_gems_first => false, :show_all => false
@@ -28,14 +24,13 @@ class Gem::Commands::WhichCommand < Gem::Command
   end
 
   def execute
-    searcher = Gem::GemPathSearcher.new
-
     found = false
 
     options[:args].each do |arg|
-      arg = arg.sub(/#{Regexp.union(*EXT)}$/, '')
+      arg = arg.sub(/#{Regexp.union(*Gem.suffixes)}$/, '')
       dirs = $LOAD_PATH
-      spec = searcher.find arg
+
+      spec = Gem::Specification.find_by_path arg
 
       if spec then
         if options[:search_gems_first] then
@@ -45,6 +40,7 @@ class Gem::Commands::WhichCommand < Gem::Command
         end
       end
 
+      # TODO: this is totally redundant and stupid
       paths = find_paths arg, dirs
 
       if paths.empty? then
@@ -62,7 +58,7 @@ class Gem::Commands::WhichCommand < Gem::Command
     result = []
 
     dirs.each do |dir|
-      EXT.each do |ext|
+      Gem.suffixes.each do |ext|
         full_path = File.join dir, "#{package_name}#{ext}"
         if File.exist? full_path then
           result << full_path

data/lib/rubygems/config_file.rb

@@ -201,11 +201,15 @@ class Gem::ConfigFile
   # Location of RubyGems.org credentials
 
   def credentials_path
-    File.join(Gem.user_home, '.gem', 'credentials')
+    File.join Gem.user_home, '.gem', 'credentials'
   end
 
   def load_api_keys
-    @api_keys = File.exists?(credentials_path) ? load_file(credentials_path) : @hash
+    @api_keys = if File.exist? credentials_path then
+                  load_file(credentials_path)
+                else
+                  @hash
+                end
     if @api_keys.key? :rubygems_api_key then
       @rubygems_api_key = @api_keys[:rubygems_api_key]
       @api_keys[:rubygems] = @api_keys.delete :rubygems_api_key unless @api_keys.key? :rubygems
@@ -215,8 +219,8 @@ class Gem::ConfigFile
   def rubygems_api_key=(api_key)
     config = load_file(credentials_path).merge(:rubygems_api_key => api_key)
 
-    dirname = File.dirname(credentials_path)
-    Dir.mkdir(dirname) unless File.exists?(dirname)
+    dirname = File.dirname credentials_path
+    Dir.mkdir(dirname) unless File.exist? dirname
 
     Gem.load_yaml
 
@@ -230,7 +234,7 @@ class Gem::ConfigFile
   def load_file(filename)
     Gem.load_yaml
 
-    return {} unless filename and File.exists?(filename)
+    return {} unless filename and File.exist? filename
     begin
       YAML.load(File.read(filename))
     rescue ArgumentError
@@ -354,6 +358,4 @@ class Gem::ConfigFile
   protected
 
   attr_reader :hash
-
 end
-

data/lib/rubygems/custom_require.rb

@@ -35,18 +35,20 @@ module Kernel
     if Gem.unresolved_deps.empty? or Gem.loaded_path? path then
       gem_original_require path
     else
-      spec = Gem.searcher.find_active path
+      spec = Gem::Specification.find { |s|
+        s.activated? and s.contains_requirable_file? path
+      }
 
       unless spec then
-        found_specs = Gem.searcher.find_in_unresolved path
+        found_specs = Gem::Specification.find_in_unresolved path
         unless found_specs.empty? then
           found_specs = [found_specs.last]
         else
-          found_specs = Gem.searcher.find_in_unresolved_tree path
+          found_specs = Gem::Specification.find_in_unresolved_tree path
         end
 
         found_specs.each do |found_spec|
-          Gem.activate_spec found_spec
+          found_spec.activate
         end
       end
 

data/lib/rubygems/defaults.rb

@@ -1,5 +1,7 @@
 module Gem
 
+  # TODO: move this whole file back into rubygems.rb
+
   @post_install_hooks   ||= []
   @post_uninstall_hooks ||= []
   @pre_uninstall_hooks  ||= []
@@ -17,16 +19,28 @@ module Gem
   # 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 ConfigMap[:rubylibprefix] then
-      File.join(ConfigMap[:rubylibprefix], 'gems',
-                ConfigMap[:ruby_version])
-    else
-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-                ConfigMap[:ruby_version])
-    end
+    path = if defined? RUBY_FRAMEWORK_VERSION then
+             [
+               File.dirname(ConfigMap[:sitedir]),
+               'Gems',
+               ConfigMap[:ruby_version]
+             ]
+           elsif ConfigMap[:rubylibprefix] then
+             [
+              ConfigMap[:rubylibprefix],
+              'gems',
+              ConfigMap[:ruby_version]
+             ]
+           else
+             [
+               ConfigMap[:libdir],
+               ruby_engine,
+               'gems',
+               ConfigMap[:ruby_version]
+             ]
+           end
+
+    @default_dir ||= File.join(*path)
   end
 
   ##
@@ -76,14 +90,18 @@ module Gem
   # The default system-wide source info cache directory
 
   def self.default_system_source_cache_dir
-    File.join Gem.dir, 'source_cache'
+    File.join(Gem.dir, 'source_cache')
   end
 
   ##
   # The default user-specific source info cache directory
 
   def self.default_user_source_cache_dir
-    File.join Gem.user_home, '.gem', 'source_cache'
+    #
+    # NOTE Probably an argument for moving this to per-ruby supported dirs like
+    # user_dir
+    #
+    File.join(Gem.user_home, '.gem', 'source_cache')
   end
 
   ##
@@ -96,6 +114,4 @@ module Gem
       'ruby'
     end
   end
-
 end
-

data/lib/rubygems/dependency.rb

@@ -32,6 +32,12 @@ class Gem::Dependency
   # <tt>:runtime</tt>.
 
   def initialize name, *requirements
+    if Regexp === name then
+      msg = ["NOTE: Dependency.new w/ a regexp is deprecated.",
+             "Dependency.new called from #{Gem.location_of_caller.join(":")}"]
+      warn msg.join("\n") unless Deprecate.skip
+    end
+
     type         = Symbol === requirements.last ? requirements.pop : :runtime
     requirements = requirements.first if 1 == requirements.length # unpack
 
@@ -206,5 +212,42 @@ class Gem::Dependency
     self.class.new name, self_req.as_list.concat(other_req.as_list)
   end
 
-end
+  def matching_specs platform_only = false
+    matches = Gem::Specification.find_all { |spec|
+      self.name === spec.name and # TODO: == instead of ===
+        requirement.satisfied_by? spec.version
+    }
+
+    if platform_only
+      matches.reject! { |spec|
+        not Gem::Platform.match spec.platform
+      }
+    end
+
+    matches = matches.sort_by { |s| s.sort_obj } # HACK: shouldn't be needed
+  end
+
+  def to_specs
+    matches = matching_specs true
+
+    # TODO: check Gem.activated_spec[self.name] in case matches falls outside
 
+    if matches.empty? then
+      specs = Gem::Specification.map(&:full_name).join ", "
+      error = Gem::LoadError.new "Could not find #{name} (#{requirement}) amongst [#{specs}]"
+      error.name        = self.name
+      error.requirement = self.requirement
+      raise error
+    end
+
+    # TODO: any other resolver validations should go here
+
+    matches
+  end
+
+  def to_spec
+    matches = self.to_specs
+
+    matches.find { |spec| spec.activated? } or matches.last
+  end
+end

data/lib/rubygems/dependency_installer.rb

@@ -15,14 +15,14 @@ class Gem::DependencyInstaller
   attr_reader :installed_gems
 
   DEFAULT_OPTIONS = {
-    :env_shebang => false,
-    :domain => :both, # HACK dup
-    :force => false,
-    :format_executable => false, # HACK dup
+    :env_shebang         => false,
+    :domain              => :both, # HACK dup
+    :force               => false,
+    :format_executable   => false, # HACK dup
     :ignore_dependencies => false,
-    :prerelease => false,
-    :security_policy => nil, # HACK NoSecurity requires OpenSSL.  AlmostNo? Low?
-    :wrappers => true,
+    :prerelease          => false,
+    :security_policy     => nil, # HACK NoSecurity requires OpenSSL. AlmostNo? Low?
+    :wrappers            => true,
   }
 
   ##
@@ -45,25 +45,26 @@ class Gem::DependencyInstaller
 
   def initialize(options = {})
     if options[:install_dir] then
-      spec_dir = options[:install_dir], 'specifications'
-      @source_index = Gem::SourceIndex.new [spec_dir]
-    else
-      @source_index = Gem.source_index
+      @gem_home = options[:install_dir]
+
+      Gem::Specification.dirs = @gem_home
+      Gem.ensure_gem_subdirectories @gem_home
+      options[:install_dir] = @gem_home # FIX: because we suck and reuse below
     end
 
     options = DEFAULT_OPTIONS.merge options
 
-    @bin_dir = options[:bin_dir]
-    @development = options[:development]
-    @domain = options[:domain]
-    @env_shebang = options[:env_shebang]
-    @force = options[:force]
-    @format_executable = options[:format_executable]
+    @bin_dir             = options[:bin_dir]
+    @development         = options[:development]
+    @domain              = options[:domain]
+    @env_shebang         = options[:env_shebang]
+    @force               = options[:force]
+    @format_executable   = options[:format_executable]
     @ignore_dependencies = options[:ignore_dependencies]
-    @prerelease = options[:prerelease]
-    @security_policy = options[:security_policy]
-    @user_install = options[:user_install]
-    @wrappers = options[:wrappers]
+    @prerelease          = options[:prerelease]
+    @security_policy     = options[:security_policy]
+    @user_install        = options[:user_install]
+    @wrappers            = options[:wrappers]
 
     @installed_gems = []
 
@@ -95,6 +96,7 @@ class Gem::DependencyInstaller
 
     if @domain == :both or @domain == :remote then
       begin
+        # REFACTOR: all = dep.requirement.needs_all?
         requirements = dep.requirement.requirements.map do |req, ver|
           req
         end
@@ -140,8 +142,8 @@ class Gem::DependencyInstaller
     add_found_dependencies to_do, dependency_list unless @ignore_dependencies
 
     dependency_list.specs.reject! { |spec|
-      ! keep_names.include? spec.full_name and
-        @source_index.any? { |n,_| n == spec.full_name }
+      not keep_names.include?(spec.full_name) and
+      Gem::Specification.include?(spec)
     }
 
     unless dependency_list.ok? or @ignore_dependencies or @force then
@@ -175,7 +177,7 @@ class Gem::DependencyInstaller
           to_do.push dep_spec
 
           # already locally installed
-          @source_index.any? do |_, installed_spec|
+          Gem::Specification.any? do |installed_spec|
             dep.name == installed_spec.name and
               dep.requirement.satisfied_by? installed_spec.version
           end
@@ -210,23 +212,20 @@ class Gem::DependencyInstaller
 
     local_gems = Dir["#{glob}*"].sort.reverse
 
-    unless local_gems.empty? then
-      local_gems.each do |gem_file|
-        next unless gem_file =~ /gem$/
-        begin
-          spec = Gem::Format.from_file_by_path(gem_file).spec
-          spec_and_source = [spec, gem_file]
-          break
-        rescue SystemCallError, Gem::Package::FormatError
-        end
+    local_gems.each do |gem_file|
+      next unless gem_file =~ /gem$/
+      begin
+        spec = Gem::Format.from_file_by_path(gem_file).spec
+        spec_and_source = [spec, gem_file]
+        break
+      rescue SystemCallError, Gem::Package::FormatError
       end
     end
 
-    if spec_and_source.nil? then
+    unless spec_and_source then
       dep = Gem::Dependency.new gem_name, version
       dep.prerelease = true if prerelease
       spec_and_sources = find_gems_with_sources(dep).reverse
-
       spec_and_source = spec_and_sources.find { |spec, source|
         Gem::Platform.match spec.platform
       }
@@ -267,9 +266,9 @@ class Gem::DependencyInstaller
 
     gather_dependencies
 
-    @gems_to_install.each do |spec|
-      last = spec == @gems_to_install.last
-      next if @source_index.any? { |n,_| n == spec.full_name } and not last
+    last = @gems_to_install.size - 1
+    @gems_to_install.each_with_index do |spec, index|
+      next if Gem::Specification.include?(spec) and index != last
 
       # TODO: make this sorta_verbose so other users can benefit from it
       say "Installing gem #{spec.full_name}" if Gem.configuration.really_verbose
@@ -292,7 +291,6 @@ class Gem::DependencyInstaller
                                 :ignore_dependencies => @ignore_dependencies,
                                 :install_dir         => @install_dir,
                                 :security_policy     => @security_policy,
-                                :source_index        => @source_index,
                                 :user_install        => @user_install,
                                 :wrappers            => @wrappers
 
@@ -303,6 +301,4 @@ class Gem::DependencyInstaller
 
     @installed_gems
   end
-
 end
-