rubygems-update 1.4.2 → 1.5.0

data/.autotest

@@ -3,27 +3,26 @@
 require 'autotest/restart'
 
 Autotest.add_hook :initialize do |at|
-  at.order = :natural # I am a bad person - Eric Hodel
   at.testlib = 'minitest/autorun'
 
   at.add_exception %r%/\.git/%
   at.add_exception %r%/\.svn/%
   at.add_exception %r%\.rbc$%
-  at.add_exception %r%test/rubygems%
+  at.add_exception %r%test/rubygems/rubygems%
 
   at.find_directories.clear
   at.find_directories.push 'lib', 'test'
 
   at.add_mapping %r%^lib/rubygems.rb$% do |_, m|
-    "test/test_gem.rb"
+    "test/rubygems/test_gem.rb"
   end
 
   at.add_mapping %r%^lib/rubygems/(.*).rb$% do |_, m|
-    "test/test_gem_#{m[1].gsub '/', '_'}.rb"
+    "test/rubygems/test_gem_#{m[1].gsub '/', '_'}.rb"
   end
 
   at.add_mapping %r%^test/support/(.*).rb$% do |_, m|
-    at.files_matching %r%^test/test_(.*)\.rb$%
+    at.files_matching %r%^test/rubygems/test_(.*)\.rb$%
   end
 
   # at.add_mapping %r%^test/support/(.*).rb$% do |_, m|

data/ChangeLog

@@ -1,5 +1,18 @@
 # -*- coding: utf-8 -*-
 
+2010-12-31  Luis Lavena  <luislavena@gmail.com>
+
+	* lib/rubygems.rb (Gem.activate): Do not add gem bindir to the
+	  $LOAD_PATH. Bug #25208.
+	* test/test_kernel.rb: ditto.
+	* lib/rubygems/commands/environment_command.rb: Add support for 'platform'
+	  suboption. Feature Request #28300
+	* test/test_gem_commands_environment_command.rb: ditto.
+	* lib/rubygems/ext/builder.rb: Give priority to make-prog from Ruby
+	  configure process. Bug #28399
+	* test/test_gem_ext_ext_conf_builder.rb: Added 2 tests to check both
+	  --with-make-prog and ENV['make'] conditions.
+
 2010-12-29  Luis Lavena  <luislavena@gmail.com>
 
 	* lib/rubygems/user_interaction.rb: Implemented SimpleDownloadReporter

data/History.txt

@@ -1,4 +1,36 @@
-=== 1.4.2 / 2011-01-06
+=== 1.5.0 / 2011-01-31
+
+Major Enhancements:
+
+* Finally fixed all known 1.9.x issues. Upgrading is now possible!
+* Merged huge 1.3.7/ruby-core changes to master.
+
+Minor Enhancements:
+
+* Added UPGRADING.rdoc to help deal with 1.9 issues.
+* Gem::Format now gives better errors for corrupt gem files and includes paths
+* Pre-install hooks can now abort gem installation by returning false
+* Move shareable TestCase classes to lib/ to help plugin authors with tests.
+* Add post-build hooks that can cancel the gem install
+* Always require custom_require now that require_gem is gone
+* Added GemInstaller accessors for @options so plugins can reference them.
+* Optimized Gem.find_files. ~10% faster than 1.4.2. ~40% faster than ruby 1.9.
+* Gem::SilentUI now behaves like Gem::StreamUI for asking questions.  Patch by
+  Erik Hollensbe.
+
+Bug Fixes:
+
+* `gem update` was implicitly doing --system.
+* 1.9.3: Fixed encoding errors causing gem installs to die during rdoc phase.
+* Add RubyForge URL to README. Closes #28825
+* 1.9.3: Use chdir {} when building extensions to prevent warnings. Fixes #4337
+* 1.9.2: Fix circular require warning.
+* Make requiring openssl even lazier at request of NaHi
+* `gem unpack` will now download the gem if it is not in the cache. Patch by
+  Erik Hollensbe.
+* rubygems-update lists its development dependencies again
+
+=== 1.4.2 / 2011-01-06
 
 Bug fixes:
 
@@ -33,6 +65,8 @@ New features:
 * Allow searching w/ file extensions: gem which fileutils.rb
 * Progress indicator during download (Ryan Melton)
 * Speed up Gem::Version#<=> by 2-3x in common cases. (raggi)
+* --source is now additive with your current sources.
+  Use --clear-sources first to maintain previous behavior.
 
 Bug fixes:
 

data/Manifest.txt

