squared 0.4.24 → 0.5.0

data/lib/squared/config.rb

@@ -15,7 +15,8 @@ module Squared
         def parse(gem, namespace, ext = [pkg])
           require gem
           obj = eval namespace
-          Array(ext).each { |val| @@mime_obj[val] = [obj, ext] }
+          ext = [ext] unless ext.is_a?(Array)
+          ext.each { |val| @@mime_obj[val] = [obj, ext] }
         rescue LoadError, NameError => e
           warn e
           nil
@@ -26,7 +27,7 @@ module Squared
         def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
           return unless project.enabled?
 
-          ret = Viewer.new(main, name, project: project, **kwargs)
+          ret = new(main, name, project: project, **kwargs)
           ret.instance_eval(&blk) if block_given?
           ret
         end
@@ -88,16 +89,16 @@ module Squared
                       @required = true
                       project ? [project, 'not found'] : ['name', 'missing']
                     end
-        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint)
+        warn log_message(Logger::WARN, msg, subject: self.class, hint: hint, pass: true)
       end
 
       def build
         return unless enabled?
 
-        namespace task_name(name) do |ns|
+        namespace(ns = task_name(name)) do
           @mime.each do |type, items|
             items.each do |command, file, opts|
-              next if Rake::Task.task_defined?("#{ns.scope.path}:#{command}:#{type}")
+              next if Rake::Task.task_defined?("#{ns}:#{command}:#{type}")
 
               namespace command do
                 unless (data = @@mime_obj[type])
@@ -128,7 +129,7 @@ module Squared
             require(gem || type)
             obj = eval namespace
           else
-            Array(ext).each do |val|
+            as_a(ext).each do |val|
               next unless (data = @@mime_obj[val])
 
               obj = data.first
@@ -136,7 +137,7 @@ module Squared
             end
           end
           if obj
-            ext << type if (ext = Array(ext)).empty?
+            ext << type if (ext = as_a(ext)).empty?
             if !file && target?
               ext.each do |val|
                 next unless (out = basepath("#{main}.#{val}")).exist?
@@ -169,7 +170,7 @@ module Squared
       end
 
       def style(name, *args)
-        apply_style(theme, name, args)
+        apply_style theme, name, args
         self
       end
 
@@ -196,7 +197,7 @@ module Squared
       private
 
       def puts(*args)
-        log_console(*args, pipe: pipe)
+        puts_oe(*args, pipe: pipe)
       end
 
       def log
@@ -212,8 +213,8 @@ module Squared
             file = nil
             ext[0] = mime
           elsif file
-            keys.unshift(file)
-            alt = basepath "#{main}.{#{ext.join(',')}}"
+            keys.prepend(file)
+            alt = basepath("#{main}.{#{ext.join(',')}}")
             file = Dir[alt].first
           else
             alt = main
