squared 0.4.3 → 0.4.4

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

@@ -11,10 +11,11 @@ module Squared
         include Common::Format
         include System
         include Shell
+        include Prompt
         include Utils
         include Rake::DSL
 
-        VAR_SET = %i[parent global envname dependfile theme run script env pass].freeze
+        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
@@ -43,6 +44,10 @@ module Squared
             @ref ||= to_s.downcase.to_sym
           end
 
+          def subtasks(val)
+            @@tasks[ref] = val.freeze
+          end
+
           def config?(*)
             false
           end
@@ -52,13 +57,15 @@ module Squared
           end
         end
 
-        (@@tasks = {})[ref] = {
-          'graph' => %i[run print].freeze,
-          'unpack' => %i[zip tar tgz tar.gz txz tar.xz].freeze
-        }.freeze
+        @@tasks = {}
         @@task_desc = Rake::TaskManager.record_task_metadata
         @@print_order = 0
 
+        subtasks({
+          'graph' => %i[run print].freeze,
+          'unpack' => %i[zip tar ext].freeze
+        })
+
         attr_reader :name, :project, :workspace, :path, :theme, :exception, :pipe, :verbose,
                     :group, :parent, :dependfile
 
@@ -218,9 +225,8 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          unless @output[2] == false || !(val = env('BUILD', suffix: 'ENV'))
-            data = parse_json(val, hint: "BUILD_#{@envname}_ENV")
-            @output[2] = data if data
+          if @output[2] != false && (val = env('BUILD', suffix: 'ENV'))
+            @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
           end
           unless @output[0] == false || @output[0].is_a?(Array)
             if (val = env('BUILD', suffix: 'OPTS'))
@@ -286,8 +292,11 @@ module Squared
                       end
                     end
                   when 'unpack'
-                    format_desc action, flag, 'tag/url,dir,digest?,f/force?'
-                    task flag, [:tag, :dir, :digest, :force] do |_, args|
+                    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
                       tag = param_guard(action, flag, args: args, key: :tag)
                       dir = param_guard(action, flag, args: args, key: :dir)
                       unless tag.match?(URI_SCHEME)
@@ -302,7 +311,7 @@ module Squared
                       else
                         force = args.fetch(:force, false)
                       end
-                      unpack(basepath(dir), uri: tag, digest: digest, ext: flag.to_s, force: force)
+                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext || flag.to_s, force: force)
                     end
                   end
                 end
@@ -386,7 +395,7 @@ module Squared
 
             run_b(@run, sync: sync, from: from) if series?(@run)
             args = @output
-            banner = verbose == 1 if task_invoked?('build', 'build:sync')
+            banner = verbose == 1 if task_invoked?('build', 'build:sync', 'default')
           end
           if args.all? { |val| val.is_a?(Array) }
             cmd = []
@@ -570,8 +579,8 @@ module Squared
                      raise_error("invalid checksum: #{digest}", hint: name)
                    end
           end
-          if (val = env('HEADERS')) && (out = parse_json(val, hint: "HEADERS_#{@envname}"))
-            headers = out
+          if (val = env('HEADERS')) && (val = parse_json(val, hint: "HEADERS_#{@envname}"))
+            headers = val
           end
           require 'open-uri'
           data = nil
@@ -602,7 +611,7 @@ module Squared
             end
           end
           ext ||= URI.parse(uri).path[/^.+?\.((?:tar\.)?\w+)$/i, 1]
-          if (n = env("#{ext == 'zip' ? 'ZIP' : 'TAR'}_DEPTH", ignore: false))
+          if (n = env("#{ext == 'zip' || ext == '7z' ? ext.upcase : 'TAR'}_DEPTH", ignore: false))
             depth = n.to_i
           end
           begin
@@ -611,24 +620,25 @@ module Squared
             file.write(data)
             file.close
             if create
-              warn log_message(Logger::WARN, name, 'force remove', hint: target, pass: true)
-              target.rmtree(verbose: true)
+              warn log_message(Logger::WARN, 'force remove', subject: name, hint: target, pass: true)
+              target.rmtree
               target.mkpath
             end
             case ext
             when 'zip', 'aar'
               session 'unzip', shell_quote(file.path), quote_option('d', target)
