rubygems-update 1.4.2 → 1.5.0

data/UPGRADING.rdoc

@@ -0,0 +1,81 @@
+= How to upgrade/downgrade Rubygems:
+
+== On Ruby 1.9.x:
+
+=== From stock ruby shipping with 1.9:
+
+Use the Normal Upgrade Method below. (finally!)
+
+== On Ruby 1.8.x:
+
+=== From rubygems 1.3.x:
+
+Use the Normal Upgrade Recipe below.
+
+=== From rubygems 1-1.x through 1.2.x:
+
+RubyGems 1.1 and 1.2 have problems upgrading when there is no
+rubygems-update installed. You will need to use the following
+instructions if you see "Nothing to update".
+
+Use the Manual Upgrade Recipe below.
+
+=== From rubygems < 1.1.x:
+
+Use the Normal Upgrade Recipe below.
+
+== Downgrade Recipe
+
+=== Normal Downgrade
+
+Use sudo/su as appropriate:
+
+    $ gem install rubygems-update -v 1.3.7
+    $ update_rubygems
+
+Replace 1.3.7 with whatever version you want to downgrade to. This
+recipe can also be used to upgrade to a specific version instead of
+the latest.
+
+Do make sure that you don't have any other versions of rubygems-update
+installed when you run the second command.
+
+=== 1.9.2 Downgrade from Rubygems 1.4.x+ to stock 1.9 rubygems:
+
+Use sudo/su as appropriate:
+
+    $ ruby --disable-gems -S gem which rubygems
+    ~/.rvm/rubies/ruby-1.9.2-p136/lib/ruby/site_ruby/1.9.1/rubygems.rb
+    $ rm ~/.rvm/rubies/ruby-1.9.2-p136/lib/ruby/site_ruby/1.9.1/rubygems.rb
+    $ rm -rf ~/.rvm/rubies/ruby-1.9.2-p136/lib/ruby/site_ruby/1.9.1/rubygems
+    $ gem -v
+    1.3.7
+
+== Upgrade Recipes
+
+=== Normal Upgrade
+
+Use sudo/su as appropriate:
+
+    $ gem update --system
+
+=== Manual Upgrade
+
+If you have an older version of RubyGems installed, then you can still
+do it in two steps:
+
+Use sudo/su as appropriate:
+
+    $ gem install rubygems-update
+    $ update_rubygems
+
+=== Manual Install
+
+If you don't have any RubyGems install, there is still the pre-gem
+approach to getting software, doing it manually:
+
+Use sudo/su as appropriate:
+
+* Download from: https://rubygems.org/pages/download
+* Unpack into a directory and cd there
+* Install with: ruby setup.rb

data/ci_build.sh

@@ -0,0 +1,27 @@
+# You must ensure that rake, hoe, and minitest are already installed in specified RVM interpreter
+export rvm_install_on_use_flag=1
+export rvm_gemset_create_on_use_flag=1
+rvm use $1
+. "$HOME/.rvm/environments/ruby-$1" # There seems to be a bug where 'rvm use' from within a script doesn't override default interpreter, so we have to manually source the rvm environment file for the proper interpreter
+
+# TODO: How can you make Hoe's check_extra_deps not use sudo?
+#rake check_extra_deps default
+# install gems manually for now
+gem install 'rake' --no-ri --no-rdoc
+gem install 'hoe' --no-ri --no-rdoc
+gem install 'builder' -v '~> 2.1' --no-ri --no-rdoc
+gem install 'hoe-seattlerb' -v '~> 1.2' --no-ri --no-rdoc
+gem install 'minitest' -v '~> 1.4' --no-ri --no-rdoc
+gem install 'session' -v '~> 2.4' --no-ri --no-rdoc
+gem install 'rubyforge' --no-ri --no-rdoc
+
+echo "----------------------------"
+echo "Build environment:"
+cat /etc/issue
+uname -a
+ruby -v
+gem env
+gem list
+echo "----------------------------"
+
+rake default

data/cruise_config.rb

@@ -2,22 +2,29 @@
 require 'socket'
 
 Project.configure do |project|
