rubygems-update 1.3.5 → 1.3.6

data/test/test_gem_version_option.rb

@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/command'
 require 'rubygems/version_option'
 

data/test/test_kernel.rb

@@ -1,10 +1,4 @@
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
-
-require File.join(File.expand_path(File.dirname(__FILE__)), 'gemutilities')
+require File.expand_path('../gemutilities', __FILE__)
 require 'rubygems/package'
 
 class TestKernel < RubyGemTestCase

data/util/CL2notes

@@ -21,7 +21,7 @@ def format_text(text, wrap, indent=0)
   result.join("\n").gsub(/^/, " " * indent)
 end
 
-version = ARGV.shift || Gem::RubyGemsVersion
+version = ARGV.shift || Gem::VERSION
 
 entries = Hash.new { |h,file| h[file] = [] }
 entry = []

data/util/gem_prelude.rb.template

@@ -2,8 +2,15 @@
 # vim: filetype=ruby
 # WARN
 
+# NOTICE: Ruby is during initialization here.
+# * Encoding.default_external does not reflects -E.
+# * Should not expect Encoding.default_internal.
+# * Locale encoding is available.
+
 if defined?(Gem) then
 
+  # :stopdoc:
+
   module Kernel
 
     def gem(gem_name, *version_requirements)
@@ -15,16 +22,16 @@ if defined?(Gem) then
   module Gem
 
     ConfigMap = {
-      :BASERUBY => RbConfig::CONFIG["BASERUBY"],
-      :sitedir => RbConfig::CONFIG["sitedir"],
-      :ruby_version => RbConfig::CONFIG["ruby_version"],
-      :libdir => RbConfig::CONFIG["libdir"],
-      :sitelibdir => RbConfig::CONFIG["sitelibdir"],
-      :arch => RbConfig::CONFIG["arch"],
-      :bindir => RbConfig::CONFIG["bindir"],
-      :EXEEXT => RbConfig::CONFIG["EXEEXT"],
-      :RUBY_SO_NAME => RbConfig::CONFIG["RUBY_SO_NAME"],
-      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"]
+      :EXEEXT            => RbConfig::CONFIG["EXEEXT"],
+      :RUBY_SO_NAME      => RbConfig::CONFIG["RUBY_SO_NAME"],
+      :arch              => RbConfig::CONFIG["arch"],
+      :bindir            => RbConfig::CONFIG["bindir"],
+      :libdir            => RbConfig::CONFIG["libdir"],
+      :ruby_install_name => RbConfig::CONFIG["ruby_install_name"],
+      :ruby_version      => RbConfig::CONFIG["ruby_version"],
+      :rubylibprefix     => RbConfig::CONFIG["rubylibprefix"],
+      :sitedir           => RbConfig::CONFIG["sitedir"],
+      :sitelibdir        => RbConfig::CONFIG["sitelibdir"],
     }
 
     def self.dir
@@ -60,26 +67,32 @@ if defined?(Gem) then
     end
 
     def self.set_home(home)
+      home = home.gsub File::ALT_SEPARATOR, File::SEPARATOR if File::ALT_SEPARATOR
       @gem_home = home
-      ensure_gem_subdirectories(@gem_home)
     end
 
     def self.set_paths(gpaths)
       if gpaths
         @gem_path = gpaths.split(File::PATH_SEPARATOR)
+
+        if File::ALT_SEPARATOR then
+          @gem_path.map! do |path|
+            path.gsub File::ALT_SEPARATOR, File::SEPARATOR
+          end
+        end
+
         @gem_path << Gem.dir
       else
+        # TODO: should this be Gem.default_path instead?
         @gem_path = [Gem.dir]
       end
-      @gem_path.uniq!
-      @gem_path.each do |gp| ensure_gem_subdirectories(gp) end
-    end
 
-    def self.ensure_gem_subdirectories(path)
+      @gem_path.uniq!
     end
 
     # INCLUDE rubygems/defaults
 
+    ##
     # Methods before this line will be removed when QuickLoader is replaced
     # with the real RubyGems
 
@@ -91,13 +104,13 @@ if defined?(Gem) then
 
       begin
         require 'rubygems/defaults/operating_system'
-      rescue LoadError
+      rescue ::LoadError
       end
 
       if defined?(RUBY_ENGINE) then
         begin
           require "rubygems/defaults/#{RUBY_ENGINE}"
