0
@@ -1,3 +1,7 @@
0
+Tue Apr  1 07:31:58 2008  Eric Hodel  <drbrain@segment7.net>
0
+
0
+	* lib/rubygems* test/rubygems*: Import RubyGems 1.1.0.
0
+
0
 Tue Apr  1 03:20:40 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
0
 
0
   * configure.in (RUBY_SETJMP, RUBY_LONGJMP, RUBY_JMP_BUF): prefers

0
@@ -7,11 +7,12 @@
0
 
0
 require 'rubygems'
0
 require 'rubygems/gem_runner'
0
+require 'rubygems/exceptions'
0
 
0
-required_version = Gem::Requirement.new ">= 1.8.3"
0
+required_version = Gem::Requirement.new "> 1.8.3"
0
 
0
-unless required_version.satisfied_by? Gem::Version.new(RUBY_VERSION) then
0
-  abort "Expected Ruby Version #{required_version}, was #{RUBY_VERSION}"
0
+unless required_version.satisfied_by? Gem.ruby_version then
0
+  abort "Expected Ruby Version #{required_version}, was #{Gem.ruby_version}"
0
 end
0
 
0
 # We need to preserve the original ARGV to use for passing gem options
0
@@ -19,5 +20,9 @@ end
0
 # it...its for the source building process.
0
 args = !ARGV.include?("--") ? ARGV.clone : ARGV[0...ARGV.index("--")]
0
 
0
-Gem::GemRunner.new.run args
0
+begin
0
+  Gem::GemRunner.new.run args
0
+rescue Gem::SystemExitException => e
0
+  exit e.exit_code
0
+end
0
 

0
@@ -1,207 +1,214 @@
0
+# depends on: array.rb dir.rb env.rb file.rb hash.rb module.rb regexp.rb
0
+
0
 # empty gem_prelude.rb
0
 #
0
 # p Gem::Enable
0
 
0
-if defined?(Gem::Enable) && Gem::Enable
0
-#t = Time.now
0
-  
0
-module Kernel
0
+if defined?(Gem::Enable) && Gem::Enable then
0
+
0
+  module Kernel
0
+
0
+    def gem(gem_name, *version_requirements)
0
+      Gem.push_gem_version_on_load_path(gem_name, *version_requirements)
0
+    end
0
 
0
-  def gem(gem_name, *version_requirements)
0
-    Gem.push_gem_version_on_load_path(gem_name, *version_requirements)
0
   end
0
 
0
-end
0
+  module Gem
0
+
0
+    ConfigMap = {
0
+      :sitedir => RbConfig::CONFIG["sitedir"],
0
+      :ruby_version => RbConfig::CONFIG["ruby_version"],
0
+      :libdir => RbConfig::CONFIG["libdir"],
0
+      :sitelibdir => RbConfig::CONFIG["sitelibdir"],
0
+      :arch => RbConfig::CONFIG["arch"],
0
+      :bindir => RbConfig::CONFIG["bindir"],
0
+      :EXEEXT => RbConfig::CONFIG["EXEEXT"],
0
+      :RUBY_SO_NAME => RbConfig::CONFIG["RUBY_SO_NAME"],
0
+      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"]
0
+    }
0
+
0
+    class << self
0
 
0
-module Gem
0
-  
0
-  ConfigMap = {
0
-    :sitedir => RbConfig::CONFIG["sitedir"],
0
-    :ruby_version => RbConfig::CONFIG["ruby_version"],
0
-    :libdir => RbConfig::CONFIG["libdir"],
0
-    :sitelibdir => RbConfig::CONFIG["sitelibdir"],
0
-    :arch => RbConfig::CONFIG["arch"],
0
-    :bindir => RbConfig::CONFIG["bindir"],
0
-    :EXEEXT => RbConfig::CONFIG["EXEEXT"],
0
-    :RUBY_SO_NAME => RbConfig::CONFIG["RUBY_SO_NAME"],
0
-    :ruby_install_name => RbConfig::CONFIG["ruby_install_name"]
0
-  }
0
-
0
-  class << self
0
-
0
-    def default_dir
0
-      if defined? RUBY_FRAMEWORK_VERSION
0
-        return File.join(File.dirname(ConfigMap[:sitedir]), "Gems")
0
-      else
0
-        File.join(ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version])
0
+      def default_dir
0
+        if defined? RUBY_FRAMEWORK_VERSION
0
+          return File.join(File.dirname(ConfigMap[:sitedir]), "Gems")
0
+        else
0
+          File.join(ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version])
0
+        end
0
       end
