rake 12.3.3 → 13.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bdd2e72f2f0ed9bd143e9f691203343bc430717dde81d9928807ce267c60d49
-  data.tar.gz: 77a5a8acd239396ac98ae54b146d70e1c8407d18109010eaa495f4fb15310f6b
+  metadata.gz: '08497cc32815feb4389235e329280cc871478425a9269dc03975b101c6c7ddda'
+  data.tar.gz: 96f4f74705c9ca03e0816641b46a71d6b13573fae70ccd529dd199437a8fd1a3
 SHA512:
-  metadata.gz: 3c47fee4f4436744de8cf095683f5298920128a12bd6415c689ca815626bbf36330015bed62e758324ee4762a018294695f6106f9c29883330cea7915787b957
-  data.tar.gz: 5d9c91f228cb06f6ebbb3b3aaae13664f4d12b04cfdd3413e4c0d1c6083ec5de2c3b89a5bf9e62a9a82105a7411ac2cb2bdb84cb36ca033a4b710d10a5661312
+  metadata.gz: 4ccd9ab5c4599602669669d449ed5c6398913545a4f445c465a13bce9a77aece4c52fd883eb21b3029e8c8e54940befd11d91e75568ed29115a0df73cd393e0e
+  data.tar.gz: a86e3a39f56b81c05c9c17e64f86b4b619739500b553271292955b48890bd409983a231a3d860235182a3c9030969ae6dbb84e6c4b359484683e0b51b6d8ff0b

data/.github/workflows/macos.yml

@@ -0,0 +1,22 @@
+name: macos
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x', '2.4.x', '2.3.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: gem install minitest
+    - name: Run test
+      env:
+        COVERALLS: "yes"
+      run: ruby -Ilib exe/rake

data/.github/workflows/ubuntu-rvm.yml

@@ -0,0 +1,28 @@
+name: ubuntu-rvm
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ 'jruby-head', 'jruby-9.2.8.0', 'ruby-head', '2.2.10' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up RVM
+      run: |
+        curl -sSL https://get.rvm.io | bash
+    - name: Set up Ruby
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        rvm install ${{ matrix.ruby }} --binary
+        rvm --default use ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        gem install minitest
+    - name: Run test
+      run: |
+        source $HOME/.rvm/scripts/rvm
+        ruby -Ilib exe/rake

data/.github/workflows/ubuntu.yml

@@ -0,0 +1,20 @@
+name: ubuntu
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x', '2.4.x', '2.3.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: gem install minitest
+    - name: Run test
+      run: ruby -Ilib exe/rake

data/.github/workflows/windows.yml

@@ -0,0 +1,20 @@
+name: windows
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        ruby: [ '2.6.x', '2.5.x', '2.4.x' ]
+    steps:
+    - uses: actions/checkout@master
+    - name: Set up Ruby
+      uses: actions/setup-ruby@v1
+      with:
+        version: ${{ matrix.ruby }}
+    - name: Install dependencies
+      run: gem install minitest
+    - name: Run test
+      run: ruby -Ilib exe/rake

data/Gemfile

@@ -1,3 +1,10 @@
 source "https://rubygems.org"
 
 gemspec
+
+group :development do
+  gem "bundler"
+  gem "minitest"
+  gem "coveralls"
+  gem "rubocop"
+end

data/History.rdoc

@@ -1,3 +1,18 @@
+=== 13.0.0.pre.1
+
+==== Enhancements
+
+* Follows recent changes on keyword arguments in ruby 2.7.
+  Pull Request #326 by nobu
+* Make `PackageTask` be able to omit parent directory while packing files 
+  Pull Request #310 by tonytonyjan
+* Add order only dependency
+  Pull Request #269 by take-cheeze
+
+==== Compatibility changes
+
+* Drop old ruby versions(< 2.2)
+
 === 12.3.3
 
 ==== Bug fixes

data/README.rdoc

@@ -3,7 +3,6 @@
 home :: https://github.com/ruby/rake
 bugs :: https://github.com/ruby/rake/issues
 docs :: https://ruby.github.io/rake
