squared 0.4.6 → 0.4.8

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

@@ -2,6 +2,7 @@
 
 require 'json'
 require 'date'
+require 'time'
 require 'logger'
 
 module Squared
@@ -13,13 +14,15 @@ module Squared
         include Shell
         include Prompt
         include Utils
+        include Support
         include Rake::DSL
 
         VAR_SET = %i[parent global envname dependfile dependindex theme run script env pass].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
-        private_constant :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME
+        TASK_METADATA = Rake::TaskManager.record_task_metadata
+        private_constant :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
 
         class << self
           def populate(*); end
@@ -44,7 +47,9 @@ module Squared
             @ref ||= to_s.downcase.to_sym
           end
 
-          def subtasks(val)
+          def subtasks(val = nil, &blk)
+            return @@tasks[val || ref].each(&blk) if block_given?
+
             @@tasks[ref] = val.freeze
           end
 
@@ -58,12 +63,11 @@ module Squared
         end
 
         @@tasks = {}
-        @@task_desc = Rake::TaskManager.record_task_metadata
         @@print_order = 0
 
         subtasks({
           'graph' => %i[run print].freeze,
-          'unpack' => %i[zip tar ext].freeze
+          'unpack' => %i[zip tar gem ext].freeze
         })
 
         attr_reader :name, :project, :workspace, :path, :theme, :exception, :pipe, :verbose,
@@ -94,7 +98,7 @@ module Squared
           @exception = env_bool(kwargs[:exception], workspace.exception, strict: true)
           @pipe = env_pipe(kwargs[:pipe], workspace.pipe, strict: true)
           @verbose = case verbose
-                     when nil
+                     when NilClass
                        workspace.verbose
                      when String
                        env_bool(verbose, workspace.verbose, strict: true, index: true)
@@ -192,19 +196,24 @@ module Squared
           return if @log
 
           log = log.is_a?(Hash) ? log.dup : { file: log }
-          unless (file = env('LOG_FILE'))
-            file = case env('LOG_AUTO')
-                   when 'y', 'year'
-                     "#{@name}-#{Date.today.year}.log"
-                   when 'm', 'month'
-                     "#{@name}-#{Date.today.strftime('%Y-%m')}.log"
-                   when 'd', 'day', '1'
-                     "#{@name}-#{Date.today}.log"
-                   end
-          end
-          if file ||= log[:file]
-            file = Date.today.strftime(file)
-            file = (dir = env('LOG_DIR')) ? @workspace.home.join(dir, file) : @workspace.home.join(file)
+          if (file = env('LOG_FILE'))
+            file = Time.now.strftime(file)
+          elsif (val = env('LOG_AUTO'))
+            file = "#{@name}-%s.log" % [case val
+                                        when 'y', 'year'
+                                          Date.today.year
+                                        when 'm', 'month'
+                                          Date.today.strftime('%Y-%m')
+                                        when 'd', 'day', '1'
+                                          Date.today
+                                        else
+                                          val.include?('%') ? Time.now.strftime(val) : Time.now.strftime('%FT%T%:z')
+                                        end]
+          elsif (val = log[:file])
+            file = val.is_a?(String) ? Time.now.strftime(val) : "#{@name}-#{Date.today}.log"
+          end
+          if file
+            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home.join(file)
             begin
               file = file.realdirpath
             rescue StandardError => e
@@ -259,7 +268,7 @@ module Squared
           return unless ref?(Base.ref)
 
           namespace name do
-            @@tasks[Base.ref].each do |action, flags|
+            Base.subtasks do |action, flags|
               next if @pass.include?(action)
 
               namespace action do
@@ -292,17 +301,21 @@ module Squared
                       end
                     end
                   when 'unpack'
-                    format_desc(action, flag, 'tag/url,dir,digest?,f/force?', before: flag == :ext ? 'ext' : nil)
+                    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
                     task flag, params do |_, args|
-                      ext = param_guard(action, flag, args: args, key: :ext).downcase if flag == :ext
+                      ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
                       tag = param_guard(action, flag, args: args, key: :tag)
                       dir = param_guard(action, flag, args: args, key: :dir)
                       unless tag.match?(URI_SCHEME)