@@ -242,15 +243,14 @@ module Squared
                                               [
                                                 { pat: /\A((?:[^:]|(?<! ):(?! ))+)\z/, styles: theme[:banner] },
                                                 { pat: /\A(.*?)(<[^>]+>)(.+)\z/m, styles: theme[:undefined], index: 2 },
-                                                { pat: /\A(.+)( : (?!undefined).+)\z/m, styles: theme[:key] },
-                                                { pat: /\A(.+ : )(-?[\d.]+)(\s*)\z/m, styles: theme[:number],
+                                                { pat: /\A((?~ : ))( : (?!undefined).+)\z/m, styles: theme[:key] },
+                                                { pat: /\A((?~: ): )(-?[\d.]+)(\s*)\z/m, styles: theme[:number],
                                                   index: 2 },
-                                                { pat: /\A(.+ : ")(.+)("\s*)\z/m, styles: theme[:string], index: 2 },
-                                                { pat: /\A(.+ : \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
-                                                { pat: /\A(.+ : \[)(.+)(\]\s*)\z/m, styles: theme[:array], index: 2 },
-                                                { pat: /\A(.+ : )(true|false)(\s*)\z/m, styles: theme[:boolean],
+                                                { pat: /\A((?~: ): ")(.+)("\s*)\z/m, styles: theme[:string], index: 2 },
+                                                { pat: /\A((?~: ): \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
+                                                { pat: /\A((?~: ): \[)(.+)(\]\s*)\z/m, styles: theme[:array],
                                                   index: 2 },
-                                                { pat: /\A(.+ : (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
+                                                { pat: /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]
                                             end, border: theme[:border])
@@ -309,7 +309,7 @@ module Squared
         return unless Rake::TaskManager.record_task_metadata
 
         val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
-        args = *name.split(':').push(command, val)
+        args = *name.split(':').append(command, val)
         if project
           project.workspace.task_desc(*args)
         else
@@ -346,8 +346,8 @@ module Squared
         basepath(file = main + @ext).to_s rescue file
       end
 
-      def basepath(*args)
-        project ? project.basepath(*args) : Pathname.pwd.join(*args)
+      def basepath(file)
+        project ? project.basepath(file) : Pathname.pwd + file
       end
     end
   end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -26,10 +26,10 @@ module Squared
             next unless base || obj < impl_project
 
             if base
-              self.impl_project = obj
+              @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)
@@ -39,7 +39,7 @@ module Squared
               impl_series.alias(*args)
             end
             if (args = obj.bannerargs)
-              attr_banner.merge(args)
+              @attr_banner.merge(args)
             end
           end
         end
@@ -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
 
@@ -92,18 +92,12 @@ module Squared
         @prefix = prefix
         @series = Application.series_wrap(self)
         @project = {}
-        @kind = Support.hashlist
+        @kind = {}
         @extensions = []
-        @envname = env_key(@main).freeze
-        @pipe = $DEBUG ? 2 : env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
+        @envname = @main.gsub(/[^\w]+/, '_').upcase.freeze
+        @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
         @exception = env_bool exception
-        @verbose = if $VERBOSE.nil?
-                     false
-                   elsif verbose.nil?
-                     @pipe != 0
-                   else
-                     env_bool(verbose, verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
-                   end
+        @verbose = env_bool(verbose, verbose.nil? || verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
         @warning = @verbose != false
         @closed = false
         if common
@@ -112,20 +106,20 @@ module Squared
         else
           @theme = {}
         end
-        @chain = Support.hashlist
+        @chain = {}
         @script = {
-          group: Support.hashobj,
-          ref: Support.hashobj,
+          group: {},
+          ref: {},
           group!: {},
           ref!: {}
         }.freeze
         @events = {
-          group: Support.hashobj,
-          ref: Support.hashobj
+          group: {},
+          ref: {}
         }.freeze
         @pass = {
-          group: Support.hashobj,
-          ref: Support.hashobj,
+          group: {},
+          ref: {},
           global: {},
           pattern: []
         }.freeze
@@ -140,7 +134,7 @@ module Squared
         return unless @pipe.is_a?(Pathname)
 
         msg = "Session started on #{Time.now} by #{@main}"
-        bord = '#' * msg.size
+        bord = '#' * s.size
         puts bord, msg, bord
       end
 
@@ -226,12 +220,12 @@ 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
-        data = Struct::ChainData.new(action, step, ns.call(with), ns.call(before), ns.call(after), sync)
-        @chain[task_name(task.to_s)] << data
+        data = Support::ChainData.new(action, step, ns.call(with), ns.call(before), ns.call(after), sync)
+        (@chain[task_name(task.to_s)] ||= []) << data
         self
       end
 
@@ -273,9 +267,9 @@ module Squared
 
       def pass(name, group: @group, ref: @ref, &blk)
         data = if group
-                 @pass[:group][group]
+                 @pass[:group][group] ||= {}
                elsif ref
-                 @pass[:ref][ref]
+                 @pass[:ref][ref] ||= {}
                else
                  @pass[:global]
                end
@@ -284,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 = Support::BannerData.new(command, [], check_style(styles, empty: false), check_style(border))
         args.each do |meth|
           if meth.is_a?(Array)
             found = false
@@ -307,26 +301,21 @@ 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)
+          items = as_a group
         else
           label = :ref
-          items = Array(ref || :_)
+          items = ref ? as_a(ref) : [:_]
         end
         items.each { |val| @banner[label][val.to_sym] = data }
         self
       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)
@@ -366,14 +355,14 @@ 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
       end
 
       def compose(name, &blk)
-        namespace(task_name(name), &blk)
+        namespace(task_name(name), &blk) if block_given?
         self
       end
 
@@ -385,7 +374,7 @@ module Squared
       def style(obj, *args, target: nil, empty: false)
         data = nil
         if target
-          Array(target).each_with_index do |key, i|
+          as_a(target).each_with_index do |key, i|
             if i == 0
               break unless (data = __get__(:theme)[key.to_sym])
             else
@@ -405,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
@@ -423,13 +412,13 @@ 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
           end
         end
-        return (group || ref ? ret : ret.first) unless block_given?
+        return (group || ref ? ret : ret[0]) unless block_given?
 
         ret.each(&blk)
         self
@@ -491,7 +480,7 @@ module Squared
       end
 
       def task_namespace(val, first: false)
-        return unless (ret = val.to_s.split(':')).size > 1
+        return nil unless (ret = val.to_s.split(':')).size > 1
 
         first ? ret.first : task_join(*ret[0..-2])
       end
@@ -523,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
@@ -543,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
@@ -629,27 +618,13 @@ module Squared
       end
 
       def home?
-        return false unless (proj = find(home))
-
-        proj.enabled?
+        !(proj = find(home)).nil? && proj.enabled?
       end
 
       def windows?
         Rake::Win32.windows?
       end
 
-      def mri?
-        RUBY_ENGINE == 'ruby'
-      end
-
-      def jruby?
-        RUBY_ENGINE == 'jruby'
-      end
-
-      def truffleruby?
-        RUBY_ENGINE == 'truffleruby'
-      end
-
       def docker?
         !Dir['/.dockerenv', '/docker-*.{sh,d}'].empty?
       end
@@ -686,10 +661,6 @@ module Squared
         { exception: exception, warning: warning }
       end
 
-      def size
-        @project.size
-      end
-
       def to_s
         (home? ? home : root).to_s
       end
@@ -703,14 +674,9 @@ module Squared
       private
 
       def __build__(default: nil, **)
-        unless task_defined?('squared:version')
-          task 'squared:version' do
-            puts Squared::VERSION
-          end
-        end
-        if default && task_defined?(out = task_name(default))
-          task Rake.application.default_task_name => out
-        end
+        return unless default && task_defined?(out = task_name(default))
+
+        task Rake.application.default_task_name => out
       end
 
       def __chain__(*)
@@ -732,7 +698,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
@@ -791,7 +757,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)
@@ -812,8 +778,8 @@ module Squared
           format_desc key
           task key do
             unless failed.empty? && group.empty?
-              puts(log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
-                               subject: 'failed placement', hint: false), pipe: 2)
+              puts log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
+                               subject: 'failed placement', hint: false, pass: true)
             end
             cols = level.flatten(1).map(&:size).max
             level.each_with_index do |grp, n|
@@ -829,13 +795,13 @@ module Squared
         end
       end
 
-      def puts(*args, **kwargs)
-        log_console(*args, pipe: kwargs[:pipe] || pipe)
+      def puts(*args)
+        puts_oe(*args, pipe: pipe)
       end
 
       def script_command(task, val, group, ref, on, &blk)
         if block_given?
-          val = Struct::RunData.new(val, blk)
+          val = Support::RunData.new(val, blk)
         elsif !val
           return self
         end
@@ -847,8 +813,8 @@ module Squared
           items = as_a(ref, :to_sym)
         end
         items.each do |name|
-          @script[label][name][task] = val
-          @events[label][name][task] = on if on.is_a?(Hash)
+          (@script[label][name] ||= {})[task] = val
+          (@events[label][name] ||= {})[task] = on if on.is_a?(Hash)
         end
         self
       end
@@ -856,26 +822,24 @@ module Squared
       def script_set(data, group: nil, ref: nil)
         data.freeze
         if group
-          Array(group).each { |val| @script[:group!][val.to_sym] = data }
+          as_a(group).each { |val| @script[:group!][val.to_sym] = data }
         elsif ref
-          Array(ref).each { |val| @script[:ref!][val.to_sym] = data }
+          as_a(ref).each { |val| @script[:ref!][val.to_sym] = data }
         else
           @script[:ref!][:''] = data
         end
       end
 
       def data_get(*args, group: nil, ref: nil, target: nil)
-        if group && target[:group].key?(key = group.to_sym)
-          target[:group][key]
-        elsif ref.is_a?(Enumerable)
+        target[:group][group.to_sym] if group
+        if ref.is_a?(Enumerable)
           ref.each do |key|
-            next unless target[:ref].key?(key)
+            next unless (ret = target[:ref][key])
 
-            ret = target[:ref][key]
             return ret if args.empty? || args.any? { |val| ret.key?(val) }
           end
           nil
-        elsif ref && target[:ref].key?(ref)
+        elsif ref
           target[:ref][ref]
         end
       end
@@ -883,7 +847,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 }
 
@@ -893,14 +857,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) ? as_a(target).any?(pat) : pat == true
       end
 
       def scriptobj