rake 11.1.2 → 11.2.0

data/Rakefile

@@ -6,77 +6,24 @@
 # This file may be distributed under an MIT style license.  See
 # MIT-LICENSE for details.
 
-require 'rbconfig'
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
-system_rake = File.join RbConfig::CONFIG['rubylibdir'], 'rake.rb'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'rdoc/task'
 
-# Use our rake, not the installed rake from system
-if $".include? system_rake or $".grep(/rake\/name_space\.rb$/).empty? then
-  exec Gem.ruby, '-Ilib', 'bin/rake', *ARGV
+Rake::TestTask.new(:test) do |t|
+  t.libs << "test"
+  t.verbose = true
+  t.test_files = FileList['test/**/test_*.rb']
 end
 
-require 'hoe'
-
-Hoe.plugin :git
-Hoe.plugin :travis
-Hoe.plugin :gemspec
-
-hoe = Hoe.spec 'rake' do
-  developer 'Hiroshi SHIBATA', 'hsbt@ruby-lang.org'
-  developer 'Eric Hodel', 'drbrain@segment7.net'
-  developer 'Jim Weirich', ''
-
-  require_ruby_version     '>= 1.9.3'
-  require_rubygems_version '>= 1.3.2'
-
-  dependency 'minitest', '~> 5.0', :developer
-
-  license "MIT"
-
-  self.readme_file  = 'README.rdoc'
-  self.history_file = 'History.rdoc'
-
-  self.extra_rdoc_files.concat FileList[
-    'MIT-LICENSE',
-    'doc/**/*.rdoc',
-    '*.rdoc',
-  ]
-
-  self.local_rdoc_dir = 'html'
-  self.rsync_args = '-avz --delete'
-  rdoc_locations << 'docs.seattlerb.org:/data/www/docs.seattlerb.org/rake/'
-
-  self.clean_globs += [
-    '**/*.o',
-    '**/*.rbc',
-    '*.dot',
-    'TAGS',
-    'doc/example/main',
-  ]
+RDoc::Task.new do |doc|
+  doc.main   = 'README.rdoc'
+  doc.title  = 'Rake -- Ruby Make'
+  doc.rdoc_files = FileList.new %w[lib MIT-LICENSE doc/**/*.rdoc *.rdoc]
+  doc.rdoc_dir = 'html'
 end
 
-hoe.testlib = :minitest
-hoe.test_prelude = 'gem "minitest", "~> 5.0"'
-
-# Use custom rdoc task due to existence of doc directory
-
-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  = 'Rake -- Ruby Make'
-
-    rdoc_files = Rake::FileList.new %w[lib History.rdoc MIT-LICENSE doc]
-    rdoc_files.add hoe.extra_rdoc_files
-
-    doc.rdoc_files = rdoc_files
-
-    doc.rdoc_dir = 'html'
-  end
-rescue LoadError
-  warn 'run `rake newb` to install rdoc'
-end
+task :default => :test

data/appveyor.yml

@@ -0,0 +1,24 @@
+---
+version: "{build}"
+clone_depth: 10
+install:
+  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
+  - ruby --version
+  - gem update --system
+  - gem --version
+  - gem install minitest --no-document
+build_script:
+  - net user
+  - net localgroup
+test_script:
+  - ruby -Ilib exe/rake
+
+environment:
+  matrix:
+    - ruby_version: "193"
+    - ruby_version: "200"
+    - ruby_version: "200-x64"
+    - ruby_version: "21"
+    - ruby_version: "21-x64"
+    - ruby_version: "22"
+    - ruby_version: "22-x64"

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "rake"
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/doc/release_notes/README.md

