squared 0.4.12 → 0.5.0

data/lib/squared/workspace/project/base.rb

@@ -9,6 +9,7 @@ module Squared
   module Workspace
     module Project
       class Base
+        include Comparable
         include Common::Format
         include System
         include Shell
@@ -17,7 +18,8 @@ module Squared
         include Support
         include Rake::DSL
 
-        VAR_SET = %i[parent global envname dependfile dependindex theme run script env pass].freeze
+        VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
+                     pass exclude].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
         SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
         URI_SCHEME = %r{^([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
@@ -31,7 +33,7 @@ module Squared
           def bannerargs(*); end
 
           def tasks
-            (%i[build archive graph] + BLK_SET).freeze
+            (%i[build archive graph prereqs] + BLK_SET).freeze
           end
 
           def as_path(val)
@@ -63,6 +65,7 @@ module Squared
         end
 
         @@tasks = {}
+        @@graph = { _: [] }
         @@print_order = 0
 
         subtasks({
@@ -73,8 +76,8 @@ module Squared
         attr_reader :name, :project, :workspace, :path, :theme, :exception, :pipe, :verbose,
                     :group, :parent, :dependfile
 
-        def initialize(workspace, path, name, *, group: nil, graph: nil, pass: nil, exclude: nil, release: nil,
-                       archive: nil, verbose: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON], **kwargs)
+        def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
+                       **kwargs)
           @path = path
           @workspace = workspace
           @name = name.to_s.freeze
@@ -87,48 +90,34 @@ module Squared
           @copy = kwargs[:copy]
           @clean = kwargs[:clean]
           @version = kwargs[:version]
-          @archive = case archive
-                     when String, Array
-                       { uri: archive }
-                     when Hash
-                       archive
-                     end
-          @release = release
-          @envname = @name.gsub(/[^\w]+/, '_').upcase.freeze
-          @exception = env_bool(kwargs[:exception], workspace.exception, strict: true)
-          @pipe = env_pipe(kwargs[:pipe], workspace.pipe, strict: true)
-          @verbose = case verbose
-                     when NilClass
-                       workspace.verbose
-                     when String
-                       env_bool(verbose, workspace.verbose, strict: true, index: true)
-                     else
-                       verbose
-                     end
-          @theme = if !@verbose
-                     {}
-                   elsif common
-                     workspace.theme
-                   else
-                     __get__(:theme)[:project][to_sym] ||= {}
-                   end
+          @release = kwargs[:release]
           @output = []
           @ref = []
           @children = []
-          @graph = if graph
-                     as_a(graph, workspace.prefix ? ->(val) { workspace.task_name(val).to_sym } : :to_sym).freeze
-                   end
-          @pass = (pass ? as_a(pass) : []).freeze
-          @exclude = (exclude ? as_a(exclude, :to_sym) : []).freeze
           @events = {
             first: first,
             last: last,
             error: error
           }
+          @envname = @name.gsub(/[^\w]+/, '_').upcase.freeze
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
           @global = false
+          @log = nil
+          @dev = nil
+          @prod = nil
+          @withargs = nil
+          @session = nil
+          @index = -1
           run_set(kwargs[:run], kwargs[:env], opts: kwargs.fetch(:opts, true))
+          exception_set kwargs[:exception]
+          pipe_set kwargs[:pipe]
+          verbose_set kwargs[:verbose]
+          graph_set kwargs[:graph]
+          pass_set kwargs[:pass]
+          exclude_set kwargs[:exclude]
+          archive_set kwargs[:archive]
+          theme_set common
           initialize_ref Base.ref
         end
 
@@ -254,6 +243,44 @@ module Squared
           end
         end
 
+        def <=>(other)
+          return 0 unless workspace == other.workspace
+
+          a, b = graph_deps
+          return 1 if a.include?(other)
+
+          c, d = graph_deps other
+          e = b.reject { |val| d.include?(val) }
+          f = d.reject { |val| b.include?(val) }
+          if parent == other.parent
+            g = []
+            h = []
+          else
+            g = a.reject { |val| c.include?(val) }
+            h = c.reject { |val| a.include?(val) }
+          end
+          g << self
+          h << other
+          e.concat(g)
+          f.concat(h)
+          if g.any? { |val| f.include?(val) }
+            -1
+          elsif h.any? { |val| e.include?(val) }
+            1
+          elsif e.any? { |val| f.include?(val) }
+            -1
+          elsif f.any? { |val| e.include?(val) }
+            1
+          elsif @index >= 0 && (i = other.instance_variable_get(:@index)) >= 0
+            @index <= i ? -1 : 1
+          else
+            0
+          end
+        rescue StandardError => e
+          log&.debug e
+          0
+        end
+
         def ref
           Base.ref
         end
@@ -274,31 +301,31 @@ module Squared
 
                     format_desc action, flag, '(-)project*'
                     task flag do |_, args|
-                      args = args.to_a.reject { |val| name == val.to_s }
+                      args = args.to_a.reject { |val| name == val }
                       if flag == :run
                         graph args
                       else
                         out, done = graph(args, out: [])
                         out.map! do |val|
                           done.each_with_index do |proj, i|
-                            next unless val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/)
-
-                            val += " (#{i.succ})"
-                            break
+                            if val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/)
+                              val += " (#{i.succ})"
+                              break
+                            end
                           end
                           val
                         end
                         emphasize(out, title: path, right: true, border: borderstyle, sub: [
                           { pat: /\A(#{Regexp.escape(path.to_s)})(.*)\z/, styles: theme[:header] },
                           { pat: /\A(#{Regexp.escape(name)})(.*)\z/, styles: theme[:active] },
-                          { pat: /\A(.+ )(\()(\d+)(\))(.*)\z/, styles: theme[:inline], index: 3 }
+                          { pat: /\A((?~ \() \()(\d+)(\).*)\z/, styles: theme[:inline], index: 2 }
                         ])
                       end
                     end
                   when 'unpack'
                     format_desc(action, flag, 'tag/url,dir,digest?,f|force?', before: flag == :ext ? 'ext' : nil)
                     params = %i[tag dir digest force]
-                    params.unshift(:ext) if flag == :ext
+                    params.prepend(:ext) if flag == :ext
                     task flag, params do |_, args|
                       ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
                       tag = param_guard(action, flag, args: args, key: :tag)
@@ -342,42 +369,31 @@ module Squared
         end
 
         def add(path, name = nil, **kwargs, &blk)
-          checkdir = lambda do |val|
-            if val.directory? && !val.empty?
-              true
-            else
-              log&.warn "workspace \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
-              false
-            end
-          end
           if path.is_a?(String) && (seg = path[%r{\A(.+)[\\/]\*+\z}, 1])
-            return self unless checkdir.call(path = basepath(seg))
+            return self unless checkdir?(path = basepath(seg))
 
-            path = path.children.select { |val| checkdir.call(val) }
+            path = path.children.select { |val| checkdir?(val) }
           end
           if path.is_a?(Array)
             name = @name if name == true
             path.each { |val| add(val, name && task_join(name, File.basename(val)), **kwargs, &blk) }
             return self
-          elsif !projectpath?(path = basepath(path)) || !checkdir.call(path)
+          elsif !projectpath?(path = basepath(path)) || !checkdir?(path)
             return self
-          else
-            name = case name
-                   when String, Symbol
-                     name.to_s
-                   end
-          end
-          if @withargs
-            data = @withargs.dup
-            data.merge!(kwargs)
-            kwargs = data
           end
+          kwargs = @withargs.yield_self { |data| data.dup.update(kwargs) } if @withargs
           kwargs[:group] = group unless kwargs.key?(:group)
           kwargs[:ref] = ref unless kwargs.key?(:ref)
           parent = self
           proj = nil
-          workspace.add(path, name || path.basename, **kwargs) do
-            variable_set :parent, parent
+          name = case name
+                 when String, Symbol
+                   name.to_s
+                 else
+                   path.basename
+                 end
+          workspace.add(path, name, **kwargs) do
+            __send__ :parent_set, parent
             proj = self
           end
           @children << proj
@@ -409,7 +425,7 @@ module Squared
 
             run_b(@run, sync: sync, from: from) if series?(@run)
             args = @output
-            banner = verbosetype > 1 if task_invoked?('build', 'build:sync', 'default')
+            banner = verbosetype > 1 if from_base?('build')
           end
           if args.first.is_a?(Struct)
             f, blk = args.first.to_a
@@ -437,7 +453,7 @@ module Squared
 
                 cmd << a if (a = compose(as_get(b), d, script: true, args: e, from: from))
               end
-              var.merge!(c) if c.is_a?(Hash)
+              var.update(c) if c.is_a?(Hash)
             end
             cmd = cmd.join(' && ')
           else
@@ -450,7 +466,7 @@ module Squared
             case opts
             when Hash
               opts = append_hash(opts, build: true)
-              cmd = as_a(cmd).push(flags).concat(opts).compact.join(' ')
+              cmd = as_a(cmd).append(flags).concat(opts).compact.join(' ')
             when Enumerable
               cmd = as_a(cmd).concat(opts.to_a)
               cmd.map! { |val| "#{val} #{flags}" } if flags
@@ -464,13 +480,42 @@ module Squared
             cmd = compose(as_get(opts), flags, script: true, args: extra, from: from)
             from = :script if from == :run && script?
           end
-          run(cmd, var, from: from, banner: banner, sync: sync)
+          run(cmd, var, sync: sync, from: from, banner: banner)
         end
 
         def depend(*, sync: invoked_sync?('depend'), **)
           run_b(@depend, sync: sync, from: :depend)
         end
 
+        def prereqs(*, sync: invoked_sync?('prereqs'), **)
+          on :first, :prereqs
+          graph_deps.flatten(1).sort.each do |proj|
+            next if @@graph[:_].include?(proj)
+
+            if (val = ENV["PREREQS_#{proj.instance_variable_get(:@envname)}"] || ENV["PREREQS_#{proj.ref.upcase}"])
+              val.split(/\s*,\s*/).each do |meth|
+                if proj.respond_to?(meth.to_sym)
+                  begin
+                    proj.__send__(meth, sync: sync)
+                  rescue StandardError => e
+                    ret = on(:error, :prereqs, e)
+                    raise unless ret == true
+                  else
+                    next
+                  end
+                end
+                if warning?
+                  warn log_message(Logger::WARN, name, 'method not found', subject: 'prereqs', hint: meth, pass: true)
+                end
+              end
+            elsif proj.build?
+              proj.build(sync: sync)
+            end
+            @@graph[:_] << proj
+          end
+          on :last, :prereqs
+        end
+
         def archive(*, sync: invoked_sync?('archive'), **)
           return unless @archive.is_a?(Hash)
 
@@ -478,7 +523,7 @@ module Squared
         end
 
         def doc(*, sync: invoked_sync?('doc'), **)
-          run_b(@doc, sync: sync, from: :doc)
+          run_b(@doc, sync: sync, from: :doc, banner: from_base?('doc') ? verbosetype > 1 : verbose)
         end
 
         def lint(*, sync: invoked_sync?('lint'), **)
@@ -542,7 +587,7 @@ module Squared
           on :last, :clean unless pass
         end
 
-        def graph(start = [], tasks = nil, sync: invoked_sync?('graph'), pass: [], out: nil)
+        def graph(start = [], tasks = nil, *, sync: invoked_sync?('graph'), pass: [], out: nil, **)
           if (val = env('GRAPH', strict: true))
             tasks ||= []
             split_escape(val).each do |task|
@@ -560,20 +605,20 @@ module Squared
             data[name] << self
             on :first, :graph
           end
-          begin
-            done = graph_branch(self, data, tasks, out, sync: sync, pass: pass)
-          rescue StandardError => e
-            ret = on(:error, :graph, e)
-            raise unless ret == true
-          end
+          ret = graph_branch(self, data, tasks, out, sync: sync, pass: pass)
+        rescue StandardError => e
+          ret = on(:error, :graph, e)
+          raise unless ret == true
+        else
           if out
-            [out, done]
+            [out, ret]
           else
             on :last, :graph
           end
         end
 
         def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {}, from: :unpack)
+          require 'open-uri'
           if !target.exist?
             target.mkpath
           elsif !target.directory?
@@ -607,7 +652,7 @@ module Squared
           end
           data = nil
           (uri = as_a(uri)).each_with_index do |url, index|
-            fetch_uri(url, headers) do |f|
+            URI.open(url, headers) do |f|
               data = f.read
               if algo && algo.hexdigest(data) != digest
                 data = nil
@@ -679,7 +724,7 @@ module Squared
                 i += 1
               end
               FileUtils.mv(entry, dest)
-              dest.children.each { |child| FileUtils.mv(child, target) }
+              dest.each_child { |child| FileUtils.mv(child, target) }
               dest.rmdir
               target = entry
               depth -= 1
@@ -736,32 +781,44 @@ module Squared
           self
         end
 
-        def variable_set(key, *val, **kwargs, &blk)
-          if variables.include?(key)
+        def variable_set(key, *args, **kwargs, &blk)
+          if block_given?
+            if blocks.include?(key)
+              series key, &blk
+              return self
+            end
+            args = block_args args, &blk
+          end
+          if variables.include?(key) || blocks.include?(key)
+            val = case args.size
+                  when 0
+                    nil
+                  when 1
+                    args.first
+                  else
+                    args
+                  end
             case key
-            when :build, :run
-              run_set(*val, **kwargs)
+            when :index
+              index_set val
+            when :graph
+              graph_set val
+            when :pass
+              pass_set val
+            when :exclude
+              exclude_set val
+            when :parent
+              parent_set val
+            when :run
+              run_set(*args, **kwargs)
             when :script
-              script_set(*val, **kwargs)
+              script_set(*args, **kwargs)
             when :env
-              run_set(output[0], *val, **kwargs)
-            when :parent
-              @parent = val if (val = val.first).is_a?(Project::Base)
-            when :graph
-              @graph = case val.first
-                       when NilClass, FalseClass
-                         nil
-                       else
-                         val.flatten.map!(&:to_s).freeze
-                       end
+              run_set(output[0], *args, **kwargs)
             when :dependfile
-              @dependfile = basepath(*val)
+              @dependfile = basepath(*args)
             else
-              if blocks.include?(key) && block_given?
-                series key, &blk
-              else
-                instance_variable_set(:"@#{key}", block_given? && val.empty? ? blk : val.first)
-              end
+              instance_variable_set(:"@#{key}", val)
             end
           else
             log&.warn "variable_set: @#{key} (private)"
@@ -805,6 +862,15 @@ module Squared
           @graph.is_a?(Array) && !@graph.empty?
         end
 
+        def prereqs?
+          target = self
+          loop do
+            return true if target.graph?
+            break unless (target = target.parent)
+          end
+          false
+        end
+
         def copy?
           runnable?(@copy) || workspace.task_defined?(name, 'copy')
         end
@@ -897,7 +963,7 @@ module Squared
           puts_oe(*args, pipe: pipe)
         end
 
-        def run(cmd = @session, var = nil, exception: @exception, sync: true, banner: true, chdir: path, from: nil, **)
+        def run(cmd = @session, var = nil, exception: @exception, sync: true, from: nil, banner: true, chdir: path, **)
           unless cmd
             if warning?
               from &&= from.to_s
@@ -910,7 +976,7 @@ module Squared
           log&.info cmd
           on :first, from
           begin
-            if cmd.match?(/\A[^:]+:[^:]/) && workspace.task_defined?(cmd)
+            if cmd.start_with?(/[^:]+:[^:]/) && workspace.task_defined?(cmd)
               log&.warn "ENV discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
@@ -922,7 +988,7 @@ module Squared
                 when Enumerable
                   cmd = command(*pre.to_a, cmd)
                 else
-                  cmd = command(pre, cmd)
+                  cmd = command pre, cmd
                 end
               end
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
@@ -940,7 +1006,7 @@ module Squared
           end
         end
 
-        def run_s(*cmd, env: nil, sync: true, banner: verbose != false, from: nil, **kwargs)
+        def run_s(*cmd, env: nil, sync: true, from: nil, banner: verbose != false, **kwargs)
           on :first, from
           begin
             cmd.flatten.each { |val| run(val, env, sync: sync, banner: banner, **kwargs) }
@@ -951,11 +1017,11 @@ module Squared
           on :last, from
         end
 
-        def run_b(obj, from: nil, sync: true)
+        def run_b(obj, **kwargs)
           case obj
           when Struct
             if (any = instance_eval(&obj.block) || obj.run)
-              run_b(any, from: from, sync: sync)
+              run_b(any, **kwargs)
             end
           when Proc
             instance_eval(&obj)
@@ -965,9 +1031,9 @@ module Squared
             if series?(obj)
               obj.each(&:call)
             elsif obj.is_a?(Array) && obj.any? { |val| !val.is_a?(String) }
-              build(*obj, from: from, sync: sync)
+              build(*obj, **kwargs)
             elsif obj
-              run_s(obj.is_a?(Enumerable) ? obj.to_a : obj, from: from, sync: sync)
+              run_s(obj.is_a?(Enumerable) ? obj.to_a : obj, **kwargs)
             end
           end
         end
@@ -1052,7 +1118,7 @@ module Squared
                        k = 0
                        final = data.keys.last
                        while k < depth
-                         indent = k > 0 && ((last && !j) || (j && k == depth - 1) || single)
+                         indent = k > 0 ? ((last && !j) || (j && k == depth - 1) || single) : j && last && depth == 1
                          s += "#{indent || (last && data[final].last == context) ? ' ' : a}   "
                          k += 1
                        end
@@ -1087,10 +1153,28 @@ module Squared
               deps.concat(objs)
             end
           end
-          data[target.name] = deps.uniq.reject { |proj| proj == target }
+          deps.uniq!
+          deps.delete(target)
+          data[target.name] = deps
           data
         end
 
+        def graph_deps(target = self)
+          key = target.name
+          return @@graph[key] if @@graph.key?(key)
+
+          base = []
+          deps = []
+          loop do
+            deps.concat(graph_branch(target, graph_collect(target), []))
+            break unless (target = target.parent)
+
+            base << target
+          end
+          deps.uniq!
+          @@graph[key] = [base, deps]
+        end
+
         def env(key, default = nil, suffix: nil, equals: nil, ignore: nil, strict: false)
           a = "#{key}_#{@envname}"
           ret = if suffix
@@ -1142,21 +1226,24 @@ module Squared
           cmd.done
         end
 
+        def session_arg?(*args, target: @session, **kwargs)
+          return false unless target
+
+          OptionPartition.arg?(target, *args, **kwargs)
+        end
+
         def option(*args, target: @session, prefix: target&.first, **kwargs)
           if prefix
             args.each do |val|
-              ret = env("#{stripext(prefix)}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
-              return ret if ret
+              next unless (ret = env("#{stripext(prefix)}_#{val.gsub(/\W/, '_')}".upcase, **kwargs))
+              return ret unless block_given?
+
+              return yield ret
             end
           end
           nil
         end
 
-        def option_sanitize(opts, list, target: @session, **kwargs)
-          op = OptionPartition.new(opts, list, target, project: self, **kwargs)
-          [op.extras, op.values]
-        end
-
         def option_clear(opts, target: @session, **kwargs)
           return unless target
 
@@ -1168,7 +1255,7 @@ module Squared
         end
 
         def print_item(*val)
-          puts if !printfirst? && stdout?
+          puts unless printfirst?
           printsucc
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
@@ -1182,7 +1269,7 @@ module Squared
               styles = [:bold] + styles
             end
           end
-          n = Project.max_width(lines)
+          n = line_width lines
           ch = ' ' * pad
           index = -1
           lines.map! do |val|
@@ -1198,7 +1285,7 @@ module Squared
         end
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
-          n = Project.max_width(lines)
+          n = line_width lines
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
             sub&.each { |h| s = sub_style(s, **h) }
@@ -1212,31 +1299,30 @@ module Squared
         def format_desc(action, flag, opts = nil, **kwargs)
           return unless TASK_METADATA
 
-          ret = [@desc, action]
-          ret << flag if flag
-          workspace.format_desc(ret, opts, **kwargs)
+          workspace.format_desc([@desc, action, flag].compact, opts, **kwargs)
         end
 
         def format_banner(cmd, banner: true)
           return unless banner && banner?
 
           if (data = workspace.banner_get(*@ref, group: group))
-            return if data.empty?
+            return if !data.command && data.order.empty?
 
             client = true
           else
-            data = { command: true, order: [:path], styles: theme[:banner], border: theme[:border] }
+            data = Workspace::Support::BannerData.new(true, [:path], theme[:banner], theme[:border])
           end
           if verbose
             out = []
-            if data[:command]
-              if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+)) /
+            if data.command
+              if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+))( |\z)/
                 path = $3 || $2 || $1
-                cmd = cmd.sub(path, stripext(path).upcase)
+                name = stripext path
+                cmd = cmd.sub(path, data.command == 0 ? name : name.upcase)
               end
               out << cmd
             end
-            data[:order].each do |val|
+            data.order.each do |val|
               if val.is_a?(Array)
                 s = ' '
                 found = false
@@ -1246,7 +1332,7 @@ module Squared
                     meth
                   elsif respond_to?(meth)
                     found = true
-                    __send__(meth)
+                    __send__ meth
                   end
                 end
                 val = val.compact.join(s)
@@ -1256,9 +1342,9 @@ module Squared
               end
               out << val.to_s
             end
-            print_banner(*out, styles: data[:styles], border: data[:border], client: client)
+            print_banner(*out, styles: data.styles, border: data.border, client: client)
           elsif workspace.series.multiple?
-            "## #{__send__(data[:order].first || :path)} ##"
+            "## #{__send__(data.order.first || :path)} ##"
           end
         end
 
@@ -1335,14 +1421,15 @@ module Squared
         end
 
         def append_any(val, target: @session, build: false, delim: false)
+          return unless val
+
           if delim && !target.include?('--')
             target << '--'
           else
             delim = false
           end
+          val = shell_split(val) if val.is_a?(String)
           case val
-          when String
-            target << val
           when Hash
             append_hash(val, target: target, build: build)
           when Enumerable
@@ -1373,7 +1460,7 @@ module Squared
             return target << (if flag
                                 shell_option(opt, equals ? val : nil, quote: quote, escape: escape, force: force)
                               else
-                                shell_quote(val)
+                                shell_quote val
                               end)
           end
           nil
@@ -1383,17 +1470,18 @@ module Squared
                           **kwargs)
           return if list.empty?
 
-          ret = []
-          list.flatten.each do |flag|
-            next unless (val = option(flag, target: target, **kwargs))
+          [].tap do |ret|
+            list.flatten.each do |flag|
+              next unless (val = option(flag, target: target, **kwargs))
 
-            if val == '0' && no
-              flag = "no-#{flag}"
-              val = nil
+              if val == '0' && no
+                flag = "no-#{flag}"
+                val = nil
+              end
+              ret << shell_option(flag, equals ? val : nil, escape: escape, quote: quote, force: force)
             end
-            ret << shell_option(flag, equals ? val : nil, escape: escape, quote: quote, force: force)
+            ret.each { |val| target << val } unless ret.empty?
           end
-          ret.each { |val| target << val } unless ret.empty?
         end
 
         def append_nocolor(target: @session)
@@ -1441,9 +1529,9 @@ module Squared
         end
 
         def collect_hash(data, pass: [])
-          ret = []
-          data.each { |key, val| ret.concat(val) unless pass.include?(key) }
-          ret
+          [].tap do |ret|
+            data.each { |key, val| ret.concat(val) unless pass.include?(key) }
+          end
         end
 
         def parse_json(val, kind: Hash, hint: nil)
@@ -1456,15 +1544,6 @@ module Squared
           ret
         end
 
-        def fetch_uri(*args, **kwargs, &blk)
-          require 'open-uri'
-          if RUBY_VERSION < '2.5'
-            open(*args, **kwargs, &blk)
-          else
-            URI.open(*args, **kwargs, &blk)
-          end
-        end
-
         def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
@@ -1479,7 +1558,7 @@ module Squared
           args
         end
 
-        def confirm_outdated(pkg, ver, rev, lock: false)
+        def confirm_outdated(pkg, ver, rev, cur = nil, lock: false, col1: 0)
           a = sub_style(case rev
                         when 1
                           'MAJOR'
@@ -1487,11 +1566,11 @@ module Squared
                           'MINOR'
                         else
                           'PATCH'
-                        end, styles: theme[:header])
-          b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
+                        end, styles: (rev == 1 && theme[:major]) || theme[:header])
+          b = sub_style(pkg.ljust(col1), styles: theme[:inline])
           c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