-                        raise_error 'no base uri' unless @release
-
-                        tag = "#{@release.include?('??') ? @release.sub('??', tag) : @release + tag}.#{flag}"
+                        if flag == :gem
+                          tag = "https://rubygems.org/downloads/#{File.basename(tag, '.gem')}.gem"
+                        elsif @release
+                          tag = "%s.#{ext}" % [@release.include?('??') ? @release.sub('??', tag) : @release + tag]
+                        else
+                          raise_error("no base uri: #{tag}", hint: ext)
+                        end
                       end
                       case (digest = args.digest)
                       when 'f', 'force'
@@ -311,7 +324,7 @@ module Squared
                       else
                         force = args.fetch(:force, false)
                       end
-                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext || flag.to_s, force: force)
+                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext, force: force)
                     end
                   end
                 end
@@ -343,15 +356,15 @@ module Squared
             end
           end
           if path.is_a?(String) && (seg = path[%r{^(.+)[\\/]\*+$}, 1])
-            return self unless checkdir.(path = basepath(seg))
+            return self unless checkdir.call(path = basepath(seg))
 
-            path = path.children.select { |val| checkdir.(val) }
+            path = path.children.select { |val| checkdir.call(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.(path)
+          elsif !projectpath?(path = basepath(path)) || !checkdir.call(path)
             return self
           elsif name.is_a?(Symbol)
             name = name.to_s
@@ -395,12 +408,19 @@ module Squared
 
             run_b(@run, sync: sync, from: from) if series?(@run)
             args = @output
-            banner = verbosity > 0 if task_invoked?('build', 'build:sync', 'default')
+            banner = verbosetype > 1 if task_invoked?('build', 'build:sync', 'default')
+          end
+          if args.first.is_a?(Struct)
+            f, blk = args.first.to_a
+            args[0] = instance_eval(&blk) || f
+            return unless args[0]
           end
           if args.all? { |val| val.is_a?(Array) }
             cmd = []
             var = {}
             args.each do |val|
+              next instance_exec(*val[1..-1], &val[0]) if val.first.is_a?(Proc)
+
               a, b, c, d, e = val
               case b
               when Hash
@@ -450,7 +470,7 @@ module Squared
         end
 
         def archive(*, sync: invoked_sync?('archive'), **)
-          return unless @archive.is_a?(Array)
+          return unless @archive.is_a?(Hash)
 
           unpack(path, **@archive, sync: sync, from: :archive)
         end
@@ -471,11 +491,18 @@ module Squared
           run_b(@copy, sync: sync, from: :copy)
         end
 
-        def clean(*, sync: invoked_sync?('clean'), **)
+        def clean(*args, sync: invoked_sync?('clean'), pass: false, **kwargs)
           return unless @clean
 
-          on :first, :clean
+          on :first, :clean unless pass
           case @clean
+          when Struct
+            if (any = instance_eval(&@clean.block) || @clean.run)
+              temp = @clean
+              @clean = any
+              clean(*args, sync: sync, pass: true, **kwargs)
+              @clean = temp
+            end
           when String
             run_s(@clean, sync: sync)
           when Hash
@@ -488,12 +515,11 @@ module Squared
             end
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
-              as_a(@clean).each do |val|
-                val = val.to_s
-                path = basepath(val)
+              @clean.each do |val|
+                path = basepath(val = val.to_s)
                 if path.directory? && val.match?(%r{[\\/]$})
                   log&.warn "rm -rf #{path}"
-                  FileUtils.rm_rf(path, verbose: verbose)
+                  rm_rf(path, verbose: verbose)
                 else
                   log&.warn "rm #{path}"
                   (val.include?('*') ? Dir[path] : [path]).each do |file|
@@ -511,7 +537,7 @@ module Squared
               run_b(@clean, sync: sync)
             end
           end
-          on :last, :clean
+          on :last, :clean unless pass
         end
 
         def graph(start = [], tasks = nil, sync: invoked_sync?('graph'), pass: [], out: nil)
@@ -519,13 +545,13 @@ module Squared
             tasks ||= []
             split_escape(val).each do |task|
               if ref?(task.to_sym) && (script = workspace.script_get(:graph, ref: task.to_sym))
-                tasks += script[:graph]
+                tasks.concat(script[:graph])
               else
                 tasks << task
               end
             end
           end
-          pass += split_escape(val) if (val = env('GRAPH', suffix: 'PASS'))
+          pass.concat(split_escape(val)) if (val = env('GRAPH', suffix: 'PASS'))
           start, neg = start.partition { |name| !name.start_with?('-') }
           data = graph_collect(self, start, pass: neg.map! { |name| name[1..-1] })
           unless out
@@ -554,8 +580,11 @@ module Squared
           elsif !target.empty?
             raise_error('directory not empty', hint: target) unless force || env('UNPACK_FORCE')
             create = true
+          elsif !uri
+            raise_error('no download uri', hint: target)
           end
           if digest
+            require 'digest'
             if (n = digest.index(':').to_i) > 0
               size = digest[0, n].downcase
               digest = digest[n + 1..-1]
@@ -582,11 +611,10 @@ module Squared
           if (val = env('HEADERS')) && (val = parse_json(val, hint: "HEADERS_#{@envname}"))
             headers = val
           end
-          require 'open-uri'
           data = nil
           (uri = as_a(uri)).each_with_index do |url, index|
             last = index == uri.size - 1
-            URI.open(url, headers) do |f|
+            fetch_uri(url, headers) do |f|
               data = f.read
               if algo && algo.hexdigest(data) != digest
                 data = nil
@@ -610,13 +638,19 @@ module Squared
               raise_error('no content', hint: url)
             end
           end
-          ext ||= URI.parse(uri).path[/^.+?\.((?:tar\.)?\w+)$/i, 1]
-          if (n = env("#{ext == 'zip' || ext == '7z' ? ext.upcase : 'TAR'}_DEPTH", ignore: false))
-            depth = n.to_i
+          raise_error('no content type', hint: uri) unless ext ||= URI.parse(uri).path[/\.(\w+)(\?|$)/i, 1]
+          ext = ext.downcase
+          if (val = env("#{%w[zip 7z gem].include?(ext) ? ext.upcase : 'TAR'}_DEPTH", ignore: false))
+            depth = val.to_i
           end
           begin
-            require 'tempfile'
-            file = Tempfile.new("#{name}-")
+            if ext == 'gem'
+              dir = Dir.mktmpdir
+              file = File.new(File.join(dir, File.basename(uri)), 'w')
+            else
+              require 'tempfile'
+              file = Tempfile.new("#{name}-")
+            end
             file.write(data)
             file.close
             if create
@@ -639,6 +673,9 @@ module Squared
               depth = 0
             when '7z'
               session '7z', 'x', shell_quote(file.path), "-o#{shell_quote(target)}"
+            when 'gem'
+              session 'gem', 'unpack', shell_quote(file.path), quote_option('target', target)
+              depth = 0 unless val
             else
               raise_error("unsupported format: #{ext}", hint: uri)
             end
@@ -647,7 +684,10 @@ module Squared
               entry = target.children.first
               break unless entry.directory?
 
-              dest = target.join(File.basename(file.path))
+              i = 0
+              while (dest = target.join("#{File.basename(file.path)}-#{i}")).exist?
+                i += 1
+              end
               FileUtils.mv(entry, dest)
               dest.children.each { |child| FileUtils.mv(child, target) }
               dest.rmdir
@@ -655,7 +695,11 @@ module Squared
               depth -= 1
             end
           ensure
-            file&.unlink
+            if dir
+              remove_entry dir
+            elsif file
+              file.unlink
+            end
           end
         end
 
@@ -715,7 +759,7 @@ module Squared
               @parent = val if (val = val.first).is_a?(Project::Base)
             when :graph
               @graph = case val.first
-                       when nil, false
+                       when NilClass, FalseClass
                          nil
                        else
                          val.flatten.map!(&:to_s).freeze
@@ -918,7 +962,13 @@ module Squared
 
         def run_b(obj, from: nil, sync: true)
           case obj
-          when Proc, Method
+          when Struct
+            if (any = instance_eval(&obj.block) || obj.run)
+              run_b(any, from: from, sync: sync)
+            end
+          when Proc
+            instance_eval(&obj)
+          when Method
             obj.call
           else
             if series?(obj)
@@ -947,14 +997,14 @@ module Squared
           end
           start = target.name
           if depth == 0
-            items = check.(dedupe.(start))
+            items = check.call(dedupe.call(start))
             single = items.size == 1
           else
-            items = check.(data[start])
+            items = check.call(data[start])
           end
           if out
             a, b, c, d, e = ARG[:GRAPH]
-            f = tag.(target)
+            f = tag.call(target)
             out << case depth
                    when 0
                      f
@@ -971,15 +1021,15 @@ module Squared
           items.each_with_index do |proj, i|
             next if done.include?(proj)
 
-            t = dedupe.(proj.name)
+            t = dedupe.call(proj.name)
             j = if out
-                  if i == items.size - 1 || check.(post = items[i + 1..-1]).empty?
+                  if i == items.size - 1 || check.call(post = items[i + 1..-1]).empty?
                     true
                   elsif !t.empty? && depth > 0
                     post.reject { |pr| t.include?(pr) }.empty?
                   end
                 end
-            unless start == proj.name || (none = check.(t).empty?)
+            unless start == proj.name || (none = check.call(t).empty?)
               graph_branch(proj, data, tasks, out, sync: sync, pass: pass, done: done, depth: depth.succ,
                                                    single: single, last: j == true, context: target)
             end
@@ -1005,7 +1055,7 @@ module Squared
             elsif none
               a, b, c, d = ARG[:GRAPH]
               out << if depth == 0
-                       "#{i == items.size - 1 ? d : c}#{b * 4} #{tag.(proj)}"
+                       "#{i == items.size - 1 ? d : c}#{b * 4} #{tag.call(proj)}"
                      else
                        s = ''.dup
                        k = 0
@@ -1015,7 +1065,7 @@ module Squared
                          s += "#{indent || (last && data[final].last == context) ? ' ' : a}   "
                          k += 1
                        end
-                       s + "#{j ? d : c}#{b * 3} #{tag.(proj)}"
+                       s + "#{j ? d : c}#{b * 3} #{tag.call(proj)}"
                      end
             end
             done << proj
@@ -1043,7 +1093,7 @@ module Squared
               next if (objs = data.fetch(proj.name, [])).include?(target)
 
               deps << proj
-              deps += objs
+              deps.concat(objs)
             end
           end
           data[target.name] = deps.uniq.reject { |proj| proj == target }
@@ -1066,7 +1116,7 @@ module Squared
         end
 
         def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
-          prefix = prefix.to_s.upcase
+          prefix = stripext(prefix.to_s).upcase
           if path && (val = ENV["PATH_#{prefix}"] || PATH[prefix] || PATH[prefix.to_sym])
             cmd[0] = shell_quote(val, force: false)
           end
@@ -1077,9 +1127,9 @@ module Squared
           main ? @session = ret : ret
         end
 
-        def session_delete(*list, target: @session)
+        def session_delete(*args, target: @session)
           ret = []
-          list.each do |val|
+          args.each do |val|
             pat = /^#{Regexp.escape(shell_option(val))}(?: |=|$)/
             if (key = target.find { |opt| opt.match?(pat) })
               target.delete(key)
@@ -1101,122 +1151,25 @@ module Squared
           cmd.done
         end
 
-        def option(*args, prefix: @session&.first, **kwargs)
+        def option(*args, target: @session, prefix: target&.first, **kwargs)
           if prefix
-            prefix = File.basename(prefix, File.extname(prefix))
             args.each do |val|
-              ret = env("#{prefix}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
+              ret = env("#{stripext(prefix)}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
               return ret if ret
             end
           end
           nil
         end
 
-        def option_sanitize(opts, list, target: @session, no: nil, single: nil, args: false, first: false, pass: ['='])
-          ret = []
-          reg = []
-          bare = []
-          e = []
-          b = []
-          m = []
-          p = []
-          q = []
-          qq = []
-          i = []
-          f = []
-          si = []
-          list.map do |val|
-            x, y = val.split('|')
-            if y
-              if (n = val.index('='))
-                x += val[n..-1]
-              end
-              [x, y]
-            else
-              x
-            end
-          end
-          .flatten
-          .each do |val|
-            if (n = val.index('='))
-              flag = val[0, n]
-              case val[n + 1]
-              when 'e'
-                e << flag
-              when 'b'
-                b << flag
-              when 'm'
-                m << flag
-              when 'q'
-                qq << flag if val[n + 2] == 'q'
-                q << flag
-              when 'p'
-                p << flag
-              when 'i'
-                i << flag
-              when 'f'
-                f << flag
-              when 'n'
-                si << flag
-              else
-                reg << Regexp.escape(flag)
-              end
-              bare << flag if val.end_with?('?')
-            else
-              bare << val
-            end
-          end
-          no = (no || []).map { |val| (n = val.index('=')) ? val[0, n] : val }
-          bare += no
-          found = false
-          opts.each do |opt|
-            next ret << opt if found
-
-            if single&.match?(opt)
-              target << "-#{opt}"
-            elsif bare.include?(opt)
-              target << (opt.size == 1 ? "-#{opt}" : "--#{opt}")
-            elsif opt.start_with?('no-') && no.include?(name = opt[3..-1])
-              target << "--no-#{name}"
-            else
-              if opt =~ /\A([^=]+)=(.+)\z/
-                key = $1
-                val = $2
-                match = ->(flag, pat) { flag.include?(key) && pat.match?(val) }
-                if e.include?(key)
-                  target << shell_option(key, val)
-                elsif q.include?(key)
-                  target << quote_option(key, val, double: qq.include?(key))
-                elsif p.include?(key)
-                  target << quote_option(key, basepath(val))
-                elsif m.include?(key)
-                  target << basic_option(key, val, merge: true)
-                elsif b.include?(key) || match.(i, /^\d+$/) || match.(f, /^\d*(?:\.\d+)?$/) || match.(si, /^-?\d+$/)
-                  target << basic_option(key, val)
-                else
-                  ret << opt
-                end
-                opt = key
-              else
-                ret << opt
-                found = true if args
-              end
-              found = true if first && pass.none? { |s| opt.include?(s) }
-            end
-          end
-          [ret, reg.empty? ? /\A\s+\z/ : /^(#{reg.join('|')})=(.+)$/]
+        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, pass: true, append: false, **kwargs)
-          return if opts.empty?
-
-          kwargs[:subject] ||= target&.first
-          kwargs[:hint] ||= 'unrecognized'
-          warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
-          append_value(opts, delim: true) if append
-          return if pass || confirm("Run? [#{sub_style(target, styles: theme[:inline])}] [y/N] ", 'N', timeout: 30)
+        def option_clear(opts, target: @session, **kwargs)
+          return unless target
 
-          raise_error 'user cancelled'
+          OptionPartition.clear(target, opts, styles: theme[:inline], **kwargs)
         end
 
         def print_item(*val)
@@ -1263,7 +1216,7 @@ module Squared
         end
 
         def format_desc(action, flag, opts = nil, **kwargs)
-          return unless @@task_desc
+          return unless TASK_METADATA
 
           ret = [@desc, action]
           ret << flag if flag
@@ -1323,7 +1276,7 @@ module Squared
             items.each_with_index do |val, i|
               next unless reg.empty? || reg.any? { |pat| val[0].match?(pat) }
 
-              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.(val) : val[0]}"
+              out << "#{i.succ.to_s.rjust(pad)}. #{each ? each.call(val) : val[0]}"
             end
           end
           sub = [headerstyle]
@@ -1331,7 +1284,7 @@ module Squared
             out = ["No #{type} were found:", '']
             unless grep.empty?
               i = 0
-              out += grep.map { |s| "#{i += 1}. #{s}" }
+              out.concat(grep.map { |s| "#{i += 1}. #{s}" })
               out << ''
             end
             if from
@@ -1358,7 +1311,6 @@ module Squared
         end
 
         def append_hash(data, target: @session, build: false)
-          target ||= []
           if build && (type = env('BUILD', suffix: 'TYPE') || ENV['BUILD_TYPE'])
             type = "__#{type}__"
             if (extra = data[type] || data[type.to_sym]).is_a?(Hash)
@@ -1379,7 +1331,7 @@ module Squared
               append_repeat(key, val, target: target)
             when Numeric
               target << basic_option(key, val)
-            when false
+            when FalseClass
               target << shell_option(key).sub(/^--(?!no-)/, '--no-')
             else
               target << shell_option(key, val.is_a?(String) ? val : nil)
@@ -1411,22 +1363,17 @@ module Squared
           end
         end
 
-        def append_value(*list, target: @session, delim: false, escape: false, quote: true)
-          return if (list = list.flatten).empty?
+        def append_value(*list, target: @session, **kwargs)
+          return unless target
 
-          target << '--' if delim && !target.include?('--')
-          list.map! do |val|
-            ret = escape ? shell_escape(val, quote: quote) : shell_quote(val)
-            target << ret
-            ret
-          end
+          OptionPartition.append(target, *list, **kwargs)
         end
 
         def append_first(*list, target: @session, flag: true, equals: false, escape: true, quote: true, force: true,
                          **kwargs)
-          return if (list = list.flatten).empty?
+          return if list.empty?
 
-          list.each do |opt|
+          list.flatten.each do |opt|
             next unless (val = option(opt, **kwargs))
 
             return target << (if flag
@@ -1440,11 +1387,11 @@ module Squared
 
         def append_option(*list, target: @session, no: false, equals: false, escape: true, quote: true, force: true,
                           **kwargs)
-          return if (list = list.flatten).empty?
+          return if list.empty?
 
           ret = []
-          list.each do |flag|
-            next unless (val = option(flag, **kwargs))
+          list.flatten.each do |flag|
+            next unless (val = option(flag, target: target, **kwargs))
 
             if val == '0' && no
               flag = "no-#{flag}"
@@ -1456,50 +1403,52 @@ module Squared
         end
 
         def append_nocolor(target: @session)
-          target << '--no-color' if !ARG[:COLOR] || stdin? || option('no-color', ignore: false)
+          target << '--no-color' if !ARG[:COLOR] || stdin? || option('color', target: target, equals: '0')
         end
 
         def merge_opts(base, data)
-          return data unless base
-          return base unless data
-
-          ret = case data
-                when String
-                  case base
-                  when String
-                    "#{base} #{data}"
-                  when Hash
-                    "#{append_hash(base).join(' ')} #{data}"
-                  when Enumerable
-                    "#{base.to_a.join(' ')} #{data}"
-                  end
-                when Hash
-                  case base
-                  when String
-                    "#{base} #{append_hash(data).join(' ')}"
-                  when Hash
-                    base.merge(data)
-                  when Enumerable
-                    base.to_a + append_hash(data)
-                  end
-                when Enumerable
-                  case base
-                  when String
-                    "#{base} #{data.to_a.join(' ')}"
-                  when Hash
-                    "#{append_hash(base).join(' ')} #{data.to_a.join(' ')}"
-                  when Enumerable
-                    base.to_a + data.to_a
-                  end
-                else
-                  base
-                end
-          ret || data
+          case data
+          when String
+            case base
+            when String
+              "#{base} #{data}"
+            when Hash
+              "#{append_hash(base).join(' ')} #{data}"
+            when Enumerable
+              "#{base.to_a.join(' ')} #{data}"
+            else
+              data
+            end
+          when Hash
+            case base
+            when String
+              "#{base} #{append_hash(data).join(' ')}"
+            when Hash
+              base.merge(data)
+            when Enumerable
+              Set.new(base.to_a + append_hash(data)).to_a
+            else
+              data
+            end
+          when Enumerable
+            case base
+            when String
+              "#{base} #{data.to_a.join(' ')}"
+            when Hash
+              "#{append_hash(base).join(' ')} #{data.to_a.join(' ')}"
+            when Enumerable
+              Set.new(base.to_a + data.to_a).to_a
+            else
+              data
+            end
+          else
+            base
+          end
         end
 
         def collect_hash(data, pass: [])
           ret = []
-          data.each { |key, val| ret += val unless pass.include?(key) }
+          data.each { |key, val| ret.concat(val) unless pass.include?(key) }
           ret
         end
 
@@ -1513,6 +1462,15 @@ 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: nil, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
@@ -1527,6 +1485,39 @@ module Squared
           args
         end
 
+        def confirm_outdated(pkg, ver, rev, lock: false)
+          a = sub_style(case rev
+                        when 1
+                          'MAJOR'
+                        when 2
+                          'MINOR'
+                        else
+                          'PATCH'
+                        end, styles: theme[:header])
+          b = sub_style("#{pkg} #{ver}", 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, timeout: 60)
+        end
+
+        def choice_index(msg, list, values: nil, multiple: false, accept: nil, trim: nil)
+          puts if @@print_order > 0
+          raise_error 'user cancelled' unless (ret = choice(msg, list, multiple: multiple))
+          ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
+          exit 1 if accept && !confirm("#{accept} [#{ret.join(', ')}] [y/N] ", 'N', timeout: 60)
+          if values
+            ret = [ret]
+            values.each do |val|
+              val, req = val if val.is_a?(Array)
+              val = Readline.readline("#{val} (#{req ? 'required' : 'optional'}): ", true).strip
+              raise_error 'user cancelled' if req && val.empty?
+              ret << (val.empty? ? nil : val)
+            end
+          end
+          @@print_order += 1
+          ret
+        end
+
         def runenv
           nil
         end
@@ -1539,12 +1530,11 @@ module Squared
           end
         end
 
-        def relativepath(*files, all: false)
-          return [] if files.empty?
+        def relativepath(*list, all: false)
+          return [] if list.empty?
 
-          pat = /^#{Regexp.escape(File.join(path, ''))}/
-          files.flatten.map! { |val| Pathname.new(val) }.select { |val| projectpath?(val) }.map! do |val|
-            val = val.absolute? ? val.to_s.sub(pat, '') : val.to_s
+          list.flatten.map! { |val| Pathname.new(val) }.select { |val| projectpath?(val) }.map! do |val|
+            val = val.absolute? ? val.relative_path_from(path).to_s : val.to_s
             val = val[2..-1] if val.start_with?('./')
             val = "#{val}*" if all && val.end_with?('/')
             val
@@ -1553,11 +1543,11 @@ module Squared
 
         def projectmap(files, parent: false, pass: true)
           unless parent
-            project = files.select { |val| projectpath?(val) }
-            raise_error 'pathspec not within worktree' unless pass || files.size == project.size
-            files = project
+            proj = files.select { |val| projectpath?(val) }
+            raise_error 'pathspec not within worktree' unless pass || files.size == proj.size
+            files = proj
           end
-          files.map { |val| val == '.' ? '.' : shell_quote(basepath(val.strip)) }
+          files.map { |val| val == '.' ? '.' : shell_quote(basepath(val)) }
         end
 
         def semver(val)
@@ -1597,7 +1587,18 @@ module Squared
         end
 
         def epochtime
-          DateTime.now.strftime('%Q').to_i
+          Time.now.strftime('%s%L').to_i
+        end
+
+        def verbosetype
+          case verbose
+          when TrueClasss
+            1
+          when Numeric
+            verbose.succ
+          else
+            0
+          end
         end
 
         def on(event, from, *args, **kwargs)
@@ -1622,15 +1623,15 @@ module Squared
           end
         end
 
-        def pwd_set(done = nil, pass: false, from: nil, dryrun: false, &blk)
+        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 = instance_eval(&blk)
+                ret = yield
               else
                 Dir.chdir(path)
-                ret = instance_eval(&blk)
+                ret = yield
                 Dir.chdir(pwd)
               end
             rescue StandardError => e
@@ -1681,13 +1682,13 @@ module Squared
             @output = if cmd.all? { |data| data.is_a?(Hash) }
                         diso = false
                         dise = false
-                        cmd.map { |data| parse.(data) }
+                        cmd.map { |data| parse.call(data) }
                       else
                         cmd.dup
                       end
             return
           when Hash
-            @output = parse.(data)
+            @output = parse.call(data)
           else
             @output[0] = cmd
           end
@@ -1747,7 +1748,8 @@ module Squared
         end
 
         def projectpath?(val)
-          Pathname.new(val).absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?('..')
+          val = Pathname.new(val).cleanpath
+          val.absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?(File.join('..', ''))
         end
 
         def semmajor?(cur, want)
@@ -1767,11 +1769,8 @@ module Squared
           val.is_a?(Array) && val.all? { |p| p.is_a?(Proc) || p.is_a?(Method) }
         end
 
-        def session_arg?(*list, target: @session, value: false)
-          list.any? do |val|
-            pat = /^#{Regexp.escape(shell_option(val))}#{value ? '[ =].' : '(?:[ =]|$)'}/
-            target.any? { |opt| opt.match?(pat) }
-          end
+        def session_arg?(*args, target: @session, **kwargs)
+          !!target && OptionPartition.arg?(target, *args, **kwargs)
         end
 
         def from_sync?(*val)