rubygems-update 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8accd7d64c97aa50aa3253effdfbf4e1e924420
-  data.tar.gz: 5ca2df4735051087a01115efd57dc61559d95b83
+  metadata.gz: d252b22411a732dda23b05c5127a9748c60875e1
+  data.tar.gz: a97c4c16f3c1501d40dca2649eed2f84f4e81b02
 SHA512:
-  metadata.gz: 3c0a14022146e9a2cc3fc93f7ae88d02d1637015ee8f55d50a8729b388b27945a7589e96a958f45f9a1dc343b339038dea611e38fa2bcb03753248f454261f0f
-  data.tar.gz: 131314e79378e98650097f46024c2da655abf63dbffccc6ab6d932dce1e6e49ab690f2021e6f2cd53ba87276ca0ba17234881fe6fa6f1f27158036f4d656620b
+  metadata.gz: 0050121aa08473845edf6930f719201d3d9fca03c206c5d22f48c900c2e13d260f7c06d8853de17365357e6b2bef0d8360b71bd96df11cb592b7de12ec17cf8a
+  data.tar.gz: 538dcbc95cb5f02f70dcd6b8b3907f60cf1f813969ca84ccd38d331e41240eb86d4ac0ef471f78639ac90f01c1a5cf388816e876a130766eec5634dcd5aceebe

data/CONTRIBUTING

@@ -8,8 +8,10 @@ contributors to follow to reduce the time it takes to get changes merged in.
 
 1. New features should be coupled with tests.
 
-2. Ensure that your code blends well with ours (eg, no trailing whitespace,
-   match indentation and coding style).
+2. Ensure that your code blends well with ours:
+   * No trailing whitespace
+   * Match indentation (two spaces)
+   * Match coding style (`if`, `elsif`, `when` need trailing `then`)
 
 3. Don't modify the history file or version number.
 
@@ -18,3 +20,13 @@ contributors to follow to reduce the time it takes to get changes merged in.
 
 For more information and ideas on how to contribute to RubyGems ecosystem, see
 here: http://guides.rubygems.org/contributing/
+
+== Getting Started
+
+Run:
+
+    $ gem install hoe
+    $ rake newb
+
+After `rake newb` finishes you can run `rake` to run the tests.
+

data/History.txt

@@ -1,5 +1,68 @@
 # coding: UTF-8
 
+=== 2.4.0 / 2014-07-16
+
+Minor enhancements:
+
+* The contents command now supports a --show-install-dir option that shows
+  only the directory the gem is installed in.  Feature request #966 by Akinori
+  MUSHA.
+* Added a --build-root option to the install command for packagers.  Pull
+  request #965 by Marcus Rückert.
+* Added vendor gem support to RubyGems.  Package managers may now install gems
+  in Gem.vendor_dir with the --vendor option to gem install.  Issue #943 by
+  Marcus Rückert.
+
+Bug fixes:
+
+* Kernel#gem now respects the prerelease flag when activating gems.
+  Previously this behavior was undefined which could lead to bugs when a
+  prerelease version was unintentionally activated.  Bug #938 by Joe Ferris.
+* RubyGems now prefers gems from git over installed gems.  This allows gems
+  from git to override an installed gem with the same name and version.  Bug
+  #944 by Thomas Kriechbaumer.
+* Fixed handling of git gems in a lockfile with unversioned dependencies.  Bug
+  #940 by Michael Kaiser-Nyman.
+* The ruby directive in a gem dependencies file is ignored when installing.
+  Bug #941 by Michael Kaiser-Nyman.
+* Added open to list of builtin commands (`gem open` now works).  Reported by
+  Espen Antonsen.
+* `gem open` now works with command-line editors.  Pull request #962 by Tim
+  Pope.
+* `gem install -g` now respects `--conservative`.  Pull request #950 by Jeremy
+  Evans.
+* RubyGems releases announcements now now include checksums.  Bug #939 by
+  Alexander E. Fischer.
+* RubyGems now expands ~ in $PATH when checking if installed executables will
+  be runnable.  Pull request #945 by Alex Talker.
+* Fixed `gem install -g --explain`.  Issue #947 by Luis Lavena.  Patch by
+  Hsing-Hui Hsu.
+* RubyGems locks less during gem activation.  Pull request #951 by Aaron
+  Patterson and Justin Searls, #969 by Jeremy Tryba.
+* Kernel#gem is now thread-safe.  Pull request #967 by Aaron Patterson.
+* RubyGems now handles spaces in directory names for some parts of extension
+  building.  Pull request #949 by Tristan Hill.
+* RubyGems no longer defines an empty Date class.  Pull Request #948 by Benoit
+  Daloze.
+* RubyGems respects --document options for `gem update` again.  Bug 946 by
+  jonforums.  Patch by Hsing-Hui Hsu.
+* RubyGems generates documentation again with --ignore-dependencies.  Bug #961
+  by Pulfer.
+* RubyGems can install extensions across partitions now.  Pull request #970 by
+  Michael Scherer.
+* `-s` is now short for `--source` which resolves an ambiguity with
+  --no-suggestions.  Pull request #955 by Alexander Kahn.
+* Added extra test for ~> for 0.0.X versions.  Pull request #958 by Mark
+  Lorenz.
+* Fixed typo in gem updated help.  Pull request #952 by Per Modin.
+* Clarified that the gem description should not be excessively long.  Part of
+  bug #956 by Renier Morales.
+* Hid documentation of outdated test_files related methods in Specification.
+  Guides issue #90 by Emil Soman.
+* RubyGems now falls back to the old index if the rubygems.org API fails
+  during gem resolution.
+
+
 === 2.3.0 / 2014-06-10
 
 Minor enhancements:

data/Rakefile

@@ -67,6 +67,8 @@ hoe = Hoe.spec 'rubygems-update' do
   spec_extras['require_paths'] = %w[hide_lib_for_update]
 end
 
+v = hoe.version
+
 hoe.test_prelude = 'gem "minitest", "~> 4.0"'
 
 Rake::Task['docs'].clear
@@ -77,7 +79,7 @@ begin
 
   RDoc::Task.new :rdoc => 'docs', :clobber_rdoc => 'clobber_docs' do |doc|
     doc.main   = hoe.readme_file
-    doc.title  = "RubyGems #{hoe.version} API Documentation"
+    doc.title  = "RubyGems #{v} API Documentation"
 
     rdoc_files = Rake::FileList.new %w[lib History.txt LICENSE.txt MIT.txt]
     rdoc_files.add hoe.extra_rdoc_files
@@ -104,18 +106,49 @@ task :prerelease => [:clobber, :check_manifest, :test]
 
 task :postrelease => %w[upload guides:publish blog:publish publish_docs]
 
-pkg_dir_path = "pkg/rubygems-update-#{hoe.version}"
-task :package do
-  mv pkg_dir_path, "pkg/rubygems-#{hoe.version}"
-  Dir.chdir 'pkg' do
-    sh "tar -czf rubygems-#{hoe.version}.tgz rubygems-#{hoe.version}"
-    sh "zip -q -r rubygems-#{hoe.version}.zip rubygems-#{hoe.version}"
+file "pkg/rubygems-#{v}" => "pkg/rubygems-update-#{v}" do |t|
+  require 'find'
+
+  dest_root = File.expand_path t.name
+
+  cd t.source do
+    Find.find '.' do |file|
+      dest = File.expand_path file, dest_root
+
+      if File.directory? file then
+        mkdir_p dest
+      else
+        rm_f dest
+        safe_ln file, dest
+      end
+    end
+  end
+end
+
+source_pkg_dir = "pkg/rubygems-#{v}"
+
+file "pkg/rubygems-#{v}.tgz" => source_pkg_dir do
+  cd 'pkg' do
+    sh "tar -czf rubygems-#{v}.tgz rubygems-#{v}"
   end
 end
 
+file "pkg/rubygems-#{v}.zip" => source_pkg_dir do
+  cd 'pkg' do
+    sh "zip -q -r rubygems-#{v}.zip rubygems-#{v}"
+  end
+end
+
+file "pkg/rubygems-update-#{v}.gem"
+
+task :package => %W[
+       pkg/rubygems-update-#{v}.gem
+       pkg/rubygems-#{v}.tgz
+       pkg/rubygems-#{v}.zip
+     ]
+
 desc "Upload release to gemcutter S3"
 task :upload_to_gemcutter do
-  v = hoe.version
   sh "s3cmd put -P pkg/rubygems-update-#{v}.gem pkg/rubygems-#{v}.zip pkg/rubygems-#{v}.tgz s3://production.s3.rubygems.org/rubygems/"
 end
 
@@ -155,7 +188,7 @@ namespace 'guides' do
         sh 'git', 'diff', '--quiet'
       rescue
         sh 'git', 'commit', 'command-reference.md', 'specification-reference.md',
-           '-m', "Rebuild for RubyGems #{hoe.version}"
+           '-m', "Rebuild for RubyGems #{v}"
       end
     end
   end
@@ -185,7 +218,24 @@ end
 
 namespace 'blog' do
   date = Time.now.strftime '%Y-%m-%d'
-  post_page = "_posts/#{date}-#{hoe.version}-released.md"
+  post_page = "_posts/#{date}-#{v}-released.md"
+  checksums = ''
+
+  task 'checksums' => 'package' do
+    require 'digest'
+    Dir['pkg/*{tgz,zip,gem}'].map do |file|
+      digest = Digest::SHA256.new
+
+      open file, 'rb' do |io|
+        while chunk = io.read(65536) do
+          digest.update chunk
+        end
+      end
+
+      checksums << "* #{File.basename(file)}  \n"
+      checksums << "  #{digest.hexdigest}\n"
+    end
+  end
 
   task 'pull' => %w[../blog.rubygems.org] do
     chdir '../blog.rubygems.org' do
@@ -197,7 +247,7 @@ namespace 'blog' do
 
   task 'update' => [path]
 