-          e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          confirm "Upgrade to #{a}? #{b + e} [#{c}] ", d
+          e = lock ? sub_style((cur || 'locked').rjust(7), styles: color(:red)) : cur&.rjust(7)
+          confirm "#{a}: #{b}#{e} #{sub_style(ver.rjust(col1 > 0 ? 10 : 0), styles: theme[:inline])} [#{c}] ", d
         end
 
         def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil,
@@ -1547,6 +1626,20 @@ module Squared
           ret
         end
 
+        def command_args(args, force: false, **kwargs)
+          return unless args.size == 1 && !option('i', 'interactive', **kwargs, equals: '0')
+
+          readline('Enter arguments', force: force)
+        end
+
+        def block_args(val = nil, &blk)
+          if (ret = instance_eval(&blk)).nil?
+            val
+          else
+            ret.is_a?(Array) ? ret : [ret]
+          end
+        end
+
         def runenv
           nil
         end
@@ -1592,8 +1685,7 @@ module Squared
         end
 
         def semscan(val, fill: true)
-          ret = val.scan(SEM_VER).first
-          fill ? semver(ret) : ret
+          val.scan(SEM_VER).first.yield_self { |data| fill ? semver(data) : data }
         end
 
         def indexitem(val)
@@ -1609,8 +1701,7 @@ module Squared
         end
 
         def color(val)