@@ -0,0 +1,4 @@
+# Note: this release notes will never been updated
+
+The maintenance policy for release notes has been changed.
+Please see [History.rdoc](https://github.com/ruby/rake/blob/master/History.rdoc).

data/{bin → exe}/rake

@@ -22,12 +22,6 @@
 # IN THE SOFTWARE.
 #++
 
-begin
-  require 'rubygems'
-  gem 'rake'
-rescue LoadError
-end
-
 require 'rake'
 
 Rake.application.run

data/lib/rake.rb

@@ -20,9 +20,7 @@
 # IN THE SOFTWARE.
 #++
 
-module Rake
-  VERSION = '11.1.2'
-end
+module Rake; end
 
 require 'rake/version'
 

data/lib/rake/application.rb

@@ -1,4 +1,3 @@
-require 'shellwords'
 require 'optparse'
 
 require 'rake/task_manager'
@@ -35,6 +34,9 @@ module Rake
     # List of the top level task names (task names from the command line).
     attr_reader :top_level_tasks
 
+    # Override the detected TTY output state (mostly for testing)
+    attr_writer :tty_output
+
     DEFAULT_RAKEFILES = [
       'rakefile',
       'Rakefile',
@@ -269,11 +271,6 @@ module Rake
       @tty_output
     end
 
-    # Override the detected TTY output state (mostly for testing)
-    def tty_output=(tty_output_state) # :nodoc:
-      @tty_output = tty_output_state
-    end
-
     # We will truncate output if we are outputting to a TTY or if we've been
     # given an explicit column width to honor
     def truncate_output? # :nodoc:

data/lib/rake/cpu_counter.rb

@@ -35,23 +35,17 @@ unless Rake::CpuCounter.method_defined?(:count)
         count_via_java_runtime
       else
         case RbConfig::CONFIG['host_os']
-        when /darwin9/
-          count_via_hwprefs_cpu_count
-        when /darwin/
-          count_via_hwprefs_thread_count || count_via_sysctl
         when /linux/
           count_via_cpuinfo
-        when /bsd/
+        when /darwin|bsd/
           count_via_sysctl
         when /mswin|mingw/
           count_via_win32
         else
           # Try everything
           count_via_win32 ||
-            count_via_sysctl ||
-            count_via_hwprefs_thread_count ||
-            count_via_hwprefs_cpu_count ||
-            count_via_cpuinfo
+          count_via_sysctl ||
+          count_via_cpuinfo
         end
       end
     end
@@ -77,14 +71,6 @@ unless Rake::CpuCounter.method_defined?(:count)
       nil
     end
 
-    def count_via_hwprefs_thread_count
-      run 'hwprefs', 'thread_count'
-    end
-
-    def count_via_hwprefs_cpu_count
-      run 'hwprefs', 'cpu_count'
-    end
-
     def count_via_sysctl
       run 'sysctl', '-n', 'hw.ncpu'
     end

data/lib/rake/file_utils.rb

@@ -45,13 +45,15 @@ module FileUtils
   def sh(*cmd, &block)
     options = (Hash === cmd.last) ? cmd.pop : {}
     shell_runner = block_given? ? block : create_shell_runner(cmd)
+
     set_verbose_option(options)
-    options[:noop] ||= Rake::FileUtilsExt.nowrite_flag
-    Rake.rake_check_options options, :noop, :verbose
-    Rake.rake_output_message cmd.join(" ") if options[:verbose]
+    verbose = options.delete :verbose
+    noop    = options.delete(:noop) || Rake::FileUtilsExt.nowrite_flag
+
+    Rake.rake_output_message sh_show_command cmd if verbose
 
-    unless options[:noop]
-      res = system(*cmd)
+    unless noop
+      res = system(*cmd, options)
       status = $?
       status = Rake::PseudoStatus.new(1) if !res && status.nil?
       shell_runner.call(res, status)
@@ -59,8 +61,9 @@ module FileUtils
   end
 
   def create_shell_runner(cmd) # :nodoc:
-    show_command = cmd.join(" ")
+    show_command = sh_show_command cmd
     show_command = show_command[0, 42] + "..." unless $trace
+
     lambda do |ok, status|
       ok or
         fail "Command failed with status (#{status.exitstatus}): " +
@@ -69,6 +72,19 @@ module FileUtils
   end
   private :create_shell_runner
 
+  def sh_show_command(cmd) # :nodoc:
+    cmd = cmd.dup
+
+    if Hash === cmd.first
+      env = cmd.first
+      env = env.map { |name, value| "#{name}=#{value}" }.join " "
+      cmd[0] = env
+    end
+
+    cmd.join " "
+  end
+  private :sh_show_command
+
   def set_verbose_option(options) # :nodoc:
     unless options.key? :verbose
       options[:verbose] =

data/lib/rake/packagetask.rb

@@ -63,6 +63,9 @@ module Rake
     # is false).
     attr_accessor :need_tar_bz2
 
+    # True if a xz'd tar file (tar.xz) should be produced (default is false)
+    attr_accessor :need_tar_xz
+
     # True if a zip file should be produced (default is false)
     attr_accessor :need_zip
 
@@ -94,6 +97,7 @@ module Rake
       @need_tar = false
       @need_tar_gz = false
       @need_tar_bz2 = false
+      @need_tar_xz = false
       @need_zip = false
       @tar_command = 'tar'
       @zip_command = 'zip'
@@ -120,7 +124,8 @@ module Rake
       [
         [need_tar, tgz_file, "z"],
         [need_tar_gz, tar_gz_file, "z"],
-        [need_tar_bz2, tar_bz2_file, "j"]
+        [need_tar_bz2, tar_bz2_file, "j"],
+        [need_tar_xz, tar_xz_file, "J"]
       ].each do |(need, file, flag)|
         if need
           task :package => ["#{package_dir}/#{file}"]
@@ -189,6 +194,12 @@ module Rake
       "#{package_name}.tar.bz2"
     end
 
+    # The package name with .tar.xz added
+
+    def tar_xz_file
+      "#{package_name}.tar.xz"
+    end
+
     # The package name with .zip added
 
     def zip_file

data/lib/rake/rake_test_loader.rb

@@ -19,4 +19,3 @@ argv = ARGV.select do |argument|
 end
 
 ARGV.replace argv
-

data/lib/rake/rule_recursion_overflow_error.rb

@@ -1,4 +1,3 @@
-
 module Rake
 
   # Error indicating a recursion overflow error in task selection.

data/lib/rake/task.rb

@@ -304,10 +304,10 @@ module Rake
     private :transform_comments
 
     # Get the first sentence in a string. The sentence is terminated
-    # by the first period or the end of the line. Decimal points do
-    # not count as periods.
+    # by the first period, exclamation mark, or the end of the line.
+    # Decimal points do not count as periods.
     def first_sentence(string)
-      string.split(/\.[ \t]|\.$|\n/).first
+      string.split(/(?<=\w)(\.|!)[ \t]|(\.$|!)|\n/).first
     end
     private :first_sentence
 

data/lib/rake/task_arguments.rb

@@ -17,7 +17,8 @@ module Rake
       @hash = {}
       @values = values
       names.each_with_index { |name, i|
-        @hash[name.to_sym] = values[i] unless values[i].nil?
+        next if values[i].nil? || values[i] == ''
+        @hash[name.to_sym] = values[i]
       }
     end
 

data/lib/rake/testtask.rb

@@ -69,6 +69,9 @@ module Rake
     # Description of the test task. (default is 'Run tests')
     attr_accessor :description
 
+    # Task prerequisites.
+    attr_accessor :deps
+
     # Explicitly define the list of test files to be included in a
     # test.  +list+ is expected to be an array of file names (a
     # FileList is acceptable).  If both +pattern+ and +test_files+ are
@@ -89,6 +92,7 @@ module Rake
       @loader = :rake
       @ruby_opts = []
       @description = "Run tests" + (@name == :test ? "" : " for #{@name}")
+      @deps = []
       yield self if block_given?
       @pattern = 'test/test*.rb' if @pattern.nil? && @test_files.nil?
       define
@@ -97,7 +101,7 @@ module Rake
     # Create the tasks defined by this task lib.
     def define
       desc @description
-      task @name do
+      task @name => Array(deps) do
         FileUtilsExt.verbose(@verbose) do
           args =
             "#{ruby_opts_string} #{run_code} " +

data/lib/rake/thread_pool.rb

@@ -1,4 +1,3 @@
-require 'thread'
 require 'set'
 
 require 'rake/promise'

data/lib/rake/version.rb

@@ -1,4 +1,6 @@
 module Rake
+  VERSION = '11.2.0'
+
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split '.'
 

data/rake.gemspec

@@ -0,0 +1,30 @@
+# coding: utf-8
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'rake/version'
+
+Gem::Specification.new do |s|
+  s.name = "rake".freeze
+  s.version = Rake::VERSION
+  s.date = "2016-03-27"
+  s.authors = ["Hiroshi SHIBATA".freeze, "Eric Hodel".freeze, "Jim Weirich".freeze]
+  s.email = ["hsbt@ruby-lang.org".freeze, "drbrain@segment7.net".freeze, "".freeze]
+
+  s.summary = "Rake is a Make-like program implemented in Ruby".freeze
+  s.description = "Rake is a Make-like program implemented in Ruby. Tasks and dependencies are\nspecified in standard Ruby syntax.\n\nRake has the following features:\n\n* Rakefiles (rake's version of Makefiles) are completely defined in\n  standard Ruby syntax.  No XML files to edit.  No quirky Makefile\n  syntax to worry about (is that a tab or a space?)\n\n* Users can specify tasks with prerequisites.\n\n* Rake supports rule patterns to synthesize implicit tasks.\n\n* Flexible FileLists that act like arrays but know about manipulating\n  file names and paths.\n\n* A library of prepackaged tasks to make building rakefiles easier. For example,\n  tasks for building tarballs and publishing to FTP or SSH sites.  (Formerly\n  tasks for building RDoc and Gems were included in rake but they're now\n  available in RDoc and RubyGems respectively.)\n\n* Supports parallel execution of tasks.".freeze
+  s.homepage = "https://github.com/ruby/rake".freeze
+  s.licenses = ["MIT".freeze]
+
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.bindir = "exe"
+  s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  s.require_paths = ["lib".freeze]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3".freeze)
+  s.rubygems_version = "2.6.1".freeze
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.2".freeze)
+  s.rdoc_options = ["--main".freeze, "README.rdoc".freeze]
+
+  s.add_development_dependency(%q<bundler>.freeze, ["~> 1.11"])
+  s.add_development_dependency(%q<minitest>.freeze, ["~> 5.8"])
+  s.add_development_dependency(%q<rdoc>.freeze, ["~> 4.0"])
+end

metadata

@@ -1,59 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 11.1.2
+  version: 11.2.0
 platform: ruby
 authors:
 - Hiroshi SHIBATA
 - Eric Hodel
 - Jim Weirich
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
 date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
-  name: hoe
+  name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.15'
+        version: '4.0'
 description: |-
   Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
   specified in standard Ruby syntax.
@@ -84,58 +84,20 @@ email:
 executables:
 - rake
 extensions: []
-extra_rdoc_files:
-- CONTRIBUTING.rdoc
-- History.rdoc
-- Manifest.txt
-- README.rdoc
-- doc/command_line_usage.rdoc
-- doc/glossary.rdoc
-- doc/proto_rake.rdoc
-- doc/rakefile.rdoc
-- doc/rational.rdoc
-- doc/release_notes/rake-0.4.14.rdoc
-- doc/release_notes/rake-0.4.15.rdoc
-- doc/release_notes/rake-0.5.0.rdoc
-- doc/release_notes/rake-0.5.3.rdoc
-- doc/release_notes/rake-0.5.4.rdoc
-- doc/release_notes/rake-0.6.0.rdoc
-- doc/release_notes/rake-0.7.0.rdoc
-- doc/release_notes/rake-0.7.1.rdoc
-- doc/release_notes/rake-0.7.2.rdoc
-- doc/release_notes/rake-0.7.3.rdoc
-- doc/release_notes/rake-0.8.0.rdoc
-- doc/release_notes/rake-0.8.2.rdoc
-- doc/release_notes/rake-0.8.3.rdoc
-- doc/release_notes/rake-0.8.4.rdoc
-- doc/release_notes/rake-0.8.5.rdoc
-- doc/release_notes/rake-0.8.6.rdoc
-- doc/release_notes/rake-0.8.7.rdoc
-- doc/release_notes/rake-0.9.0.rdoc
-- doc/release_notes/rake-0.9.1.rdoc
-- doc/release_notes/rake-0.9.2.2.rdoc
-- doc/release_notes/rake-0.9.2.rdoc
-- doc/release_notes/rake-0.9.3.rdoc
-- doc/release_notes/rake-0.9.4.rdoc
-- doc/release_notes/rake-0.9.5.rdoc
-- doc/release_notes/rake-0.9.6.rdoc
-- doc/release_notes/rake-10.0.0.rdoc
-- doc/release_notes/rake-10.0.1.rdoc
-- doc/release_notes/rake-10.0.2.rdoc
-- doc/release_notes/rake-10.0.3.rdoc
-- doc/release_notes/rake-10.1.0.rdoc
-- MIT-LICENSE
+extra_rdoc_files: []
 files:
-- ".autotest"
+- ".gitignore"
 - ".rubocop.yml"
-- ".togglerc"
+- ".travis.yml"
 - CONTRIBUTING.rdoc
+- Gemfile
 - History.rdoc
 - MIT-LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
-- bin/rake
+- appveyor.yml
+- bin/console
+- bin/setup
 - doc/command_line_usage.rdoc
 - doc/example/Rakefile1
 - doc/example/Rakefile2
@@ -148,6 +110,7 @@ files:
 - doc/rake.1
 - doc/rakefile.rdoc
 - doc/rational.rdoc
+- doc/release_notes/README.md
 - doc/release_notes/rake-0.4.14.rdoc
 - doc/release_notes/rake-0.4.15.rdoc
 - doc/release_notes/rake-0.5.0.rdoc
@@ -178,12 +141,12 @@ files:
 - doc/release_notes/rake-10.0.2.rdoc
 - doc/release_notes/rake-10.0.3.rdoc
 - doc/release_notes/rake-10.1.0.rdoc
+- exe/rake
 - lib/rake.rb
 - lib/rake/application.rb
 - lib/rake/backtrace.rb
 - lib/rake/clean.rb
 - lib/rake/cloneable.rb
-- lib/rake/contrib/.document
 - lib/rake/contrib/compositepublisher.rb
 - lib/rake/contrib/ftptools.rb
 - lib/rake/contrib/sshpublisher.rb
@@ -227,59 +190,7 @@ files:
 - lib/rake/trace_output.rb
 - lib/rake/version.rb
 - lib/rake/win32.rb
-- rakelib/test_times.rake
-- test/file_creation.rb
-- test/helper.rb
-- test/support/rakefile_definitions.rb
-- test/support/ruby_runner.rb
-- test/test_private_reader.rb
-- test/test_rake.rb
-- test/test_rake_application.rb
-- test/test_rake_application_options.rb
-- test/test_rake_backtrace.rb
-- test/test_rake_clean.rb
-- test/test_rake_cpu_counter.rb
-- test/test_rake_definitions.rb
-- test/test_rake_directory_task.rb
-- test/test_rake_dsl.rb
-- test/test_rake_early_time.rb
-- test/test_rake_extension.rb
-- test/test_rake_file_creation_task.rb
-- test/test_rake_file_list.rb
-- test/test_rake_file_list_path_map.rb
-- test/test_rake_file_task.rb
-- test/test_rake_file_utils.rb
-- test/test_rake_ftp_file.rb
-- test/test_rake_functional.rb
-- test/test_rake_invocation_chain.rb
-- test/test_rake_late_time.rb
-- test/test_rake_linked_list.rb
-- test/test_rake_makefile_loader.rb
-- test/test_rake_multi_task.rb
-- test/test_rake_name_space.rb
-- test/test_rake_package_task.rb
-- test/test_rake_path_map.rb
-- test/test_rake_path_map_explode.rb
-- test/test_rake_path_map_partial.rb
-- test/test_rake_pathname_extensions.rb
-- test/test_rake_pseudo_status.rb
-- test/test_rake_rake_test_loader.rb
-- test/test_rake_reduce_compat.rb
-- test/test_rake_require.rb
-- test/test_rake_rules.rb
-- test/test_rake_scope.rb
-- test/test_rake_task.rb
-- test/test_rake_task_argument_parsing.rb
-- test/test_rake_task_arguments.rb
-- test/test_rake_task_manager.rb
-- test/test_rake_task_manager_argument_resolution.rb
-- test/test_rake_task_with_arguments.rb
-- test/test_rake_test_task.rb
-- test/test_rake_thread_pool.rb
-- test/test_rake_top_level_functions.rb
-- test/test_rake_win32.rb
-- test/test_thread_history_display.rb
-- test/test_trace_output.rb
+- rake.gemspec
 homepage: https://github.com/ruby/rake
 licenses:
 - MIT
@@ -302,7 +213,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.2
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Rake is a Make-like program implemented in Ruby