rubygems-update 1.6.2 → 1.7.0

data/.autotest

@@ -4,7 +4,6 @@ require 'autotest/restart'
 
 Autotest.add_hook :initialize do |at|
   at.testlib = 'minitest/autorun'
-  at.unit_diff = "cat -u"
 
   at.add_exception %r%/\.git/%
   at.add_exception %r%/\.svn/%

data/History.txt

@@ -1,4 +1,66 @@
-=== 1.6.2 / 2011-03-08
+=== 1.7.0 / 2011-03-31
+
+* 16 Deprecations (woot!)
+  * Deprecated Gem.all_load_paths, latest_load_paths, promote_load_path, and
+    cache.
+  * Deprecated RemoteFetcher#open_uri_or_path.
+  * Deprecated SourceIndex#all_gems.
+  * Deprecated SourceIndex#initialize(hash_of_specs).
+  * Deprecated SourceIndex.from_installed_gems, from_gems_in, and
+    load_specification.
+  * Deprecated Specification#has_rdoc, default_executable, and
+    test_suite_file(=).
+  * Deprecated Specification#has_rdoc= and default_executable=
+
+* 26 minor enhancements:
+  * Added stupid simple deprecation module.
+  * Added --spec option to `gem unpack` to output a gem's original metadata
+  * Added packaging option to Specification#validate
+  * Gem.bin_path requires the exec_name argument.
+  * Read from cached specs if fetch fails for some reason
+  * Refactored Specification#assign_defaults into #initialize.
+  * RemoteFetcher#fetch_path now dispatches dynamically to 'fetch_<uri.schema>'
+  * Removed Specification @@gather.
+  * Removed Specification.attribute.
+  * Removed Specification.attribute_alias_singular.
+  * Removed Specification.attribute_defaults.
+  * Removed Specification.attributes
+  * Removed Specification.overwrite_accessor.
+  * Removed Specification.read_only.
+  * Removed Specification.required_attribute.
+  * Removed Specification::SPECIFICATION_VERSION_HISTORY and turned into rdoc
+  * Removed blanket rescue in default_executable. Hope it doesn't blow up! :P
+  * Removed nearly all metaprogramming from Specification. Yay for
+    attr_accessor!
+  * SourceIndex#initialize changed to prefer an array of spec dirs, defaulting
+    to none.
+  * SourceIndex.new is now the preferred way to create SourceIndex instances.
+    *gasp*
+  * Specification#validate now checks that array attribs are indeed arrays.
+  * Specification.default_value is now an instance method.
+  * Switched Specification::TODAY to be proper midnight @ UTC
+  * Update Gem::RemoteFetcher\'s User-Agent to handle RUBY_ENGINE and
+    RUBY_REVISION when patchlevel is -1
+  * UpdateCommand#gems_to_update now returns (name, version) pairs.
+  * UpdateCommand#which_to_update now takes an optional system argument.
+
+* 11 bug fixes:
+  * Added missing remote fetcher require to pristine command (aarnell)
+  * Building gems now checks to ensure all required fields are non-nil
+  * Fix option parser when summary is nil.
+  * Fixed `gem contents` to work with the lightweight specifications
+  * Fixed `gem update --system x.y.z` where x.y.z == latest version. (MGPalmer)
+  * Fixed gem contents sorting and tests. (MGPalmer)
+  * Fixed intermittant problem in `gem fetch` with --platform specified (quix)
+  * Fixed lightweight specifications so `gem rdoc` will generate proper
+    documentation
+  * MockGemUI#terminate_interaction should not raise Gem::SystemExitException.
+    (MGPalmer)
+  * RubyGems now raises a better error for broken .gem files.  Bug #29067 by
+    Elias Baixas
+  * `gem update` now uniq's command line arguments.
+
+=== 1.6.2 / 2011-03-08
 
 Bug Fixes:
 
@@ -972,11 +1034,11 @@ There has been some minor usability enhancements and changes ...
   names.  This was useful for him while testing libs that he had in
   development.
 
-=== 0.8.1 / 2009-09-14
+=== 0.8.1 / 2004-09-17
 
 * Quick release to capture some bug fixes.
 
