rubygems-update 1.3.5 → 1.3.6

data/lib/rubygems/dependency_installer.rb

@@ -38,7 +38,7 @@ class Gem::DependencyInstaller
   # :format_executable:: See Gem::Installer#initialize.
   # :ignore_dependencies:: Don't install any dependencies.
   # :install_dir:: See Gem::Installer#install.
-  # :prerelease:: Allow prerelease versions
+  # :prerelease:: Allow prerelease versions.  See #install.
   # :security_policy:: See Gem::Installer::new and Gem::Security.
   # :user_install:: See Gem::Installer.new
   # :wrappers:: See Gem::Installer::new
@@ -89,14 +89,18 @@ class Gem::DependencyInstaller
 
     if @domain == :both or @domain == :remote then
       begin
-        requirements = dep.version_requirements.requirements.map do |req, ver|
+        requirements = dep.requirement.requirements.map do |req, ver|
           req
         end
 
-        all = !@prerelease && (requirements.length > 1 ||
+        all = !dep.prerelease? &&
+              # we only need latest if there's one requirement and it is
+              # guaranteed to match the newest specs
+              (requirements.length > 1 or
                 (requirements.first != ">=" and requirements.first != ">"))
 
-        found = Gem::SpecFetcher.fetcher.fetch dep, all, true, @prerelease
+        found = Gem::SpecFetcher.fetcher.fetch dep, all, true, dep.prerelease?
+
         gems_and_sources.push(*found)
 
       rescue Gem::RemoteFetcher::FetchError => e
@@ -120,7 +124,7 @@ class Gem::DependencyInstaller
   def gather_dependencies
     specs = @specs_and_sources.map { |spec,_| spec }
 
-    dependency_list = Gem::DependencyList.new
+    dependency_list = Gem::DependencyList.new @development
     dependency_list.add(*specs)
 
     unless @ignore_dependencies then
@@ -143,7 +147,7 @@ class Gem::DependencyInstaller
 
             @source_index.any? do |_, installed_spec|
               dep.name == installed_spec.name and
-                dep.version_requirements.satisfied_by? installed_spec.version
+                dep.requirement.satisfied_by? installed_spec.version
             end
           end
 
@@ -164,7 +168,9 @@ class Gem::DependencyInstaller
   # +version+.  Returns an Array of specs and sources required for
   # installation of the gem.
 
-  def find_spec_by_name_and_version gem_name, version = Gem::Requirement.default
+  def find_spec_by_name_and_version(gem_name,
+                                    version = Gem::Requirement.default,
+                                    prerelease = false)
     spec_and_source = nil
 
     glob = if File::ALT_SEPARATOR then
@@ -189,6 +195,7 @@ class Gem::DependencyInstaller
 
     if spec_and_source.nil? 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|
@@ -205,13 +212,24 @@ class Gem::DependencyInstaller
   end
 
   ##
-  # Installs the gem and all its dependencies.  Returns an Array of installed
-  # gems specifications.
+  # Installs the gem +dep_or_name+ and all its dependencies.  Returns an Array
+  # of installed gem specifications.
+  #
+  # If the +:prerelease+ option is set and there is a prerelease for
+  # +dep_or_name+ the prerelease version will be installed.
+  #
+  # Unless explicitly specified as a prerelease dependency, prerelease gems
+  # that +dep_or_name+ depend on will not be installed.
+  #
+  # If c-1.a depends on b-1 and a-1.a and there is a gem b-1.a available then
+  # c-1.a, b-1 and a-1.a will be installed.  b-1.a will need to be installed
+  # separately.
 
   def install dep_or_name, version = Gem::Requirement.default
     if String === dep_or_name then
-      find_spec_by_name_and_version dep_or_name, version
+      find_spec_by_name_and_version dep_or_name, version, @prerelease
     else
+      dep_or_name.prerelease = @prerelease
       @specs_and_sources = [find_gems_with_sources(dep_or_name).last]
     end
 

data/lib/rubygems/dependency_list.rb

@@ -6,23 +6,41 @@
 
 require 'tsort'
 
+##
+# Gem::DependencyList is used for installing and uninstalling gems in the
+# correct order to avoid conflicts.
+
 class Gem::DependencyList
 
   include Enumerable
   include TSort
 
-  def self.from_source_index(src_index)
-    deps = new
+  ##
+  # Allows enabling/disabling use of development dependencies
+
+  attr_accessor :development
 
-    src_index.each do |full_name, spec|
-      deps.add spec
+  ##
+  # Creates a DependencyList from a Gem::SourceIndex +source_index+
+
+  def self.from_source_index(source_index)
+    list = new
+
+    source_index.each do |full_name, spec|
+      list.add spec
     end
 
-    deps
+    list
   end
 
-  def initialize
+  ##
+  # Creates a new DependencyList.  If +development+ is true, development
+  # dependencies will be included.
+
+  def initialize development = false
     @specs = []
+
+    @development = development
   end
 
   ##
@@ -33,8 +51,9 @@ class Gem::DependencyList
   end
 
   ##
-  # Return a list of the specifications in the dependency list, sorted in
-  # order so that no spec in the list depends on a gem earlier in the list.
+  # Return a list of the gem specifications in the dependency list, sorted in
+  # order so that no gemspec in the list depends on a gemspec earlier in the
+  # list.
   #
   # This is useful when removing gems from a set of installed gems.  By
   # removing them in the returned order, you don't get into as many dependency
@@ -77,6 +96,10 @@ class Gem::DependencyList
     @specs.find { |spec| spec.full_name == full_name }
   end
 
+  def inspect # :nodoc:
+    "#<%s:0x%x %p>" % [self.class, object_id, map { |s| s.full_name }]
+  end
+
   ##
   # Are all the dependencies in the list satisfied?
 
@@ -89,10 +112,10 @@ class Gem::DependencyList
   end
 
   ##
-  # Is is ok to remove a gem from the dependency list?
+  # Is is ok to remove a gemspec from the dependency list?
   #
   # If removing the gemspec creates breaks a currently ok dependency, then it
-  # is NOT ok to remove the gem.
+  # is NOT ok to remove the gemspec.
 
   def ok_to_remove?(full_name)
     gem_to_remove = find_name full_name
@@ -117,13 +140,16 @@ class Gem::DependencyList
     }
   end
 