0
-    end
0
 
0
-    def dir
0
-      @gem_home ||= nil
0
-      set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
0
-      @gem_home
0
-    end
0
+      def dir
0
+        @gem_home ||= nil
0
+        set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
0
+        @gem_home
0
+      end
0
 
0
-    def path
0
-      @gem_path ||= nil
0
-      unless @gem_path
0
-        paths = [ENV['GEM_PATH']]
0
-        paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
0
-        set_paths(paths.compact.join(File::PATH_SEPARATOR))
0
+      def path
0
+        @gem_path ||= nil
0
+        unless @gem_path
0
+          paths = [ENV['GEM_PATH']]
0
+          paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
0
+          set_paths(paths.compact.join(File::PATH_SEPARATOR))
0
+        end
0
+        @gem_path
0
       end
0
-      @gem_path
0
-    end
0
 
0
-    # Set the Gem home directory (as reported by +dir+).
0
-    def set_home(home)
0
-      @gem_home = home
0
-      ensure_gem_subdirectories(@gem_home)
0
-    end
0
+      # Set the Gem home directory (as reported by +dir+).
0
+      def set_home(home)
0
+        @gem_home = home
0
+        ensure_gem_subdirectories(@gem_home)
0
+      end
0
 
0
-    def set_paths(gpaths)
0
-      if gpaths
0
-        @gem_path = gpaths.split(File::PATH_SEPARATOR)
0
-        @gem_path << Gem.dir
0
-      else
0
-        @gem_path = [Gem.dir]
0
+      def set_paths(gpaths)
0
+        if gpaths
0
+          @gem_path = gpaths.split(File::PATH_SEPARATOR)
0
+          @gem_path << Gem.dir
0
+        else
0
+          @gem_path = [Gem.dir]
0
+        end
0
+        @gem_path.uniq!
0
+        @gem_path.each do |gp| ensure_gem_subdirectories(gp) end
0
       end
0
-      @gem_path.uniq!
0
-      @gem_path.each do |gp| ensure_gem_subdirectories(gp) end
0
-    end
0
-    
0
-    def ensure_gem_subdirectories(path)
0
-    end
0
 
0
-  end
0
+      def ensure_gem_subdirectories(path)
0
+      end
0
+
0
+    end
0
 
0
-  module QuickLoader
0
+    module QuickLoader
0
 
0
-    class << self
0
-      def load_full_rubygems_library
0
-        class << Gem
0
-          Gem.methods(false).each do |method_name|
0
-            undef_method method_name
0
+      class << self
0
+        def load_full_rubygems_library
0
+          class << Gem
0
+            Gem.methods(false).each do |method_name|
0
+              undef_method method_name
0
+            end
0
           end
0
-        end
0
 
0
-        Kernel.send :undef_method, :gem
0
+          Kernel.send :undef_method, :gem
0
 
0
-        $".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
0
-                            Gem::ConfigMap[:ruby_version], 'rubygems.rb')
0
+          $".delete File.join(Gem::ConfigMap[:libdir], 'ruby',
0
+                              Gem::ConfigMap[:ruby_version], 'rubygems.rb')
0
 
0
-        require 'rubygems'
0
+          require 'rubygems'
0
+        end
0
       end
0
-    end
0
 