-=== 0.8.0 / 2009-09-12
+=== 0.8.0 / 2004-09-15
 
 * Remove need for library stubs.  Set the RUBYOPT environment variable to
   include "rrubygems", and a normal require will find gem files.  Continue to
@@ -1003,6 +1065,10 @@ There has been some minor usability enhancements and changes ...
 
 See ChangeLog
 
+=== 0.6.1 / 2004-06-08
+
+See ChangeLog
+
 === 0.6.0 / 2004-06-08
 
 * Collapse output of --search and --list (and gem_server) operations so that
@@ -1039,7 +1105,7 @@ See ChangeLog
   automatically included.
 * Some small bug fixes
 
-=== 0.4.0 / 2004-05-31
+=== 0.4.0 / 2004-05-30
 
 * Minor bug fixes including Windows compatability issues
 

data/README.rdoc

@@ -47,3 +47,6 @@ You're sure you've found a bug!  But where do you let us know?  The best place
 for letting the RubyGems team know about bugs you've found is {on the rubygems
 tracker at rubyforge}[http://rubyforge.org/tracker/?group_id=126].
 
+=== Bundler Compatibility
+
+See http://gembundler.com/compatibility for known issues.

data/Rakefile

@@ -171,3 +171,79 @@ task "rcov:for", [:test] do |task, args|
   ruby "#{flags.join ' '} #{rcov} #{rflags.join ' '} #{args[:test]}"
 end
 
+def changelog_section code
+  name = {
+    :major   => "major enhancement",
+    :minor   => "minor enhancement",
+    :bug     => "bug fix",
+    :unknown => "unknown",
+  }[code]
+
+  changes = $changes[code]
+  count = changes.size
+  name += "s" if count > 1
+  name.sub!(/fixs/, 'fixes')
+
+  return if count < 1
+
+  puts "* #{count} #{name}:"
+  puts
+  changes.sort.each do |line|
+    puts "  * #{line}"
+  end
+  puts
+end
+
+desc "Print the current changelog."
+task "git:newchangelog" do
+  # This must be in here until rubygems depends on the version of hoe that has
+  # git_tags
+  # TODO: get this code back into hoe-git
+  module Hoe::Git
+    module_function :git_tags, :git_svn?, :git_release_tag_prefix
+  end
+
+  tags  = Hoe::Git.git_tags
+  tag   = ENV["FROM"] || tags.last
+  range = [tag, "HEAD"].compact.join ".."
+  cmd   = "git log #{range} '--format=tformat:%B|||%aN|||%aE|||'"
+  now   = Time.new.strftime "%Y-%m-%d"
+
+  changes = `#{cmd}`.split(/\|\|\|/).each_slice(3).map do |msg, author, email|
+    msg.split(/\n/).reject { |s| s.empty? }
+  end
+
+  changes = changes.flatten
+
+  next if changes.empty?
+
+  $changes = Hash.new { |h,k| h[k] = [] }
+
+  codes = {
+    "!" => :major,
+    "+" => :minor,
+    "*" => :minor,
+    "-" => :bug,
+    "?" => :unknown,
+  }
+
+  codes_re = Regexp.escape codes.keys.join
+
+  changes.each do |change|
+    if change =~ /^\s*([#{codes_re}])\s*(.*)/ then
+      code, line = codes[$1], $2
+    else
+      code, line = codes["?"], change.chomp
+    end
+
+    $changes[code] << line
+  end
+
+  puts "=== #{ENV['VERSION'] || 'NEXT'} / #{now}"
+  puts
+  changelog_section :major
+  changelog_section :minor
+  changelog_section :bug
+  changelog_section :unknown
+  puts
+end

data/lib/rubygems.rb

@@ -28,6 +28,7 @@ end
 require 'rubygems/defaults'
 require "rubygems/dependency_list"
 require 'rbconfig'
+require "rubygems/deprecate"
 
 ##
 # RubyGems is the Ruby standard for publishing and managing third party
@@ -118,7 +119,7 @@ require 'rbconfig'
 # -The RubyGems Team
 
 module Gem
-  VERSION = '1.6.2'
+  VERSION = '1.7.0'
 
   ##
   # Raised when RubyGems is unable to load or activate a gem.  Contains the
@@ -182,7 +183,6 @@ module Gem
 
   @configuration = nil
   @loaded_specs = {}
-  @loaded_stacks = {}
   @platforms = []
   @ruby = nil
   @sources = []
@@ -232,34 +232,27 @@ module Gem
   # Gem::Requirement and Gem::Version documentation.
 
   def self.activate(dep, *requirements)
-    # TODO: remove options entirely
-    if requirements.last.is_a?(Hash)
-      options = requirements.pop
-    else
-      options = {}
-    end
+    activate_dep dep, *requirements
+  end
 
+  def self.activate_dep dep, *requirements
     requirements = Gem::Requirement.default if requirements.empty?
     dep = Gem::Dependency.new(dep, requirements) unless Gem::Dependency === dep
 
-    # TODO: remove sources entirely
-    sources = options[:sources] || []
     matches = Gem.source_index.search dep, true
     report_activate_error(dep) if matches.empty?
 
-    if @loaded_specs[dep.name] then
+    existing_spec = @loaded_specs[dep.name]
+
+    # TODO: move this to Dependency
+    if existing_spec then
       # This gem is already loaded.  If the currently loaded gem is not in the
       # list of candidate gems, then we have a version conflict.
-      existing_spec = @loaded_specs[dep.name]
 
       # TODO: unless dep.matches_spec? existing_spec then
       unless matches.any? { |spec| spec.version == existing_spec.version } then
-        sources_message = sources.map { |spec| spec.full_name }
-        stack_message = @loaded_stacks[dep.name].map { |spec| spec.full_name }
-
-        msg = "can't activate #{dep} for #{sources_message.inspect}, "
-        msg << "already activated #{existing_spec.full_name} for "
-        msg << "#{stack_message.inspect}"
+        msg = "can't activate #{dep}, "
+        msg << "already activated #{existing_spec.full_name}"
 
         e = Gem::LoadError.new msg
         e.name = dep.name
@@ -271,9 +264,36 @@ module Gem
       return false
     end
 
+    # TODO: this + spec.conflicts hint that activation is still dumb
     spec = matches.last
 
+    activate_spec spec
+  end
+
+  def self.activate_spec spec
+    existing_spec = @loaded_specs[spec.name]
+
+    # TODO: move this to Specification
+    if existing_spec then
+      if spec.version != existing_spec.version then
+        # This gem is already loaded.  If the currently loaded gem is not in the
+        # list of candidate gems, then we have a version conflict.
+
+        msg = "can't activate #{dep}, "
+        msg << "already activated #{existing_spec.full_name}"
+
+        e = Gem::LoadError.new msg
+        e.name = dep.name
+        e.requirement = dep.requirement
+
+        raise e
+      end
+
+      return false
+    end
+
     conf = spec.conflicts
+
     unless conf.empty? then
       why = conf.map { |act,con|
         "#{act.full_name} conflicts with #{con.join(", ")}"
@@ -284,11 +304,8 @@ module Gem
       raise LoadError, "Unable to activate #{spec.full_name}, because #{why}"
     end
 
-    return false if spec.loaded?
-
     spec.loaded = true
     @loaded_specs[spec.name]  = spec
-    @loaded_stacks[spec.name] = sources.dup
 
     spec.runtime_dependencies.each do |spec_dep|
       next if Gem.loaded_specs.include? spec_dep.name
@@ -372,6 +389,8 @@ module Gem
   # you to specify specific gem versions.
 
   def self.bin_path(name, exec_name = nil, *requirements)
+    raise ArgumentError, "you must supply exec_name" unless exec_name
+
     requirements = Gem::Requirement.default if
       requirements.empty?
     specs = Gem.source_index.find_name(name, requirements)
@@ -587,6 +606,7 @@ module Gem
   # Zlib::GzipReader wrapper that unzips +data+.
 
   def self.gunzip(data)
+    # TODO: move to utils
     require 'stringio'
     require 'zlib'
     data = StringIO.new data
@@ -598,6 +618,7 @@ module Gem
   # Zlib::GzipWriter wrapper that zips +data+.
 
   def self.gzip(data)
+    # TODO: move to utils
     require 'stringio'
     require 'zlib'
     zipped = StringIO.new
@@ -611,6 +632,7 @@ module Gem
   # A Zlib::Inflate#inflate wrapper
 
   def self.inflate(data)
+    # TODO: move to utils
     require 'zlib'
     Zlib::Inflate.inflate data
   end
@@ -620,12 +642,14 @@ module Gem
   # <tt>https://rubygems.org</tt>.
 
   def self.host
+    # TODO: move to utils
     @host ||= "https://rubygems.org"
   end
 
   ## Set the default RubyGems API host.
 
   def self.host= host
+    # TODO: move to utils
     @host = host
   end
 
@@ -706,6 +730,7 @@ module Gem
     file = $1
     lineno = $2.to_i
 
+    # TODO: it is ALWAYS joined! STUPID!
     [file, lineno]
   end
 
@@ -1022,7 +1047,7 @@ module Gem
   # Returns the Gem::SourceIndex of specifications that are in the Gem.path
 
   def self.source_index
-    @@source_index ||= SourceIndex.from_installed_gems
+    @@source_index ||= SourceIndex.new Gem::SourceIndex.installed_spec_directories
   end
 
   ##
@@ -1214,11 +1239,6 @@ module Gem
   end
 
   def self.cache # :nodoc:
-    warn "#{Gem.location_of_caller.join ':'}:Warning: " \
-      "Gem::cache is deprecated and will be removed on or after " \
-      "August 2011.  " \
-      "Use Gem::source_index."
-
     source_index
   end
 
@@ -1238,6 +1258,16 @@ module Gem
   autoload :Platform, 'rubygems/platform'
   autoload :Builder, 'rubygems/builder'
   autoload :ConfigFile, 'rubygems/config_file'
+
+  class << self
+    extend Deprecate
+    # Can't do this one until I add Specification#activate
+    # deprecate :activate,          "Specification#activate", 2011, 10
+    deprecate :all_load_paths,    :none,                    2011, 10
+    deprecate :latest_load_paths, :none,                    2011, 10
+    deprecate :promote_load_path, :none,                    2011, 10
+    deprecate :cache,             "Gem::source_index",      2011, 8
+  end
 end
 
 module Kernel

data/lib/rubygems/command.rb

@@ -404,10 +404,12 @@ class Gem::Command
       end
     end
 
-    @parser.separator nil
-    @parser.separator "  Summary:"
-    wrap(@summary, 80 - 4).split("\n").each do |line|
-      @parser.separator "    #{line.strip}"
+    if @summary then
+      @parser.separator nil
+      @parser.separator "  Summary:"
+      wrap(@summary, 80 - 4).split("\n").each do |line|
+        @parser.separator "    #{line.strip}"
+      end
     end
 
     if description then

data/lib/rubygems/commands/contents_command.rb

@@ -58,7 +58,7 @@ class Gem::Commands::ContentsCommand < Gem::Command
                   "specified path"
                 end
 
-    si = Gem::SourceIndex.from_gems_in(*spec_dirs)
+    si = Gem::SourceIndex.new spec_dirs
 
     gem_names = if options[:all] then
                   si.map { |_, spec| spec.name }
@@ -67,9 +67,9 @@ class Gem::Commands::ContentsCommand < Gem::Command
                 end
 
     gem_names.each do |name|
-      gem_spec = si.find_name(name, version).last
+      spec = si.find_name(name, version).last
 
-      unless gem_spec then
+      unless spec then
         say "Unable to find gem '#{name}' in #{path_kind}"
 
         if Gem.configuration.verbose then
@@ -80,16 +80,19 @@ class Gem::Commands::ContentsCommand < Gem::Command
         terminate_interaction 1 if gem_names.length == 1
       end
 
-      files = options[:lib_only] ? gem_spec.lib_files : gem_spec.files
+      gem_path = spec.full_gem_path
+      extra    = "/{#{spec.require_paths.join ','}}" if options[:lib_only]
+      glob     = "#{gem_path}#{extra}/**/*"
+      files    = Dir[glob]
 
-      files.each do |f|
-        path = if options[:prefix] then
-                 File.join gem_spec.full_gem_path, f
-               else
-                 f
-               end
+      gem_path = File.join gem_path, '' # add trailing / if missing
 
-        say path
+      files.sort.each do |file|
+        next if File.directory? file
+
+        file = file.sub gem_path, '' unless options[:prefix]
+
+        say file
       end
     end
   end