rubygems-update 1.7.2 → 1.8.0

data/lib/rubygems/builder.rb

@@ -38,7 +38,7 @@ class Gem::Builder
     @signer = sign
     write_package
     say success if Gem.configuration.verbose
-    @spec.file_name
+    File.basename @spec.cache_file
   end
 
   def success
@@ -46,7 +46,7 @@ class Gem::Builder
   Successfully built RubyGem
   Name: #{@spec.name}
   Version: #{@spec.version}
-  File: #{@spec.file_name}
+  File: #{File.basename @spec.cache_file}
 EOM
   end
 
@@ -73,16 +73,17 @@ EOM
   end
 
   def write_package
-    open @spec.file_name, 'wb' do |gem_io|
+    file_name = File.basename @spec.cache_file
+    open file_name, 'wb' do |gem_io|
       Gem::Package.open gem_io, 'w', @signer do |pkg|
         yaml = @spec.to_yaml
         pkg.metadata = yaml
 
         @spec.files.each do |file|
-          next if File.directory? file
-          next if file == @spec.file_name # Don't add gem onto itself
+          next if File.directory?(file)
+          next if file == file_name # Don't add gem onto itself
 
-          stat = File.stat file
+          stat = File.stat(file)
           mode = stat.mode & 0777
           size = stat.size
 

data/lib/rubygems/command_manager.rb

@@ -37,6 +37,13 @@ class Gem::CommandManager
     @command_manager ||= new
   end
 
+  ##
+  # Reset the authoritative instance of the command manager.
+
+  def self.reset
+    @command_manager = nil
+  end
+
   ##
   # Register all the subcommands supported by the gem command.
 
@@ -80,6 +87,13 @@ class Gem::CommandManager
     @commands[command] = false
   end
 
+  ##
+  # Unregister the Symbol +command+ as a gem command.
+
+  def unregister_command(command)
+    @commands.delete command
+  end
+
   ##
   # Return the registered command from the command name.
 
@@ -160,7 +174,7 @@ class Gem::CommandManager
     retried = false
 
     begin
-      commands.const_get const_name
+      commands.const_get(const_name).new
     rescue NameError
       raise if retried
 
@@ -173,7 +187,7 @@ class Gem::CommandManager
           Gem.configuration.backtrace
       end
       retry
-    end.new
+    end
   end
 
 end

data/lib/rubygems/commands/build_command.rb

@@ -17,32 +17,34 @@ class Gem::Commands::BuildCommand < Gem::Command
 
   def execute
     gemspec = get_one_gem_name
-    if File.exist?(gemspec)
-      specs = load_gemspecs(gemspec)
-      specs.each do |spec|
+
+    if File.exist? gemspec
+      spec = load_gemspec gemspec
+
+      if spec then
         Gem::Builder.new(spec).build
+      else
+        alert_error "Error loading gemspec. Aborting."
+        terminate_interaction 1
       end
     else
       alert_error "Gemspec file not found: #{gemspec}"
+      terminate_interaction 1
     end
   end
 
-  def load_gemspecs(filename)
+  def load_gemspec filename
     if yaml?(filename)
-      result = []
       open(filename) do |f|
         begin
-          while not f.eof? and spec = Gem::Specification.from_yaml(f)
-            result << spec
-          end
+          Gem::Specification.from_yaml(f)
         rescue Gem::EndOfYAMLException
-          # OK
+          nil
         end
       end
     else
-      result = [Gem::Specification.load(filename)]
+      Gem::Specification.load(filename) # can return nil
     end
-    result
   end
 
   def yaml?(filename)

data/lib/rubygems/commands/cert_command.rb

@@ -50,7 +50,7 @@ class Gem::Commands::CertCommand < Gem::Command
                'Build private key and self-signed',
                'certificate for EMAIL_ADDR.') do |value, options|
       vals = Gem::Security.build_self_signed_cert(value)
-      File.chmod 0600, vals[:key_path]
+      FileUtils.chmod 0600, vals[:key_path]
       say "Public Cert: #{vals[:cert_path]}"
       say "Private Key: #{vals[:key_path]}"
       say "Don't forget to move the key file to somewhere private..."

data/lib/rubygems/commands/cleanup_command.rb

@@ -1,5 +1,4 @@
 require 'rubygems/command'
