rubygems-update 1.3.6 → 1.3.7

data/ChangeLog

@@ -1,5 +1,91 @@
 # -*- coding: utf-8 -*-
 
+2010-05-13  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  1.3.7.
+
+2010-04-30  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/server.rb:  Use gem_dirs, not gem_dir.
+
+2010-04-21  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems.rb:  1.3.7.pre.1.
+	* lib/rubygems/commands/contents_command.rb:  Make --prefix the
+	  default as specified in --help.  Bug #27211 by Mamoru Tasaka.
+	* lib/rubygems/commands/environment_command.rb:  Hide gemcutter_key to
+	  for security.
+	* lib/rubygems/commands/server_command.rb:  Allow specification of
+	  multiple gem dirs.  Bug #27573 by Yuki Sonoda.
+	* lib/rubygems.rb:  Require rubygems/custom_require if --disable-gem
+	  was set.  Bug #27700 by Roger Pack.
+
+2010-04-21  Evan Phoenix <evan@fallingsnow.net>
+
+	* lib, test: Add ability to install and fetch to report that the
+	  reason they couldn't find a gem was because all available gems can't
+	  be used on the current platform.
+
+2010-04-20  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/specification.rb:  Avoid deprecated API for YAML.  Ruby
+	  bug #3102 by Aaron Patterson.
+	* lib/rubygems/remote_fetcher.rb:  Avoid deprecated API for URI.  Ruby
+	  bug #3103 by Aaron Patterson.
+	* lib/rubygems/platform.rb:  Add platform support for IronRuby.  Patch
+	  #27951 by Will Green.
+	* lib/rubygems/commands/fetch_command.rb:  Restore fetching of old
+	  versions.  Bug #27960 by Eric Hankins.
+	* lib/rubygems/command_manager.rb:  Update documentation.  Bug #28024
+	  by Roger Pack.
+	* lib/rubygems/remote_fetcher.rb:  Raise a better error when the host
+	  is down.  Bug #28092 by Eric Peterson.
+	* History.txt:  Add reminder to include --user-install change in the
+	  1.3.7 release notes.  Bug #27896 by Matt Patterson.
+	* lib/rubygems/commands/query_command.rb:  --version is only for use
+	  with --installed.  Bug #27857 by Greg Hazel.
+	* lib/rubygems/commands/query_command.rb:  Regular output now lists
+	  platforms.  Bug #27856 by Greg Hazel.
+
+2010-04-19  Eric Hodel  <drbrain@segment7.net>
+
+	* lib, test: Stop using Gem::RubyGemsVersion
+
+2010-04-14  James Tucker <jftucker@gmail.com>
+
+	* lib/rubygems/command_manager.rb: Now catches errors caused by command
+	  loading. (Protect against broken plugins)
+	* lib/rubygems.rb: Introduce and use Gem.load_plugins, RubyGems now
+	  protects against exceptions being raised by plugins.
+
+2010-03-25  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/builder.rb:  Now requires user_interaction.  Ruby
+	  Bug #1040 by Phillip Toland.
+	* lib/rubygems/installer.rb:  Make argument order match for
+	  generate_windows_script.  Ruby patch #825 by okkez.
+	* lib/rubygems/package_task.rb:  Depend on the package dir like the
+	  other package tasks.
+
+2010-03-08  James Tucker  <jftucker@gmail.com>
+
+	* lib/rubygems/remote_fetcher.rb: fetcher now retries on a read timeout.
+	* lib/rubygems/specification.rb: specifications loaded from file are now
+	  evaluated with their filename to aid debugging.
+
+2010-02-24  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/commands/unpack_command.rb:  `gem unpack` now unpacks
+	  remote gems.
+
+2010-02-23  Eric Hodel  <drbrain@segment7.net>
+
+	* lib/rubygems/dependency.rb:  Support #version_requirements= with a
+	  warning.  Bug #27868 by Wei Jen Lu.
+	* lib/rubygems/installer.rb:  Fix `gem unpack`.  Bug #27872 by Timothy
+	  Jones.
+	* lib, test:  Import changes from ruby trunk.
+
 2010-02-20  Eric Hodel  <drbrain@segment7.net>
 
 	* lib/rubygems.rb:  1.3.6.

data/History.txt

@@ -1,4 +1,4 @@
-=== 1.3.6 / 2010-02-17
+=== 1.3.7 / 2010-05-13
 
 NOTE:
 
@@ -11,6 +11,39 @@ http://gems.rubyforge.org will continue to work for the forseeable future.
 
 New features:
 
