rubygems-update 1.3.4 → 1.3.5

data/Manifest.txt

@@ -2,6 +2,7 @@
 .document
 ChangeLog
 GPL.txt
+History.txt
 LICENSE.txt
 Manifest.txt
 README
@@ -9,35 +10,6 @@ Rakefile
 bin/gem
 bin/update_rubygems
 cruise_config.rb
-doc/release_notes/docs-rubygems-announce.rdoc
-doc/release_notes/rel_0_2_0.rdoc
-doc/release_notes/rel_0_3_0.rdoc
-doc/release_notes/rel_0_4_0.rdoc
-doc/release_notes/rel_0_5_0.rdoc
-doc/release_notes/rel_0_6_0.rdoc
-doc/release_notes/rel_0_7_0.rdoc
-doc/release_notes/rel_0_8_0.rdoc
-doc/release_notes/rel_0_8_1.rdoc
-doc/release_notes/rel_0_8_10.rdoc
-doc/release_notes/rel_0_8_11.rdoc
-doc/release_notes/rel_0_8_3.rdoc
-doc/release_notes/rel_0_8_4.rdoc
-doc/release_notes/rel_0_8_5.rdoc
-doc/release_notes/rel_0_8_7.rdoc
-doc/release_notes/rel_0_9_0.rdoc
-doc/release_notes/rel_0_9_2.rdoc
-doc/release_notes/rel_0_9_3.rdoc
-doc/release_notes/rel_0_9_4.rdoc
-doc/release_notes/rel_0_9_5.rdoc
-doc/release_notes/rel_1_0_0.rdoc
-doc/release_notes/rel_1_0_1.rdoc
-doc/release_notes/rel_1_1_0.rdoc
-doc/release_notes/rel_1_1_1.rdoc
-doc/release_notes/rel_1_2_0.rdoc
-doc/release_notes/rel_1_3_0.rdoc
-doc/release_notes/rel_1_3_1.rdoc
-doc/release_notes/rel_1_3_2.rdoc
-doc/release_notes/rel_1_3_3.rdoc
 lib/gauntlet_rubygems.rb
 lib/rbconfig/datadir.rb
 lib/rubygems.rb
@@ -111,7 +83,6 @@ lib/rubygems/platform.rb
 lib/rubygems/remote_fetcher.rb
 lib/rubygems/require_paths_builder.rb
 lib/rubygems/requirement.rb
-lib/rubygems/rubygems_version.rb
 lib/rubygems/security.rb
 lib/rubygems/server.rb
 lib/rubygems/source_index.rb

data/README

@@ -1,21 +1,40 @@
 = RubyGems
 
-(See Releases for release-specific information)
+* http://rubygems.rubyforge.org/
+* http://rubyforge.org/projects/rubygems
+* http://rubygems.org/
 
-== Installation
+== DESCRIPTION
 