-require 'rubygems/source_index'
 require 'rubygems/dependency_list'
 require 'rubygems/uninstaller'
 
@@ -38,28 +37,20 @@ installed elsewhere in GEM_PATH the cleanup command won't touch it.
     say "Cleaning up installed gems..."
     primary_gems = {}
 
-    Gem.source_index.each do |name, spec|
+    Gem::Specification.each do |spec|
       if primary_gems[spec.name].nil? or
          primary_gems[spec.name].version < spec.version then
         primary_gems[spec.name] = spec
       end
     end
 
-    gems_to_cleanup = []
-
-    unless options[:args].empty? then
-      options[:args].each do |gem_name|
-        dep = Gem::Dependency.new gem_name, Gem::Requirement.default
-        specs = Gem.source_index.search dep
-        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].map do |gem_name|
+                          Gem::Specification.find_all_by_name gem_name
+                        end.flatten
+                      else
+                        Gem::Specification.to_a
+                      end
 
     gems_to_cleanup = gems_to_cleanup.select { |spec|
       primary_gems[spec.name].version != spec.version
@@ -83,8 +74,8 @@ installed elsewhere in GEM_PATH the cleanup command won't touch it.
           :version => "= #{spec.version}",
         }
 
-        if Gem.user_dir == spec.installation_path then
-          uninstall_options[:install_dir] = spec.installation_path
+        if Gem.user_dir == spec.base_dir then
+          uninstall_options[:install_dir] = spec.base_dir
         end
 
         uninstaller = Gem::Uninstaller.new spec.name, uninstall_options

data/lib/rubygems/commands/contents_command.rb

@@ -52,22 +52,22 @@ class Gem::Commands::ContentsCommand < Gem::Command
     end.flatten
 
     path_kind = if spec_dirs.empty? then
-                  spec_dirs = Gem::SourceIndex.installed_spec_directories
+                  spec_dirs = Gem::Specification.dirs
                   "default gem paths"
                 else
                   "specified path"
                 end
 
-    si = Gem::SourceIndex.new spec_dirs
-
     gem_names = if options[:all] then
-                  si.map { |_, spec| spec.name }
+                  Gem::Specification.map(&:name)
                 else
                   get_all_gem_names
                 end
 
     gem_names.each do |name|
-      spec = si.find_name(name, version).last
+      # HACK: find_by_name fails for some reason... ARGH
+      # How many places must we embed our resolve logic?
+      spec = Gem::Specification.find_all_by_name(name, version).last
 
       unless spec then
         say "Unable to find gem '#{name}' in #{path_kind}"

data/lib/rubygems/commands/dependency_command.rb

@@ -44,11 +44,6 @@ class Gem::Commands::DependencyCommand < Gem::Command
 
   def execute
     options[:args] << '' if options[:args].empty?
-    specs = {}
-
-    source_indexes = Hash.new do |h, source_uri|
-      h[source_uri] = Gem::SourceIndex.new
-    end
 
     pattern = if options[:args].length == 1 and
                  options[:args].first =~ /\A\/(.*)\/(i)?\z/m then
@@ -58,7 +53,10 @@ class Gem::Commands::DependencyCommand < Gem::Command
                 /\A#{Regexp.union(*options[:args])}/
               end
 
-    dependency = Gem::Dependency.new pattern, options[:version]
+    # TODO: deprecate for real damnit
+    dependency = Deprecate.skip_during {
+      Gem::Dependency.new pattern, options[:version]
+    }
     dependency.prerelease = options[:prerelease]
 
     if options[:reverse_dependencies] and remote? and not local? then
@@ -66,26 +64,23 @@ class Gem::Commands::DependencyCommand < Gem::Command
       terminate_interaction 1
     end
 
-    if local? then
-      Gem.source_index.search(dependency).each do |spec|
-        source_indexes[:local].add_spec spec
-      end
-    end
+    specs = []
+
+    specs.concat dependency.matching_specs if local?
 
     if remote? and not options[:reverse_dependencies] then
       fetcher = Gem::SpecFetcher.fetcher
 
+      # REFACTOR: fetcher.find_specs_matching => specs
       specs_and_sources = fetcher.find_matching(dependency, false, true,
                                                 dependency.prerelease?)
 
