rubygems-update 1.8.30 → 2.0.0.preview2

data/lib/rubygems/deprecate.rb

@@ -20,51 +20,51 @@
 #       end
 #     end
 
-module Gem
-  module Deprecate
+module Gem::Deprecate
 
-    def self.skip # :nodoc:
-      @skip ||= false
-    end
-
-    def self.skip= v # :nodoc:
-      @skip = v
-    end
+  def self.skip # :nodoc:
+    @skip ||= false
+  end
 
-    ##
-    # Temporarily turn off warnings. Intended for tests only.
+  def self.skip= v # :nodoc:
+    @skip = v
+  end
 
-    def skip_during
-      Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
-      yield
-    ensure
-      Gem::Deprecate.skip = original
-    end
+  ##
+  # Temporarily turn off warnings. Intended for tests only.
 
-    ##
-    # Simple deprecation method that deprecates +name+ by wrapping it up
-    # in a dummy method. It warns on each call to the dummy method
-    # telling the user of +repl+ (unless +repl+ is :none) and the
-    # year/month that it is planned to go away.
+  def skip_during
+    Gem::Deprecate.skip, original = true, Gem::Deprecate.skip
+    yield
+  ensure
+    Gem::Deprecate.skip = original
+  end
 
-    def deprecate name, repl, year, month
-      class_eval {
-        old = "_deprecated_#{name}"
-        alias_method old, name
-        define_method name do |*args, &block| # TODO: really works on 1.8.7?
-          klass = self.kind_of? Module
-          target = klass ? "#{self}." : "#{self.class}#"
-          msg = [ "NOTE: #{target}#{name} is deprecated",
-            repl == :none ? " with no replacement" : ", use #{repl}",
-            ". It will be removed on or after %4d-%02d-01." % [year, month],
-            "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
-          ]
-          warn "#{msg.join}." unless Gem::Deprecate.skip
-          send old, *args, &block
-        end
-      }
-    end
+  ##
+  # Simple deprecation method that deprecates +name+ by wrapping it up
+  # in a dummy method. It warns on each call to the dummy method
+  # telling the user of +repl+ (unless +repl+ is :none) and the
+  # year/month that it is planned to go away.
 
-    module_function :deprecate, :skip_during
+  def deprecate name, repl, year, month
+    class_eval {
+      old = "_deprecated_#{name}"
+      alias_method old, name
+      define_method name do |*args, &block| # TODO: really works on 1.8.7?
+        klass = self.kind_of? Module
+        target = klass ? "#{self}." : "#{self.class}#"
+        msg = [ "NOTE: #{target}#{name} is deprecated",
+          repl == :none ? " with no replacement" : "; use #{repl} instead",
+          ". It will be removed on or after %4d-%02d-01." % [year, month],
+          "\n#{target}#{name} called from #{Gem.location_of_caller.join(":")}",
+        ]
+        warn "#{msg.join}." unless Gem::Deprecate.skip
+        send old, *args, &block
+      end
+    }
   end
+
+  module_function :deprecate, :skip_during
+
 end
+

data/lib/rubygems/errors.rb

@@ -1,35 +1,88 @@
-class Gem::ErrorReason; end
-
-# Generated when trying to lookup a gem to indicate that the gem
-# was found, but that it isn't usable on the current platform.
-#
-# fetch and install read these and report them to the user to aid
-# in figuring out why a gem couldn't be installed.
+##
+# This file contains all the various exceptions and other errors that are used
+# inside of RubyGems.
 #
-class Gem::PlatformMismatch < Gem::ErrorReason
+# DOC: Confirm _all_
 
-  attr_reader :name
-  attr_reader :version
-  attr_reader :platforms
+module Gem
+  ##
+  # Raised when RubyGems is unable to load or activate a gem.  Contains the
+  # name and version requirements of the gem that either conflicts with
+  # already activated gems or that RubyGems is otherwise unable to activate.
 
-  def initialize(name, version)
-    @name = name
-    @version = version
-    @platforms = []
-  end
+  class LoadError < ::LoadError
+    # Name of gem
+    attr_accessor :name
 