-        rescue LoadError
+        rescue ::LoadError
         end
       end
     ensure
@@ -106,7 +119,13 @@ if defined?(Gem) then
 
     module QuickLoader
 
+      @loaded_full_rubygems_library = false
+
       def self.load_full_rubygems_library
+        return if @loaded_full_rubygems_library
+
+        @loaded_full_rubygems_library = true
+
         class << Gem
           Gem::GEM_PRELUDE_METHODS.each do |method_name|
             undef_method method_name
@@ -117,8 +136,7 @@ if defined?(Gem) then
           undef_method :gem if method_defined? :gem
         end
 
-        $".delete File.join(Gem::ConfigMap[:libdir],
-                            Gem::ConfigMap[:ruby_install_name],
+        $".delete File.join(Gem::ConfigMap[:rubylibprefix],
                             Gem::ConfigMap[:ruby_version], 'rubygems.rb')
 
         require 'rubygems'
@@ -129,14 +147,14 @@ if defined?(Gem) then
 
       def push_gem_version_on_load_path(gem_name, *version_requirements)
         if version_requirements.empty?
-          unless GemPaths.has_key?(gem_name)
-            raise LoadError.new("Could not find RubyGem #{gem_name} (>= 0)\n")
+          unless GemPaths.has_key?(gem_name) then
+            raise Gem::LoadError, "Could not find RubyGem #{gem_name} (>= 0)\n"
           end
 
           # highest version gems already active
           return false
         else
-          if version_requirements.length > 1
+          if version_requirements.length > 1 then
             QuickLoader.load_full_rubygems_library
             return gem(gem_name, *version_requirements)
           end
@@ -144,24 +162,24 @@ if defined?(Gem) then
           requirement, version = version_requirements[0].split
           requirement.strip!
 
-          if requirement == ">" || requirement == ">="
-            if (GemVersions[gem_name] <=> Gem.calculate_integers_for_gem_version(version)) >= 0
-              return false
-            end
-          elsif requirement == "~>"
-            loaded_version = GemVersions[gem_name]
-            required_version = Gem.calculate_integers_for_gem_version(version)
-            if loaded_version && (loaded_version[0] == required_version[0])
-              return false
+          if loaded_version = GemVersions[gem_name] then
+            case requirement
+            when ">", ">=" then
+              return false if
+                (loaded_version <=> Gem.integers_for(version)) >= 0
+            when "~>" then
+              required_version = Gem.integers_for version
+
+              return false if loaded_version.first == required_version.first
             end
           end
 
           QuickLoader.load_full_rubygems_library
-          gem(gem_name, *version_requirements)
+          gem gem_name, *version_requirements
         end
       end
 
-      def calculate_integers_for_gem_version(gem_version)
+      def integers_for(gem_version)
         numbers = gem_version.split(".").collect {|n| n.to_i}
         numbers.pop while numbers.last == 0
         numbers << 0 if numbers.empty?
@@ -171,16 +189,20 @@ if defined?(Gem) then
       def push_all_highest_version_gems_on_load_path
         Gem.path.each do |path|
           gems_directory = File.join(path, "gems")
-          if File.exist?(gems_directory)
+
+          if File.exist?(gems_directory) then
             Dir.entries(gems_directory).each do |gem_directory_name|
               next if gem_directory_name == "." || gem_directory_name == ".."
+
               dash = gem_directory_name.rindex("-")
               next if dash.nil?
+
               gem_name = gem_directory_name[0...dash]
               current_version = GemVersions[gem_name]
-              new_version = calculate_integers_for_gem_version(gem_directory_name[dash+1..-1])
-              if current_version
-                if (current_version <=> new_version) == -1
+              new_version = integers_for(gem_directory_name[dash+1..-1])
+
+              if current_version then
+                if (current_version <=> new_version) == -1 then
                   GemVersions[gem_name] = new_version
                   GemPaths[gem_name] = File.join(gems_directory, gem_directory_name)
                 end
@@ -210,7 +232,7 @@ if defined?(Gem) then
         # "tag" the first require_path inserted into the $LOAD_PATH to enable
         # indexing correctly with rubygems proper when it inserts an explicitly
         # gem version