-          ret = theme[val]
-          ret && !ret.empty? ? ret : [val]
+          theme[val].yield_self { |styles| styles && !styles.empty? ? styles : [val] }
         end
 
         def colormap(val)
@@ -1652,39 +1743,22 @@ module Squared
           end
         end
 
-        def pwd_set(done = nil, pass: false, from: nil, dryrun: false)
-          pwd = Pathname.pwd
-          if block_given?
-            begin
-              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
-                ret = yield
-              else
-                Dir.chdir(path)
-                ret = yield
-                Dir.chdir(pwd)
-              end
-            rescue StandardError => e
-              log&.error e
-              unless dryrun
-                ret = on(:error, from, e)
-                raise if exception && ret != true
-              end
-            else
-              ret
-            end
-          elsif @pwd == pwd
-            @pwd = nil
-            pwd unless done
-          elsif @pwd
-            return unless path == pwd
-
-            Dir.chdir(@pwd)
-            @pwd = nil
-          elsif !done && path != pwd
-            @pwd = pwd
+        def pwd_set(pass: false, from: nil)
+          pwd = Dir.pwd
+          if path.to_s == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
+            ret = yield
+          else
             Dir.chdir(path)
-            @pwd
+            ret = yield
+            Dir.chdir(pwd)
           end