+* `gem` commands
+  * `gem install` and `gem fetch` now report alternate platforms when a
+    matching one couldn't be found.
+  * `gem contents` --prefix is now the default as specified in --help.  Bug
+    #27211 by Mamoru Tasaka.
+  * `gem fetch` can fetch of old versions again.  Bug #27960 by Eric Hankins.
+  * `gem query` and friends output now lists platforms.  Bug #27856 by Greg
+    Hazel.
+  * `gem server` now allows specification of multiple gem dirs for
+    documentation.  Bug #27573 by Yuki Sonoda.
+  * `gem unpack` can unpack gems again.  Bug #27872 by Timothy Jones.
+  * `gem unpack` now unpacks remote gems.
+  * --user-install is no longer the default.  If you really liked it, see
+    Gem::ConfigFile to learn how to set it by default.  (This change was made
+    in 1.3.6)
+* RubyGems now has platform support for IronRuby.  Patch #27951 by Will Green.
+
+Bug fixes:
+
+* Require rubygems/custom_require if --disable-gem was set.  Bug #27700 by
+  Roger Pack.
+* RubyGems now protects against exceptions being raised by plugins.
+* rubygems/builder now requires user_interaction.  Ruby Bug #1040 by Phillip
+  Toland.
+* Gem::Dependency support #version_requirements= with a warning.  Fix for old
+  Rails versions.  Bug #27868 by Wei Jen Lu.
+* Gem::PackageTask depends on the package dir like the other rake package
+  tasks so dependencies can be hooked up correctly.
+
+=== 1.3.6 / 2010-02-17
+
+New features:
+
 * `gem` commands
   * Added `gem push` and `gem owner` for interacting with modern/Gemcutter
     sources

data/Manifest.txt

@@ -54,6 +54,7 @@ lib/rubygems/dependency.rb
 lib/rubygems/dependency_installer.rb
 lib/rubygems/dependency_list.rb
 lib/rubygems/doc_manager.rb
+lib/rubygems/errors.rb
 lib/rubygems/exceptions.rb
 lib/rubygems/ext.rb
 lib/rubygems/ext/builder.rb
@@ -112,8 +113,12 @@ test/gem_package_tar_test_case.rb
 test/gemutilities.rb
 test/insure_session.rb
 test/mockgemui.rb
+test/plugin/exception/rubygems_plugin.rb
+test/plugin/load/rubygems_plugin.rb
+test/plugin/standarderror/rubygems_plugin.rb
 test/private_key.pem
 test/public_cert.pem
+test/rubygems/commands/crash_command.rb
 test/rubygems_plugin.rb
 test/simple_gem.rb
 test/test_config.rb
@@ -183,4 +188,4 @@ test/test_gem_version.rb
 test/test_gem_version_option.rb
 test/test_kernel.rb
 util/CL2notes
-util/gem_prelude.rb.template
+util/gem_prelude.rb

data/Rakefile

@@ -27,9 +27,9 @@ hoe = Hoe.spec 'rubygems-update' do
                    'data__',
                    'html',
                    'logs',
+                   'graph.dot',
                    'pkgs/sources/sources*.gem',
-                   'scripts/*.hieraki',
-                   'util/gem_prelude.rb')
+                   'scripts/*.hieraki')
 
   extra_dev_deps << ['builder', '~> 2.1']
   extra_dev_deps << ['hoe-seattlerb', '~> 1.2']
@@ -64,10 +64,18 @@ task :scrub_dev_deps do
   hoe.spec.dependencies.reject! { |d| :development == d.type }
 end
 
-task :release => [:clobber, :sanity_check, :test_functional,
-                  :test, :package, :tag]
+task :prerelease => [:clobber, :sanity_check, :test, :test_functional]
 
-Rake::Task[:release_to_rubyforge].clear
+task :postrelease => [:tag, :publish_docs]
+
+Rake::Task[:release_to_rubyforge].clear_actions
+
+task :release_to_rubyforge do
+  files = Dir["pkg/rubygems-update*.gem"]
+  rf = RubyForge.new.configure
+  rf.login
+  rf.add_file hoe.rubyforge_name, hoe.rubyforge_name, hoe.version, files.first
+end
 
 pkg_dir_path = "pkg/rubygems-update-#{hoe.version}"
 task pkg_dir_path do
@@ -85,38 +93,50 @@ task :sanity_check do
   abort "svn status dirty. commit or revert them" unless `svn st`.empty?
 end
 
