rubygems-update 2.1.0.rc.1 → 2.1.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9e359df25a77bb8a4f3dd815bb9e0eb8818b51b
-  data.tar.gz: 28c30aed29afd6a35066c34cbcd5e14e7a8caea3
+  metadata.gz: 7da132d518c17a925f7ab5d00e1017bd8cce49d4
+  data.tar.gz: ee8eb91dc1ea06f0784dc4924a2563d109ce0138
 SHA512:
-  metadata.gz: 25d3b5b2271e8f99690a3dd3fe3162de304c57fd735974f82f471bafab1a8e8981679223c862b7a18e79f8fd66f94584a7aff00f72020ba8799422a67c975766
-  data.tar.gz: a17143f3404896f47f4edab1684eb5ff03e51c1419e24a1b6354122fa679f1928f169e4dafb9a40adac057ebb83b6eab12f0fc209614ae1d49f3ee42acd72f50
+  metadata.gz: 66a6e4769192f4c73ea72e465228dfee2e3145c0bcb836398a093deb621bf7be0650ca6ca9ac4d1146887997b179aac891a007017dea8749276ae8bafc5b19b8
+  data.tar.gz: ae9cc7d9106c3d141b2ea1100d279f1f94b05cdd4e817dc8e22795415df9b67a8a504b0d410232b9c4ad8bc0928e3cbed8afdc41cbf0e6c76e9479ea27a1ff0c

data/History.txt

@@ -1,6 +1,6 @@
 # coding: UTF-8
 
-=== 2.1.0.rc.1
+=== 2.1.0.rc.2
 
 Major enhancements:
 
@@ -83,8 +83,16 @@ Minor enhancements:
 Bug fixes:
 
 * rubygems_plugin.rb files are now only loaded from the latest installed gem.
-* Altered use of cryptography in the test suite to work on JRuby, but some
-  tests still fail on JRuby.  Bug #606 by Hemant Kumar.
+
+=== 2.0.7 / 2013-08-15
+
+* Extensions may now be built in parallel (therefore gems may be installed in
+  parallel).  Bug #607 by Hemant Kumar.
+* Changed broken link to RubyGems Bookshelf to point to RubyGems guides.  Ruby
+  pull request #369 by 謝致邦.
+* Fixed various test failures due to platform differences or poor tests.
+  Patches by Yui Naruse and Koichi Sasada.
+* Fixed documentation for Kernel#require.
 
 === 2.0.6 / 2013-07-24
 

data/Manifest.txt

@@ -266,6 +266,7 @@ test/rubygems/test_gem_security_trust_dir.rb
 test/rubygems/test_gem_server.rb
 test/rubygems/test_gem_silent_ui.rb
 test/rubygems/test_gem_source.rb
+test/rubygems/test_gem_source_installed.rb
 test/rubygems/test_gem_source_list.rb
 test/rubygems/test_gem_source_local.rb
 test/rubygems/test_gem_source_specific_file.rb

data/Rakefile

@@ -25,7 +25,6 @@ Hoe.plugin :git
 Hoe.plugin :travis
 
 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'
@@ -60,31 +59,36 @@ hoe = Hoe.spec 'rubygems-update' do
   self.extra_rdoc_files = Dir["*.rdoc"]
 
   spec_extras['rdoc_options'] = proc do |rdoc_options|
-    rdoc_options << "--title=RubyGems #{self.version} Documentation"
+    rdoc_options << "--title=RubyGems Update Documentation"
   end
 
   self.rsync_args += " --no-p -O"
 
-  # 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']
+  spec_extras['require_paths'] = %w[hide_lib_for_update]
 end
 
 hoe.test_prelude = 'gem "minitest", "~> 4.0"'
 
-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"
+Rake::Task['docs'].clear
+Rake::Task['clobber_docs'].clear
+
+begin
+  require 'rdoc/task'
+
+  RDoc::Task.new :rdoc => 'docs', :clobber_rdoc => 'clobber_docs' do |doc|
+    doc.main   = hoe.readme_file
+    doc.title  = "RubyGems #{hoe.version} API Documentation"
+
+    rdoc_files = Rake::FileList.new %w[lib History.txt LICENSE.txt MIT.txt]
+    rdoc_files.add hoe.extra_rdoc_files
+
+    doc.rdoc_files = rdoc_files
+
+    doc.rdoc_dir = 'doc'
+  end
+rescue LoadError, RuntimeError # rake 10.1 on rdoc from ruby 1.9.2 and earlier
+  task 'docs' do
+    abort 'You must install rdoc to build documentation, try `rake newb` again'
   end
 end
 

data/lib/rubygems.rb

@@ -8,7 +8,7 @@
 require 'rbconfig'
 
 module Gem
-  VERSION = '2.1.0.rc.1'
+  VERSION = '2.1.0.rc.2'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -36,9 +36,9 @@ require 'rubygems/errors'
 #
 # Further RubyGems documentation can be found at:
 #