@@ -7,8 +7,10 @@ LICENSE.txt
 Manifest.txt
 README.rdoc
 Rakefile
+UPGRADING.rdoc
 bin/gem
 bin/update_rubygems
+ci_build.sh
 cruise_config.rb
 hide_lib_for_update/note.txt
 lib/gauntlet_rubygems.rb
@@ -30,7 +32,6 @@ lib/rubygems/commands/help_command.rb
 lib/rubygems/commands/install_command.rb
 lib/rubygems/commands/list_command.rb
 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
@@ -69,7 +70,9 @@ lib/rubygems/gemcutter_utilities.rb
 lib/rubygems/indexer.rb
 lib/rubygems/install_update_options.rb
 lib/rubygems/installer.rb
+lib/rubygems/installer_test_case.rb
 lib/rubygems/local_remote_options.rb
+lib/rubygems/mock_gem_ui.rb
 lib/rubygems/old_format.rb
 lib/rubygems/package.rb
 lib/rubygems/package/f_sync_dir.rb
@@ -78,6 +81,7 @@ lib/rubygems/package/tar_input.rb
 lib/rubygems/package/tar_output.rb
 lib/rubygems/package/tar_reader.rb
 lib/rubygems/package/tar_reader/entry.rb
+lib/rubygems/package/tar_test_case.rb
 lib/rubygems/package/tar_writer.rb
 lib/rubygems/package_task.rb
 lib/rubygems/platform.rb
@@ -87,10 +91,9 @@ lib/rubygems/requirement.rb
 lib/rubygems/security.rb
 lib/rubygems/server.rb
 lib/rubygems/source_index.rb
-lib/rubygems/source_info_cache.rb
-lib/rubygems/source_info_cache_entry.rb
 lib/rubygems/spec_fetcher.rb
 lib/rubygems/specification.rb
+lib/rubygems/test_case.rb
 lib/rubygems/test_utilities.rb
 lib/rubygems/text.rb
 lib/rubygems/uninstaller.rb
@@ -102,90 +105,88 @@ lib/ubygems.rb
 pkgs/sources/lib/sources.rb
 pkgs/sources/sources.gemspec
 setup.rb