+  ##
+  # Removes the gemspec matching +full_name+ from the dependency list
+
   def remove_by_name(full_name)
     @specs.delete_if { |spec| spec.full_name == full_name }
   end
 
   ##
   # Return a hash of predecessors.  <tt>result[spec]</tt> is an Array of
-  # gemspecs that have a dependency satisfied by the named spec.
+  # gemspecs that have a dependency satisfied by the named gemspec.
 
   def spec_predecessors
     result = Hash.new { |h,k| h[k] = [] }
@@ -152,7 +178,10 @@ class Gem::DependencyList
   def tsort_each_child(node, &block)
     specs = @specs.sort.reverse
 
-    node.dependencies.each do |dep|
+    dependencies = node.runtime_dependencies
+    dependencies.push(*node.development_dependencies) if @development
+
+    dependencies.each do |dep|
       specs.each do |spec|
         if spec.satisfies_requirement? dep then
           begin

data/lib/rubygems/doc_manager.rb

@@ -97,6 +97,13 @@ class Gem::DocManager
     File.exist?(File.join(@doc_dir, "rdoc"))
   end
 
+  ##
+  # Is the RI documentation installed?
+
+  def ri_installed?
+    File.exist?(File.join(@doc_dir, "ri"))
+  end
+
   ##
   # Generate the RI documents for this gem spec.
   #

data/lib/rubygems/format.rb

@@ -14,25 +14,22 @@ require 'rubygems/package'
 
 class Gem::Format
 
-  attr_accessor :spec, :file_entries, :gem_path
+  attr_accessor :spec
+  attr_accessor :file_entries
+  attr_accessor :gem_path
 
   extend Gem::UserInteraction
 
   ##
-  # Constructs an instance of a Format object, representing the gem's
-  # data structure.
-  #
-  # gem:: [String] The file name of the gem
-  #
+  # Constructs a Format representing the gem's data which came from +gem_path+
+
   def initialize(gem_path)
     @gem_path = gem_path
   end
 
   ##
-  # Reads the named gem file and returns a Format object, representing 
-  # the data from the gem file
-  #
-  # file_path:: [String] Path to the gem file
+  # Reads the gem +file_path+ using +security_policy+ and returns a Format
+  # representing the data in the gem
 
   def self.from_file_by_path(file_path, security_policy = nil)
     format = nil
@@ -41,25 +38,24 @@ class Gem::Format
       raise Gem::Exception, "Cannot load gem at [#{file_path}] in #{Dir.pwd}"
     end
 
-    # check for old version gem
-    if File.read(file_path, 20).include?("MD5SUM =")
+    start = File.read file_path, 20
+
+    if start.nil? or start.length < 20 then
+      nil
+    elsif start.include?("MD5SUM =") # old version gems
       require 'rubygems/old_format'
 
