squared 0.4.6 → 0.4.8

data/lib/squared/common/utils.rb

@@ -2,6 +2,7 @@
 
 require 'pathname'
 require 'rake'
+require 'time'
 
 module Squared
   module Common
@@ -101,6 +102,11 @@ module Squared
         (cur.strftime('%Q').to_i + time_offset) - (val.strftime('%Q').to_i + ret)
       end
 
+      def time_since(val, ms: true)
+        s = ms ? '%s%L' : '%s'
+        Time.now.utc.strftime(s).to_i - Time.parse(val).utc.strftime(s).to_i
+      end
+
       def env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
         ret = env_value(key, suffix: suffix, strict: strict)
         return ret == equals.to_s unless equals.nil?
@@ -125,7 +131,7 @@ module Squared
 
       def env_bool(key, default = false, suffix: nil, strict: false, index: false)
         case key
-        when nil
+        when ::NilClass
           default
         when ::String
           case (val = env_value(key, suffix: suffix, strict: strict))
@@ -142,14 +148,6 @@ module Squared
       end
 
       def env_pipe(key, default = 1, suffix: nil, strict: false, root: nil)
-        if default.is_a?(::String)
-          begin
-            default = (root ? root.join(default) : Pathname.new(default)).realdirpath
-          rescue StandardError => e
-            default = 1
-            warn e
-          end
-        end
         case key
         when ::String
           case (ret = env_value(key, suffix: suffix, strict: strict))
@@ -159,7 +157,16 @@ module Squared
         when ::Numeric
           return key if key.between?(0, 2)
         end
-        default
+        begin
+          if default.is_a?(::String)
+            default = (root ? Pathname.new(root).join(default) : Pathname.new(default)).realdirpath
+          end
+        rescue StandardError => e
+          warn e
+          1
+        else
+          default
+        end
       end
 
       def env_match(key, default = nil, suffix: nil, strict: false, options: 0, timeout: nil)

data/lib/squared/config.rb

@@ -38,7 +38,6 @@ module Squared
       end
 
       @@mime_obj = {}
-      @@task_desc = Rake::TaskManager.record_task_metadata
 
       attr_reader :main, :name, :project, :theme
       attr_accessor :pipe
@@ -306,7 +305,7 @@ module Squared
       end
 
       def task_desc(command, *ext, target: nil)
-        return unless @@task_desc
+        return unless Rake::TaskManager.record_task_metadata
 
         val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
         args = *name.split(':').push(command, val)

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.4.6'
+  VERSION = '0.4.8'
 end

data/lib/squared/workspace/application.rb

@@ -15,7 +15,8 @@ module Squared
         global: false,
         env: false
       }.freeze
-      private_constant :SCRIPT_OBJ
+      TASK_METADATA = Rake::TaskManager.record_task_metadata
+      private_constant :SCRIPT_OBJ, :TASK_METADATA
 
       class << self
         def implement(*objs, base: false)
@@ -38,7 +39,7 @@ module Squared
               impl_series.alias(*args)
             end
             if (args = obj.bannerargs)
-              @attr_banner += args
+              @attr_banner.merge(args)
             end
           end
         end
@@ -51,6 +52,14 @@ module Squared
           end
         end
 
+        def exclude(*args)
+          @task_exclude.merge(args.map!(&:to_sym))
+        end
+
+        def series_wrap(app)
+          impl_series.new(app, exclude: @task_exclude.to_a)
+        end
+
         def baseref
           impl_project.ref
         end
@@ -64,7 +73,7 @@ module Squared
       end
 
       @kind_project = []
-      @@task_desc = Rake::TaskManager.record_task_metadata
+      @task_exclude = SymSet.new
 
       attr_reader :root, :home, :main, :prefix, :exception, :warning, :pipe, :verbose, :theme, :series, :closed
 
@@ -81,7 +90,7 @@ module Squared
         @home.mkpath rescue nil
         @root = @home.parent
         @prefix = prefix
-        @series = Application.impl_series.new(self)
+        @series = Application.series_wrap(self)
         @project = {}
         @kind = {}
         @extensions = []
@@ -184,36 +193,36 @@ module Squared
         self
       end
 
-      def run(script, group: @group, ref: @ref, on: nil)
-        script_command :run, script, group, ref, on
+      def run(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :run, script, group, ref, on, &blk
       end
 
       def script(script, group: @group, ref: @ref, on: nil)
         script_command :script, script, group, ref, on
       end
 
-      def depend(script, group: @group, ref: @ref, on: nil)
-        script_command :depend, script, group, ref, on
+      def depend(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :depend, script, group, ref, on, &blk
       end
 
       def graph(script, group: @group, ref: @ref, on: nil)
         script_command :graph, as_a(script, :to_s).freeze, group, ref, on
       end
 
-      def clean(script, group: @group, ref: @ref, on: nil)
-        script_command :clean, script, group, ref, on
+      def clean(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :clean, script, group, ref, on, &blk
       end
 
-      def doc(script, group: @group, ref: @ref, on: nil)
-        script_command :doc, script, group, ref, on
+      def doc(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :doc, script, group, ref, on, &blk
       end
 
-      def lint(script, group: @group, ref: @ref, on: nil)
-        script_command :lint, script, group, ref, on
+      def lint(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :lint, script, group, ref, on, &blk
       end
 
-      def test(script, group: @group, ref: @ref, on: nil)
-        script_command :test, script, group, ref, on
+      def test(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :test, script, group, ref, on, &blk
       end
 
       def log(script, group: @group, ref: @ref)
@@ -350,7 +359,7 @@ module Squared
       end
 
       def describe(data)
-        @describe = {
+        @describe ||= {
           alias: {},
           replace: [],
           pattern: {}
@@ -408,7 +417,7 @@ module Squared
       end
 
       def task_desc(*args, **kwargs)
-        return unless @@task_desc
+        return unless TASK_METADATA
 
         name = kwargs.delete(:name)
         if @describe
@@ -422,7 +431,7 @@ module Squared
           @describe[:replace].each do |pat, tmpl|
             next unless val =~ pat
 
-            val = replace.($~, tmpl.dup)
+            val = replace.call($~, tmpl.dup)
             found = true
           end
           if (out = @describe[:alias][val])
@@ -432,7 +441,7 @@ module Squared
             @describe[:pattern].each do |key, pat|
               next unless val =~ pat
 
-              val = replace.($~, key.dup)
+              val = replace.call($~, key.dup)
               found = true
               break
             end
@@ -461,7 +470,7 @@ module Squared
                 tasks.clear
                 break
               end
-              tasks += items
+              tasks.concat(items)
             end
             return tasks unless tasks.empty?
           end
@@ -495,7 +504,7 @@ module Squared
       end
 
       def format_desc(val, opts = nil, arg: 'opts*', before: nil, after: nil, out: false)
-        return unless @@task_desc || out
+        return unless TASK_METADATA || out
 
         val = val.to_s.split(':') if val.is_a?(String)
         if before || after || opts
@@ -552,6 +561,8 @@ module Squared
       end
 
       def task_include?(obj, key, ref = nil)
+        return false if @series.exclude.include?(key)
+
         task_base?(key) ? obj.has?(key, ref || baseref) : task_extend?(obj, key)
       end
 
@@ -643,7 +654,12 @@ module Squared
         puts_oe(*args, pipe: pipe)
       end
 
-      def script_command(task, val, group, ref, on)
+      def script_command(task, val, group, ref, on, &blk)
+        if block_given?
+          val = Struct.new(:run, :block).new(val, blk)
+        elsif !val
+          return self
+        end
         if group
           label = :group
           items = as_a(group, :to_sym)