-  def add_platform(platform)
-    @platforms << platform
+    # Version requirement of gem
+    attr_accessor :requirement
   end
 
-  def wordy
-    prefix = "Found #{@name} (#{@version})"
+  # FIX: does this need to exist? The subclass is the only other reference
+  # I can find.
+  class ErrorReason; end
+
+  # Generated when trying to lookup a gem to indicate that the gem
+  # was found, but that it isn't usable on the current platform.
+  #
+  # fetch and install read these and report them to the user to aid
+  # in figuring out why a gem couldn't be installed.
+  #
+  class PlatformMismatch < ErrorReason
+
+    ##
+    # the name of the gem
+    attr_reader :name
+
+    ##
+    # the version
+    attr_reader :version
+
+    ##
+    # The platforms that are mismatched
+    attr_reader :platforms
+
+    def initialize(name, version)
+      @name = name
+      @version = version
+      @platforms = []
+    end
 
-    if @platforms.size == 1
-      "#{prefix}, but was for platform #{@platforms[0]}"
-    else
-      "#{prefix}, but was for platforms #{@platforms.join(' ,')}"
+    ##
+    # append a platform to the list of mismatched platforms.
+    #
+    # Platforms are added via this instead of injected via the constructor
+    # so that we can loop over a list of mismatches and just add them rather
+    # than perform some kind of calculation mismatch summary before creation.
+    def add_platform(platform)
+      @platforms << platform
+    end
+
+    ##
+    # A wordy description of the error.
+    def wordy
+      "Found %s (%), but was for platform%s %s" %
+        [@name,
+         @version,
+         @platforms.size == 1 ? 's' : '',
+         @platforms.join(' ,')]
     end
   end
 
+  ##
+  # An error that indicates we weren't able to fetch some
+  # data from a source
+
+  class SourceFetchProblem < ErrorReason
+    def initialize(source, error)
+      @source = source
+      @error = error
+    end
+
+    attr_reader :source, :error
+
+    def wordy
+      "Unable to download data from #{@source.uri} - #{@error.message}"
+    end
+  end
 end

data/lib/rubygems/exceptions.rb

@@ -1,7 +1,14 @@
+# TODO: the documentation in here is terrible.
+#
+# Each exception needs a brief description and the scenarios where it is
+# likely to be raised
+
 ##
 # Base exception class for RubyGems.  All exception raised by RubyGems are a
 # subclass of this one.
-class Gem::Exception < RuntimeError; end
+class Gem::Exception < RuntimeError
+  attr_accessor :source_exception
+end
 
 class Gem::CommandLineError < Gem::Exception; end
 
@@ -24,11 +31,18 @@ class Gem::EndOfYAMLException < Gem::Exception; end
 
 ##
 # Signals that a file permission error is preventing the user from
-# installing in the requested directories.
+# operating on the given directory.
+
 class Gem::FilePermissionError < Gem::Exception
-  def initialize(path)
-    super("You don't have write permissions into the #{path} directory.")
+
+  attr_reader :directory
+
+  def initialize directory
+    @directory = directory
+
+    super "You don't have write permissions for the #{directory} directory."
   end
+
 end
 
 ##
@@ -37,9 +51,12 @@ class Gem::FormatException < Gem::Exception
   attr_accessor :file_path
 end
 
-class Gem::GemNotFoundException < Gem::Exception
-  def initialize(msg, name=nil, version=nil, errors=nil)
-    super msg
+class Gem::GemNotFoundException < Gem::Exception; end
+
+class Gem::SpecificGemNotFoundException < Gem::GemNotFoundException
+  def initialize(name, version, errors=nil)
+    super "Could not find a valid gem '#{name}' (#{version}) locally or in a repository"
+
     @name = name
     @version = version
     @errors = errors
@@ -89,3 +106,4 @@ class Gem::SystemExitException < SystemExit
   end
 
 end
+

data/lib/rubygems/ext/builder.rb

@@ -4,18 +4,8 @@
 # See LICENSE.txt for permissions.
 #++
 