-      format = Gem::OldFormat.from_file_by_path(file_path)
+      Gem::OldFormat.from_file_by_path file_path
     else
       open file_path, Gem.binary_mode do |io|
-        format = from_io io, file_path, security_policy
+        from_io io, file_path, security_policy
       end
     end
-
-    return format
   end
 
   ##
-  # Reads a gem from an io stream and returns a Format object, representing
-  # the data from the gem file
-  #
-  # io:: [IO] Stream from which to read the gem
+  # Reads a gem from +io+ at +gem_path+ using +security_policy+ and returns a
+  # Format representing the data from the gem
 
   def self.from_io(io, gem_path="(io)", security_policy = nil)
     format = new gem_path

data/lib/rubygems/gem_openssl.rb

@@ -30,7 +30,7 @@ module Gem
 
     def ensure_ssl_available
       unless ssl_available?
-        fail Gem::Exception, "SSL is not installed on this system"
+        raise Gem::Exception, "SSL is not installed on this system"
       end
     end
   end

data/lib/rubygems/gem_path_searcher.rb

@@ -1,9 +1,3 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
 ##
 # GemPathSearcher has the capability to find loadable files inside
 # gems.  It generates data up front to speed up searches later.
@@ -14,14 +8,16 @@ class Gem::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.
+    # 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.
+
+    # 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_for(spec)
+      @lib_dirs[spec.object_id] = lib_dirs_for spec
     end
   end
 
@@ -72,6 +68,7 @@ class Gem::GemPathSearcher
   # Some of the intermediate results are cached in @lib_dirs for speed.
 
   def matching_files(spec, path)
+    return [] unless @lib_dirs[spec.object_id] # case no paths
     glob = File.join @lib_dirs[spec.object_id], "#{path}#{Gem.suffix_pattern}"
     Dir[glob].select { |f| File.file? f.untaint }
   end
@@ -95,7 +92,8 @@ class Gem::GemPathSearcher
   #   '/usr/local/lib/ruby/gems/1.8/gems/foobar-1.0/{lib,ext}'
 
   def lib_dirs_for(spec)
-    "#{spec.full_gem_path}/{#{spec.require_paths.join(',')}}"
+    "#{spec.full_gem_path}/{#{spec.require_paths.join(',')}}" if
+      spec.require_paths
   end
 
 end

data/lib/rubygems/gemcutter_utilities.rb

@@ -0,0 +1,49 @@
+require 'net/http'
+require 'rubygems/remote_fetcher'
+
+module Gem::GemcutterUtilities
+
+  def sign_in
+    return if Gem.configuration.rubygems_api_key
+
+    say "Enter your RubyGems.org credentials."
+    say "Don't have an account yet? Create one at http://rubygems.org/sign_up"
+
+    email    =              ask "   Email: "
+    password = ask_for_password "Password: "
+    say "\n"
+
+    response = rubygems_api_request :get, "api/v1/api_key" do |request|
+      request.basic_auth email, password
+    end
+
+    with_response response do |resp|
+      say "Signed in."
+      Gem.configuration.rubygems_api_key = resp.body
+    end
+  end
+
+  def rubygems_api_request(method, path, &block)
+    host = ENV['RUBYGEMS_HOST'] || 'https://rubygems.org'
+    uri = URI.parse "#{host}/#{path}"
+
+    request_method = Net::HTTP.const_get method.to_s.capitalize
+
+    Gem::RemoteFetcher.fetcher.request(uri, request_method, &block)
+  end
+
+  def with_response(resp)
+    case resp
+    when Net::HTTPSuccess then
+      if block_given? then
+        yield resp
+      else
+        say resp.body
+      end
+    else
+      say resp.body
+      terminate_interaction 1
+    end
+  end
+
+end

data/lib/rubygems/indexer.rb

@@ -58,7 +58,7 @@ class Gem::Indexer
 
   def initialize(directory, options = {})
     unless ''.respond_to? :to_xs then
-      fail "Gem::Indexer requires that the XML Builder library be installed:" \
+      raise "Gem::Indexer requires that the XML Builder library be installed:" \
            "\n\tgem install builder"
     end
 
@@ -350,7 +350,7 @@ class Gem::Indexer
         end
 
         index.sort_by { |_, spec| [-spec.date.to_i, spec] }.each do |_, spec|