-  
-  # Send email notifications about broken and fixed builds to email1@your.site, email2@your.site (default: send to nobody)
-  project.email_notifier.emails = ['rubygems-developers@rubyforge.org'] if Socket.gethostname =~ /ci.pivotallabs.com/
+  # To add a build for a new interpreter (from ccrb root):
+  # ./cruise add RubyGems-x_y_z-pxxx -s git -r git://github.com/rubygems/rubygems.git
+  interpreter = Regexp.new(/RubyGems-(.*)$/i).match(project.name)[1]
+  interpreter.gsub!('_','.')
 
-  # Set email 'from' field to john@doe.com:
-  project.email_notifier.from = 'devnull+rubygems-ci@pivotallabs.com'
+  # only send notifications from the official ci box
+  if Socket.gethostname =~ /cibuilder.pivotallabs.com/
+    # explicitly enable dev list notification only for interpreters which should be green
+    interpreters_with_enabled_notification = [
+      '1.8.7-p302'
+    ]
+    if interpreters_with_enabled_notification.include?(interpreter)
+      project.email_notifier.emails = ['rubygems-developers@rubyforge.org']
+    end
 
-  # Build the project by invoking rake task 'custom'
-  # project.rake_task = 'custom'
+    # Always notify the following for all interpreters:
+    project.email_notifier.emails.concat([
+      'thewoolleyman+rubygems-ci@gmail.com'
+    ])
+  end
 
-  # Build the project by invoking shell script "build_my_app.sh". Keep in mind that when the script is invoked,
-  # current working directory is <em>[cruise&nbsp;data]</em>/projects/your_project/work, so if you do not keep build_my_app.sh
-  # in version control, it should be '../build_my_app.sh' instead
-  project.build_command = 'rake check_extra_deps default'
+  project.build_command = "./ci_build.sh '#{interpreter}@rubygems'"
 
-  # Ping Subversion for new revisions every 5 minutes (default: 30 seconds)
+  project.email_notifier.from = 'thewoolleyman+rubygems-ci@gmail.com'
   project.scheduler.polling_interval = 5.minutes
-
 end

data/lib/rbconfig/datadir.rb

@@ -9,5 +9,5 @@
 # once.
 
 warn 'rbconfig/datadir.rb and {Rb}Config.datadir is being deprecated from '\
- 'RubyGems. It will be removed completely on or after January 2011. If you '\
+ 'RubyGems. It will be removed completely on or after June 2011. If you '\
  'wish to rely on a datadir, please use Gem.datadir.'

data/lib/rubygems.rb

@@ -5,7 +5,25 @@
 # See LICENSE.txt for permissions.
 #++
 
-gem_disabled = !defined? Gem
+module Gem
+  QUICKLOADER_SUCKAGE = RUBY_VERSION =~ /^1\.9\.1/
+  GEM_PRELUDE_SUCKAGE = RUBY_VERSION =~ /^1\.9\.2/
+end
+
+if Gem::GEM_PRELUDE_SUCKAGE and defined?(Gem::QuickLoader) then
+  Gem::QuickLoader.remove
+
+  $LOADED_FEATURES.delete Gem::QuickLoader.path_to_full_rubygems_library
+
+  if $LOADED_FEATURES.any? do |path| path.end_with? '/rubygems.rb' end then
+    # TODO path does not exist here
+    raise LoadError, "another rubygems is already loaded from #{path}"
+  end
+
+  class << Gem
+    remove_method :try_activate if Gem.respond_to?(:try_activate, true)
+  end
+end
 
 require 'rubygems/defaults'
 require 'rbconfig'
@@ -100,7 +118,7 @@ require 'thread' # HACK: remove me for 1.5 - this is here just for rails
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.4.2'
+  RubyGemsVersion = VERSION = '1.5.0'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -180,11 +198,25 @@ module Gem
   @ruby = nil
   @sources = []
 
+  @post_build_hooks     ||= []
   @post_install_hooks   ||= []
   @post_uninstall_hooks ||= []
   @pre_uninstall_hooks  ||= []
   @pre_install_hooks    ||= []
 
+  ##
+  # Try to activate a gem containing +path+. Returns true if
+  # activation succeeded or wasn't needed because it was already
+  # activated. Returns false if it can't find the path in a gem.
+
+  def self.try_activate path
+    spec = Gem.searcher.find path
+    return false unless spec
+
+    Gem.activate spec.name, "= #{spec.version}"
+    return true
+  end
+
   ##
   # Activates an installed gem matching +gem+.  The gem must satisfy
   # +requirements+.