-build status :: {<img src="https://travis-ci.org/ruby/rake.svg?branch=master" alt="travis-ci">}[https://travis-ci.org/ruby/rake] {<img src="https://ci.appveyor.com/api/projects/status/github/ruby/rake?branch=master&svg=true" alt="appveyor">}[https://ci.appveyor.com/project/ruby/rake]
 
 == Description
 

data/lib/rake/clean.rb

@@ -28,10 +28,10 @@ module Rake
       end
     end
 
-    def cleanup(file_name, opts={})
+    def cleanup(file_name, **opts)
       begin
         opts = { verbose: Rake.application.options.trace }.merge(opts)
-        rm_r file_name, opts
+        rm_r file_name, **opts
       rescue StandardError => ex
         puts "Failed to remove #{file_name}: #{ex}" unless file_already_gone?(file_name)
       end

data/lib/rake/file_utils.rb

@@ -97,12 +97,11 @@ module FileUtils
   # Example:
   #   ruby %{-pe '$_.upcase!' <README}
   #
-  def ruby(*args, &block)
-    options = (Hash === args.last) ? args.pop : {}
+  def ruby(*args, **options, &block)
     if args.length > 1
-      sh(*([RUBY] + args + [options]), &block)
+      sh(RUBY, *args, **options, &block)
     else
-      sh("#{RUBY} #{args.first}", options, &block)
+      sh("#{RUBY} #{args.first}", **options, &block)
     end
   end
 
@@ -110,17 +109,15 @@ module FileUtils
 
   #  Attempt to do a normal file link, but fall back to a copy if the link
   #  fails.
-  def safe_ln(*args)
-    if !LN_SUPPORTED[0]
-      cp(*args)
-    else
+  def safe_ln(*args, **options)
+    if LN_SUPPORTED[0]
       begin
-        ln(*args)
+        return options.empty? ? ln(*args) : ln(*args, **options)
       rescue StandardError, NotImplementedError
         LN_SUPPORTED[0] = false
-        cp(*args)
       end
     end
+    options.empty? ? cp(*args) : cp(*args, **options)
   end
 
   # Split a file path into individual directory names.

data/lib/rake/file_utils_ext.rb

@@ -23,19 +23,18 @@ module Rake
       opts = FileUtils.options_of name
       default_options = []
       if opts.include?("verbose")
-        default_options << ":verbose => FileUtilsExt.verbose_flag"
+        default_options << "verbose: FileUtilsExt.verbose_flag"
       end
       if opts.include?("noop")
-        default_options << ":noop => FileUtilsExt.nowrite_flag"
+        default_options << "noop: FileUtilsExt.nowrite_flag"
       end
 
       next if default_options.empty?
       module_eval(<<-EOS, __FILE__, __LINE__ + 1)
-      def #{name}( *args, &block )
-        super(
-          *rake_merge_option(args,
-            #{default_options.join(', ')}
-            ), &block)
+      def #{name}(*args, **options, &block)
+        super(*args,
+            #{default_options.join(', ')},
+            **options, &block)
       end
       EOS
     end
@@ -113,16 +112,6 @@ module Rake
       end
     end
 
-    # Merge the given options with the default values.
-    def rake_merge_option(args, defaults)
-      if Hash === args.last
-        defaults.update(args.last)
-        args.pop
-      end
-      args.push defaults
-      args
-    end
-
     # Send the message to the default rake output (which is $stderr).
     def rake_output_message(message)
       $stderr.puts(message)

data/lib/rake/packagetask.rb

@@ -79,6 +79,9 @@ module Rake
     # Zip command for zipped archives.  The default is 'zip'.
     attr_accessor :zip_command
 
+    # True if parent directory should be omited (default is false)
+    attr_accessor :without_parent_dir
+
     # Create a Package Task with the given name and version.  Use +:noversion+
     # as the version to build a package without a version or to provide a
     # fully-versioned package name.
@@ -102,6 +105,7 @@ module Rake
       @need_zip = false
       @tar_command = "tar"
       @zip_command = "zip"
+      @without_parent_dir = false
     end
 
     # Create the tasks defined by this task library.
@@ -132,7 +136,8 @@ module Rake
           task package: ["#{package_dir}/#{file}"]
           file "#{package_dir}/#{file}" =>
             [package_dir_path] + package_files do
-            chdir(package_dir) { sh @tar_command, "#{flag}cvf", file, package_name }
+            chdir(working_dir) { sh @tar_command, "#{flag}cvf", file, target_dir }
+            mv "#{package_dir_path}/#{target_dir}", package_dir if without_parent_dir
           end
         end
       end
@@ -141,7 +146,8 @@ module Rake
         task package: ["#{package_dir}/#{zip_file}"]
         file "#{package_dir}/#{zip_file}" =>
           [package_dir_path] + package_files do
-          chdir(package_dir) { sh @zip_command, "-r", zip_file, package_name }
+          chdir(working_dir) { sh @zip_command, "-r", zip_file, target_dir }
+          mv "#{package_dir_path}/#{zip_file}", package_dir if without_parent_dir
         end
       end
 
@@ -202,6 +208,15 @@ module Rake
     def zip_file
       "#{package_name}.zip"
     end
+
+    def working_dir
+      without_parent_dir ? package_dir_path : package_dir
+    end
+
+    # target directory relative to working_dir
+    def target_dir
+      without_parent_dir ? "." : package_name
+    end
   end
 
 end

data/lib/rake/task.rb

@@ -17,6 +17,9 @@ module Rake
     attr_reader :prerequisites
     alias prereqs prerequisites
 
+    # List of order only prerequisites for a task.
+    attr_reader :order_only_prerequisites
+
     # List of actions attached to a task.
     attr_reader :actions
 
@@ -56,7 +59,7 @@ module Rake
 
     # List of prerequisite tasks
     def prerequisite_tasks
-      prerequisites.map { |pre| lookup_prerequisite(pre) }
+      (prerequisites + order_only_prerequisites).map { |pre| lookup_prerequisite(pre) }
     end
 
     def lookup_prerequisite(prerequisite_name) # :nodoc:
@@ -105,6 +108,7 @@ module Rake
       @arg_names       = nil
       @locations       = []
       @invocation_exception = nil
+      @order_only_prerequisites = []
     end
 
     # Enhance a task with prerequisites or actions.  Returns self.
@@ -270,7 +274,11 @@ module Rake
       end
       application.trace "** Execute #{name}" if application.options.trace
       application.enhance_with_matching_rule(name) if @actions.empty?
-      @actions.each { |act| act.call(self, args) }
+      if opts = Hash.try_convert(args) and !opts.empty?
+        @actions.each { |act| act.call(self, args, **opts)}
+      else
+        @actions.each { |act| act.call(self, args)}
+      end
     end
 
     # Is this task needed?
@@ -360,6 +368,18 @@ module Rake
       return result
     end
 
+    # Format dependencies parameter to pass to task.
+    def self.format_deps(deps)
+      deps = [deps] unless deps.respond_to?(:to_ary)
+      deps.map { |d| Rake.from_pathname(d).to_s }
+    end
+
+    # Add order only dependencies.
+    def |(deps)
+      @order_only_prerequisites |= Task.format_deps(deps) - @prerequisites
+      self
+    end
+
     # ----------------------------------------------------------------
     # Rake Module Methods
     #

data/lib/rake/task_manager.rb

@@ -15,13 +15,13 @@ module Rake
     end
 
     def create_rule(*args, &block) # :nodoc:
-      pattern, args, deps = resolve_args(args)
+      pattern, args, deps, order_only = resolve_args(args)
       pattern = Regexp.new(Regexp.quote(pattern) + "$") if String === pattern
-      @rules << [pattern, args, deps, block]
+      @rules << [pattern, args, deps, order_only, block]
     end
 
     def define_task(task_class, *args, &block) # :nodoc:
-      task_name, arg_names, deps = resolve_args(args)
+      task_name, arg_names, deps, order_only = resolve_args(args)
 
       original_scope = @scope
       if String === task_name and
@@ -31,15 +31,15 @@ module Rake
       end
 
       task_name = task_class.scope_name(@scope, task_name)
-      deps = [deps] unless deps.respond_to?(:to_ary)
-      deps = deps.map { |d| Rake.from_pathname(d).to_s }
       task = intern(task_class, task_name)
       task.set_arg_names(arg_names) unless arg_names.empty?
       if Rake::TaskManager.record_task_metadata
         add_location(task)
         task.add_description(get_description(task))
       end
-      task.enhance(deps, &block)
+      task.enhance(Task.format_deps(deps), &block)
+      task | order_only unless order_only.nil?
+      task
     ensure
       @scope = original_scope
     end
@@ -109,7 +109,7 @@ module Rake
       else
         arg_names = args
       end
-      [task_name, arg_names, []]
+      [task_name, arg_names, [], nil]
     end
     private :resolve_args_without_dependencies
 
@@ -122,7 +122,10 @@ module Rake
     #   task :t, [a] => [:d]
     #
     def resolve_args_with_dependencies(args, hash) # :nodoc:
-      fail "Task Argument Error" if hash.size != 1
+      fail "Task Argument Error" if
+        hash.size != 1 &&
+        (hash.size != 2 || !hash.key?(:order_only))
+      order_only = hash.delete(:order_only)
       key, value = hash.map { |k, v| [k, v] }.first
       if args.empty?
         task_name = key
@@ -134,7 +137,7 @@ module Rake
         deps = value
       end
       deps = [deps] unless deps.respond_to?(:to_ary)
-      [task_name, arg_names, deps]
+      [task_name, arg_names, deps, order_only]
     end
     private :resolve_args_with_dependencies
 
@@ -145,9 +148,10 @@ module Rake
     def enhance_with_matching_rule(task_name, level=0)
       fail Rake::RuleRecursionOverflowError,
         "Rule Recursion Too Deep" if level >= 16
-      @rules.each do |pattern, args, extensions, block|
+      @rules.each do |pattern, args, extensions, order_only, block|
         if pattern && pattern.match(task_name)
           task = attempt_rule(task_name, pattern, args, extensions, block, level)
+          task | order_only unless order_only.nil?
           return task if task
         end
       end

data/lib/rake/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Rake
-  VERSION = "12.3.3"
+  VERSION = "13.0.0.pre.1"
 
   module Version # :nodoc: all
     MAJOR, MINOR, BUILD, *OTHER = Rake::VERSION.split "."

data/rake.gemspec

@@ -29,14 +29,8 @@ Rake has the following features:
   s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
   s.require_paths = ["lib".freeze]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 2.0.0".freeze)
+  s.required_ruby_version = Gem::Requirement.new(">= 2.2".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)
-  s.add_development_dependency(%q<minitest>.freeze)
-  s.add_development_dependency(%q<rdoc>.freeze)
-  s.add_development_dependency(%q<coveralls>.freeze)
-  s.add_development_dependency(%q<rubocop>.freeze)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rake
 version: !ruby/object:Gem::Version
-  version: 12.3.3
+  version: 13.0.0.pre.1
 platform: ruby
 authors:
 - Hiroshi SHIBATA
@@ -10,78 +10,8 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2019-09-09 00:00:00.000000000 Z
+dependencies: []
 description: |
   Rake is a Make-like program implemented in Ruby. Tasks and dependencies are
   specified in standard Ruby syntax.
@@ -101,13 +31,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu-rvm.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - CONTRIBUTING.rdoc
 - Gemfile
 - History.rdoc
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- azure-pipelines.yml
 - bin/bundle
 - bin/console
 - bin/rake
@@ -185,14 +118,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.2
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.0.pre1
 signing_key: 
 specification_version: 4
 summary: Rake is a Make-like program implemented in Ruby

data/azure-pipelines.yml

@@ -1,11 +0,0 @@
-jobs:
-- job: macOS
-  pool:
-    vmImage: 'macos-10.13'
-  steps:
-  - script: |
-      gem install bundler
-      bundle install --retry=3 --jobs=4
-    displayName: 'bundle install'
-  - script: ruby -Ilib exe/rake
-    displayName: 'ruby -Ilib exe/rake'