-        unless require_paths.empty?
+        unless require_paths.empty? then
           require_paths.first.instance_variable_set(:@gem_prelude_index, true)
         end
         # gem directories must come after -I and ENV['RUBYLIB']
@@ -219,8 +241,9 @@ if defined?(Gem) then
 
       def const_missing(constant)
         QuickLoader.load_full_rubygems_library
-        if Gem.const_defined?(constant)
-          Gem.const_get(constant)
+
+        if Gem.const_defined?(constant) then
+          Gem.const_get constant
         else
           super
         end
@@ -239,7 +262,7 @@ if defined?(Gem) then
 
   begin
     Gem.push_all_highest_version_gems_on_load_path
-    $" << File.join(Gem::ConfigMap[:libdir], Gem::ConfigMap[:ruby_install_name],
+    $" << File.join(Gem::ConfigMap[:rubylibprefix],
                     Gem::ConfigMap[:ruby_version], "rubygems.rb")
   rescue Exception => e
     puts "Error loading gem paths on load path in gem_prelude"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rubygems-update
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 6
+  version: 1.3.6
 platform: ruby
 authors: 
 - Jim Weirich
@@ -32,59 +37,10 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2009-07-21 00:00:00 -07:00
+date: 2010-02-20 00:00:00 -08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: builder
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: session
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe-seattlerb
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: minitest
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.4"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.3.2
-    version: 
+dependencies: []
+
 description: |-
   RubyGems is a package management framework for Ruby.
   
@@ -95,7 +51,7 @@ description: |-
   
   To upgrade to the latest RubyGems, run:
   
-    $ gem install --system  # you might need to be an administrator or root
+    $ gem update --system  # you might need to be an administrator or root
   
   NOTE:  RubyGems 1.1 and 1.2 have problems upgrading when there is no
   rubygems-update installed.  You will need to use the following instructions
@@ -128,6 +84,7 @@ extra_rdoc_files:
 - History.txt
 - LICENSE.txt
 - Manifest.txt
+- hide_lib_for_update/note.txt
 files: 
 - .autotest
 - .document
@@ -141,6 +98,7 @@ files:
 - bin/gem
 - bin/update_rubygems
 - cruise_config.rb
+- hide_lib_for_update/note.txt
 - lib/gauntlet_rubygems.rb
 - lib/rbconfig/datadir.rb
 - lib/rubygems.rb
@@ -162,7 +120,9 @@ files:
 - lib/rubygems/commands/lock_command.rb
 - lib/rubygems/commands/mirror_command.rb
 - lib/rubygems/commands/outdated_command.rb
+- lib/rubygems/commands/owner_command.rb
 - lib/rubygems/commands/pristine_command.rb
+- lib/rubygems/commands/push_command.rb
 - lib/rubygems/commands/query_command.rb
 - lib/rubygems/commands/rdoc_command.rb
 - lib/rubygems/commands/search_command.rb
@@ -181,10 +141,6 @@ files:
 - lib/rubygems/dependency.rb
 - lib/rubygems/dependency_installer.rb
 - lib/rubygems/dependency_list.rb
-- lib/rubygems/digest/digest_adapter.rb
-- lib/rubygems/digest/md5.rb
-- lib/rubygems/digest/sha1.rb
-- lib/rubygems/digest/sha2.rb
 - lib/rubygems/doc_manager.rb
 - lib/rubygems/exceptions.rb
 - lib/rubygems/ext.rb
@@ -196,6 +152,7 @@ files:
 - lib/rubygems/gem_openssl.rb
 - lib/rubygems/gem_path_searcher.rb
 - lib/rubygems/gem_runner.rb
+- lib/rubygems/gemcutter_utilities.rb
 - lib/rubygems/indexer.rb
 - lib/rubygems/install_update_options.rb
 - lib/rubygems/installer.rb
@@ -223,7 +180,6 @@ files:
 - lib/rubygems/specification.rb
 - lib/rubygems/test_utilities.rb
 - lib/rubygems/text.rb
-- lib/rubygems/timer.rb
 - lib/rubygems/uninstaller.rb
 - lib/rubygems/user_interaction.rb
 - lib/rubygems/validator.rb
@@ -266,7 +222,9 @@ files:
 - test/test_gem_commands_lock_command.rb
 - test/test_gem_commands_mirror_command.rb
 - test/test_gem_commands_outdated_command.rb