@@ -258,9 +290,6 @@ module Gem
       activate dep_gem, :sources => [spec, *sources]
     end
 
-    # bin directory must come before library directories
-    spec.require_paths.unshift spec.bindir if spec.bindir
-
     require_paths = spec.require_paths.map do |path|
       File.join spec.full_gem_path, path
     end
@@ -427,7 +456,7 @@ module Gem
 
   def self.dir
     @gem_home ||= nil
-    set_home(ENV['GEM_HOME'] || Gem.configuration.home || default_dir) unless @gem_home
+    set_home(ENV['GEM_HOME'] || default_dir) unless @gem_home
     @gem_home
   end
 
@@ -483,13 +512,9 @@ module Gem
     files = []
 
     if check_load_path
-      $LOAD_PATH.each do |load_path|
-        globbed = Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
-
-        globbed.each do |load_path_file|
-          files << load_path_file if File.file?(load_path_file.untaint)
-        end
-      end
+      files = $LOAD_PATH.map { |load_path|
+        Dir["#{File.expand_path glob, load_path}#{Gem.suffix_pattern}"]
+      }.flatten.select { |file| File.file? file.untaint }
     end
 
     specs = searcher.find_all glob
@@ -631,17 +656,29 @@ module Gem
   def self.load_path_insert_index
     index = $LOAD_PATH.index ConfigMap[:sitelibdir]
 
-    $LOAD_PATH.each_with_index do |path, i|
-      if path.instance_variables.include?(:@gem_prelude_index) or
-        path.instance_variables.include?('@gem_prelude_index') then
-        index = i
-        break
+    if QUICKLOADER_SUCKAGE then
+      $LOAD_PATH.each_with_index do |path, i|
+        if path.instance_variables.include?(:@gem_prelude_index) or
+            path.instance_variables.include?('@gem_prelude_index') then
+          index = i
+          break
+        end
       end
     end
 
     index
   end
 
+  ##
+  # Loads YAML, preferring Psych
+
+  def self.load_yaml
+    require 'psych'
+  rescue ::LoadError
+  ensure
+    require 'yaml'
+  end
+
   ##
   # The file name and line number of the caller of the caller of this method.
 
@@ -667,7 +704,7 @@ module Gem
     @gem_path ||= nil
 
     unless @gem_path then
-      paths = [ENV['GEM_PATH'] || Gem.configuration.path || default_path]
+      paths = [ENV['GEM_PATH'] || default_path]
 
       if defined?(APPLE_GEM_HOME) and not ENV['GEM_PATH'] then
         paths << APPLE_GEM_HOME
@@ -697,6 +734,17 @@ module Gem
     @platforms
   end
 
+  ##
+  # Adds a post-build hook that will be passed an Gem::Installer instance
+  # when Gem::Installer#install is called.  The hook is called after the gem
+  # has been extracted and extensions have been built but before the
+  # executables or gemspec has been written.  If the hook returns +false+ then
+  # the gem's files will be removed and the install will be aborted.
+
+  def self.post_build(&hook)
+    @post_build_hooks << hook
+  end
+
   ##
   # Adds a post-install hook that will be passed an Gem::Installer instance
   # when Gem::Installer#install is called
@@ -716,7 +764,8 @@ module Gem
 
   ##
   # Adds a pre-install hook that will be passed an Gem::Installer instance
-  # when Gem::Installer#install is called
+  # when Gem::Installer#install is called.  If the hook returns +false+ then
+  # the install will be aborted.
 
   def self.pre_install(&hook)
     @pre_install_hooks << hook
@@ -951,7 +1000,14 @@ module Gem
   # Suffixes for require-able paths.
 
   def self.suffixes
-    ['', '.rb', '.rbw', '.so', '.bundle', '.dll', '.sl', '.jar']
+    @suffixes ||= ['',
+                   '.rb',
+                   *%w(DLEXT DLEXT2).map { |key|
+                     val = RbConfig::CONFIG[key]
+                     next unless val and not val.empty?
+                     ".#{val}"
+                   }
+                  ].compact.uniq
   end
 
   ##
@@ -1059,6 +1115,12 @@ module Gem
 
     attr_reader :loaded_specs
 
+    ##
+    # The list of hooks to be run before Gem::Install#install finishes
+    # installation
+
+    attr_reader :post_build_hooks
+
     ##
     # The list of hooks to be run before Gem::Install#install does any work
 
