squared 0.4.14 → 0.5.1

data/lib/squared/workspace/application.rb

@@ -29,7 +29,7 @@ module Squared
               @impl_project = obj
               impl_series.base_set(obj)
             else
-              kind_project.unshift(obj)
+              kind_project.prepend(obj)
               obj.tasks&.each { |task| impl_series.add(task, obj) }
             end
             if (args = obj.batchargs)
@@ -73,7 +73,7 @@ module Squared
       end
 
       @kind_project = []
-      @task_exclude = SymSet.new
+      @task_exclude = Set.new
 
       attr_reader :root, :home, :main, :prefix, :exception, :warning, :pipe, :verbose, :theme, :series, :closed
 
@@ -220,7 +220,7 @@ module Squared
             if arg.include?(':') || (keys && !keys.include?(arg))
               task_name(arg)
             else
-              /\A#{Regexp.escape(task_name(arg))}:/
+              /#{Regexp.escape(arg)}:/
             end
           end
         end
@@ -278,7 +278,7 @@ module Squared
       end
 
       def banner(*args, command: true, styles: nil, border: nil, group: @group, ref: @ref)
-        data = { command: command, order: [], styles: check_style(styles, empty: false), border: check_style(border) }
+        data = Struct::BannerData.new(command, [], check_style(styles, empty: false), check_style(border))
         args.each do |meth|
           if meth.is_a?(Array)
             found = false
@@ -301,9 +301,8 @@ module Squared
           elsif !Application.attr_banner.include?(meth = meth.to_sym)
             next
           end
-          data[:order] << meth
+          data.order << meth
         end
-        data = {} if !command && data[:order].empty?
         if group
           label = :group
           items = Array(group)
@@ -316,11 +315,7 @@ module Squared
       end
 
       def add(path, project = nil, **kwargs, &blk)
-        if @withargs
-          data = @withargs.dup
-          data.merge!(kwargs)
-          kwargs = data
-        end
+        kwargs = @withargs.yield_self { |data| data.dup.update(kwargs) } if @withargs
         ref = if kwargs.key?(:ref)
                 kwargs = kwargs.dup unless @withargs
                 kwargs.delete(:ref)
@@ -360,7 +355,7 @@ module Squared
         end
           .each do |dir, basename, opts|
             args = kwargs.dup
-            args.merge!(opts) if opts
+            args.update(opts) if opts
             add(dir, basename, group: val, **args, &blk)
           end
         self
@@ -399,7 +394,7 @@ module Squared
         }
         data.each do |key, val|
           key = key.to_s
-          if key.match?(/\A(\\A|\^)/) || key.match?(/(\\z|\$)\z/)
+          if key.start_with?(/(\\A|\^)/) || key.match?(/(\\z|\$)\z/)
             @describe[:replace] << [Regexp.new(key), val]
           else
             @describe[val.is_a?(Regexp) ? :pattern : :alias][key.to_s] = val
@@ -417,7 +412,7 @@ module Squared
         if ret.empty?
           ret = @project.select { |_, item| item.ref?(ref) }.map(&:last) if ref
           if ret.empty? && (path || name)
-            path &&= rootpath(path)
+            path &&= rootpath path
             name &&= name.to_s
             proj = @project.find { |_, item| (path && item.path == path) || (name && item.name == name) }&.last
             ret << proj if proj
@@ -517,7 +512,7 @@ module Squared
           obj.allref.each do |ref|
             next unless obj.has?(key, ref) && (alt = data[ref])
 
-            ret = task_resolve(obj, alt)
+            ret = task_resolve obj, alt
             break unless ret.empty?
           end
         else
@@ -537,7 +532,7 @@ module Squared
       end
 
       def format_desc(val, opts = nil, arg: 'opts*', before: nil, after: nil, out: false)
-        return unless TASK_METADATA || out
+        return unless TASK_METADATA
 
         val = val.split(':') if val.is_a?(String)
         if before || after || opts
@@ -711,7 +706,7 @@ module Squared
               else
                 step = 0
                 catch :found do
-                  has = ->(c, d) { c.any? { |e| e.is_a?(Regexp) ? d.match?(e) : d == e } }
+                  has = ->(c, d) { c.any? { |e| e.is_a?(Regexp) ? d.start_with?(e) : d == e } }
                   w = data.with
                   a = data.after
                   b = data.before
@@ -770,7 +765,7 @@ module Squared
                 end
               end
               if step == -1
-                level.unshift(data.action)
+                level.prepend(data.action)
                 step = 0
               elsif step > 0
                 (level[step -= 1] ||= []).concat(data.action)
@@ -860,7 +855,7 @@ module Squared
       def root?(path, pass: [])
         return false unless path.directory?
 
-        path.children.each do |c|
+        path.each_child do |c|
           name = c.basename.to_s
           next if c.to_s == __FILE__ || (@main == name && c.directory? && c.empty?) || pass.any? { |val| val == name }
 
@@ -870,14 +865,14 @@ module Squared
       end
 
       def script?(state, target: nil, pat: nil, group: nil, ref: baseref, global: false)
-        data = script_find(ref, group)
+        data = script_find ref, group
         if global
           target = data[:script] || data[:run] if target.nil?
           pat = data[state] if pat.nil?
         end
         return false if state == :prod && data[:dev] == true && data[:global]
 
-        target && pat.is_a?(Regexp) ? Array(target).any? { |val| val.match?(pat) } : pat == true
+        target && pat.is_a?(Regexp) ? Array(target).any?(pat) : pat == true
       end
 
       def scriptobj