+- test/test_gem_commands_owner_command.rb
 - test/test_gem_commands_pristine_command.rb
+- test/test_gem_commands_push_command.rb
 - test/test_gem_commands_query_command.rb
 - test/test_gem_commands_server_command.rb
 - test/test_gem_commands_sources_command.rb
@@ -275,11 +233,11 @@ files:
 - test/test_gem_commands_uninstall_command.rb
 - test/test_gem_commands_unpack_command.rb
 - test/test_gem_commands_update_command.rb
+- test/test_gem_commands_which_command.rb
 - test/test_gem_config_file.rb
 - test/test_gem_dependency.rb
 - test/test_gem_dependency_installer.rb
 - test/test_gem_dependency_list.rb
-- test/test_gem_digest.rb
 - test/test_gem_doc_manager.rb
 - test/test_gem_ext_configure_builder.rb
 - test/test_gem_ext_ext_conf_builder.rb
@@ -287,6 +245,7 @@ files:
 - test/test_gem_format.rb
 - test/test_gem_gem_path_searcher.rb
 - test/test_gem_gem_runner.rb
+- test/test_gem_gemcutter_utilities.rb
 - test/test_gem_indexer.rb
 - test/test_gem_install_update_options.rb
 - test/test_gem_installer.rb
@@ -303,8 +262,6 @@ files:
 - test/test_gem_requirement.rb
 - test/test_gem_server.rb
 - test/test_gem_source_index.rb
-- test/test_gem_source_info_cache.rb
-- test/test_gem_source_info_cache_entry.rb
 - test/test_gem_spec_fetcher.rb
 - test/test_gem_specification.rb
 - test/test_gem_stream_ui.rb
@@ -316,32 +273,36 @@ files:
 - util/CL2notes
 - util/gem_prelude.rb.template
 has_rdoc: true
-homepage: http://rubygems.rubyforge.org/
+homepage: http://rubygems.org/
 licenses: []
 
 post_install_message: 
 rdoc_options: 
 - --main
 - README
-- --title=RubyGems 1.3.5 Documentation
+- --title=RubyGems 1.3.6 Documentation
 require_paths: 
-- lib
+- hide_lib_for_update
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 3
       version: 1.8.3
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rubygems
-rubygems_version: 1.3.4
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: RubyGems is a package management framework for Ruby
@@ -364,7 +325,9 @@ test_files:
 - test/test_gem_commands_lock_command.rb
 - test/test_gem_commands_mirror_command.rb
 - test/test_gem_commands_outdated_command.rb
+- test/test_gem_commands_owner_command.rb
 - test/test_gem_commands_pristine_command.rb
+- test/test_gem_commands_push_command.rb
 - test/test_gem_commands_query_command.rb
 - test/test_gem_commands_server_command.rb
 - test/test_gem_commands_sources_command.rb
@@ -373,11 +336,11 @@ test_files:
 - test/test_gem_commands_uninstall_command.rb
 - test/test_gem_commands_unpack_command.rb
 - test/test_gem_commands_update_command.rb
+- test/test_gem_commands_which_command.rb
 - test/test_gem_config_file.rb
 - test/test_gem_dependency.rb
 - test/test_gem_dependency_installer.rb
 - test/test_gem_dependency_list.rb
-- test/test_gem_digest.rb
 - test/test_gem_doc_manager.rb
 - test/test_gem_ext_configure_builder.rb
 - test/test_gem_ext_ext_conf_builder.rb
@@ -385,6 +348,7 @@ test_files:
 - test/test_gem_format.rb
 - test/test_gem_gem_path_searcher.rb
 - test/test_gem_gem_runner.rb
+- test/test_gem_gemcutter_utilities.rb
 - test/test_gem_indexer.rb
 - test/test_gem_install_update_options.rb
 - test/test_gem_installer.rb
@@ -401,8 +365,6 @@ test_files:
 - test/test_gem_requirement.rb
 - test/test_gem_server.rb
 - test/test_gem_source_index.rb
-- test/test_gem_source_info_cache.rb
-- test/test_gem_source_info_cache_entry.rb
 - test/test_gem_spec_fetcher.rb
 - test/test_gem_specification.rb
 - test/test_gem_stream_ui.rb