-  file path do
+  file path => 'checksums' do
     name  = `git config --get user.name`.strip
     email = `git config --get user.email`.strip
 
@@ -251,13 +301,13 @@ namespace 'blog' do
     Tempfile.open 'blog_post' do |io|
       io.write <<-ANNOUNCEMENT
 ---
-title: #{hoe.version} Released
+title: #{v} Released
 layout: post
 author: #{name}
 author_email: #{email}
 ---
 
-RubyGems #{hoe.version} includes #{change_types}.
+RubyGems #{v} includes #{change_types}.
 
 To update to the latest RubyGems you can run:
 
@@ -269,6 +319,10 @@ RubyGems][upgrading] instructions.  To install RubyGems by hand see the
 
 #{change_log}
 
+SHA256 Checksums:
+
+#{checksums}
+
 [download]: http://rubygems.org/pages/download
 [upgrading]: http://rubygems.rubyforge.org/rubygems-update/UPGRADING_rdoc.html
 
@@ -286,7 +340,7 @@ RubyGems][upgrading] instructions.  To install RubyGems by hand see the
     chdir '../blog.rubygems.org' do
       sh 'git', 'add', post_page
       sh 'git', 'commit', post_page,
-         '-m', "Added #{hoe.version} release announcement"
+         '-m', "Added #{v} release announcement"
     end
   end
 
@@ -365,83 +419,6 @@ task :diff_rubinius do
   diff_with rubinius_dir
 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
-
 desc "Cleanup trailing whitespace"
 task :whitespace do
   system 'find . -not \( -name .svn -prune -o -name .git -prune \) -type f -print0 | xargs -0 sed -i "" -E "s/[[:space:]]*$//"'

data/lib/rubygems.rb

@@ -6,9 +6,10 @@
 #++
 
 require 'rbconfig'
+require 'thread'
 
 module Gem
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end
 
 # Must be first since it unloads the prelude from 1.9.2
@@ -156,6 +157,7 @@ module Gem
 
   @configuration = nil
   @loaded_specs = {}
+  LOADED_SPECS_MUTEX = Mutex.new
   @path_to_default_spec_map = {}
   @platforms = []
   @ruby = nil
@@ -544,9 +546,9 @@ module Gem
   #   Fetching: minitest-3.0.1.gem (100%)
   #   => [#<Gem::Specification:0x1013b4528 @name="minitest", ...>]
 
-  def self.install name, version = Gem::Requirement.default
+  def self.install name, version = Gem::Requirement.default, *options
     require "rubygems/dependency_installer"
-    inst = Gem::DependencyInstaller.new
+    inst = Gem::DependencyInstaller.new(*options)
     inst.install name, version
     inst.installed_gems
   end

data/lib/rubygems/command_manager.rb

@@ -48,6 +48,7 @@ class Gem::CommandManager
     :list,
     :lock,
     :mirror,
+    :open,
     :outdated,
     :owner,
     :pristine,

data/lib/rubygems/commands/contents_command.rb

@@ -8,7 +8,8 @@ class Gem::Commands::ContentsCommand < Gem::Command
 
   def initialize
     super 'contents', 'Display the contents of the installed gems',
-          :specdirs => [], :lib_only => false, :prefix => true
+          :specdirs => [], :lib_only => false, :prefix => true,
+          :show_install_dir => false
 
     add_version_option
 
@@ -32,6 +33,11 @@ class Gem::Commands::ContentsCommand < Gem::Command
       options[:prefix] = prefix
     end
 
+    add_option(      '--[no-]show-install-dir',
+               'Show only the gem install dir') do |show, options|
+      options[:show_install_dir] = show
+    end
+
     @path_kind = nil
     @spec_dirs = nil
     @version   = nil
@@ -65,7 +71,12 @@ prefix or only the files that are requireable.
     names = gem_names
 
     names.each do |name|
-      found = gem_contents name
+      found =
+        if options[:show_install_dir] then
+          gem_install_dir name
+        else
+          gem_contents name
+        end
 
       terminate_interaction 1 unless found or names.length > 1
     end
@@ -115,6 +126,16 @@ prefix or only the files that are requireable.
     true
   end
 
+  def gem_install_dir name
+    spec = spec_for name
+
+    return false unless spec
+
+    say spec.gem_dir
+
+    true
+  end
+
   def gem_names # :nodoc:
     if options[:all] then
       Gem::Specification.map(&:name)

data/lib/rubygems/commands/install_command.rb

@@ -278,6 +278,14 @@ to write the specification by hand.  For example:
     inst = Gem::Installer.new gem, options
     inst.install
 
+    require 'rubygems/dependency_installer'
+    dinst = Gem::DependencyInstaller.new options
+    dinst.installed_gems.replace [inst.spec]
+
+    Gem.done_installing_hooks.each do |hook|
+      hook.call dinst, [inst.spec]
+    end unless Gem.done_installing_hooks.empty?
+
     @installed_specs.push(inst.spec)
   end