-test/bogussources.rb
-test/data/gem-private_key.pem
-test/data/gem-public_cert.pem
-test/fake_certlib/openssl.rb
-test/foo/discover.rb
-test/functional.rb
-test/gem_installer_test_case.rb
-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
-test/test_gem.rb
-test/test_gem_builder.rb
-test/test_gem_command.rb
-test/test_gem_command_manager.rb
-test/test_gem_commands_build_command.rb
-test/test_gem_commands_cert_command.rb
-test/test_gem_commands_check_command.rb
-test/test_gem_commands_contents_command.rb
-test/test_gem_commands_dependency_command.rb
-test/test_gem_commands_environment_command.rb
-test/test_gem_commands_fetch_command.rb
-test/test_gem_commands_generate_index_command.rb
-test/test_gem_commands_install_command.rb
-test/test_gem_commands_list_command.rb
-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
-test/test_gem_commands_specification_command.rb
-test/test_gem_commands_stale_command.rb
-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_doc_manager.rb
-test/test_gem_ext_configure_builder.rb
-test/test_gem_ext_ext_conf_builder.rb
-test/test_gem_ext_rake_builder.rb
-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
-test/test_gem_local_remote_options.rb
-test/test_gem_package_tar_header.rb
-test/test_gem_package_tar_input.rb
-test/test_gem_package_tar_output.rb
-test/test_gem_package_tar_reader.rb
-test/test_gem_package_tar_reader_entry.rb
-test/test_gem_package_tar_writer.rb
-test/test_gem_package_task.rb
-test/test_gem_platform.rb
-test/test_gem_remote_fetcher.rb
-test/test_gem_requirement.rb
-test/test_gem_server.rb
-test/test_gem_source_index.rb
-test/test_gem_spec_fetcher.rb
-test/test_gem_specification.rb
-test/test_gem_stream_ui.rb
-test/test_gem_uninstaller.rb
-test/test_gem_validator.rb
-test/test_gem_version.rb
-test/test_gem_version_option.rb
-test/test_kernel.rb
+test/rubygems/bogussources.rb
+test/rubygems/data/gem-private_key.pem
+test/rubygems/data/gem-public_cert.pem
+test/rubygems/fake_certlib/openssl.rb
+test/rubygems/foo/discover.rb
+test/rubygems/functional.rb
+test/rubygems/insure_session.rb
+test/rubygems/plugin/exception/rubygems_plugin.rb
+test/rubygems/plugin/load/rubygems_plugin.rb
+test/rubygems/plugin/standarderror/rubygems_plugin.rb
+test/rubygems/private_key.pem
+test/rubygems/public_cert.pem
+test/rubygems/rubygems/commands/crash_command.rb
+test/rubygems/rubygems_plugin.rb
+test/rubygems/sff/discover.rb
+test/rubygems/simple_gem.rb
+test/rubygems/test_config.rb
+test/rubygems/test_gem.rb
+test/rubygems/test_gem_builder.rb
+test/rubygems/test_gem_command.rb
+test/rubygems/test_gem_command_manager.rb
+test/rubygems/test_gem_commands_build_command.rb
+test/rubygems/test_gem_commands_cert_command.rb
+test/rubygems/test_gem_commands_check_command.rb
+test/rubygems/test_gem_commands_contents_command.rb
+test/rubygems/test_gem_commands_dependency_command.rb
+test/rubygems/test_gem_commands_environment_command.rb
+test/rubygems/test_gem_commands_fetch_command.rb
+test/rubygems/test_gem_commands_generate_index_command.rb
+test/rubygems/test_gem_commands_install_command.rb
+test/rubygems/test_gem_commands_list_command.rb
+test/rubygems/test_gem_commands_lock_command.rb
+test/rubygems/test_gem_commands_outdated_command.rb
+test/rubygems/test_gem_commands_owner_command.rb
+test/rubygems/test_gem_commands_pristine_command.rb
+test/rubygems/test_gem_commands_push_command.rb
+test/rubygems/test_gem_commands_query_command.rb
+test/rubygems/test_gem_commands_server_command.rb
+test/rubygems/test_gem_commands_sources_command.rb
+test/rubygems/test_gem_commands_specification_command.rb
+test/rubygems/test_gem_commands_stale_command.rb
+test/rubygems/test_gem_commands_uninstall_command.rb
+test/rubygems/test_gem_commands_unpack_command.rb
+test/rubygems/test_gem_commands_update_command.rb
+test/rubygems/test_gem_commands_which_command.rb
+test/rubygems/test_gem_config_file.rb
+test/rubygems/test_gem_dependency.rb
+test/rubygems/test_gem_dependency_installer.rb
+test/rubygems/test_gem_dependency_list.rb
+test/rubygems/test_gem_doc_manager.rb
+test/rubygems/test_gem_ext_configure_builder.rb
+test/rubygems/test_gem_ext_ext_conf_builder.rb
+test/rubygems/test_gem_ext_rake_builder.rb
+test/rubygems/test_gem_format.rb
+test/rubygems/test_gem_gem_path_searcher.rb
+test/rubygems/test_gem_gem_runner.rb
+test/rubygems/test_gem_gemcutter_utilities.rb
+test/rubygems/test_gem_indexer.rb
+test/rubygems/test_gem_install_update_options.rb
+test/rubygems/test_gem_installer.rb
+test/rubygems/test_gem_local_remote_options.rb
+test/rubygems/test_gem_package_tar_header.rb
+test/rubygems/test_gem_package_tar_input.rb
+test/rubygems/test_gem_package_tar_output.rb
+test/rubygems/test_gem_package_tar_reader.rb
+test/rubygems/test_gem_package_tar_reader_entry.rb
+test/rubygems/test_gem_package_tar_writer.rb
+test/rubygems/test_gem_package_task.rb
+test/rubygems/test_gem_platform.rb
+test/rubygems/test_gem_remote_fetcher.rb
+test/rubygems/test_gem_requirement.rb
+test/rubygems/test_gem_security.rb
+test/rubygems/test_gem_server.rb
+test/rubygems/test_gem_source_index.rb
+test/rubygems/test_gem_spec_fetcher.rb
+test/rubygems/test_gem_specification.rb
+test/rubygems/test_gem_stream_ui.rb
+test/rubygems/test_gem_text.rb
+test/rubygems/test_gem_uninstaller.rb
+test/rubygems/test_gem_validator.rb
+test/rubygems/test_gem_version.rb
+test/rubygems/test_gem_version_option.rb
+test/rubygems/test_kernel.rb
 util/CL2notes
 util/gem_prelude.rb

data/README.rdoc

@@ -4,6 +4,7 @@
 * http://docs.rubygems.org
 * http://help.rubygems.org
 * http://github.com/rubygems
+* http://rubyforge.org/projects/rubygems
 
 == DESCRIPTION
 
@@ -18,22 +19,32 @@ To upgrade to the latest RubyGems, run:
 
   $ 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