-          gem_path = CGI.escapeHTML "http://#{@rss_gems_host}/gems/#{spec.full_name}.gem"
+          gem_path = CGI.escapeHTML "http://#{@rss_gems_host}/gems/#{spec.file_name}"
           size = File.stat(spec.loaded_from).size rescue next
 
           description = spec.description || spec.summary || ''

data/lib/rubygems/install_update_options.rb

@@ -95,8 +95,7 @@ module Gem::InstallUpdateOptions
 
     add_option(:"Install/Update",       '--[no-]user-install',
                'Install in user\'s home directory instead',
-               'of GEM_HOME. Defaults to using home',
-               'only if GEM_HOME is not writable.') do |value, options|
+               'of GEM_HOME.') do |value, options|
       options[:user_install] = value
     end
 
@@ -105,13 +104,6 @@ module Gem::InstallUpdateOptions
                 "dependencies") do |value, options|
       options[:development] = true
     end
-
-    add_option(:"Install/Update", "--prerelease",
-               "Install prerelease versions of a gem if",
-               "available. Defaults to skipping",
-               "prereleases.") do |value, options|
-      options[:prerelease] = true
-    end
   end
 
   ##

data/lib/rubygems/installer.rb

@@ -5,7 +5,6 @@
 #++
 
 require 'fileutils'
-require 'pathname'
 require 'rbconfig'
 
 require 'rubygems/format'
@@ -28,6 +27,12 @@ require 'rubygems/require_paths_builder'
 
 class Gem::Installer
 
+  ##
+  # Paths where env(1) might live.  Some systems are broken and have it in
+  # /bin
+
+  ENV_PATHS = %w[/usr/bin/env /bin/env]
+
   ##
   # Raised when there is an error while building extensions.
   #
@@ -52,16 +57,10 @@ class Gem::Installer
 
   attr_reader :spec
 
-  @home_install_warning = false
   @path_warning = false
 
   class << self
 
-    ##
-    # True if we've warned about ~/.gems install
-
-    attr_accessor :home_install_warning
-
     ##
     # True if we've warned about PATH not including Gem.bindir
 
@@ -106,7 +105,7 @@ class Gem::Installer
     @env_shebang         = options[:env_shebang]
     @force               = options[:force]
     gem_home             = options[:install_dir]
-    @gem_home            = Pathname.new(gem_home).expand_path
+    @gem_home            = File.expand_path(gem_home)
     @ignore_dependencies = options[:ignore_dependencies]
     @format_executable   = options[:format_executable]
     @security_policy     = options[:security_policy]
@@ -121,27 +120,6 @@ class Gem::Installer
       raise Gem::InstallError, "invalid gem format for #{@gem}"
     end
 
-    begin
-      FileUtils.mkdir_p @gem_home
-    rescue Errno::EACCES, Errno::ENOTDIR
-      # We'll divert to ~/.gems below
-    end
-
-    if not File.writable? @gem_home or
-        # TODO: Shouldn't have to test for existence of bindir; tests need it.
-        (@gem_home.to_s == Gem.dir and File.exist? Gem.bindir and
-         not File.writable? Gem.bindir) then
-      if options[:user_install] == false then # You don't want to use ~
-        raise Gem::FilePermissionError, @gem_home
-      elsif options[:user_install].nil? then
-        unless self.class.home_install_warning or options[:unpack] then
-          alert_warning "Installing to ~/.gem since #{@gem_home} and\n\t  #{Gem.bindir} aren't both writable."
-          self.class.home_install_warning = true
-        end
-      end
-      options[:user_install] = true
-    end
-
     if options[:user_install] and not options[:unpack] then
       @gem_home = Gem.user_dir
 
@@ -152,12 +130,11 @@ class Gem::Installer
           self.class.path_warning = true
         end
       end
-
-      FileUtils.mkdir_p @gem_home unless File.directory? @gem_home
-      # If it's still not writable, you've got issues.
-      raise Gem::FilePermissionError, @gem_home unless File.writable? @gem_home
     end
 
+    FileUtils.mkdir_p @gem_home
+    raise Gem::FilePermissionError, @gem_home unless File.writable? @gem_home
+
     @spec = @format.spec
 
     @gem_dir = File.join(@gem_home, "gems", @spec.full_name).untaint
@@ -183,14 +160,15 @@ class Gem::Installer
     unless @force then
       if rrv = @spec.required_ruby_version then
         unless rrv.satisfied_by? Gem.ruby_version then