-task :tag => [:sanity_check] do
-  reltag = "REL_#{PKG_VERSION.gsub(/\./, '_')}"
+task :tag => :sanity_check do
+  reltag = "REL_#{Gem::VERSION.gsub(/\./, '_')}"
   svn_url = "svn+ssh://rubyforge.org/var/svn/rubygems"
   sh %{svn copy #{svn_url}/trunk #{svn_url}/tags/#{reltag}}
 end
 
 # Misc Tasks ---------------------------------------------------------
 
-desc "build util/gem_prelude.rb from the template and defaults.rb"
-file 'util/gem_prelude.rb' =>
-     %w[util/gem_prelude.rb.template lib/rubygems/defaults.rb Rakefile] do
-  gem_prelude = File.read 'util/gem_prelude.rb.template'
-  defaults = File.read 'lib/rubygems/defaults.rb'
-
-  raise 'template error' unless defaults.sub!(/^module Gem\n/, '')
-  raise 'template error' unless defaults.sub!(/^end\n/, '')
+# Git mirror support. You probably don't need to care about
+# these. Don't run 'em unless you have a John-style git-svn setup
+# pointed at a valid, pushable Git remote called "origin".
 
-  defaults[0, 0] = "  # begin rubygems/defaults\n"
-  defaults << "  # end rubygems/defaults\n"
-  defaults.gsub!(/^/, '  ')
-
-  raise 'template error' unless
-    gem_prelude.sub!(/^# WARN\n/,
-                     "# THIS FILE WAS AUTOGENERATED, DO NOT EDIT\n")
-  raise 'template error' unless
-    gem_prelude.sub!(/^    # INCLUDE rubygems\/defaults\n/, defaults)
-
-  rm_f 'util/gem_prelude.rb'
+namespace :git do
+  namespace :svn do
+    task(:fetch) { sh "git svn fetch" }
+  end
 
-  open 'util/gem_prelude.rb', 'w' do |io|
-    io.write gem_prelude
-    io.chmod 0444
+  task :sync => %w(svn:fetch sync:branches sync:tags)
+
+  namespace :sync do
+    task :branches do
+      {
+        "trunk" => "master",
+      }.each do |svn, git|
+        sh "git push origin svn/#{svn}:#{git}"
+      end
+    end
+
+    task :tags do
+      old    = `git tag`
+      tags   = `git for-each-ref refs/remotes/svn/tags`.split "\n"
+      tagged = false
+
+      tags.each do |tag|
+        next unless /(REL_.*)$/ =~ tag
+        name, sha, _, sym = $1, *tag.split(/\s/)
+
+        next if /#{name}/ =~ old
+        sh "git tag -f '#{name}' #{sha}"
+        tagged = true
+      end
+
+      sh "git push --tags" if tagged
+    end
   end
 end
 
@@ -131,7 +151,7 @@ end
 
 def rsync_with dir
   rsync_options = "-avP --exclude '*svn*' --exclude '*swp' --exclude '*rbc'" +
-    "--exclude '*.rej' --exclude '*.orig' --exclude 'lib/rubygems/defaults/*'"
+    " --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"
@@ -153,22 +173,22 @@ rubinius_dir = ENV['RUBINIUS_PATH'] || '../../../git/git.rubini.us/code'
 ruby_dir     = ENV['RUBY_PATH']     || '../../ruby/trunk'
 
 desc "Updates Ruby HEAD with the currently checked-out copy of RubyGems."
-task :update_ruby     => 'util/gem_prelude.rb' do
+task :update_ruby 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
+task :update_rubinius do
   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
+task :diff_ruby 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
+task :diff_rubinius do
   diff_with rubinius_dir
 end
 
@@ -193,3 +213,28 @@ task "rcov:for", [:test] do |task, args|
 
   ruby "#{flags.join ' '} #{rcov} #{rflags.join ' '} #{args[:test]}"
 end
+
+task :graph do
+  $: << File.expand_path("~/Work/p4/zss/src/graph/dev/lib")
+  require 'graph'
+  deps = Graph.new
+  deps.rotate
+
+  current = nil
+  `rake -P -s`.each_line do |line|
+    case line
+    when /^rake (.+)/
+      current = $1
+      deps[current] if current # force the node to exist, in case of a leaf
+    when /^\s+(.+)/
+      deps[current] << $1 if current
+    else
+      warn "unparsed: #{line.chomp}"
+    end
+  end
+
+
+  deps.boxes
+  deps.save "graph", nil
+end
+

data/lib/rubygems.rb

@@ -5,6 +5,8 @@
 # See LICENSE.txt for permissions.
 #++
 
+gem_disabled = !defined? Gem
+
 require 'rubygems/defaults'
 require 'thread'
 require 'etc'
@@ -98,7 +100,7 @@ require 'etc'
 # -The RubyGems Team
 
 module Gem
-  RubyGemsVersion = VERSION = '1.3.6'
+  RubyGemsVersion = VERSION = '1.3.7'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -129,6 +131,7 @@ module Gem
     :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"],
     :vendordir         => RbConfig::CONFIG["vendordir"] ,
@@ -143,7 +146,7 @@ module Gem
   # :stopdoc:
   MUTEX = Mutex.new
 
-  RubyGemsPackageVersion = RubyGemsVersion
+  RubyGemsPackageVersion = VERSION
   # :startdoc:
 
   ##
@@ -253,8 +256,6 @@ module Gem
       File.join spec.full_gem_path, path
     end
 
-    sitelibdir = ConfigMap[:sitelibdir]
-
     # gem directories must come after -I and ENV['RUBYLIB']
     insert_index = load_path_insert_index
 
@@ -311,8 +312,8 @@ module Gem
   ##
   # Find the full path to the executable for gem +name+.  If the +exec_name+
   # is not given, the gem's default_executable is chosen, otherwise the
-  # specifed executable's path is returned.  +version_requirements+ allows you
-  # to specify specific gem versions.
+  # specified executable's path is returned.  +version_requirements+ allows
+  # you to specify specific gem versions.
 
   def self.bin_path(name, exec_name = nil, *version_requirements)
     version_requirements = Gem::Requirement.default if
@@ -341,7 +342,7 @@ module Gem
   # The mode needed to read a file as straight binary.
 
   def self.binary_mode
-    @binary_mode ||= RUBY_VERSION > '1.9' ? 'rb:ascii-8bit' : 'rb'
+    'rb'
   end
 
   ##
@@ -699,14 +700,15 @@ module Gem
   # The directory prefix this RubyGems was installed at.
 
   def self.prefix
-    prefix = File.dirname File.expand_path(__FILE__)
+    dir = File.dirname File.expand_path(__FILE__)
+    prefix = File.dirname dir
 
-    if File.dirname(prefix) == File.expand_path(ConfigMap[:sitelibdir]) or
-       File.dirname(prefix) == File.expand_path(ConfigMap[:libdir]) or
-       'lib' != File.basename(prefix) then
+    if prefix == File.expand_path(ConfigMap[:sitelibdir]) or
+       prefix == File.expand_path(ConfigMap[:libdir]) or
+       'lib' != File.basename(dir) then
       nil
     else
-      File.dirname prefix
+      prefix
     end
   end
 
@@ -974,6 +976,28 @@ module Gem
     @@win_platform
   end
 
+  ##
+  # Find all 'rubygems_plugin' files and load them
+
+  def self.load_plugins
+    plugins = Gem.find_files 'rubygems_plugin'
+
+    plugins.each do |plugin|
+
+      # Skip older versions of the GemCutter plugin: Its commands are in
+      # RubyGems proper now.
+
+      next if plugin =~ /gemcutter-0\.[0-3]/
+
+      begin
+        load plugin
+      rescue ::Exception => e
+        details = "#{plugin.inspect}: #{e.message} (#{e.class})"
+        warn "Error loading RubyGems plugin #{details}"
+      end
+    end
+  end
+
   class << self
 
     ##
@@ -1024,6 +1048,8 @@ end
 
 module Kernel
 
+  undef gem if respond_to? :gem # defined in gem_prelude.rb on 1.9
+
   ##
   # Use Kernel#gem to activate a specific version of +gem_name+.
   #
@@ -1081,12 +1107,18 @@ require 'rubygems/platform'
 require 'rubygems/builder'              # HACK: Needed for rake's package task.
 
 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
   begin
+    ##
+    # Defaults the ruby implementation wants to provide for RubyGems
+
     require "rubygems/defaults/#{RUBY_ENGINE}"
   rescue LoadError
   end
@@ -1094,25 +1126,15 @@ end
 
 require 'rubygems/config_file'
 
-if RUBY_VERSION < '1.9' then
-  require 'rubygems/custom_require'
-end
-
-Gem.clear_paths
-
-plugins = Gem.find_files 'rubygems_plugin'
-
-plugins.each do |plugin|
+##
+# 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.
 
-  # Skip older versions of the GemCutter plugin: Its commands are in
-  # RubyGems proper now.
+require 'rubygems/custom_require' if gem_disabled or RUBY_VERSION < '1.9'
 
-  next if plugin =~ /gemcutter-0\.[0-3]/
+Gem.clear_paths
 
-  begin
-    load plugin
-  rescue => e
-    warn "error loading #{plugin.inspect}: #{e.message} (#{e.class})"
-  end
-end
+Gem.load_plugins