+# * {RubyGems Guides}[http://guides.rubygems.org]
 # * {RubyGems API}[http://rubygems.rubyforge.org/rdoc] (also available from
 #   <tt>gem server</tt>)
-# * {RubyGems Bookshelf}[http://rubygem.org]
 #
 # == RubyGems Plugins
 #
@@ -1048,16 +1048,14 @@ module Gem
     #
 
     def register_default_spec(spec)
-      new_format, prefix_pattern = nil
+      new_format = Gem.default_gems_use_full_paths? || spec.require_paths.any? {|path| spec.files.any? {|f| f.start_with? path } }
 
-      spec.files.each do |file|
-        if new_format == nil
-          new_format = spec.require_paths.any? {|path| file.start_with? path}
-
-          prefix_group = spec.require_paths.map {|f| f + "/"}.join("|")
-          prefix_pattern = /^(#{prefix_group})/
-        end
+      if new_format
+        prefix_group = spec.require_paths.map {|f| f + "/"}.join("|")
+        prefix_pattern = /^(#{prefix_group})/
+      end
 
+      spec.files.each do |file|
         if new_format
           file = file.sub(prefix_pattern, "")
           next unless $~

data/lib/rubygems/basic_specification.rb

@@ -1,139 +1,143 @@
-module Gem
-  # BasicSpecification is an abstract class which implements some common code used by
-  # both Specification and StubSpecification.
-  class BasicSpecification
-    def self.default_specifications_dir
-      File.join(Gem.default_dir, "specifications", "default")
-    end
+##
+# BasicSpecification is an abstract class which implements some common code
+# used by both Specification and StubSpecification.
 
-    ##
-    # Name of the gem
+class Gem::BasicSpecification
 
-    def name
-      raise NotImplementedError
-    end
+  ##
+  # The path this gemspec was loaded from.  This attribute is not persisted.
 
-    ##
-    # Version of the gem
+  attr_reader :loaded_from
 
-    def version
-      raise NotImplementedError
-    end
+  def self.default_specifications_dir
+    File.join(Gem.default_dir, "specifications", "default")
+  end
 
-    ##
-    # Platform of the gem
+  ##
+  # True when the gem has been activated
 
-    def platform
-      raise NotImplementedError
-    end
+  def activated?
+    raise NotImplementedError
+  end
 
-    ##
-    # Require paths of the gem
+  ##
+  # Returns the full path to the base gem directory.
+  #
+  # eg: /usr/local/lib/ruby/gems/1.8
+
+  def base_dir
+    return Gem.dir unless loaded_from
+    @base_dir ||= if default_gem? then
+                    File.dirname File.dirname File.dirname loaded_from
+                  else
+                    File.dirname File.dirname loaded_from
+                  end
+  end
 
-    def require_paths
-      raise NotImplementedError
-    end
+  ##
+  # Return true if this spec can require +file+.
 
-    ##
-    # True when the gem has been activated
+  def contains_requirable_file? file
+    root     = full_gem_path
+    suffixes = Gem.suffixes
 
-    def activated?
-      raise NotImplementedError
+    require_paths.any? do |lib|
+      base = "#{root}/#{lib}/#{file}"
+      suffixes.any? { |suf| File.file? "#{base}#{suf}" }
     end
+  end
 
-    ##
-    # Return a Gem::Specification from this gem
+  def default_gem?
+    loaded_from &&
+      File.dirname(loaded_from) == self.class.default_specifications_dir
+  end
 
-    def to_spec
-      raise NotImplementedError
-    end
+  def find_full_gem_path # :nodoc:
+    # TODO: also, shouldn't it default to full_name if it hasn't been written?
+    path = File.expand_path File.join(gems_dir, full_name)
+    path.untaint
+    path if File.directory? path
+  end
+
+  private :find_full_gem_path
 
-    ##
-    # The filename of the gem specification
-    attr_reader :filename
+  ##
+  # The full path to the gem (install path + full name).
 
-    ##
-    # Set the filename of the Specification was loaded from. +path+ is converted
-    # to a String.
+  def full_gem_path
+    # TODO: This is a heavily used method by gems, so we'll need
+    # to aleast just alias it to #gem_dir rather than remove it.
+    @full_gem_path ||= find_full_gem_path
+  end
 
-    def filename= path
-      @filename      = path && path.to_s
+  ##
+  # Returns the full name (name-version) of this Gem.  Platform information
+  # is included (name-version-platform) if it is specified and not the
+  # default Ruby platform.
 
-      @full_gem_path = nil
-      @gems_dir      = nil
-      @base_dir      = nil
+  def full_name
+    if platform == Gem::Platform::RUBY or platform.nil? then
+      "#{name}-#{version}".untaint
+    else
+      "#{name}-#{version}-#{platform}".untaint
     end
+  end
 
-    ##
-    # Return true if this spec can require +file+.
+  ##
+  # Returns the full path to the gems directory containing this spec's
+  # gem directory. eg: /usr/local/lib/ruby/1.8/gems
 
-    def contains_requirable_file? file
-      root     = full_gem_path
-      suffixes = Gem.suffixes
+  def gems_dir
+    # TODO: this logic seems terribly broken, but tests fail if just base_dir
+    @gems_dir ||= File.join(loaded_from && base_dir || Gem.dir, "gems")
+  end
 
-      require_paths.any? do |lib|
-        base = "#{root}/#{lib}/#{file}"
-        suffixes.any? { |suf| File.file? "#{base}#{suf}" }
-      end
-    end
+  ##
+  # Set the path the Specification was loaded from. +path+ is converted to a
+  # String.
 
-    ##
-    # The full path to the gem (install path + full name).
+  def loaded_from= path
+    @loaded_from   = path && path.to_s
 
-    def full_gem_path
-      # TODO: This is a heavily used method by gems, so we'll need
-      # to aleast just alias it to #gem_dir rather than remove it.
-      @full_gem_path ||= find_full_gem_path
-    end
+    @full_gem_path = nil
+    @gems_dir      = nil
+    @base_dir      = nil
+  end
 
-    # :nodoc:
-    def find_full_gem_path
-      # TODO: also, shouldn't it default to full_name if it hasn't been written?
-      path = File.expand_path File.join(gems_dir, full_name)
-      path.untaint
-      path if File.directory? path
-    end
-    private :find_full_gem_path
+  ##
+  # Name of the gem
 
-    ##
-    # Returns the full path to the gems directory containing this spec's
-    # gem directory. eg: /usr/local/lib/ruby/1.8/gems
+  def name
+    raise NotImplementedError
+  end
 
-    def gems_dir
-      # TODO: this logic seems terribly broken, but tests fail if just base_dir
-      @gems_dir ||= File.join(filename && base_dir || Gem.dir, "gems")
-    end
+  ##
+  # Platform of the gem
 
-    ##
-    # Returns the full path to the base gem directory.
-    #
-    # eg: /usr/local/lib/ruby/gems/1.8
-
-    def base_dir
-      return Gem.dir unless filename
-      @base_dir ||= if default_gem? then
-                      File.dirname File.dirname File.dirname filename
-                    else
-                      File.dirname File.dirname filename
-                    end
-    end
+  def platform
+    raise NotImplementedError
+  end
 
-    def default_gem?
-      filename &&
-        File.dirname(filename) == self.class.default_specifications_dir
-    end
+  ##
+  # Require paths of the gem
 
-    ##
-    # Returns the full name (name-version) of this Gem.  Platform information
-    # is included (name-version-platform) if it is specified and not the
-    # default Ruby platform.
-
-    def full_name
-      if platform == Gem::Platform::RUBY or platform.nil? then
-        "#{name}-#{version}".untaint
-      else
-        "#{name}-#{version}-#{platform}".untaint
-      end
-    end
+  def require_paths
+    raise NotImplementedError
   end
+
+  ##
+  # Return a Gem::Specification from this gem
+
+  def to_spec
+    raise NotImplementedError
+  end
+
+  ##
+  # Version of the gem
+
+  def version
+    raise NotImplementedError
+  end
+
 end
+

data/lib/rubygems/commands/build_command.rb

@@ -15,6 +15,25 @@ class Gem::Commands::BuildCommand < Gem::Command
     "GEMSPEC_FILE  gemspec file name to build a gem for"
   end
 
+  def description # :nodoc:
+    <<-EOF
+The build command allows you to create a gem from a ruby gemspec.
+
+The best way to build a gem is to use a Rakefile and the Gem::PackageTask
+which ships with RubyGems.
+
+The gemspec can either be created by hand or extracted from an existing gem
+with gem spec:
+
+  $ gem unpack my_gem-1.0.gem
+  Unpacked gem: '.../my_gem-1.0'
+  $ gem spec my_gem-1.0.gem --ruby > my_gem-1.0/my_gem-1.0.gemspec
+  $ cd my_gem-1.0
+  [edit gem contents]
+  $ gem build my_gem-1.0.gemspec
+    EOF
+  end
+
   def usage # :nodoc:
     "#{program_name} GEMSPEC_FILE"
   end

data/lib/rubygems/commands/check_command.rb

@@ -79,6 +79,13 @@ class Gem::Commands::CheckCommand < Gem::Command
     '--gems --alien'
   end
 
+  def description # :nodoc:
+    <<-EOF
+The check command can list and repair problems with installed gems and
+specifications and will clean up gems that have been partially uninstalled.
+    EOF
+  end
+
   def usage # :nodoc:
     "#{program_name} [OPTIONS] [GEMNAME ...]"
   end