rubygems-update 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3715c090bb9c46a51a84c8eca827fd3bd7ac44c8
-  data.tar.gz: 80c3d4c9042d3c70b4f4581ccbbe6d13608f6b8c
+  metadata.gz: 23d91223aab36769e7bd55ec6a42800a4b8d9f40
+  data.tar.gz: b5190f2902a2fe929a7c27a0864a2f0d087e749f
 SHA512:
-  metadata.gz: 56f3726b20096af80cc5772b838ff6ff4eb44fb0479d6855795730d163f07635a7a854bf2cc4ea9dee77cd6b83ced4c47af7e805496aff6c2fefe318b3cdc162
-  data.tar.gz: 1960e19c702fcdea527e28e95c9f94b3eb790fa58eb9dcb57073516524e23e46db38e5310903f0f009ae50dd121157e48c5130b7f88cf40759d519244e29d4bf
+  metadata.gz: f96281ae469f202368eab4524a800b4d9f0dc389b6628afc5c0a3d70981dac6c069d0a4e058dddfe10a1c6e753ed3d69c69bb4ffc22f1575673b89eb393d4d28
+  data.tar.gz: cb3f3ff170c6d6b680f72cfe9b296f335f3dc5d5564ffeba7df037808fa4696892754c107fbaf94b8698b37253f2d7106f3378e34c018c9dd9647e6f185d32dc

data/History.txt

@@ -1,6 +1,47 @@
 # coding: UTF-8
 
-=== 2.0.3 / 2012-03-1
+=== 2.0.4 / 2013-07-09
+
+Bug fixes:
+
+* Fixed error caused by gem install not finding the right platform for your
+  platform. Bug #576 by John Anderson
+* Fixed pushing gems with the default host.  Bug #495 by Utkarsh Kukreti
+* Improved unhelpful error message from `gem owner --remove`.  Bug #488 by
+  Steve Klabnik
+* Fixed typo in `gem spec` help.  Pull request #563 by oooooooo
+* Fixed creation of build_info with --install-dir.  Bug #457 by Vít Ondruch.
+* RubyGems converts non-string dependency names to strings now.  Bug #505 by
+  Terence Lee
+* Outdated prerelease versions are now listed in `gem outdated`.
+* RubyGems now only calls fsync() on the specification when installing, not
+  every file from the gem.  This improves the performance of gem installation
+  on some systems.  Pull Request #556 by Grzesiek Kolodziejczyk
+* Removed surprise search term anchoring in `gem search` to restore 1.8-like
+  search behavior while still defaulting to --remote.  Pull request #562 by
+  Ben Bleything
+* Fixed handling of DESTDIR when building extensions.  Pull request #573 by
+  Akinori MUSHA
+* Fixed documentation of `gem pristine` defaults (--all is not a default).
+  Pull request #577 by Shannon Skipper
+* Fixed a windows extension-building test failure.  Pull request #575 by
+  Hiroshi Shirosaki
+* Fixed issue with `gem update` where it would attempt to use a Version
+  instead of a Requirement to find the latest gem.  Fixes #570 by Nick Cox.
+* RubyGems now ignores an empty but set RUBYGEMS_HOST environment variable.
+  Based on pull request #558 by Robin Dupret.
+* Removed duplicate creation of gem subdirectories in
+  Gem::DependencyInstaller.  Pull Request #456 by Vít Ondruch
+* RubyGems now works with Ruby built with `--with-ruby-version=''`.  Pull
+  Request #455 by Vít Ondruch
+* Fixed race condition when two threads require the same gem.  Ruby bug report
+  #8374 by Joel VanderWerf
+* Cleaned up siteconf between extension build and extension install.  Pull
+  request #587 by Dominic Cleal
+* Fix deprecation warnings when converting gemspecs to yaml.  Ruby commit
+  r41148 by Yui Naruse
+
+=== 2.0.3 / 2013-03-11
 
 * Bug fixes:
   * Reverted automatic upgrade to HTTPS as it breaks RubyGems APIs.  Fixes

data/Manifest.txt

@@ -142,7 +142,6 @@ test/rubygems/good_rake.rb
 test/rubygems/grandchild_cert.pem
 test/rubygems/grandchild_cert_32.pem
 test/rubygems/grandchild_key.pem
-test/rubygems/insure_session.rb
 test/rubygems/invalid_issuer_cert.pem
 test/rubygems/invalid_issuer_cert_32.pem
 test/rubygems/invalid_key.pem