+        rescue StandardError => e
+          puts e
+          log&.error e
+          ret = on(:error, from, e)
+          raise if exception && ret != true
+        else
+          ret
         end
 
         def run_set(cmd, val = nil, opts: nil, **)
@@ -1749,6 +1823,72 @@ module Squared
           @output[4] = args unless @output[4] == false || args.nil?
         end
 
+        def index_set(val)
+          @index = val if val.is_a?(Numeric)
+        end
+
+        def parent_set(val)
+          @parent = val if val.is_a?(Project::Base)
+        end
+
+        def exception_set(val)
+          @exception = env_bool(val, workspace.exception, strict: true)
+        end
+
+        def pipe_set(val)
+          @pipe = env_pipe(val, workspace.pipe, strict: true)
+        end
+
+        def verbose_set(val)
+          @verbose = case val
+                     when NilClass
+                       workspace.verbose
+                     when String
+                       env_bool(val, workspace.verbose, strict: true, index: true)
+                     else
+                       val
+                     end
+        end
+
+        def graph_set(val)
+          @graph = if val
+                     as_a(val).map { |s| workspace.prefix ? workspace.task_name(s).to_sym : s.to_sym }.freeze
+                   end
+        end
+
+        def pass_set(val)
+          @pass = (val ? as_a(val, :to_s) : []).freeze
+        end
+
+        def exclude_set(val)
+          @exclude = (val ? as_a(val, :to_sym) : []).freeze
+        end
+
+        def archive_set(val)
+          @archive = case val
+                     when String, Array
+                       { uri: val }
+                     when Hash
+                       val
+                     end
+        end
+
+        def theme_set(common)
+          @theme = if !verbose
+                     {}
+                   elsif common
+                     workspace.theme
+                   else
+                     __get__(:theme)[:project][to_sym] ||= {}
+                   end
+        end
+
+        def dependfile_set(list)
+          @dependindex = list.index { |file| basepath(file).exist? }.tap do |index|
+            @dependfile = @path + list[index || 0]
+          end
+        end
+
         def as_get(val)
           return unless val
 
