rubygems-update 1.3.7 → 1.4.0

data/lib/rubygems/dependency_installer.rb

@@ -132,41 +132,48 @@ class Gem::DependencyInstaller
 
     dependency_list = Gem::DependencyList.new @development
     dependency_list.add(*specs)
+    to_do = specs.dup
 
-    unless @ignore_dependencies then
-      to_do = specs.dup
-      seen = {}
+    add_found_dependencies to_do, dependency_list unless @ignore_dependencies
 
-      until to_do.empty? do
-        spec = to_do.shift
-        next if spec.nil? or seen[spec.name]
-        seen[spec.name] = true
+    @gems_to_install = dependency_list.dependency_order.reverse
+  end
 
-        deps = spec.runtime_dependencies
-        deps |= spec.development_dependencies if @development
+  def add_found_dependencies to_do, dependency_list
+    seen = {}
 
-        deps.each do |dep|
-          results = find_gems_with_sources(dep).reverse
+    until to_do.empty? do
+      spec = to_do.shift
+      next if spec.nil? or seen[spec.name]
+      seen[spec.name] = true
 
-          results.reject! do |dep_spec,|
-            to_do.push dep_spec
+      deps = spec.runtime_dependencies
+      deps |= spec.development_dependencies if @development
 
-            @source_index.any? do |_, installed_spec|
-              dep.name == installed_spec.name and
-                dep.requirement.satisfied_by? installed_spec.version
-            end
-          end
+      deps.each do |dep|
+        results = find_gems_with_sources(dep).reverse
 
-          results.each do |dep_spec, source_uri|
-            next if seen[dep_spec.name]
-            @specs_and_sources << [dep_spec, source_uri]
-            dependency_list.add dep_spec
+        # FIX: throw in everything that satisfies, and let
+        # FIX: dependencylist reduce to the chosen few
+        results.reject! do |dep_spec,|
+          to_do.push dep_spec
+
+          # already locally installed
+          @source_index.any? do |_, installed_spec|
+            dep.name == installed_spec.name and
+              dep.requirement.satisfied_by? installed_spec.version
           end
         end
+
+        results.each do |dep_spec, source_uri|
+          next if seen[dep_spec.name]
+          @specs_and_sources << [dep_spec, source_uri]
+
+          # FIX: this is the bug
+          dependency_list.add dep_spec
+        end
       end
     end
-
-    @gems_to_install = dependency_list.dependency_order.reverse
   end
 
   ##

data/lib/rubygems/dependency_list.rb

@@ -187,6 +187,7 @@ class Gem::DependencyList
           begin
             yield spec
           rescue TSort::Cyclic
+            # do nothing
           end
           break
         end
@@ -201,13 +202,7 @@ class Gem::DependencyList
   # +ignored+.
 
   def active_count(specs, ignored)
-    result = 0
-
-    specs.each do |spec|
-      result += 1 unless ignored[spec.full_name]
-    end
-
-    result
+    specs.count { |spec| ignored[spec.full_name].nil? }
   end
 
 end

data/lib/rubygems/doc_manager.rb

@@ -4,7 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'fileutils'
 require 'rubygems'
 
 ##
@@ -77,7 +76,7 @@ class Gem::DocManager
       :formatter => RDoc::RI::Formatter,
     }
 
-    driver = RDoc::RI::Driver.new(options).class_cache
+    RDoc::RI::Driver.new(options).class_cache
   end
 
   ##
@@ -85,6 +84,7 @@ class Gem::DocManager
   # RDoc (template etc.) as a String.
 
   def initialize(spec, rdoc_args="")
+    require 'fileutils'
     @spec = spec
     @doc_dir = File.join(spec.installation_path, "doc", spec.full_name)
     @rdoc_args = rdoc_args.nil? ? [] : rdoc_args.split

data/lib/rubygems/ext/rake_builder.rb

@@ -19,7 +19,7 @@ class Gem::Ext::RakeBuilder < Gem::Ext::Builder
     # Deal with possible spaces in the path, e.g. C:/Program Files
     dest_path = '"' + dest_path + '"' if dest_path.include?(' ')
 
-    cmd = ENV['rake'] || "#{Gem.ruby} -rubygems #{Gem.bin_path('rake')}" rescue Gem.default_exec_format % 'rake'
+    cmd = ENV['rake'] || "\"#{Gem.ruby}\" -rubygems #{Gem.bin_path('rake')}" rescue Gem.default_exec_format % 'rake'
     cmd += " RUBYARCHDIR=#{dest_path} RUBYLIBDIR=#{dest_path}" # ENV is frozen
 
     run cmd, results

data/lib/rubygems/format.rb

@@ -4,8 +4,6 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'fileutils'
-
 require 'rubygems/package'
 
 ##
@@ -32,8 +30,6 @@ class Gem::Format
   # representing the data in the gem
 
   def self.from_file_by_path(file_path, security_policy = nil)