-            when 'tar', 'tgz', 'tar.gz', 'tar.xz'
+            when 'tar', 'tgz', 'tar.gz', 'tar.xz', 'gz', 'xz'
               flags = +(verbose ? 'v' : '')
-              case ext
-              when 'tgz', 'tar.gz'
+              if ext.end_with?('gz')
                 flags += 'z'
-              when 'txz', 'tar.xz'
+              elsif ext.end_with?('xz')
                 flags += 'J'
               end
               session 'tar', "-x#{flags}", basic_option('strip-components', depth), quote_option('f', file.path),
                       quote_option('C', target)
               depth = 0
+            when '7z'
+              session '7z', 'x', shell_quote(file.path), "-o#{shell_quote(target)}"
             else
               raise_error("unsupported format: #{ext}", hint: uri)
             end
@@ -790,9 +800,7 @@ module Squared
         end
 
         def exclude?(*refs)
-          return false if @exclude.empty?
-
-          refs.flatten.any? { |ref| @exclude.include?(ref) }
+          !@exclude.empty? && has_value?(@exclude, refs.flatten)
         end
 
         def task_include?(key, ref = nil)
@@ -868,19 +876,33 @@ module Squared
           on :first, from
           begin
             if cmd.match?(/\A[^:]+:[^:]/) && workspace.task_defined?(cmd)
-              log&.warn "ENV was discarded: #{var}" if var
+              log&.warn "ENV discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
-              print_item format_banner(cmd, banner: banner) if sync && !env('BANNER', equals: '0')
+              print_item format_banner(cmd, banner: banner) if sync
+              if var.is_a?(Hash)
+                case (pre = runenv)
+                when Hash
+                  var = pre.merge(var)
+                when String
+                  cmd = "#{pre} && #{cmd}"
+                end
+              elsif var != false && (var = runenv).is_a?(String)
+                cmd = "#{var} && #{cmd}"
+                var = nil
+              end
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
-              shell(*args, chdir: chdir, exception: exception)
+              ret = shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
             log&.error e
             ret = on(:error, from, e)
             raise unless ret == true
+
+            false
           else
             on :last, from
+            ret
           end
         end
 
@@ -1044,9 +1066,9 @@ module Squared
           ret.empty? || (ignore && as_a(ignore).any? { |val| ret == val.to_s }) ? default : ret
         end
 
-        def session(*cmd, prefix: cmd.first, main: true, options: true)
+        def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
           prefix = prefix.to_s.upcase
-          if (val = PATH[prefix] || PATH[prefix.to_sym])
+          if path && (val = PATH[prefix] || PATH[prefix.to_sym])
             cmd[0] = shell_quote(val, force: false)
           end
           ret = JoinSet.new(cmd.flatten(1))
@@ -1059,7 +1081,8 @@ module Squared
         def session_delete(*list, target: @session)
           ret = []
           list.each do |val|