@@ -1093,11 +1155,6 @@ module Gem
 
   MARSHAL_SPEC_DIR = "quick/Marshal.#{Gem.marshal_version}/"
 
-  ##
-  # Location of legacy YAML quick gemspecs on remote repositories
-
-  YAML_SPEC_DIR = 'quick/'
-
   autoload :Version, 'rubygems/version'
   autoload :Requirement, 'rubygems/requirement'
   autoload :Dependency, 'rubygems/dependency'
@@ -1108,11 +1165,12 @@ module Gem
   autoload :SourceIndex, 'rubygems/source_index'
   autoload :Platform, 'rubygems/platform'
   autoload :Builder, 'rubygems/builder'
+  autoload :ConfigFile, 'rubygems/config_file'
 end
 
 module Kernel
 
-  undef gem if respond_to? :gem # defined in gem_prelude.rb on 1.9
+  remove_method :gem if 'method' == defined? gem # from gem_prelude.rb on 1.9
 
   ##
   # Use Kernel#gem to activate a specific version of +gem_name+.
@@ -1157,39 +1215,38 @@ end
 # "#{ConfigMap[:datadir]}/#{package_name}".
 
 def RbConfig.datadir(package_name)
-  require 'rbconfig/datadir' # TODO Deprecate after January 2010.
+  require 'rbconfig/datadir' # TODO Deprecate after June 2010.
   Gem.datadir(package_name) ||
     File.join(Gem::ConfigMap[:datadir], package_name)
 end
 
 require 'rubygems/exceptions'
 
-begin
-  ##
-  # Defaults the operating system (or packager) wants to provide for RubyGems.
-
-  require 'rubygems/defaults/operating_system'
-rescue LoadError
-end
-
-if defined?(RUBY_ENGINE) then
+gem_preluded = Gem::GEM_PRELUDE_SUCKAGE and defined? Gem
+unless gem_preluded then # TODO: remove guard after 1.9.2 dropped
   begin
     ##
-    # Defaults the ruby implementation wants to provide for RubyGems
+    # Defaults the operating system (or packager) wants to provide for RubyGems.
 
-    require "rubygems/defaults/#{RUBY_ENGINE}"
+    require 'rubygems/defaults/operating_system'
   rescue LoadError
   end
-end
 
-require 'rubygems/config_file'
+  if defined?(RUBY_ENGINE) then
+    begin
+      ##
+      # Defaults the ruby implementation wants to provide for RubyGems
+
+      require "rubygems/defaults/#{RUBY_ENGINE}"
+    rescue LoadError
+    end
+  end
+end
 
 ##
 # Enables the require hook for RubyGems.
-#
-# Ruby 1.9 allows --disable-gems, so we require it when we didn't detect a Gem
-# constant at rubygems.rb load time.
 
-require 'rubygems/custom_require' if gem_disabled or RUBY_VERSION < '1.9'
+require 'rubygems/custom_require' unless Gem::GEM_PRELUDE_SUCKAGE
 
 Gem.clear_paths
+

data/lib/rubygems/builder.rb

@@ -4,16 +4,12 @@
 # See LICENSE.txt for permissions.
 #++
 
+require 'rubygems'
 require 'rubygems/user_interaction'
 
-begin
-  require 'psych'
-rescue LoadError
-end
+Gem.load_yaml
 
-require 'yaml'
 require 'rubygems/package'
-require 'rubygems/security'
 
 ##
 # The Builder class processes RubyGem specification files
@@ -66,6 +62,8 @@ EOM
     signer = nil
 
     if @spec.respond_to?(:signing_key) and @spec.signing_key then
+      require 'rubygems/security'
+
       signer = Gem::Security::Signer.new @spec.signing_key, @spec.cert_chain
       @spec.signing_key = nil
       @spec.cert_chain = signer.cert_chain.map { |cert| cert.to_s }
@@ -77,11 +75,7 @@ EOM
   def write_package
     open @spec.file_name, 'wb' do |gem_io|
       Gem::Package.open gem_io, 'w', @signer do |pkg|
-        yaml = if defined?(Psych) then
-                 Psych.dump(@spec)
-               else
-                 YAML.dump(@spec)
-               end
+        yaml = @spec.to_yaml
         pkg.metadata = yaml
 
         @spec.files.each do |file|