-          raise Gem::InstallError, "#{@spec.name} requires Ruby version #{rrv}"
+          raise Gem::InstallError, "#{@spec.name} requires Ruby version #{rrv}."
         end
       end
 
       if rrgv = @spec.required_rubygems_version then
         unless rrgv.satisfied_by? Gem::Version.new(Gem::RubyGemsVersion) then
           raise Gem::InstallError,
-                "#{@spec.name} requires RubyGems version #{rrgv}"
+            "#{@spec.name} requires RubyGems version #{rrgv}. " +
+            "Try 'gem update --system' to update RubyGems itself."
         end
       end
 
@@ -229,8 +207,7 @@ class Gem::Installer
 
     say @spec.post_install_message unless @spec.post_install_message.nil?
 
-    @spec.loaded_from = File.join(@gem_home, 'specifications',
-                                  "#{@spec.full_name}.gemspec")
+    @spec.loaded_from = File.join(@gem_home, 'specifications', @spec.spec_name)
 
     @source_index.add_spec @spec
 
@@ -262,7 +239,7 @@ class Gem::Installer
   # True if the gems in the source_index satisfy +dependency+.
 
   def installation_satisfies_dependency?(dependency)
-    @source_index.find_name(dependency.name, dependency.version_requirements).size > 0
+    @source_index.find_name(dependency.name, dependency.requirement).size > 0
   end
 
   ##
@@ -281,8 +258,7 @@ class Gem::Installer
   def write_spec
     rubycode = @spec.to_ruby
 
-    file_name = File.join @gem_home, 'specifications',
-                          "#{@spec.full_name}.gemspec"
+    file_name = File.join @gem_home, 'specifications', @spec.spec_name
 
     file_name.untaint
 
@@ -392,23 +368,25 @@ class Gem::Installer
   # necessary.
 
   def shebang(bin_file_name)
-    if @env_shebang then
-      "#!/usr/bin/env " + Gem::ConfigMap[:ruby_install_name]
-    else
-      path = File.join @gem_dir, @spec.bindir, bin_file_name
-
-      File.open(path, "rb") do |file|
-        first_line = file.gets
-        if first_line =~ /^#!/ then
-          # Preserve extra words on shebang line, like "-w".  Thanks RPA.
-          shebang = first_line.sub(/\A\#!.*?ruby\S*/, "#!#{Gem.ruby}")
-        else
-          # Create a plain shebang line.
-          shebang = "#!#{Gem.ruby}"
-        end
+    ruby_name = Gem::ConfigMap[:ruby_install_name] if @env_shebang
+    path = File.join @gem_dir, @spec.bindir, bin_file_name
+    first_line = File.open(path, "rb") {|file| file.gets}
+
+    if /\A#!/ =~ first_line then
+      # Preserve extra words on shebang line, like "-w".  Thanks RPA.
+      shebang = first_line.sub(/\A\#!.*?ruby\S*(?=(\s+\S+))/, "#!#{Gem.ruby}")
+      opts = $1
+      shebang.strip! # Avoid nasty ^M issues.
+    end
 
-        shebang.strip # Avoid nasty ^M issues.
-      end
+    if not ruby_name then
+      "#!#{Gem.ruby}#{opts}"
+    elsif opts then
+      "#!/bin/sh\n'exec' #{ruby_name.dump} '-x' \"$0\" \"$@\"\n#{shebang}"
+    else
+      # Create a plain shebang line.
+      @env_path ||= ENV_PATHS.find {|env_path| File.executable? env_path }
+      "#!#{@env_path} #{ruby_name}"
     end
   end
 
@@ -514,7 +492,7 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
   # Ensures that files can't be installed outside the gem directory.
 
   def extract_files
-    expand_and_validate_gem_dir
+    @gem_dir = File.expand_path @gem_dir
 
     raise ArgumentError, "format required to extract from" if @format.nil?
 
@@ -558,24 +536,5 @@ Results logged to #{File.join(Dir.pwd, 'gem_make.out')}
     end
   end
 
-  private
-
-  ##
-  # HACK Pathname is broken on windows.
-
-  def absolute_path? pathname
-    pathname.absolute? or (Gem.win_platform? and pathname.to_s =~ /\A[a-z]:/i)
-  end
-
-  def expand_and_validate_gem_dir
-    @gem_dir = Pathname.new(@gem_dir).expand_path
-
-    unless absolute_path?(@gem_dir) then # HACK is this possible after #expand_path?
-      raise ArgumentError, "install directory %p not absolute" % @gem_dir
-    end
-
-    @gem_dir = @gem_dir.to_s
-  end
-
 end