-Get it from RubyForge (http://rubygems.rubyforge.org) and run (as root, if appropriate and necessary)
+RubyGems is a package management framework for Ruby.
 
-  ruby setup.rb
+This gem is an update for the RubyGems software. You must have an
+installation of RubyGems before this update can be applied.
 
-For more details and other options, see:
+See Gem for information on RubyGems (or `ri Gem`)
 
-  ruby setup.rb --help
+To upgrade to the latest RubyGems, run:
+
+  $ gem install --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
+if you see "Nothing to update".
+
+If you have an older version of RubyGems installed, then you can still
+do it in two steps:
 
-* {User Guide/Installation}[http://docs.rubygems.org/read/chapter/3]
+  $ gem install rubygems-update  # again, might need to be admin/root
+  $ update_rubygems              # ... here too
 
-Further documentation can be found on the Gem module.  (<tt>ri Gem</tt>)
+If you don't have any RubyGems install, there is still the pre-gem approach to
+getting software, doing it manually:
 
-Thanks!
+1. Download from: http://rubyforge.org/frs/?group_id=126
+2. Unpack into a directory and cd there
+3. Install with: ruby setup.rb  # you may need admin/root privilege
+
+For more details and other options, see:
+
+  ruby setup.rb --help
 
--The RubyGems Team

data/Rakefile

@@ -1,319 +1,75 @@
-# Rakefile for RubyGems      -*- ruby -*-
-
-#--
-# Copyright 2006 by Chad Fowler, Rich Kilmer, Jim Weirich and others.
-# All rights reserved.
-# See LICENSE.txt for permissions.
-#++
+# -*- ruby -*-
 
 $:.unshift 'lib'
 
 require 'rubygems'
-require 'rake/clean'
-require 'rake/testtask'
 require 'rubygems/package_task'
 
-def generate_rubygems_version(path, version)
-  open path, 'w' do |f|
-    f.puts <<-EOF
-#--
-# DO NOT EDIT
-# This file is auto-generated by build scripts.
-# See:  rake update_version
-#++
+require 'hoe'
 
-module Gem
+Hoe.plugin :minitest
 
-  ##
-  # The version of RubyGems you are using
+hoe = Hoe.spec 'rubygems-update' do
+  self.rubyforge_name = 'rubygems'
+  self.author         = ['Jim Weirich', 'Chad Fowler', 'Eric Hodel']
+  self.email          = %w[rubygems-developers@rubyforge.org]
+  self.readme_file    = 'README'
+  self.need_zip       = false
+  self.need_tar       = false
 
-  RubyGemsVersion = '#{version}'
+  spec_extras[:required_ruby_version] = Gem::Requirement.new '> 1.8.3'
+  spec_extras[:executables]           = ['update_rubygems']
 
-  ##
-  # The version of RubyGems you are using (duplicated for familiarity)
+  clean_globs.push('**/debug.log',
+                   '*.out',
+                   '.config',
+                   'data__',
+                   'html',
+                   'logs',
+                   'pkgs/sources/sources*.gem',
+                   'scripts/*.hieraki',
+                   'util/gem_prelude.rb')
 
-  VERSION = RubyGemsVersion
+  extra_dev_deps << 'builder' << 'session' << 'hoe-seattlerb'
+  extra_dev_deps << ['minitest', '~> 1.4']
 
-end
-    EOF
+  spec_extras['rdoc_options'] = proc do |rdoc_options|
+    rdoc_options << "--title=RubyGems #{self.version} Documentation"
   end
 end
 
-ENV['CERT_DIR'] ||=  File.join(Gem.user_home, '.gem')
-
-PKG_NAME = 'rubygems'
-
-if ENV['REL'] then
-  PKG_VERSION = ENV['REL']
-  CURRENT_VERSION = Gem::RubyGemsVersion
-else
-  PKG_VERSION = Gem::RubyGemsVersion
-  CURRENT_VERSION = PKG_VERSION
-end
-
-CLOBBER.include(
-  '**/debug.log',
-  '*.out',
-  '.config',
-  'data__',
-  'html',
-  'logs',
-  'pkgs/sources/sources*.gem',
-  'scripts/*.hieraki',
-  'test/data/[a-z]*.gem',
-  'test/data/gemhome'
-  )
-CLOBBER.exclude('test/data/broken-1.0.0.gem')
-
-desc "Run all tests"
-task :default => [:test]
-
-desc "Run unit tests (functionals fail on win32)"
-task :test => [:test_units]
-
-desc "Run just the unit tests"
-Rake::TestTask.new(:test_units) do |t|
-  t.test_files = FileList['test/test*.rb']
-  t.warning = true
-  t.libs = %w[lib test]
-end
-
 desc "Run just the functional tests"
 Rake::TestTask.new(:test_functional) do |t|
   t.test_files = FileList['test/functional*.rb']
   t.warning = true
 end
 
-desc "Run the unit and functional tests"
-Rake::TestTask.new(:test_all) do |t|
-  t.test_files = FileList['test/{test,functional}*.rb']
-  t.warning = true
-end
-
-# Shortcuts for test targets
-task :tf => [:test_functional]
-task :tu => [:test_units]
-task :ta => [:test_all]
-
 # --------------------------------------------------------------------
 # Creating a release
 
-desc "Make a new release"
-task :release => [
-  :prerelease,
-  :clobber,
-  :test_functional,
-  :test_units,
-  :update_version,
-  :package,
-  :tag] do
+task :release => [:clobber, :sanity_check, :test_functional,
+                  :test, :package, :tag]
 
-  warn "**************************************************************"
-  warn "* Release #{PKG_VERSION} Complete."
-  warn "* Packages ready to upload."
-  warn "**************************************************************"
+pkg_dir_path = "pkg/rubygems-update-#{hoe.version}"
+task pkg_dir_path do
+  mv pkg_dir_path, "pkg/rubygems-#{hoe.version}"
 end
 
-desc "Validate that everything is ready to go for a release."
-task :prerelease do
-  warn "**************************************************************"
-  warn "* Making RubyGem Release #{PKG_VERSION}"
-  warn "* (current version #{CURRENT_VERSION})"
-  warn "**************************************************************"
-
-  # Is a release number supplied?
-  raise "Usage: rake release REL=x.y.z [REUSE=tag_suffix]" unless ENV['REL']
-
-  # Is the release different than the current release.
-  # (or is REUSE set?)
-  if PKG_VERSION == CURRENT_VERSION && ! ENV['REUSE']
-    raise "Current version is #{PKG_VERSION}, must specify REUSE=tag_suffix to reuse version"
-  end
-
-  # Are all source files checked in?
-  if ENV['RELTEST'] then
-    warn "Release Task Testing, skipping checked-in file test"
-  else
-    warn "Checking for unchecked-in files..."
-    data = `svn st`
-    unless data =~ /^$/
-      abort "svn status is not clean ... do you have unchecked-in files?"
-    end
-    warn "No outstanding checkins found ... OK"
+task :package => [pkg_dir_path, :sanity_check] do
+  Dir.chdir 'pkg' do
+    sh "tar -czf rubygems-#{hoe.version}.tgz rubygems-#{hoe.version}"
+    sh "zip -q -r rubygems-#{hoe.version}.zip rubygems-#{hoe.version}"
   end
 end
 
-task :update_version => [:prerelease] do
-  if PKG_VERSION == CURRENT_VERSION then
-    warn "No version change ... skipping version update"
-  else
-    warn "Updating RubyGem version to #{PKG_VERSION}"
-
-    generate_rubygems_version 'lib/rubygems/rubygems_version.rb', PKG_VERSION
-
-    if ENV['RELTEST'] then
-      warn "Release Task Testing, skipping commiting of new version"
-    else
-      sh %{svn commit -m "Updated to version #{PKG_VERSION}" lib/rubygems/rubygems_version.rb} # "
-    end
-  end
+task :sanity_check do
+  abort "svn status dirty. commit or revert them" unless `svn st`.empty?
 end
 
-task :tag => [:prerelease] do
+task :tag => [:sanity_check] do
   reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
-  reltag = "REL_#{ENV['REUSE'].gsub(/\./, '_')}" if ENV['REUSE']
-  warn "Tagging SVN with [#{reltag}]"
-  software_dir = File.basename(Dir.pwd)
-  if ENV['RELTEST'] then
-    warn "Release Task Testing, skipping SVN tagging (in dir #{software_dir})"
-  else
-    sh %{svn copy svn+ssh://rubyforge.org/var/svn/rubygems/trunk svn+ssh://rubyforge.org/var/svn/rubygems/tags/#{reltag}}
-  end
-end
-
-begin # rcov
-  require 'rcov/rcovtask'
-
-  Rcov::RcovTask.new do |t|
-    t.libs << "test"
-    t.rcov_opts = ['-xRakefile', '-xrakefile', '-xpublish.rf', '--text-report']
-    t.test_files = FileList[
-      'test/{functional,test}*.rb'
-    ]
-    t.verbose = true
-  end
-rescue LoadError
-end
-
-begin # rdoc
-  gem 'rdoc'
-  require 'rdoc/task'
-
-  desc "Create the RDoc html files"
-  RDoc::Task.new :rdoc do |rdoc|
-    rdoc.rdoc_dir = 'html'
-    rdoc.title    = "RubyGems #{CURRENT_VERSION}"
-    rdoc.options << '--line-numbers' << '--main' << 'README'
-    rdoc.rdoc_files.include 'README', 'LICENSE.txt', 'GPL.txt', 'lib', 'doc'
-  end
-
-  desc "Publish RDoc on RubyForge"
-  task :publish_rdoc => ["html/index.html"] do
-    sh "rsync -avP --delete html/ rubyforge.org:/var/www/gforge-projects/rubygems/rdoc"
-  end
-rescue Gem::LoadError
-  warn "install RDoc 2.4.2+"
-end
-
-# Wiki Doc Targets
-
-desc "Upload the Hieraki Data"
-task :upload => [:upload_gemdoc]
-
-task :upload_gemdoc => ['scripts/gemdoc.hieraki'] do
-  ruby %{scripts/upload_gemdoc.rb}
-end
-
-desc "Build the Hieraki documentation"
-task :hieraki => ['scripts/gemdoc.hieraki', 'scripts/specdoc.hieraki']
-
-file 'scripts/gemdoc.hieraki' => ['scripts/gemdoc.rb', 'scripts/gemdoc.data'] do
-  chdir('scripts') do
-    ruby %{-I../lib gemdoc.rb <gemdoc.data >gemdoc.hieraki}
-  end
-end
-
-file 'scripts/specdoc.hieraki' =>
-  ['scripts/specdoc.rb', 'scripts/specdoc.data', 'scripts/specdoc.yaml'] do
-  chdir('scripts') do
-    ruby %{-I../lib specdoc.rb >specdoc.hieraki}
-  end
-end
-
-# Package tasks
-
-PKG_FILES = File.read('Manifest.txt').split "\n"
-
-Rake::PackageTask.new :package do |p|
-  p.name          = PKG_NAME
-  p.version       = PKG_VERSION
-  p.need_tar      = true
-  p.need_zip      = true
-  p.package_files = PKG_FILES
-end
-
-warn_unsigned = true
-
-Spec = Gem::Specification.new do |s|
-  s.name                  = PKG_NAME + "-update"
-  s.version               = PKG_VERSION
-  s.required_ruby_version = Gem::Requirement.new '> 1.8.3'
-  s.summary               = "RubyGems update gem"
-  s.description           = <<-DESCRIPTION
-RubyGems is a package management framework for Ruby.
-
-This gem is an update for the RubyGems software.  You must have an
-installation of RubyGems before this update can be applied.
-  DESCRIPTION
-  s.files                 = PKG_FILES
-  s.require_path          = 'lib'
-  s.authors               = ['Jim Weirich', 'Chad Fowler', 'Eric Hodel']
-  s.email                 = "rubygems-developers@rubyforge.org"
-  s.homepage              = "http://rubygems.rubyforge.org"
-  s.rubyforge_project     = "rubygems"
-  s.bindir                = "bin"
-  s.executables           = ["update_rubygems"]
-
-  certdir                 = ENV['CERT_DIR']
-
-  if certdir then
-    key  = File.join certdir, 'gem-private_key.pem'
-    cert = File.join certdir, 'gem-public_cert.pem'
-
-    warn_unsigned = ! (File.exist? key and File.exist? cert)
-
-    unless warn_unsigned then
-      s.signing_key = File.join(certdir, 'gem-private_key.pem')
-      s.cert_chain  = [File.join(certdir, 'gem-public_cert.pem')]
-    end
-  end
-end
-
-# Add console output about signing the Gem
-file "pkg/#{Spec.full_name}.gem" do
-  if warn_unsigned then
-    warn "WARNING:  gem will not be signed, no key or certificate found in #{ENV['CERT_DIR']}"
-  else
-    puts "Signed with certificates in '#{ENV['CERT_DIR']}'"
-  end
-end
-
-Gem::PackageTask.new Spec do |p| end
-
-desc "Build the Gem spec file for the rubygems-update package"
-task :gemspec => "pkg/rubygems-update.gemspec"
-file "pkg/rubygems-update.gemspec" => ["pkg", "Rakefile"] do |t|
-  open t.name, 'w' do |f|
-    f.puts Spec.to_yaml
-  end
-end
-
-desc "Install RubyGems"
-task :install do
-  opts = ENV['SETUP_OPTIONS']
-  ruby "setup.rb #{opts}".strip
-
-  svnversion = `svnversion`.split(':').last.sub(/[^\d]+/, '').strip
-
-  unless svnversion.empty? then
-    File.read('lib/rubygems/rubygems_version.rb') =~ /RubyGemsVersion = '(.*)'/
-    current_version = $1.split '.', 4
-    rubygems_version = (current_version[0, 3] << svnversion).join '.'
-    rubygems_version_file = File.join Gem::ConfigMap[:sitelibdir], 'rubygems',
-                                      'rubygems_version.rb'
-
-    generate_rubygems_version rubygems_version_file, rubygems_version
-  end
+  svn_url = "svn+ssh://rubyforge.org/var/svn/rubygems"
+  sh %{svn copy #{svn_url}/trunk #{svn_url}/tags/#{reltag}}
 end
 
 # Misc Tasks ---------------------------------------------------------
@@ -335,6 +91,8 @@ file 'util/gem_prelude.rb' =>
   raise 'template error' unless
     gem_prelude.sub!(/^    # INCLUDE rubygems\/defaults\n/, defaults)
 
+  rm_f 'util/gem_prelude.rb'
+
   open 'util/gem_prelude.rb', 'w' do |io|
     io.write gem_prelude
   end
@@ -349,47 +107,45 @@ end
 # If you don't have this directory structure, set RUBY_PATH and/or
 # RUBINIUS_PATH.
 
-diff_options = "-urpN --exclude '*svn*' --exclude '*swp' --exclude '*rbc'"
-rsync_options = "-avP --exclude '*svn*' --exclude '*swp' --exclude '*rbc' --exclude '*.rej' --exclude '*.orig' --exclude 'lib/rubygems/defaults/*'"
-
-rubinius_dir = ENV['RUBINIUS_PATH'] || '../../../git/git.rubini.us/code'
-ruby_dir = ENV['RUBY_PATH'] || '../../ruby/trunk'
+def rsync_with dir
+  rsync_options = "-avP --exclude '*svn*' --exclude '*swp' --exclude '*rbc'" +
+    "--exclude '*.rej' --exclude '*.orig' --exclude 'lib/rubygems/defaults/*'"
+  sh "rsync #{rsync_options} bin/gem             #{dir}/bin/gem"
+  sh "rsync #{rsync_options} lib/                #{dir}/lib"
+  sh "rsync #{rsync_options} test/               #{dir}/test/rubygems"
+  sh "rsync #{rsync_options} util/gem_prelude.rb #{dir}/gem_prelude.rb"
+end
 
-desc "Updates Ruby HEAD with the currently checked-out copy of RubyGems."
-task :update_ruby => 'util/gem_prelude.rb' do
-  sh "rsync #{rsync_options} bin/gem #{ruby_dir}/bin/gem"
-  sh "rsync #{rsync_options} lib/ #{ruby_dir}/lib"
-  sh "rsync #{rsync_options} test/ #{ruby_dir}/test/rubygems"
-  sh "rsync #{rsync_options} util/gem_prelude.rb #{ruby_dir}/gem_prelude.rb"
+def diff_with dir
+  diff_options = "-urpN --exclude '*svn*' --exclude '*swp' --exclude '*rbc'"
+  sh "diff #{diff_options} bin/gem             #{dir}/bin/gem;         true"
+  sh "diff #{diff_options} lib/ubygems.rb      #{dir}/lib/ubygems.rb;  true"
+  sh "diff #{diff_options} lib/rubygems.rb     #{dir}/lib/rubygems.rb; true"
+  sh "diff #{diff_options} lib/rubygems        #{dir}/lib/rubygems;    true"
+  sh "diff #{diff_options} lib/rbconfig        #{dir}/lib/rbconfig;    true"
+  sh "diff #{diff_options} test                #{dir}/test/rubygems;   true"
+  sh "diff #{diff_options} util/gem_prelude.rb #{dir}/gem_prelude.rb;  true"
 end
 
-desc "Diffs Ruby HEAD with the currently checked-out copy of RubyGems."
-task :diff_ruby => 'util/gem_prelude.rb' do
-  options = "-urpN --exclude '*svn*' --exclude '*swp' --exclude '*rbc'"
+rubinius_dir = ENV['RUBINIUS_PATH'] || '../../../git/git.rubini.us/code'
+ruby_dir     = ENV['RUBY_PATH']     || '../../ruby/trunk'
 
-  sh "diff #{diff_options} bin/gem #{ruby_dir}/bin/gem; true"
-  sh "diff #{diff_options} lib/ubygems.rb #{ruby_dir}/lib/ubygems.rb; true"
-  sh "diff #{diff_options} lib/rubygems.rb #{ruby_dir}/lib/rubygems.rb; true"
-  sh "diff #{diff_options} lib/rubygems #{ruby_dir}/lib/rubygems; true"
-  sh "diff #{diff_options} lib/rbconfig #{ruby_dir}/lib/rbconfig; true"
-  sh "diff #{diff_options} test #{ruby_dir}/test/rubygems; true"
-  sh "diff #{diff_options} util/gem_prelude.rb #{ruby_dir}/gem_prelude.rb; true"
+desc "Updates Ruby HEAD with the currently checked-out copy of RubyGems."
+task :update_ruby     => 'util/gem_prelude.rb' do
+  rsync_with ruby_dir
 end
 
 desc "Updates Rubinius HEAD with the currently checked-out copy of RubyGems."
 task :update_rubinius => 'util/gem_prelude.rb' do
-  sh "rsync #{rsync_options} bin/gem #{rubinius_dir}/lib/bin/gem.rb"
-  sh "rsync #{rsync_options} lib/ #{rubinius_dir}/lib"
-  sh "rsync #{rsync_options} test/ #{rubinius_dir}/test/rubygems"
-  sh "rsync #{rsync_options} util/gem_prelude.rb #{rubinius_dir}/kernel/common/gem_prelude.rb"
+  rsync_with rubinius_dir
+end
+
+desc "Diffs Ruby HEAD with the currently checked-out copy of RubyGems."
+task :diff_ruby       => 'util/gem_prelude.rb' do
+  diff_with ruby_dir
 end
 
 desc "Diffs Rubinius HEAD with the currently checked-out copy of RubyGems."
-task :diff_rubinius => 'util/gem_prelude.rb' do
-  sh "diff #{diff_options} bin/gem #{rubinius_dir}/lib/bin/gem.rb; true"
-  sh "diff #{diff_options} lib/ubygems.rb #{rubinius_dir}/lib/ubygems.rb; true"
-  sh "diff #{diff_options} lib/rubygems.rb #{rubinius_dir}/lib/rubygems.rb; true"
-  sh "diff #{diff_options} lib/rubygems #{rubinius_dir}/lib/rubygems; true"
-  sh "diff #{diff_options} test #{rubinius_dir}/test/rubygems; true"
-  sh "diff #{diff_options} util/gem_prelude.rb #{rubinius_dir}/kernel/common/gem_prelude.rb; true"
+task :diff_rubinius   => 'util/gem_prelude.rb' do
+  diff_with rubinius_dir
 end