@@ -189,7 +188,6 @@ 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_search_command.rb
 test/rubygems/test_gem_commands_server_command.rb
 test/rubygems/test_gem_commands_setup_command.rb
 test/rubygems/test_gem_commands_sources_command.rb

data/Rakefile

@@ -50,7 +50,6 @@ hoe = Hoe.spec 'rubygems-update' do
 
   extra_dev_deps << ['builder', '~> 2.1']
   extra_dev_deps << ['hoe-seattlerb', '~> 1.2']
-  extra_dev_deps << ['session', '~> 2.4']
   extra_dev_deps << ['rdoc', '~> 3.0']
   extra_dev_deps << ['ZenTest', '~> 4.5']
   extra_dev_deps << ['rake', '~> 0.9.3']

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.0.3'
+  VERSION = '2.0.4'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -173,7 +173,12 @@ module Gem
     # require will try to activate the more specific version.
 
     spec = Gem::Specification.find_inactive_by_path path
-    return false unless spec
+
+    unless spec
+      spec = Gem::Specification.find_by_path path
+      return true if spec && spec.activated?
+      return false
+    end
 
     begin
       spec.activate

data/lib/rubygems/commands/help_command.rb

@@ -113,7 +113,15 @@ platform.
       format = "#{' ' * margin_width}%-#{desc_width}s%s"
 
       command_manager.command_names.each do |cmd_name|
-        summary = command_manager[cmd_name].summary
+        command = command_manager[cmd_name]
+
+        summary =
+          if command then
+            command.summary
+          else
+            "[No command found for #{cmd_name}, bug?]"
+          end
+
         summary = wrap(summary, summary_width).split "\n"
         out << sprintf(format, cmd_name, summary.shift)
         until summary.empty? do

data/lib/rubygems/commands/list_command.rb

@@ -7,9 +7,8 @@ require 'rubygems/commands/query_command'
 
 class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
 
-  def initialize(name = 'list',
-                 summary = 'Display gems whose name starts with STRING')
-    super name, summary
+  def initialize
+    super 'list', 'Display gems whose name starts with STRING'
 
     remove_option('--name-matches')
   end
@@ -27,9 +26,8 @@ class Gem::Commands::ListCommand < Gem::Commands::QueryCommand
   end
 
   def execute
-    name = get_one_optional_argument || ''
-    options[:name] = /^#{name}/i
-
+    string = get_one_optional_argument || ''
+    options[:name] = /^#{string}/i
     super
   end
 

data/lib/rubygems/commands/owner_command.rb

@@ -73,7 +73,7 @@ class Gem::Commands::OwnerCommand < Gem::Command
           request.add_field "Authorization", api_key
         end
 
-        with_response response
+        with_response response, "Removing #{owner}"
       rescue
         # ignore
       end

data/lib/rubygems/commands/pristine_command.rb

@@ -10,7 +10,8 @@ class Gem::Commands::PristineCommand < Gem::Command
   def initialize
     super 'pristine',
           'Restores installed gems to pristine condition from files located in the gem cache',