@@ -1765,7 +1905,7 @@ module Squared
               unless @pass.include?(key.to_s) || ws.task_defined?(name, action) || ws.task_exclude?(action, self)
                 ws.task_desc(@desc, action)
                 task action do
-                  __send__(key)
+                  __send__ key
                 end
               end
               next if (items = @children.select { |item| item.task_include?(key) }).empty?
@@ -1777,8 +1917,18 @@ module Squared
         end
 
         def projectpath?(val)
-          val = Pathname.new(val).cleanpath
-          val.absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?(File.join('..', ''))
+          Pathname.new(val).cleanpath.yield_self do |file|
+            file.absolute? ? file.to_s.start_with?(File.join(path, '')) : !file.to_s.start_with?(File.join('..', ''))
+          end
+        end
+
+        def checkdir?(val)
+          if val.directory? && !val.empty?
+            true
+          else
+            log&.warn "directory \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
+            false
+          end
         end
 
         def semmajor?(cur, want)
@@ -1802,8 +1952,8 @@ module Squared
           val.is_a?(Array) && val.all? { |p| p.is_a?(Proc) || p.is_a?(Method) }
         end
 
-        def session_arg?(*args, target: @session, **kwargs)
-          !!target && OptionPartition.arg?(target, *args, **kwargs)
+        def from_base?(val)
+          task_invoked?(val, "#{val}:sync", 'default')
         end
 
         def from_sync?(*val)