-    format = nil
-
     unless File.exist?(file_path)
       raise Gem::Exception, "Cannot load gem at [#{file_path}] in #{Dir.pwd}"
     end

data/lib/rubygems/gem_openssl.rb

@@ -42,9 +42,7 @@ begin
   # Reference a constant defined in the .rb portion of ssl (just to
   # make sure that part is loaded too).
 
-  dummy = OpenSSL::Digest::SHA1
-
-  Gem.ssl_available = true
+  Gem.ssl_available = !!OpenSSL::Digest::SHA1
 
   class OpenSSL::X509::Certificate # :nodoc:
     # Check the validity of this certificate.

data/lib/rubygems/gem_path_searcher.rb

@@ -54,6 +54,23 @@ class Gem::GemPathSearcher
     end
   end
 
+  ##
+  # Find all files +path+ .rb advertised by all gemspecs.
+  # Only files in the gemspec's require paths are considered.
+
+  def find_all_dot_rb(path)
+    rb_path = "#{path}.rb"
+
+    @gemspecs.select do |spec|
+      rp = spec.require_paths
+      next false unless rp
+
+      rp.find do |lib|
+        spec.files.include? File.join(lib, rb_path)
+      end
+    end
+  end
+
   ##
   # Attempts to find a matching path using the require_paths of the given
   # +spec+.

data/lib/rubygems/gem_runner.rb

@@ -8,6 +8,11 @@ require 'rubygems/command_manager'
 require 'rubygems/config_file'
 require 'rubygems/doc_manager'
 
+##
+# Load additional plugins from $LOAD_PATH
+
+Gem.load_env_plugins
+
 ##
 # Run an instance of the gem program.
 #
@@ -76,3 +81,4 @@ class Gem::GemRunner
 
 end
 
+Gem.load_plugins

data/lib/rubygems/gemcutter_utilities.rb

@@ -1,4 +1,3 @@
-require 'net/http'
 require 'rubygems/remote_fetcher'
 
 module Gem::GemcutterUtilities
@@ -23,8 +22,9 @@ module Gem::GemcutterUtilities
     end
   end
 
-  def rubygems_api_request(method, path, &block)
-    host = ENV['RUBYGEMS_HOST'] || 'https://rubygems.org'
+  def rubygems_api_request(method, path, host = Gem.host, &block)
+    require 'net/http'
+    host = ENV['RUBYGEMS_HOST'] if ENV['RUBYGEMS_HOST']
     uri = URI.parse "#{host}/#{path}"
 
     request_method = Net::HTTP.const_get method.to_s.capitalize

data/lib/rubygems/indexer.rb

@@ -1,7 +1,3 @@
-require 'fileutils'
-require 'tmpdir'
-require 'zlib'
-
 require 'rubygems'
 require 'rubygems/format'
 
@@ -57,6 +53,10 @@ class Gem::Indexer
   # Create an indexer that will index the gems in +directory+.
 
   def initialize(directory, options = {})
+    require 'fileutils'
+    require 'tmpdir'
+    require 'zlib'
+
     unless ''.respond_to? :to_xs then
       raise "Gem::Indexer requires that the XML Builder library be installed:" \
            "\n\tgem install builder"

data/lib/rubygems/install_update_options.rb

@@ -104,6 +104,12 @@ module Gem::InstallUpdateOptions
                 "dependencies") do |value, options|
       options[:development] = true
     end
+
+    add_option(:"Install/Update", "--conservative",
+                "Don't attempt to upgrade gems already",
+                "meeting version requirement") do |value, options|
+      options[:conservative] = true
+    end
   end
 
   ##

data/lib/rubygems/installer.rb

@@ -4,10 +4,8 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'fileutils'
-require 'rbconfig'
-
 require 'rubygems/format'
+require 'rubygems/exceptions'
 require 'rubygems/ext'
 require 'rubygems/require_paths_builder'
 
@@ -91,6 +89,8 @@ class Gem::Installer
   # :wrappers:: Install wrappers if true, symlinks if false.
 
   def initialize(gem, options={})