-      specs_and_sources.each do |spec_tuple, source_uri|
-        spec = fetcher.fetch_spec spec_tuple, URI.parse(source_uri)
-
-        source_indexes[source_uri].add_spec spec
-      end
+      specs.concat specs_and_sources.map { |spec_tuple, source_uri|
+        fetcher.fetch_spec spec_tuple, URI.parse(source_uri)
+      }
     end
 
-    if source_indexes.empty? then
+    if specs.empty? then
       patterns = options[:args].join ','
       say "No gems found matching #{patterns} (#{options[:version]})" if
         Gem.configuration.verbose
@@ -93,24 +88,18 @@ class Gem::Commands::DependencyCommand < Gem::Command
       terminate_interaction 1
     end
 
-    specs = {}
-
-    source_indexes.values.each do |source_index|
-      source_index.gems.each do |name, spec|
-        specs[spec.full_name] = [source_index, spec]
-      end
-    end
+    specs = specs.uniq.sort
 
     reverse = Hash.new { |h, k| h[k] = [] }
 
     if options[:reverse_dependencies] then
-      specs.values.each do |_, spec|
+      specs.each do |spec|
         reverse[spec.full_name] = find_reverse_dependencies spec
       end
     end
 
     if options[:pipe_format] then
-      specs.values.sort_by { |_, spec| spec }.each do |_, spec|
+      specs.each do |spec|
         unless spec.dependencies.empty?
           spec.dependencies.sort_by { |dep| dep.name }.each do |dep|
             say "#{dep.name} --version '#{dep.requirement}'"
@@ -120,7 +109,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
     else
       response = ''
 
-      specs.values.sort_by { |_, spec| spec }.each do |_, spec|
+      specs.each do |spec|
         response << print_dependencies(spec)
         unless reverse[spec.full_name].empty? then
           response << "  Used by\n"
@@ -152,7 +141,7 @@ class Gem::Commands::DependencyCommand < Gem::Command
   def find_reverse_dependencies(spec)
     result = []
 
-    Gem.source_index.each do |name, sp|
+    Gem::Specification.each do |sp|
       sp.dependencies.each do |dep|
         dep = Gem::Dependency.new(*dep) unless Gem::Dependency === dep
 
@@ -166,17 +155,5 @@ class Gem::Commands::DependencyCommand < Gem::Command
     result
   end
 
-  def find_gems(name, source_index)
-    specs = {}
-
-    spec_list = source_index.search name, options[:version]
-
-    spec_list.each do |spec|
-      specs[spec.full_name] = [source_index, spec]
-    end
-
-    specs
-  end
-
 end
 

data/lib/rubygems/commands/fetch_command.rb

@@ -59,7 +59,7 @@ class Gem::Commands::FetchCommand < Gem::Command
       end
 
       path = Gem::RemoteFetcher.fetcher.download spec, source_uri
-      FileUtils.mv path, spec.file_name
+      FileUtils.mv path, File.basename(spec.cache_file)
 
       say "Downloaded #{spec.full_name}"
     end

data/lib/rubygems/commands/install_command.rb

@@ -114,7 +114,8 @@ to write the specification by hand.  For example:
 
     get_all_gem_names.each do |gem_name|
       begin
-        next if options[:conservative] && Gem.available?(gem_name, options[:version])
+        next if options[:conservative] and
+          not Gem::Dependency.new(gem_name, options[:version]).matching_specs.empty?
 
         inst = Gem::DependencyInstaller.new options
         inst.install gem_name, options[:version]

data/lib/rubygems/commands/lock_command.rb

@@ -87,7 +87,7 @@ lock it down to the exact version.
 
       spec.runtime_dependencies.each do |dep|
         next if locked[dep.name]
-        candidates = Gem.source_index.search dep
+        candidates = dep.matching_specs
 
         if candidates.empty? then
           complain "Unable to satisfy '#{dep}' from currently installed gems"
@@ -99,11 +99,11 @@ lock it down to the exact version.
   end
 
   def spec_path(gem_full_name)
-    gemspecs = Gem.path.map do |path|
+    gemspecs = Gem.path.map { |path|
       File.join path, "specifications", "#{gem_full_name}.gemspec"
-    end
+    }
 
-    gemspecs.find { |gemspec| File.exist? gemspec }
+    gemspecs.find { |path| File.exist? path }
   end
 
 end