0
-    GemPaths = {}
0
-    GemVersions = {}
0
-    
0
-    def push_gem_version_on_load_path(gem_name, *version_requirements)
0
-      if version_requirements.empty?
0
-        unless GemPaths.has_key?(gem_name)
0
-          raise LoadError.new("Could not find RubyGem #{gem_name} (>= 0)\n") 
0
-        end
0
-        # highest version gems already active
0
-        return false
0
-      else
0
-        if version_requirements.length > 1
0
-          QuickLoader.load_full_rubygems_library
0
-          return gem(gem_name, *version_requirements)
0
-        end
0
-        requirement, version = version_requirements[0].split
0
-        requirement.strip!
0
-        if requirement == ">" || requirement == ">="
0
-          if (GemVersions[gem_name] <=> Gem.calculate_integers_for_gem_version(version)) >= 0
0
-            return false 
0
+      GemPaths = {}
0
+      GemVersions = {}
0
+
0
+      def push_gem_version_on_load_path(gem_name, *version_requirements)
0
+        if version_requirements.empty?
0
+          unless GemPaths.has_key?(gem_name)
0
+            raise LoadError.new("Could not find RubyGem #{gem_name} (>= 0)\n") 
0
+          end
0
+
0
+          # highest version gems already active
0
+          return false
0
+        else
0
+          if version_requirements.length > 1
0
+            QuickLoader.load_full_rubygems_library
0
+            return gem(gem_name, *version_requirements)
0
           end
0
-        elsif requirement == "~>"
0
-          loaded_version = GemVersions[gem_name]
0
-          required_version = Gem.calculate_integers_for_gem_version(version)
0
-          if loaded_version && (loaded_version[0] == required_version[0])
0
-            return false
0
+
0
+          requirement, version = version_requirements[0].split
0
+          requirement.strip!
0
+
0
+          if requirement == ">" || requirement == ">="
0
+            if (GemVersions[gem_name] <=> Gem.calculate_integers_for_gem_version(version)) >= 0
0
+              return false 
0
+            end
0
+          elsif requirement == "~>"
0
+            loaded_version = GemVersions[gem_name]
0
+            required_version = Gem.calculate_integers_for_gem_version(version)
0
+            if loaded_version && (loaded_version[0] == required_version[0])
0
+              return false
0
+            end
0
           end
0
+
0
+          QuickLoader.load_full_rubygems_library
0
+          gem(gem_name, *version_requirements)
0
         end
0
-        QuickLoader.load_full_rubygems_library
0
-        gem(gem_name, *version_requirements)
0
       end
0
-    end
0
 
0
-    def calculate_integers_for_gem_version(gem_version)
0
-      numbers = gem_version.split(".").collect {|n| n.to_i}
0
-      numbers.pop while numbers.last == 0
0
-      numbers << 0 if numbers.empty?
0
-      numbers
0
-    end
0
-  
0
-    def push_all_highest_version_gems_on_load_path
0
-      Gem.path.each do |path|
0
-        gems_directory = File.join(path, "gems")
0
-        if File.exist?(gems_directory)
0
-          Dir.entries(gems_directory).each do |gem_directory_name|
0
-            next if gem_directory_name == "." || gem_directory_name == ".."
0
-            dash = gem_directory_name.rindex("-")
0
-            next if dash.nil?
0
-            gem_name = gem_directory_name[0...dash]
0
-            current_version = GemVersions[gem_name]
0
-            new_version = calculate_integers_for_gem_version(gem_directory_name[dash+1..-1])
0
-            if current_version
0
-              if (current_version <=> new_version) == -1
0
+      def calculate_integers_for_gem_version(gem_version)
0
+        numbers = gem_version.split(".").collect {|n| n.to_i}
0
+        numbers.pop while numbers.last == 0
0
+        numbers << 0 if numbers.empty?
0
+        numbers
0
+      end
0
+
0
+      def push_all_highest_version_gems_on_load_path
0
+        Gem.path.each do |path|
0
+          gems_directory = File.join(path, "gems")
0
+          if File.exist?(gems_directory)
0
+            Dir.entries(gems_directory).each do |gem_directory_name|
0
+              next if gem_directory_name == "." || gem_directory_name == ".."
0
+              dash = gem_directory_name.rindex("-")
0
+              next if dash.nil?
0
+              gem_name = gem_directory_name[0...dash]
0
+              current_version = GemVersions[gem_name]
0
+              new_version = calculate_integers_for_gem_version(gem_directory_name[dash+1..-1])
0
+              if current_version
0
+                if (current_version <=> new_version) == -1
0
+                  GemVersions[gem_name] = new_version
0
+                  GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
0
+                end
0
+              else
0
                 GemVersions[gem_name] = new_version