-            if (key = target.find { |opt| opt.match?(/^#{Regexp.escape(shell_option(val))}(?: |=|$)/o) })
+            pat = /^#{Regexp.escape(shell_option(val))}(?: |=|$)/
+            if (key = target.find { |opt| opt.match?(pat) })
               target.delete(key)
               ret << key
             end
@@ -1089,7 +1112,7 @@ module Squared
           nil
         end
 
-        def option_sanitize(opts, list, target: @session, no: nil, first: false, pass: ['='])
+        def option_sanitize(opts, list, target: @session, no: nil, single: nil, args: false, first: false, pass: ['='])
           ret = []
           reg = []
           bare = []
@@ -1101,6 +1124,7 @@ module Squared
           qq = []
           i = []
           f = []
+          si = []
           list = list.map do |val|
             x, y = val.split('|')
             if y
@@ -1131,6 +1155,8 @@ module Squared
                 i << flag
               when 'f'
                 f << flag
+              when 'n'
+                si << flag
               else
                 reg << Regexp.escape(flag)
               end
@@ -1145,12 +1171,14 @@ module Squared
           opts.each do |opt|
             next ret << opt if found
 
-            if bare.include?(opt)
+            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 =~ /^([^=]+)=(.+)$/
+              if opt =~ /\A([^=]+)=(.+)\z/
                 key = $1
                 val = $2
                 match = ->(flag, pat) { flag.include?(key) && pat.match?(val) }
@@ -1162,7 +1190,7 @@ module Squared
                   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+)?$/)
+                elsif b.include?(key) || match.(i, /^\d+$/) || match.(f, /^\d*(?:\.\d+)?$/) || match.(si, /^-?\d+$/)
                   target << basic_option(key, val)
                 else
                   ret << opt
@@ -1170,6 +1198,7 @@ module Squared
                 opt = key
               else
                 ret << opt
+                found = true if args
               end
               found = true if first && pass.none? { |s| opt.include?(s) }
             end
@@ -1177,14 +1206,20 @@ module Squared
           [ret, reg.empty? ? /\A\s+\z/ : /^(#{reg.join('|')})=(.+)$/]
         end
 
-        def option_clear(opts, target: @session, **kwargs)
+        def option_clear(opts, target: @session, pass: true, append: false, **kwargs)
+          return if opts.empty?
+
           kwargs[:subject] ||= target&.first
-          kwargs[:hint] ||= 'not used'
-          warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs) unless opts.empty?
+          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)
+
+          raise_error 'user cancelled'
         end
 
         def print_item(*val)
-          puts if @@print_order > 0 && verbose && !stdin?
+          puts if @@print_order > 0 && stdout?
           @@print_order += 1
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
@@ -1236,7 +1271,7 @@ module Squared
         end
 
         def format_banner(cmd, banner: true)
-          return unless banner && ARG[:BANNER]
+          return unless banner && banner?
 
           if (data = workspace.banner_get(*@ref, group: group))
             return if data.empty?
@@ -1468,18 +1503,19 @@ module Squared
           ret
         end
 
-        def parse_json(val, hint: nil)
+        def parse_json(val, kind: Hash, hint: nil)
           ret = JSON.parse(val)
-          raise_error('invalid JSON object', val, hint: hint) unless ret.is_a?(Hash)
+          raise_error("invalid JSON #{kind.name}", val, hint: hint) if kind && !ret.is_a?(kind)
         rescue StandardError => e
           log&.warn e
+          warn log_message(Logger::WARN, e, subject: name, pass: true) if warning?
         else
           ret
         end
 
         def param_guard(action, flag, args: nil, key: nil, pat: nil, values: nil)
           if args && key
-            val = args[key]
+            val = args.fetch(key, nil)
             return val unless val.nil? || (pat && !val.match?(pat)) || (values && !values.include?(val))
 
             @session = nil
@@ -1491,19 +1527,28 @@ module Squared
           args
         end
 
+        def runenv
+          nil
+        end
+
         def relativepath(*files, all: false)
           return [] if files.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(/^#{Regexp.escape(File.join(path, ''))}/o, '') : val.to_s
+            val = val.absolute? ? val.to_s.sub(pat, '') : val.to_s
             val = val[2..-1] if val.start_with?('./')
             val = "#{val}*" if all && val.end_with?('/')
             val
           end
         end
 
-        def projectmap(files, parent: false)
-          files = files.select { |val| projectpath?(val) } unless parent
+        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
+          end
           files.map { |val| val == '.' ? '.' : shell_quote(basepath(val.strip)) }
         end
 
@@ -1716,7 +1761,8 @@ module Squared
 
         def session_arg?(*list, target: @session, value: false)
           list.any? do |val|
-            target.any? { |opt| opt.match?(/^#{Regexp.escape(shell_option(val))}#{value ? '[ =].' : '(?:[ =]|$)'}/o) }
+            pat = /^#{Regexp.escape(shell_option(val))}#{value ? '[ =].' : '(?:[ =]|$)'}/
+            target.any? { |opt| opt.match?(pat) }
           end
         end
 
@@ -1741,14 +1787,36 @@ module Squared
           end
         end
 
+        def banner?
+          ARG[:BANNER] && !env('BANNER', equals: '0')
+        end
+
         def stdin?
           pipe == 0
         end
 
+        def stdout?
+          !!verbose && !stdin?
+        end
+
         def warning?
           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
+          end
+        end
+
         def variables
           Base.tasks + VAR_SET
         end