data/lib/rubygems/commands/outdated_command.rb

@@ -16,11 +16,8 @@ class Gem::Commands::OutdatedCommand < Gem::Command
   end
 
   def execute
-    # FIX: this should be able to be Gem.source_index but our test fails :(
-    locals = Gem::SourceIndex.new Gem::SourceIndex.installed_spec_directories
-
-    locals.outdated.sort.each do |name|
-      local   = locals.find_name(name).last
+    outdated.sort.each do |name|
+      local   = Gem::Specification.find_all_by_name(name).max
       dep     = Gem::Dependency.new local.name, ">= #{local.version}"
       remotes = Gem::SpecFetcher.fetcher.fetch dep
 
@@ -31,5 +28,20 @@ class Gem::Commands::OutdatedCommand < Gem::Command
     end
   end
 
-end
+  def outdated
+    outdateds = []
+
+    fetcher = Gem::SpecFetcher.fetcher
+
+    Gem::Specification.latest_specs.each do |local|
+      dependency = Gem::Dependency.new local.name, ">= #{local.version}"
+      remotes    = fetcher.find_matching dependency
+      remotes    = remotes.map { |(_, version, _), _| version }
+      latest     = remotes.sort.last
 
+      outdateds << local.name if latest and local.version < latest
+    end
+
+    outdateds
+  end
+end

data/lib/rubygems/commands/pristine_command.rb

@@ -10,7 +10,8 @@ class Gem::Commands::PristineCommand < Gem::Command
   def initialize
     super 'pristine',
           'Restores installed gems to pristine condition from files located in the gem cache',
-          :version => Gem::Requirement.default
+          :version => Gem::Requirement.default, :extensions => true,
+          :all => false
 
     add_option('--all',
                'Restore all installed gems to pristine',
@@ -18,6 +19,11 @@ class Gem::Commands::PristineCommand < Gem::Command
       options[:all] = value
     end
 
+    add_option('--[no-]extensions',
+               'Restore gems with extensions') do |value, options|
+      options[:extensions] = value
+    end
+
     add_version_option('restore to', 'pristine condition')
   end
 
@@ -26,7 +32,7 @@ class Gem::Commands::PristineCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--all"
+    "--all --extensions"
   end
 
   def description # :nodoc:
@@ -40,6 +46,9 @@ for the gem are regenerated.
 
 If the cached gem cannot be found, you will need to use `gem install` to
 revert the gem.
+
+If --no-extensions is provided pristine will not attempt to restore gems with
+extensions.
     EOF
   end
 
@@ -48,20 +57,17 @@ revert the gem.
   end
 
   def execute
-    gem_name = nil
-
     specs = if options[:all] then
-              Gem.source_index.map do |name, spec|
-                spec
-              end
+              Gem::Specification.map
             else
-              gem_name = get_one_gem_name
-              Gem.source_index.find_name(gem_name, options[:version])
+              get_all_gem_names.map do |gem_name|
+                Gem::Specification.find_all_by_name gem_name, options[:version]
+              end.flatten
             end
 
-    if specs.empty? then
+    if specs.to_a.empty? then
       raise Gem::Exception,
-            "Failed to find gem #{gem_name} #{options[:version]}"
+            "Failed to find gems #{options[:args]} #{options[:version]}"
     end
 
     install_dir = Gem.dir # TODO use installer option
@@ -69,18 +75,22 @@ revert the gem.
     raise Gem::FilePermissionError.new(install_dir) unless
       File.writable?(install_dir)
 
-    say "Restoring gem(s) to pristine condition..."
+    say "Restoring gems to pristine condition..."
 
     specs.each do |spec|
-      gem = spec.cache_gem
+      unless spec.extensions.empty? or options[:extensions] then
+        say "Skipped #{spec.full_name}, it needs to compile an extension"
+        next
+      end
+
+      gem = spec.cache_file
 
-      if gem.nil? then
+      unless File.exist? gem then
         require 'rubygems/remote_fetcher'
 
         say "Cached gem for #{spec.full_name} not found, attempting to fetch..."
         dep = Gem::Dependency.new spec.name, spec.version
         Gem::RemoteFetcher.fetcher.download_to_cache dep
-        gem = spec.cache_gem
       end
 
       # TODO use installer options