0
                 GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
0
               end
0
-            else
0
-              GemVersions[gem_name] = new_version
0
-              GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
0
             end
0
           end
0
         end
0
-      end
0
-      require_paths = []
0
-      GemPaths.values.each do |path|
0
-        if File.exist?(File.join(path, ".require_paths"))
0
-          require_paths.concat(File.read(File.join(path, ".require_paths")).split.map {|require_path| File.join(path, require_path)})
0
-        else
0
-          require_paths << File.join(path, "bin") if File.exist?(File.join(path, "bin"))
0
-          require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib"))
0
+
0
+        require_paths = []
0
+
0
+        GemPaths.values.each do |path|
0
+          if File.exist?(File.join(path, ".require_paths"))
0
+            require_paths.concat(File.read(File.join(path, ".require_paths")).split.map {|require_path| File.join(path, require_path)})
0
+          else
0
+            require_paths << File.join(path, "bin") if File.exist?(File.join(path, "bin"))
0
+            require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib"))
0
+          end
0
+        end
0
+
0
+        # "tag" the first require_path inserted into the $LOAD_PATH to enable
0
+        # indexing correctly with rubygems proper when it inserts an explicitly
0
+        # gem version
0
+        unless require_paths.empty?
0
+          require_paths.first.instance_variable_set(:@gem_prelude_index, true)
0
         end
0
+        # gem directories must come after -I and ENV['RUBYLIB']
0
+        $:[$:.index(ConfigMap[:sitelibdir]),0] = require_paths
0
+      end
0
+
0
+      def const_missing(constant)
0
+        QuickLoader.load_full_rubygems_library
0
+        Gem.const_get(constant)
0
       end
0
-      
0
-      # "tag" the first require_path inserted into the $LOAD_PATH to enable
0
-      # indexing correctly with rubygems proper when it inserts an explicitly
0
-      # gem version
0
-      unless require_paths.empty?
0
-        require_paths.first.instance_variable_set(:@gem_prelude_index, true)
0
+
0
+      def method_missing(method, *args, &block)
0
+        QuickLoader.load_full_rubygems_library
0
+        super unless Gem.respond_to?(method)
0
+        Gem.send(method, *args, &block)
0
       end
0
-      # gem directories must come after -I and ENV['RUBYLIB']
0
-      $:[$:.index(ConfigMap[:sitelibdir]),0] = require_paths
0
     end
0
 
0
-    def const_missing(constant)
0
-      QuickLoader.load_full_rubygems_library
0
-      Gem.const_get(constant)
0
-    end
0
+    extend QuickLoader
0
 
0
-    def method_missing(method, *args, &block)
0
-      QuickLoader.load_full_rubygems_library
0
-      super unless Gem.respond_to?(method)
0
-      Gem.send(method, *args, &block)
0
-    end
0
   end
0
-  
0
-  extend QuickLoader
0
 
0
-end
0
+  begin
0
+    Gem.push_all_highest_version_gems_on_load_path
0
+    $" << File.join(Gem::ConfigMap[:libdir], "ruby",
0
+                    Gem::ConfigMap[:ruby_version], "rubygems.rb")
0
+  rescue Exception => e
0
+    puts "Error loading gem paths on load path in gem_prelude"
0
+    puts e
0
+    puts e.backtrace.join("\n")
0
+  end
0
 
0
-begin
0
-  Gem.push_all_highest_version_gems_on_load_path
0
-  $" << File.join(Gem::ConfigMap[:libdir], "ruby",
0
-                  Gem::ConfigMap[:ruby_version], "rubygems.rb")
0
-rescue Exception => e
0
-  puts "Error loading gem paths on load path in gem_prelude"
0
-  puts e
0
-  puts e.backtrace.join("\n")
0
 end
0
 
0
-#puts "Gem load in #{Time.now - t} seconds"
0
-end # Gem::Enable