-if you see "Nothing to update".
+See UPGRADING.rdoc for more details and alternative instructions.
 
-If you have an older version of RubyGems installed, then you can still
-do it in two steps:
+-----
 
-  $ gem install rubygems-update  # again, might need to be admin/root
-  $ update_rubygems              # ... here too
+NOTE: Ruby 1.9 ships with rubygems and contains a very buggy
+"gem-prelude". It is a gem loading system that can interfere with
+updating rubygems itself. We do NOT recommend you update to rubygems
+1.4 if you're running ruby 1.9.x until we get that sorted out in a
+future ruby release.
+
+If you absolutely hate kittens and you _must_ upgrade, you're going to
+have to do something really hokey like:
+
+% alias ruby19="ruby19 --disable-gems"
+% alias gem19="ruby19 --disable-gems -S gem"
+
+Even deleting the stock rubygems in 1.9 doesn't fix this situation.
+
+-----
 
 If you don't have any RubyGems install, there is still the pre-gem approach to
 getting software, doing it manually:
 
-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
+* Download from: https://rubygems.org/pages/download
+* Unpack into a directory and cd there
+* Install with: ruby setup.rb  # you may need admin/root privilege
 
 For more details and other options, see:
 

data/Rakefile

@@ -5,19 +5,28 @@ $:.unshift 'lib'
 require 'rubygems'
 require 'rubygems/package_task'
 
+# HACK bootstrap load_yaml, remove after 1.5 release
+def Gem.load_yaml; end unless Gem.respond_to? :load_yaml
+
+begin
+  require 'psych'
+rescue ::LoadError
+  require 'yaml'
+end
+
 require 'hoe'
 
 Hoe::RUBY_FLAGS << " --disable-gems" if RUBY_VERSION > "1.9"
 
 Hoe.plugin :minitest
+Hoe.plugin :git
+Hoe.plugin :rubyforge
 
 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.rdoc'
-  self.need_zip       = false
-  self.need_tar       = false
 
   spec_extras[:required_rubygems_version] = Gem::Requirement.default
   spec_extras[:required_ruby_version]     = Gem::Requirement.new '> 1.8.3'
@@ -35,7 +44,6 @@ hoe = Hoe.spec 'rubygems-update' do
 
   extra_dev_deps << ['builder', '~> 2.1']
   extra_dev_deps << ['hoe-seattlerb', '~> 1.2']
-  extra_dev_deps << ['minitest', '~> 1.4']
   extra_dev_deps << ['session', '~> 2.4']
 
   self.extra_rdoc_files = Dir["*.rdoc"]
@@ -43,7 +51,26 @@ hoe = Hoe.spec 'rubygems-update' do
   spec_extras['rdoc_options'] = proc do |rdoc_options|
     rdoc_options << "--title=RubyGems #{self.version} Documentation"
   end
-  spec_extras['require_paths'] = %w[hide_lib_for_update]
+
+  # FIX: this exists because update --system installs the gem and
+  # doesn't uninstall it. It should uninstall or better, not install
+  # in the first place.
+  spec_extras['require_paths'] = %w[hide_lib_for_update] unless
+    ENV['RAKE_SUCKS']
+end
+
+task :docs => :rake_sucks
+task :rake_sucks do
+  # This exists ENTIRELY because the rake design convention of
+  # RDocTask.new is broken. Because most of the work is being done
+  # inside initialize(?!?) BEFORE tasks are even running, too much
+  # stuff is set in stone, and we can't deal with the require_paths
+  # issue above.
+  unless ENV['RAKE_SUCKS'] then
+    ENV['RAKE_SUCKS'] = "1"
+    rm_rf "doc"
+    sh "rake docs"
+  end
 end
 
 desc "Run just the functional tests"
@@ -55,19 +82,6 @@ end
 # --------------------------------------------------------------------
 # Creating a release
 
-# It's good to have RG's development dependencies expressed in the Hoe
-# block above, but including them in the rubygems-update gemspec makes
-# it very difficult for people on old RG versions to install it,
-# especially since they're working against stub legacy indexes
-# now. Remove 'em before building the gem.
-
-task :debug_gem => :scrub_dev_deps
-Rake::Task[:gem].prerequisites.unshift :scrub_dev_deps
-
-task :scrub_dev_deps do
-  hoe.spec.dependencies.reject! { |d| :development == d.type }
-end
-
 task :prerelease => [:clobber, :sanity_check, :test, :test_functional]
 
 task :postrelease => [:tag, :publish_docs]