@@ -1819,13 +1969,9 @@ module Squared
           return val if group && !(val = from_sync?(ac, group)).nil?
           return val if (base = workspace.find_base(self)) && !(val = from_sync?(ac, base.ref)).nil?
           return false if workspace.series.chain?(val = task_join(name, action))
+          return true if task_invoked?(val) && (!task_invoked?(ac) || !workspace.task_defined?(ac, 'sync'))
 
-          if task_invoked?(val) && (!task_invoked?(ac) || !workspace.task_defined?(ac, 'sync'))
-            true
-          else
-            val = workspace.series.name_get(action)
-            val != action && invoked_sync?(val)
-          end
+          workspace.series.name_get(action).yield_self { |name| name != action && invoked_sync?(name) }
         end
 
         def success?(ret)
@@ -1848,22 +1994,19 @@ module Squared
           workspace.warning
         end
 
-        def has_value?(data, val)
-          return data.value?(val) if data.is_a?(Hash)
-          return data.is_a?(Enumerable) && data.to_a.include?(val) if !val.is_a?(Enumerable) || val.is_a?(Hash)
-
-          val.to_a.any? do |obj|
-            case data
-            when Hash
-              data.value?(obj)
-            when Enumerable
-              data.to_a.include?(obj)
-            end
+        def has_value?(data, other)
+          case data
+          when Hash
+            other.is_a?(Enumerable) ? other.any? { |obj| data.value?(obj) } : data.value?(other)
+          when Enumerable
+            other.is_a?(Enumerable) ? other.any? { |obj| data.include?(obj) } : data.include?(other)
+          else
+            false
           end
         end
 
         def variables
-          Base.tasks + VAR_SET
+          VAR_SET
         end
 
         def blocks
@@ -1871,7 +2014,7 @@ module Squared
         end
 
         def borderstyle
-          ((data = workspace.banner_get(*@ref, group: group)) && data[:border]) || theme[:border]
+          workspace.banner_get(*@ref, group: group)&.border || theme[:border]
         end
 
         def headerstyle
@@ -1884,7 +2027,7 @@ module Squared
       end
 
       Application.implement(Base, base: true)
-      Application.attr_banner = Common::SymSet.new(%i[name project path ref group parent])
+      Application.attr_banner = Set.new(%i[name project path ref group parent])
     end
   end
 end