-          :version => Gem::Requirement.default, :extensions => true,
+          :version => Gem::Requirement.default,
+          :extensions => true,
           :all => false
 
     add_option('--all',
@@ -37,7 +38,7 @@ class Gem::Commands::PristineCommand < Gem::Command
   end
 
   def defaults_str # :nodoc:
-    "--all --extensions"
+    '--extensions'
   end
 
   def description # :nodoc:
@@ -52,8 +53,8 @@ for the gem are regenerated.
 If the cached gem cannot be found, you will need to use `gem install` to
 revert the gem.
 
-If --no-extensions is provided pristine will not attempt to restore gems with
-extensions.
+If --no-extensions is provided pristine will not attempt to restore gems
+with extensions.
     EOF
   end
 

data/lib/rubygems/commands/push_command.rb

@@ -20,7 +20,8 @@ class Gem::Commands::PushCommand < Gem::Command
   end
 
   def initialize
-    super 'push', description
+    super 'push', description, :host => self.host
+
     add_proxy_option
     add_key_option
 

data/lib/rubygems/commands/search_command.rb

@@ -1,17 +1,31 @@
 require 'rubygems/command'
-require 'rubygems/commands/list_command'
+require 'rubygems/commands/query_command'
 
-class Gem::Commands::SearchCommand < Gem::Commands::ListCommand
+class Gem::Commands::SearchCommand < Gem::Commands::QueryCommand
 
   def initialize
     super 'search', 'Display all gems whose name contains STRING'
 
-    @defaults[:domain] = :remote
+    remove_option '--name-matches'
+  end
+
+  def arguments # :nodoc:
+    "STRING        fragment of gem name to search for"
   end
 
   def defaults_str # :nodoc:
     "--remote --no-details"
   end
 
+  def usage # :nodoc:
+    "#{program_name} [STRING]"
+  end
+
+  def execute
+    string = get_one_optional_argument
+    options[:name] = /#{string}/i
+    super
+  end
+
 end
 

data/lib/rubygems/commands/setup_command.rb

@@ -159,29 +159,7 @@ By default, this RubyGems will install gem as:
 
     options[:previous_version] = Gem::Version.new(options[:previous_version])
 
-    release_notes = File.join Dir.pwd, 'History.txt'
-
-    release_notes = if File.exist? release_notes then
-                      history = File.read release_notes
-                      history = history.sub(/^# coding:.*?^=/m, '')
-
-                      text = history.split(HISTORY_HEADER)
-                      text.shift # correct an off-by-one generated by split
-                      version_lines = history.scan(HISTORY_HEADER)
-                      versions = history.scan(VERSION_MATCHER).flatten.map { |x| Gem::Version.new(x) }
-
-                      history_string = ""
-
-                      until versions.length == 0 or versions.shift < options[:previous_version]
-                        history_string += version_lines.shift + text.shift
-                      end
-
-                      history_string
-                    else
-                      "Oh-no! Unable to find release notes!"
-                    end
-
-    say release_notes
+    show_release_notes
 
     say
     say "-" * 78
@@ -458,6 +436,40 @@ abort "#{deprecation_message}"
     end
   end
 
+  def show_release_notes
+    release_notes = File.join Dir.pwd, 'History.txt'
+
+    release_notes =
+      if File.exist? release_notes then
+        history = File.read release_notes
+
+        history.force_encoding Encoding::UTF_8 if
+          Object.const_defined? :Encoding
+
+        history = history.sub(/^# coding:.*?^=/m, '')
+
+        text = history.split(HISTORY_HEADER)
+        text.shift # correct an off-by-one generated by split
+        version_lines = history.scan(HISTORY_HEADER)
+        versions = history.scan(VERSION_MATCHER).flatten.map do |x|
+          Gem::Version.new(x)
+        end
+
+        history_string = ""
+
+        until versions.length == 0 or
+              versions.shift < options[:previous_version] do
+          history_string += version_lines.shift + text.shift
+        end
+
+        history_string
+      else
+        "Oh-no! Unable to find release notes!"
+      end
+
+    say release_notes
+  end
+
   def uninstall_old_gemcutter
     require 'rubygems/uninstaller'
 

data/lib/rubygems/commands/specification_command.rb

@@ -28,7 +28,7 @@ class Gem::Commands::SpecificationCommand < Gem::Command
       options[:format] = :ruby
     end
 
-    add_option('--yaml', 'Output RUBY format') do |value, options|
+    add_option('--yaml', 'Output YAML format') do |value, options|
       options[:format] = :yaml
     end
 

data/lib/rubygems/commands/update_command.rb

@@ -94,7 +94,7 @@ class Gem::Commands::UpdateCommand < Gem::Command
 
     say "Updating #{name}"
     begin
-      @installer.install name, version
+      @installer.install name, Gem::Requirement.new(version)
       success = true
     rescue Gem::InstallError => e
       alert_error "Error installing #{name}:\n\t#{e.message}"

data/lib/rubygems/core_ext/kernel_require.rb

@@ -4,6 +4,8 @@
 # See LICENSE.txt for permissions.
 #++
 
+require 'monitor'
+
 module Kernel
 
   if defined?(gem_original_require) then
@@ -31,7 +33,11 @@ module Kernel
   # The normal <tt>require</tt> functionality of returning false if
   # that file has already been loaded is preserved.
 
+  ACTIVATION_MONITOR = Monitor.new
+
   def require path
+    ACTIVATION_MONITOR.enter
+
     spec = Gem.find_unresolved_default_spec(path)
     if spec
       Gem.remove_unresolved_default_spec(spec)
@@ -111,6 +117,8 @@ module Kernel
     end
 
     raise load_error
+  ensure
+    ACTIVATION_MONITOR.exit
   end
 
   private :require

data/lib/rubygems/defaults.rb

@@ -54,7 +54,9 @@ module Gem
   # Path for gems in the user's home directory
 
   def self.user_dir
-    File.join Gem.user_home, '.gem', ruby_engine, ConfigMap[:ruby_version]
+    parts = [Gem.user_home, '.gem', ruby_engine]
+    parts << ConfigMap[:ruby_version] unless ConfigMap[:ruby_version].empty?
+    File.join parts
   end
 
   ##

data/lib/rubygems/dependency_installer.rb

@@ -63,7 +63,6 @@ class Gem::DependencyInstaller
       # HACK shouldn't change the global settings, needed for -i behavior
       # maybe move to the install command?  See also github #442
       Gem::Specification.dirs = @install_dir
-      Gem.ensure_gem_subdirectories @install_dir
     end
 
     options = DEFAULT_OPTIONS.merge options

data/lib/rubygems/dependency_resolver.rb

@@ -349,7 +349,7 @@ module Gem
         when Dependency
           @dependency == other
         when DependencyRequest
-          @dependency == other.dep && @requester == other.requester
+          @dependency == other.dependency && @requester == other.requester
         else
           false
         end

data/lib/rubygems/errors.rb

@@ -62,10 +62,10 @@ module Gem
     ##
     # A wordy description of the error.
     def wordy
-      "Found %s (%), but was for platform%s %s" %
+      "Found %s (%s), but was for platform%s %s" %
         [@name,
          @version,
-         @platforms.size == 1 ? 's' : '',
+         @platforms.size == 1 ? '' : 's',
          @platforms.join(' ,')]
     end
   end

data/lib/rubygems/ext/builder.rb

@@ -23,9 +23,14 @@ class Gem::Ext::Builder
       make_program = (/mswin/ =~ RUBY_PLATFORM) ? 'nmake' : 'make'
     end
 
-    ['', ' install'].each do |target|
-      cmd = "#{make_program}#{target}"
-      run(cmd, results, "make#{target}")
+    ['', 'install'].each do |target|
+      # Pass DESTDIR via command line to override what's in MAKEFLAGS
+      cmd = [
+        make_program,
+        '"DESTDIR=%s"' % ENV['DESTDIR'],
+        target
+      ].join(' ').rstrip
+      run(cmd, results, "make #{target}".rstrip)
     end
   end
 

data/lib/rubygems/ext/ext_conf_builder.rb

@@ -37,6 +37,7 @@ class Gem::Ext::ExtConfBuilder < Gem::Ext::Builder
         run cmd, results
 
         ENV["DESTDIR"] = nil
+        siteconf.unlink
 
         make dest_path, results
 

data/lib/rubygems/gemcutter_utilities.rb

@@ -38,7 +38,7 @@ module Gem::GemcutterUtilities
 
     say "Enter your #{pretty_host} credentials."
     say "Don't have an account yet? " +
-        "Create one at https://#{sign_in_host}/sign_up"
+        "Create one at #{sign_in_host}/sign_up"
 
     email    =              ask "   Email: "
     password = ask_for_password "Password: "
@@ -60,7 +60,14 @@ module Gem::GemcutterUtilities
     configured_host = Gem.host unless
       Gem.configuration.disable_default_gem_server
 
-    @host ||= ENV['RUBYGEMS_HOST'] || configured_host
+    @host ||=
+      begin
+        env_rubygems_host = ENV['RUBYGEMS_HOST']
+        env_rubygems_host = nil if
+          env_rubygems_host and env_rubygems_host.empty?
+
+        env_rubygems_host|| configured_host
+      end
   end
 
   def rubygems_api_request(method, path, host = nil, &block)
@@ -79,7 +86,7 @@ module Gem::GemcutterUtilities
     Gem::RemoteFetcher.fetcher.request(uri, request_method, &block)
   end
 
-  def with_response(resp)
+  def with_response resp, error_prefix = nil
     case resp
     when Net::HTTPSuccess then
       if block_given? then
@@ -88,7 +95,10 @@ module Gem::GemcutterUtilities
         say resp.body
       end
     else
-      say resp.body
+      message = resp.body
+      message = "#{error_prefix}: #{message}" if error_prefix
+
+      say message
       terminate_interaction 1 # TODO: question this
     end
   end