-require 'thread'
-
 class Gem::Ext::Builder
 
-  ##
-  # The builder shells-out to run various commands after changing the
-  # directory.  This means multiple installations cannot be allowed to build
-  # extensions in parallel as they may change each other's directories leading
-  # to broken extensions or failed installations.
-
-  CHDIR_MUTEX = Mutex.new # :nodoc:
-
   def self.class_name
     name =~ /Ext::(.*)Builder/
     $1.downcase
@@ -26,23 +16,22 @@ class Gem::Ext::Builder
       raise Gem::InstallError, "Makefile not found:\n\n#{results.join "\n"}"
     end
 
+    mf = Gem.read_binary 'Makefile'
+    mf = mf.gsub(/^RUBYARCHDIR\s*=\s*\$[^$]*/, "RUBYARCHDIR = #{dest_path}")
+    mf = mf.gsub(/^RUBYLIBDIR\s*=\s*\$[^$]*/, "RUBYLIBDIR = #{dest_path}")
+
+    File.open('Makefile', 'wb') {|f| f.print mf}
+
     # try to find make program from Ruby configure arguments first
     RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
-    make_program = $1 || ENV['make']
+    make_program = $1 || ENV['MAKE'] || ENV['make']
     unless make_program then
       make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
     end
 
-    destdir = '"DESTDIR=%s"' % ENV['DESTDIR'] if RUBY_VERSION > '2.0'
-
-    ['', 'install'].each do |target|
-      # Pass DESTDIR via command line to override what's in MAKEFLAGS
-      cmd = [
-        make_program,
-        destdir,
-        target
-      ].join(' ').rstrip
-      run(cmd, results, "make #{target}".rstrip)
+    ['', ' install'].each do |target|
+      cmd = "#{make_program}#{target}"
+      run(cmd, results, "make#{target}")
     end
   end
 
@@ -51,10 +40,18 @@ class Gem::Ext::Builder
   end
 
   def self.run(command, results, command_name = nil)
-    results << command
-    results << `#{command} #{redirector}`
+    verbose = Gem.configuration.really_verbose
+
+    if verbose
+      puts(command)
+      system(command)
+    else
+      results << command
+      results << `#{command} #{redirector}`
+    end
 
     unless $?.success? then
+      results << "Building has failed. See above output for more information on the failure." if verbose
       raise Gem::InstallError, "#{command_name || class_name} failed:\n\n#{results.join "\n"}"
     end
   end

data/lib/rubygems/ext/configure_builder.rb

@@ -8,10 +8,10 @@ require 'rubygems/ext/builder'
 
 class Gem::Ext::ConfigureBuilder < Gem::Ext::Builder
 
-  def self.build(extension, directory, dest_path, results)
+  def self.build(extension, directory, dest_path, results, args=[])
     unless File.exist?('Makefile') then
       cmd = "sh ./configure --prefix=#{dest_path}"
-      cmd << " #{Gem::Command.build_args.join ' '}" unless Gem::Command.build_args.empty?
+      cmd << " #{args.join ' '}" unless args.empty?
 
       run cmd, results
     end

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -6,58 +6,18 @@
 
 require 'rubygems/ext/builder'
 require 'rubygems/command'
-require 'fileutils'
-require 'tempfile'
 
 class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
-  FileEntry = FileUtils::Entry_ # :nodoc:
 
-  def self.build(extension, directory, dest_path, results)
-    tmp_dest = Dir.mktmpdir(".gem.", ".")
+  def self.build(extension, directory, dest_path, results, args=[])
+    cmd = "#{Gem.ruby} #{File.basename extension}"
+    cmd << " #{args.join ' '}" unless args.empty?
 
-    t = nil
-    Tempfile.open %w"siteconf .rb", "." do |siteconf|
-      t = siteconf
-      siteconf.puts "require 'rbconfig'"
-      siteconf.puts "dest_path = #{(tmp_dest || dest_path).dump}"
-      %w[sitearchdir sitelibdir].each do |dir|
-        siteconf.puts "RbConfig::MAKEFILE_CONFIG['#{dir}'] = dest_path"
-        siteconf.puts "RbConfig::CONFIG['#{dir}'] = dest_path"
-      end
+    run cmd, results
 
