squared 0.5.18 → 0.6.0

data/lib/squared/common/utils.rb

@@ -9,21 +9,44 @@ module Squared
     module Utils
       module_function
 
-      def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/)
+      def as_a(obj, *meth, flat: nil, compact: false, &blk)
+        return [] if obj.nil?
+
+        unless obj.is_a?(::Array)
+          obj = if obj.respond_to?(:to_ary)
+                  obj.to_ary
+                elsif obj.respond_to?(:to_a) && !obj.is_a?(::Hash) && (val = obj.to_a).is_a?(::Array)
+                  val
+                else
+                  [obj]
+                end
+        end
+        obj = flat.is_a?(::Numeric) ? obj.flatten(flat) : obj.flatten if flat
+        obj = obj.compact if compact
+        obj = obj.map(&meth.shift) until meth.empty?
+        return obj unless block_given?
+
+        obj.select(&blk)
+      end
+
+      def split_escape(val, char: ',', &blk)
+        ret = val.split(/\s*(?<!\\)#{char}\s*/)
+        return ret unless block_given?
+
+        ret.each(&blk)
       end
 
       def split_option(val)
         val = val.strip
         return [val, '', ''] unless (i = val.index('='))
 
-        last = val[(i + 1)..-1].strip
+        last = val[i.succ..-1].strip
         quote = ''
         if last =~ /\A(["'])(.+)\1\z/
           last = $2
           quote = $1
         end
-        [val[0..(i - 1)], last, quote]
+        [val[0..i.pred], last, quote]
       end
 
       def task_invoke(*cmd, args: [], exception: true, warning: true)
@@ -105,9 +128,9 @@ module Squared
         end
       end
 
-      def env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
+      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?
+        return Array(equals).any? { |val| val.to_s == ret } unless equals.nil?
 
         ret.empty? || (ignore && Array(ignore).any? { |val| val.to_s == ret }) ? default : ret
       end

data/lib/squared/config.rb

@@ -12,18 +12,19 @@ module Squared
       include Rake::DSL
 
       class << self
-        def parse(gem, namespace, ext = [gem])
+        def parse(gem, namespace, ext = [pkg])
           require gem
-          [eval(namespace), Array(ext)].tap do |data|
-            data.last.each { |key| @@mime_obj[key] = data }
-          end
+          obj = eval namespace
+          Array(ext).each { |val| @@mime_obj[val] = [obj, ext] }
         rescue LoadError, NameError => e
           warn e
           nil
+        else
+          @@mime_obj[ext.first]
         end
 
-        def link(project, main = project.dependfile&.basename, name = nil, **kwargs, &blk)
-          return unless project.enabled? && main
+        def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
+          return unless project.enabled?
 
           ret = new(main, name, project: project, **kwargs)
           ret.instance_eval(&blk) if block_given?
@@ -85,7 +86,7 @@ module Squared
                       ['path not found', realpath]
                     else
                       @required = true
-                      project ? [project, 'not found'] : %w[name missing]
+                      project ? [project, 'missing'] : %w[name missing]
                     end
         warn log_message(Logger::WARN, msg, subject: self.class, hint: hint)
       end
@@ -105,7 +106,7 @@ module Squared
                   next unless (data = Viewer.parse(type, type.upcase, ext))
                 end
                 obj, ext = data
-                target = file || target? ? file || realpath : nil
+                target = file || (realpath if target?)
 
                 task_desc(command, *ext, target: target)
                 task type, [:keys] do |_, args|
@@ -159,7 +160,7 @@ module Squared
       end
 
       def also(path, type = nil, name: nil, **kwargs)
-        return self unless (file = basepath(path)).exist? && !@mime.frozen?
+        return self if @mime.frozen? || !(file = basepath(path)).exist?
 
         ext = mimetype file
         type ||= ext
@@ -204,7 +205,7 @@ module Squared
 
       def read_keys(reader, type, file, keys, ext: [type], opts: {})
         if file && (mime = mimetype(file)) && basepath(file).exist?
-          raise_error(file, mime, hint: 'invalid') unless ext.include?(mime)
+          raise_error file, mime, hint: 'invalid' unless ext.include?(mime)
         else
           if ext.include?(mime)
             alt = file
@@ -219,7 +220,7 @@ module Squared
             args = { hint: 'no keys' }
           end
           unless file
-            args ||= { hint: 'not found', kind: LoadError }
+            args ||= { kind: Errno::ENOENT }
             raise_error(reader.name, "#{File.basename(alt, '.*')}.#{ext.first}", **args)
           end
         end
@@ -236,22 +237,18 @@ module Squared
         title = Pathname.new(file)
                         .realpath
                         .to_s
-                        .sub(/\A#{Regexp.escape(File.join(Dir.pwd, ''))}/, '')
+                        .sub(/^#{Regexp.escape(File.join(Dir.pwd, ''))}/, '')
         emphasize(lines, title: title, sub: unless stdin?
                                               [
-                                                { 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],
-                                                  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],
-                                                  index: 2 },
-                                                { pat: /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
-                                                  index: 2 }
+                                                opt_style(theme[:banner], /\A((?:[^:]|(?<! ):(?! ))+)\z/),
+                                                opt_style(theme[:undefined], /\A(.*?)(<[^>]+>)(.+)\z/m, 2),
+                                                opt_style(theme[:key], /\A((?~ : ))( : (?!undefined).+)\z/m),
+                                                opt_style(theme[:number], /\A((?~: ): )(-?[\d.]+)(\s*)\z/m, 2),
+                                                opt_style(theme[:string], /\A((?~: ): ")(.+)("\s*)\z/m, 2),
+                                                opt_style(theme[:hash], /\A((?~: ): \{)(.+)(\}\s*)\z/m, 2),
+                                                opt_style(theme[:array], /\A((?~: ): \[)(.+)(\]\s*)\z/m, 2),
+                                                opt_style(theme[:boolean], /\A((?~: ): )(true|false)(\s*)\z/m, 2),
+                                                opt_style(theme[:value], /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, 2)
                                               ]
                                             end, border: theme[:border])
       end
@@ -262,7 +259,7 @@ module Squared
         symbolize = opts[:symbolize_names]
         keys.each do |key|
           begin
-            items = key.split('.').flat_map { |name| name =~ /^(.+)\[(\d+)\]$/ ? [$1, $2.to_i] : name }
+            items = key.split('.')
             items = items.map(&:to_sym) if symbolize
             val = data.dig(*items)
             if val.nil?
@@ -293,7 +290,7 @@ module Squared
         if stdin?
           puts out.map!(&:last).join("\n")
         else
-          out.map! { |a, b| '%-*s : %s' % [pad, a, b] }
+          out.map! { |item| '%-*s : %s' % [pad, item[0], item[1]] }
         end
       end
 
@@ -308,7 +305,7 @@ module Squared
       def task_desc(command, *ext, target: nil)
         return unless Rake::TaskManager.record_task_metadata
 
-        val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
+        val = "#{ext.first}[#{"file?=#{File.basename(main)}.#{ext.last}," if target}keys+]"
         args = *name.split(':').push(command, val)
         if project
           project.workspace.task_desc(*args)
@@ -322,9 +319,7 @@ module Squared
       end
 
       def warning?
-        return true unless project
-
-        project.workspace.warning
+        project ? project.workspace.warning : true
       end
 
       def stdin?
@@ -349,9 +344,7 @@ module Squared
       end
 
       def basepath(*args)
-        return Pathname.pwd.join(*args) unless project
-
-        project.basepath(*args)
+        project ? project.basepath(*args) : Pathname.pwd.join(*args)
       end
     end
   end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -5,18 +5,11 @@ module Squared
     class Application
       include Common::Format
       include Utils
+      include Support::Variables
       include Rake::DSL
 
-      SCRIPT_OBJ = {
-        run: nil,
-        script: nil,
-        dev: nil,
-        prod: nil,
-        global: false,
-        env: false
-      }.freeze
       TASK_METADATA = Rake::TaskManager.record_task_metadata
-      private_constant :SCRIPT_OBJ, :TASK_METADATA
+      private_constant :TASK_METADATA
 
       class << self
         def implement(*objs, base: false)
@@ -75,7 +68,8 @@ module Squared
       @kind_project = []
       @task_exclude = Set.new
 
-      attr_reader :root, :home, :main, :prefix, :exception, :warning, :pipe, :verbose, :theme, :series, :closed
+      attr_reader :root, :home, :main, :prefix, :theme, :series, :closed
+      attr_accessor :exception, :pipe, :verbose, :warning
 
       def initialize(home = (ARG[:HOME] && ENV[ARG[:HOME]]) || Dir.pwd, *, main: nil, prefix: nil,
                      verbose: ARG[:VERBOSE], common: ARG[:COMMON], pipe: ARG[:PIPE], exception: ARG[:FAIL], **)
@@ -92,40 +86,40 @@ module Squared
         @prefix = prefix
         @series = Application.series_wrap(self)
         @project = {}
-        @kind = Support.hashlist
+        @kind = hashlist
         @extensions = []
         @envname = env_key(@main).freeze
-        @pipe = $DEBUG ? 2 : 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
-        @warning = @verbose != false
+        self.exception = env_bool exception
+        self.pipe = $DEBUG ? 2 : env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
+        self.verbose = if $VERBOSE.nil?
+                         false
+                       elsif verbose.nil?
+                         @pipe != 0
+                       else
+                         env_bool(verbose, verbose.is_a?(String) ? @pipe != 0 : verbose, index: true)
+                       end
+        self.warning = @verbose != false
         @closed = false
-        if common
-          @theme = __get__(:theme)[:workspace]
-          ARG[:COLOR] = false if @pipe == 0 || @pipe.is_a?(Pathname)
-        else
-          @theme = {}
-        end
-        @chain = Support.hashlist
+        @theme = if common
+                   ARG[:COLOR] = false if @pipe == 0 || @pipe.is_a?(Pathname)
+                   __get__(:theme)[:workspace]
+                 else
+                   {}
+                 end
+        @chain = hashlist
         @script = {
-          group: Support.hashobj,
-          ref: Support.hashobj,
+          group: hashobj,
+          ref: hashobj,
           group!: {},
           ref!: {}
         }.freeze
         @events = {
-          group: Support.hashobj,
-          ref: Support.hashobj
+          group: hashobj,
+          ref: hashobj
         }.freeze
         @pass = {
-          group: Support.hashobj,
-          ref: Support.hashobj,
+          group: hashobj,
+          ref: hashobj,
           global: {},
           pattern: []
         }.freeze
@@ -179,11 +173,14 @@ module Squared
       end
 
       def with(*val, pass: false, group: nil, **kwargs, &blk)
-        return self if pass == true || (pass && Array(pass).map(&:to_s).any? { |s| respond_to?(s) && __send__(s) })
+        return self if pass == true || (pass && as_a(pass, :to_s).any? { |s| respond_to?(s) && __send__(s) })
 
         @group = nil
         @ref = nil
-        @withargs = kwargs.empty? ? nil : kwargs
+        @withargs = unless kwargs.empty?
+                      kwargs.delete(:parent)
+                      kwargs
+                    end
         val = as_a(group || kwargs[:ref], flat: true, compact: true) if val.empty?
         kind = val.first
         val = kind if val.size == 1
@@ -193,7 +190,7 @@ module Squared
         when Symbol
           @ref = val
         else
-          raise_error 'missing group or ref' if block_given?
+          raise_error ArgumentError, 'missing group or ref' if block_given?
         end
         if block_given?
           instance_eval(&blk)
@@ -218,7 +215,7 @@ module Squared
                  nil
                else
                  action.map! { |val| task_name(val) }
-                 prefix ? nil : @project.keys
+                 @project.keys unless prefix
                end
         ns = lambda do |val|
           next if (ret = as_a(val, :to_s, flat: true)).empty?
@@ -310,22 +307,21 @@ module Squared
           end
           data.order << meth
         end
-        if group
-          label = :group
-          items = Array(group)
-        else
-          label = :ref
-          items = Array(ref || :_)
-        end
-        items.each { |val| @banner[label][val.to_sym] = data }
+        Array(if group
+                label = :group
+                group
+              else
+                label = :ref
+                ref || :_
+              end).each { |val| @banner[label][val.to_sym] = data }
         self
       end
 
       def add(path, project = nil, **kwargs, &blk)
-        kwargs = Support.hashdup(@withargs).update(kwargs) if @withargs
+        kwargs = hashdup(@withargs).update(kwargs) if @withargs
         ref = kwargs.key?(:ref) ? kwargs.delete(:ref) : @ref
         kwargs[:group] = @group if @group && !kwargs.key?(:group)
-        path = root + path
+        path = rootpath path
         project = (project || path.basename).to_s
         name = task_name project
         index = 0
@@ -382,11 +378,10 @@ module Squared
           end
         end
         if obj.is_a?(String)
-          begin
-            obj = JSON.parse(homepath(obj).read, { symbolize_names: true })
+          obj = begin
+            JSON.parse(homepath(obj).read, { symbolize_names: true })
           rescue StandardError => e
             warn log_message(Logger::ERROR, e)
-            obj = nil
           end
         end
         apply_style(data || theme, obj, args, empty: empty) if obj && (!target || data)
@@ -448,7 +443,7 @@ module Squared
       end
 
       def task_localname(val)
-        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/, '') : val.to_s
+        prefix && val.is_a?(String) ? val.sub(/^#{Regexp.escape(prefix)}:/, '') : val.to_s
       end
 
       def task_desc(*args, **kwargs)
@@ -497,7 +492,7 @@ module Squared
         if (base = task_base?(key))
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
-          obj.allref do |ref|
+          obj.allref.each do |ref|
             next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
@@ -516,7 +511,7 @@ module Squared
         if tasks.empty?
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
-          obj.allref do |ref|
+          obj.allref.each do |ref|
             next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve obj, alt
@@ -564,7 +559,7 @@ module Squared
 
           return ret
         end
-        @script[:ref!][:''] || SCRIPT_OBJ
+        @script[:ref!][:''] ||= scriptobj
       end
 
       def script_get(*args, group: nil, ref: nil)
@@ -740,23 +735,23 @@ module Squared
                       index = k if w && has.call(w, v1)
                       if a && has.call(a, v1)
                         if index
-                          with.call(l + 1)
+                          with.call(l.succ)
                           throw :found
                         else
-                          index = k + 1
+                          index = k.succ
                         end
                       elsif b && has.call(b, v1)
                         if index
                           with.call(l)
                           throw :found
                         else
-                          index = k - 1
+                          index = k.pred
                         end
                       elsif index
                         if a || b
                           tasks.each_with_index do |v2, m|
                             if a && has.call(a, v2)
-                              with.call(m + 1)
+                              with.call(m.succ)
                               throw :found
                             elsif b && has.call(b, v2)
                               with.call(m)
@@ -766,7 +761,7 @@ module Squared
                           if !pass
                             pass = [i, data]
                           elsif pass.include?(data)
-                            if i == pass.first + 1
+                            if i == pass.first.succ
                               pass.delete(data)
                               pass = nil if pass.size == 1
                             end
@@ -778,7 +773,7 @@ module Squared
                       else
                         next
                       end
-                      step = index == -1 ? -1 : index + 1
+                      step = index == -1 ? -1 : index.succ
                       throw :found
                     end
                   end
@@ -806,18 +801,15 @@ 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)
+              group.each { |val| failed += val.action }
+              puts log_message(Logger::ERROR, *failed, subject: 'failed placement', hint: false), pipe: 2
             end
-            cols = level.flatten(1).map(&:size).max
-            level.each_with_index do |grp, n|
-              title = "Step #{n.succ}#{if !sync.include?(grp) || (grp.size == 1 && series.parallel.include?(grp.first))
-                                         ''
-                                       else
+            level.each_with_index do |grp, i|
+              title = "Step #{i.succ}#{if sync.include?(grp) && !(grp.size == 1 && series.parallel.include?(grp.first))
                                          ' (sync)'
                                        end}"
-              emphasize(grp, title: title, cols: [cols, title.size].max, border: theme[:border],
-                             sub: [pat: /\A(Step \d+)(.*)\z/, styles: theme[:header]])
+              emphasize(grp, title: title, cols: level.flatten(1).push(title), border: theme[:border],
+                             sub: opt_style(theme[:header], /\A(Step \d+)(.*)\z/))
             end
           end
         end
@@ -835,12 +827,11 @@ module Squared
         end
         if group
           label = :group
-          items = as_a(group, :to_sym)
+          as_a group, :to_sym
         else
           label = :ref
-          items = as_a(ref, :to_sym)
-        end
-        items.each do |name|
+          as_a ref, :to_sym
+        end.each do |name|
           @script[label][name][task] = val
           @events[label][name][task] = on if on.is_a?(Hash)
         end
@@ -879,26 +870,34 @@ module Squared
 
         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 }
-
-          return false
+          unless c.to_s == __FILE__ || (@main == name && c.directory? && c.empty?) || pass.any? { |val| val == name }
+            return false
+          end
         end
         true
       end
 
-      def script?(state, target: nil, pat: nil, group: nil, ref: baseref, global: false)
+      def script?(state, target: nil, pat: nil, group: nil, ref: baseref, global: false, script: true)
         data = script_find ref, group
+        type = script ? :script : :run
         if global
-          target = data[:script] || data[:run] if target.nil?
+          target = data[type] if target.nil?
           pat = data[state] if pat.nil?
         end
-        return false if state == :prod && data[:dev] == true && data[:global]
+        return false if state == :prod && data[:dev] == true && data[:global][type]
 
         target && pat.is_a?(Regexp) ? Array(target).any?(pat) : pat == true
       end
 
       def scriptobj
-        SCRIPT_OBJ.dup
+        {
+          run: nil,
+          script: nil,
+          dev: nil,
+          prod: nil,
+          global: {},
+          env: {}
+        }
       end
     end
   end