+    require 'fileutils'
+
     @gem = gem
 
     options = {
@@ -318,7 +318,7 @@ class Gem::Installer
   def generate_bin_script(filename, bindir)
     bin_script_path = File.join bindir, formatted_program_filename(filename)
 
-    exec_path = File.join @gem_dir, @spec.bindir, filename
+    File.join @gem_dir, @spec.bindir, filename
 
     # HACK some gems don't have #! in their executables, restore 2008/06
     #if File.read(exec_path, 2) == '#!' then
@@ -466,7 +466,7 @@ TEXT
 
         say results.join("\n") if Gem.configuration.really_verbose
 
-      rescue => ex
+      rescue
         results = results.join "\n"
 
         File.open('gem_make.out', 'wb') { |f| f.puts results }
@@ -497,6 +497,8 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
 
     raise ArgumentError, "format required to extract from" if @format.nil?
 
+    dirs = []
+
     @format.file_entries.each do |entry, file_data|
       path = entry['path'].untaint
 
@@ -514,7 +516,12 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
       end
 
       FileUtils.rm_rf(path) if File.exists?(path)
-      FileUtils.mkdir_p File.dirname(path)
+
+      dir = File.dirname(path)
+      if !dirs.include?(dir)
+        dirs << dir
+        FileUtils.mkdir_p dir
+      end
 
       File.open(path, "wb") do |out|
         out.write file_data

data/lib/rubygems/local_remote_options.rb

@@ -51,6 +51,7 @@ module Gem::LocalRemoteOptions
     end
 
     add_bulk_threshold_option
+    add_clear_sources_option
     add_source_option
     add_proxy_option
     add_update_sources_option
@@ -68,6 +69,18 @@ module Gem::LocalRemoteOptions
     end
   end
 
+  ##
+  # Add the --clear-sources option
+
+  def add_clear_sources_option
+    add_option(:"Local/Remote", '--clear-sources',
+               'Clear the gem sources') do |value, options|
+
+      Gem.sources.clear
+      options[:sources_cleared] = true
+    end
+  end
+
   ##
   # Add the --http-proxy option
 
@@ -88,14 +101,14 @@ module Gem::LocalRemoteOptions
     accept_uri_http
 
     add_option(:"Local/Remote", '--source URL', URI::HTTP,
-               'Use URL as the remote source for gems') do |source, options|
+               'Add URL as a remote source for gems') do |source, options|
+
       source << '/' if source !~ /\/\z/
 
-      if options[:added_source] then
-        Gem.sources << source unless Gem.sources.include?(source)
+      if options.delete :sources_cleared then
+        Gem.sources = [source]
       else
-        options[:added_source] = true
-        Gem.sources.replace [source]
+        Gem.sources << source unless Gem.sources.include?(source)
       end
     end
   end

data/lib/rubygems/old_format.rb

@@ -5,9 +5,6 @@
 #++
 
 require 'rubygems'
-require 'fileutils'
-require 'yaml'
-require 'zlib'
 
 ##
 # The format class knows the guts of the RubyGem .gem file format and provides
@@ -24,6 +21,9 @@ class Gem::OldFormat
   # gem:: [String] The file name of the gem
 
   def initialize(gem_path)
+    require 'fileutils'
+    require 'yaml'
+    require 'zlib'
     @gem_path = gem_path
   end
 
@@ -143,7 +143,7 @@ class Gem::OldFormat
         end
         yield [entry, Zlib::Inflate.inflate(file_data.strip.unpack("m")[0])]
       end
-    rescue Zlib::DataError => e
+    rescue Zlib::DataError
       raise Gem::Exception, errstr
     end
   end

data/lib/rubygems/package.rb

@@ -4,12 +4,6 @@
 # See LICENSE.txt for additional licensing information.
 #++
 
-require 'fileutils'
-require 'find'
-require 'stringio'
-require 'yaml'
-require 'zlib'
-
 require 'rubygems/security'
 require 'rubygems/specification'
 
@@ -20,6 +14,7 @@ require 'rubygems/specification'
 class Gem::FileOperations
 
   def initialize(logger = nil)
+    require 'fileutils'
     @logger = logger
   end
 

data/lib/rubygems/package/tar_input.rb

@@ -4,6 +4,9 @@
 # See LICENSE.txt for additional licensing information.
 #--
 
+require "yaml"
+require "zlib"
+
 class Gem::Package::TarInput
 
   include Gem::Package::FSyncDir

data/lib/rubygems/package_task.rb

@@ -111,14 +111,14 @@ class Gem::PackageTask < Rake::PackageTask
     Gem.configuration.verbose = trace
 
     file gem_path => [package_dir, gem_dir] + @gem_spec.files do
-      when_writing "Creating #{gem_spec.file_name}" do
-        Gem::Builder.new(gem_spec).build
-        verbose trace do
-          mv gem_file, gem_path
+      chdir(gem_dir) do
+        when_writing "Creating #{gem_spec.file_name}" do
+          Gem::Builder.new(gem_spec).build
+          verbose(true) {
+            mv gem_file, ".."
+          }
         end
       end
     end
   end
-
 end
-

data/lib/rubygems/platform.rb

@@ -70,7 +70,7 @@ class Gem::Platform
                       when /hpux(\d+)/ then            [ 'hpux',      $1  ]
                       when /^java$/, /^jruby$/ then    [ 'java',      nil ]
                       when /^java([\d.]*)/ then        [ 'java',      $1  ]
-                      when /^dotnet$/ then             [ 'dotnet',    nil ]                       
+                      when /^dotnet$/ then             [ 'dotnet',    nil ]
                       when /^dotnet([\d.]*)/ then      [ 'dotnet',    $1  ]
                       when /linux/ then                [ 'linux',     $1  ]
                       when /mingw32/ then              [ 'mingw32',   nil ]