-      siteconf.flush
-
-      rubyopt = ENV["RUBYOPT"]
-      destdir = ENV["DESTDIR"]
-
-      begin
-        ENV["RUBYOPT"] = ["-r#{siteconf.path}", rubyopt].compact.join(' ')
-        cmd = [Gem.ruby, File.basename(extension), *Gem::Command.build_args].join ' '
-
-        run cmd, results
-
-        ENV["DESTDIR"] = nil
-        ENV["RUBYOPT"] = rubyopt
-        siteconf.unlink
-
-        make dest_path, results
-
-        if tmp_dest
-          FileEntry.new(tmp_dest).traverse do |ent|
-            destent = ent.class.new(dest_path, ent.rel)
-            destent.exist? or File.rename(ent.path, destent.path)
-          end
-        end
-      ensure
-        ENV["RUBYOPT"] = rubyopt
-        ENV["DESTDIR"] = destdir
-      end
-    end
-    t.unlink if t and t.path
+    make dest_path, results
 
     results
-  ensure
-    FileUtils.rm_rf tmp_dest if tmp_dest
   end
 
 end

data/lib/rubygems/ext/rake_builder.rb

@@ -9,10 +9,10 @@ require 'rubygems/command'
 
 class Gem::Ext::RakeBuilder < Gem::Ext::Builder
 
-  def self.build(extension, directory, dest_path, results)
+  def self.build(extension, directory, dest_path, results, args=[])
     if File.basename(extension) =~ /mkrf_conf/i then
       cmd = "#{Gem.ruby} #{File.basename extension}"
-      cmd << " #{Gem::Command.build_args.join " "}" unless Gem::Command.build_args.empty?
+      cmd << " #{args.join " "}" unless args.empty?
       run cmd, results
     end
 

data/lib/rubygems/gem_runner.rb

@@ -4,10 +4,9 @@
 # See LICENSE.txt for permissions.
 #++
 
-require "rubygems"
+require 'rubygems'
 require 'rubygems/command_manager'
 require 'rubygems/config_file'
-require 'rubygems/doc_manager'
 
 ##
 # Load additional plugins from $LOAD_PATH
@@ -29,25 +28,21 @@ class Gem::GemRunner
     # TODO: nuke these options
     @command_manager_class = options[:command_manager] || Gem::CommandManager
     @config_file_class = options[:config_file] || Gem::ConfigFile
-    @doc_manager_class = options[:doc_manager] || Gem::DocManager
   end
 
   ##
   # Run the gem command with the following arguments.
 
   def run(args)
-    start_time = Time.now
-
     if args.include?('--')
       # We need to preserve the original ARGV to use for passing gem options
       # to source gems.  If there is a -- in the line, strip all options after
       # it...its for the source building process.
+      # TODO use slice!
       build_args = args[args.index("--") + 1...args.length]
       args = args[0...args.index("--")]
     end
 
-    Gem::Command.build_args = build_args if build_args
-
     do_configuration args
     cmd = @command_manager_class.instance
 
@@ -62,14 +57,7 @@ class Gem::GemRunner
       Gem::Command.add_specific_extra_args command_name, config_args
     end
 
-    cmd.run Gem.configuration.args
-    end_time = Time.now
-
-    if Gem.configuration.benchmark then
-      printf "\nExecution time: %0.2f seconds.\n", end_time - start_time
-      puts "Press Enter to finish"
-      STDIN.gets
-    end
+    cmd.run Gem.configuration.args, build_args
   end
 
   private
@@ -78,7 +66,6 @@ class Gem::GemRunner
     Gem.configuration = @config_file_class.new(args)
     Gem.use_paths Gem.configuration[:gemhome], Gem.configuration[:gempath]
     Gem::Command.extra_args = Gem.configuration[:gem]
-    @doc_manager_class.configured_args = Gem.configuration[:rdoc]
   end
 
 end