squared 0.5.10 → 0.5.12

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

@@ -65,11 +65,13 @@ module Squared
 
         @@tasks = {}
         @@graph = { _: [] }
-        @@asdf = if File.exist?("#{Dir.home}/.asdf/asdf.sh")
-                   [Pathname.new("#{Dir.home}/.asdf"), 15]
-                 elsif ENV['ASDF_DATA_DIR']
-                   [Pathname.new(ENV['ASDF_DATA_DIR']), 16]
-                 end
+        @@asdf = Pathname.new("#{Dir.home}/.asdf").yield_self do |path|
+          if path.join('asdf.sh').exist?
+            [path, 15]
+          elsif ENV['ASDF_DATA_DIR']
+            [Pathname.new(ENV['ASDF_DATA_DIR']), 16]
+          end
+        end
         @@print_order = 0
 
         subtasks({
@@ -80,6 +82,7 @@ module Squared
 
         attr_reader :name, :project, :workspace, :path, :theme, :group, :parent, :dependfile,
                     :exception, :pipe, :verbose
+        attr_accessor :global
 
         def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
                        **kwargs)
@@ -97,9 +100,14 @@ module Squared
           @clean = kwargs[:clean]
           @release = kwargs[:release]
           self.version = kwargs[:version]
-          self.exception = kwargs[:exception]
-          self.pipe = kwargs[:pipe]
-          self.verbose = kwargs[:verbose]
+          self.exception = env_bool(kwargs[:exception], workspace.exception, strict: true)
+          self.pipe = env_pipe(kwargs[:pipe], workspace.pipe, strict: true)
+          self.verbose = case (val = env('VERBOSE', kwargs[:verbose]))
+                         when String
+                           env_bool(val, workspace.verbose, strict: true, index: true)
+                         else
+                           val.nil? ? workspace.verbose : val
+                         end
           @output = []
           @ref = []
           @children = []
@@ -150,8 +158,10 @@ module Squared
           data = @workspace.script_find(*@ref, @group)
           if @output[0].nil?
             if (scr = data[:script])
-              @global = true
-              script_set(scr, args: data.fetch(:args, kwargs[:args]), prod: kwargs[:prod])
+              unless kwargs[:script] == false
+                @global = true
+                script_set(scr, args: data.fetch(:args, kwargs[:args]), prod: kwargs[:prod])
+              end
             elsif (run = data[:run])
               @global = true
               run_set run
@@ -174,7 +184,6 @@ module Squared
             @global = true
             run_set data[:run]
           end
-          @global = true
         end
 
         def initialize_events(ref, **)
@@ -291,21 +300,29 @@ module Squared
         end
 
         def exception=(val)
-          @exception = env_bool(val, workspace.exception, strict: true)
+          @exception = case val
+                       when Numeric, TrueClass, FalseClass
+                         val
+                       else
+                         workspace.exception
+                       end
         end
 
         def pipe=(val)
-          @pipe = env_pipe(val, workspace.pipe, strict: true)
+          @pipe = case val
+                  when Numeric, Pathname
+                    val
+                  else
+                    workspace.pipe
+                  end
         end
 
         def verbose=(val)
-          @verbose = case (val = env('VERBOSE', val))
-                     when NilClass
-                       workspace.verbose
-                     when String
-                       env_bool(val, workspace.verbose, strict: true, index: true)
-                     else
+          @verbose = case val
+                     when Numeric, TrueClass, FalseClass
                        val
+                     else
+                       workspace.verbose
                      end
         end
 
@@ -335,13 +352,8 @@ module Squared
                       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
-                          end
-                          val
+                          n = done.index { |proj| val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/) }
+                          n ? "#{val} (#{n.succ})" : val
                         end
                         emphasize(out, title: path, right: true, border: borderstyle, sub: [
                           { pat: /\A(#{Regexp.escape(path.to_s)})(.*)\z/, styles: theme[:header] },
@@ -389,6 +401,7 @@ module Squared
                                  version, opts = choice_index('Select a version',
                                                               @asdf[1].children
                                                                       .map(&:basename)
+                                                                      .sort { |a, b| b <=> a }
                                                                       .append('latest', 'system'),
                                                               force: true, accept: [['Confirm?', false, true]],
                                                               values: ['Options'])
@@ -425,32 +438,32 @@ module Squared
         end
 
         def add(path, name = nil, **kwargs, &blk)
-          if path.is_a?(String) && (seg = path[%r{\A(.+)[\\/]\*+\z}, 1])
-            return self unless checkdir?(path = basepath(seg))
+          if path.is_a?(String) && path =~ %r{\A(.+)[\\/]\*+\z}
+            return self unless checkdir?(path = basepath($1))
 
             path = path.children.select { |val| checkdir?(val) }
           end
           if path.is_a?(Array)
-            name = @name if name == true
+            name = self.name if name == true
             path.each { |val| add(val, name && task_join(name, File.basename(val)), **kwargs, &blk) }
-            return self
-          end
-          return self unless projectpath?(path = basepath(path)) && checkdir?(path)
-
-          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
-          name = case name
-                 when String, Symbol
-                   name.to_s
-                 else
-                   path.basename
-                 end
-          workspace.add(path, name, **kwargs) do
-            __send__ :parent_set, parent
-            @children << self
-            instance_eval(&blk) if block_given?
+          elsif projectpath?(path = basepath(path)) && checkdir?(path)
+            kwargs = hashdup(@withargs).update(kwargs) if @withargs
+            kwargs[:group] = group if group && !kwargs.key?(:group)
+            kwargs[:ref] = ref unless kwargs.key?(:ref)
+            parent = self
+            proj = nil
+            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
+              instance_eval(&blk) if block_given?
+            end
+            @children << proj
           end
           self
         end
@@ -461,13 +474,13 @@ module Squared
         end
 
         def inject(obj, *args, **kwargs, &blk)
-          return self unless enabled?
-
-          out = obj.link(self, *args, **kwargs, &blk) if obj.respond_to?(:link)
-          if !out
-            print_error('link not compatible', subject: obj, hint: name)
-          elsif out.respond_to?(:build)
-            out.build
+          if enabled?
+            out = obj.link(self, *args, **kwargs, &blk) if obj.respond_to?(:link)
+            if !out
+              print_error('link not compatible', subject: obj, hint: name)
+            elsif out.respond_to?(:build)
+              out.build
+            end
           end
           self
         end
@@ -477,9 +490,9 @@ module Squared
           if args.empty?
             return unless from == :run
 
-            run_b(@run, sync: sync, from: from) if series?(@run)
-            args = @output
             banner = verbosetype > 1 if from_base?('build')
+            run_b(@run, sync: sync, from: from, banner: banner) if series?(@run)
+            args = @output
           end
           if args.first.is_a?(Struct)
             f, blk = args.first.to_a
@@ -513,11 +526,9 @@ module Squared
           else
             cmd, opts, var, flags, extra = args
           end
-          if cmd.is_a?(Proc) || cmd.is_a?(Method)
-            run_b(cmd, sync: sync, from: from)
-            return
-          end
           if cmd
+            return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
+
             cmd = as_get(cmd, from)
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
             flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
@@ -553,13 +564,13 @@ module Squared
             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|
+              split_escape(val).each do |meth|
                 if proj.respond_to?(meth.to_sym)
                   begin
                     proj.__send__(meth, sync: sync)
                     next
                   rescue StandardError => e
-                    on_error(:prereqs, e, exception: true)
+                    on_error(e, :prereqs, exception: true)
                   end
                 end
                 print_error(name, 'method not found', subject: 'prereqs', hint: meth)
@@ -579,7 +590,7 @@ module Squared
         end
 
         def doc(*, sync: invoked_sync?('doc'), **)
-          run_b(@doc, sync: sync, from: :doc, banner: from_base?('doc') ? verbosetype > 1 : verbose)
+          run_b(@doc, sync: sync, banner: from_base?('doc') ? verbose? : verbosetype > 0, from: :doc)
         end
 
         def lint(*, sync: invoked_sync?('lint'), **)
@@ -600,9 +611,9 @@ module Squared
           on :first, :clean unless pass
           case @clean
           when Struct
-            if (any = instance_eval(&@clean.block) || @clean.run)
+            if (val = instance_eval(&@clean.block) || @clean.run)
               temp = @clean
-              @clean = any
+              @clean = val
               clean(*args, sync: sync, pass: true, **kwargs)
               @clean = temp
             end
@@ -612,7 +623,7 @@ module Squared
             begin
               @clean.each { |cmd, opts| build(cmd.to_s, opts, sync: sync) }
             rescue StandardError => e
-              on_error e, from
+              on_error e, :clean
             end
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
@@ -620,7 +631,7 @@ module Squared
                 entry = basepath(val = val.to_s)
                 if entry.directory? && val.match?(%r{[\\/]\z})
                   log&.warn "rm -rf #{entry}"
-                  rm_rf(entry, verbose: verbose)
+                  rm_rf(entry, verbose: verbosetype > 0)
                 else
                   log&.warn "rm #{entry}"
                   (val.include?('*') ? Dir[entry] : [entry]).each do |file|
@@ -659,7 +670,7 @@ module Squared
           end
           ret = graph_branch(self, data, tasks, out, sync: sync, pass: pass)
         rescue StandardError => e
-          on_error(:graph, e, exception: true)
+          on_error(e, :graph, exception: true)
         else
           if out
             [out, ret]
@@ -718,10 +729,12 @@ module Squared
                 case f.content_type
                 when 'application/zip'
                   ext = 'zip'
-                when 'application/x-gzip'
+                when %r{application/(?:x-)?gzip}
                   ext = 'tgz'
                 when 'application/x-xz'
                   ext = 'txz'
+                when 'application/x-7z-compressed'
+                  ext = '7z'
                 end
               end
               break uri = url if data
@@ -756,7 +769,7 @@ module Squared
             case ext
             when 'zip', 'aar'
               session 'unzip', shell_quote(file), quote_option('d', target)
-            when 'tar', 'tgz', 'tar.gz', 'tar.xz', 'gz', 'xz'
+            when 'tar', 'tgz', 'txz', 'tar.gz', 'tar.xz', 'gz', 'xz'
               flags = +(verbose ? 'v' : '')
               if ext.end_with?('gz')
                 flags += 'z'
@@ -780,9 +793,7 @@ module Squared
               break unless entry.directory?
 
               i = 0
-              while (dest = target + "#{File.basename(file)}-#{i}").exist?
-                i += 1
-              end
+              i += 1 while (dest = target + "#{File.basename(file)}-#{i}").exist?
               FileUtils.mv(entry, dest)
               dest.each_child { |child| FileUtils.mv(child, target) }
               dest.rmdir
@@ -822,7 +833,7 @@ module Squared
             cmd << '--no-header' unless legacy
             cmd << name
           end
-          print_success if success?(run(from: :"asdf:#{flag}")) && flag == :set
+          print_success if success?(run(from: :"asdf:#{flag}"), flag == :set)
         end
 
         def first(key, *args, **kwargs, &blk)
@@ -868,9 +879,9 @@ module Squared
         end
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, from: nil, banner: true, chdir: path,
-                interactive: nil, hint: nil, **)
+                interactive: nil, hint: nil, series: true, **)
           unless cmd
-            print_error('no command given', subject: project, hint: from || 'unknown', pass: true)
+            print_error('no command session started', subject: project, hint: from, pass: true)
             return
           end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
@@ -893,7 +904,7 @@ module Squared
               log&.warn "ENV discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
-              print_item format_banner(hint ? "#{cmd} (#{hint})" : cmd, banner: banner) if sync
+              print_item(format_banner(hint ? "#{cmd} (#{hint})" : cmd, banner: banner), series: series) if sync
               if var != false && (pre = runenv)
                 case pre
                 when Hash
@@ -908,7 +919,7 @@ module Squared
               ret = shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
-            on_error(from, e, exception: true)
+            on_error(e, from, exception: true)
             false
           else
             on :last, from
@@ -1120,8 +1131,8 @@ module Squared
         def run_b(obj, **kwargs)
           case obj
           when Struct
-            if (any = instance_eval(&obj.block) || obj.run)
-              run_b(any, **kwargs)
+            if (val = instance_eval(&obj.block) || obj.run)
+              run_b(val, **kwargs)
             end
           when Proc
             instance_eval(&obj)
@@ -1141,6 +1152,7 @@ module Squared
         def graph_branch(target, data, tasks = nil, out = nil, sync: true, pass: [], done: [], depth: 0,
                          single: false, last: false, context: nil)
           tag = ->(proj) { "#{proj.name}#{SEM_VER.match?(proj.version) ? "@#{proj.version}" : ''}" }
+          script = ->(proj) { workspace.script_get(:graph, group: proj.group, ref: proj.allref)&.fetch(:graph, nil) }
           check = ->(deps) { deps.reject { |val| done.include?(val) } }
           dedupe = lambda do |name|
             next [] unless (ret = data[name])
@@ -1191,10 +1203,7 @@ module Squared
                                                    single: single, last: j == true, context: target)
             end
             if !out
-              if !tasks && (script = workspace.script_get(:graph, group: proj.group, ref: proj.allref))
-                tasks = script[:graph]
-              end
-              (tasks || (dev? ? ['build', 'copy'] : ['depend', 'build'])).each do |meth|
+              (tasks || (subtasks = script.call(proj)) || (dev? ? %w[build copy] : %w[depend build])).each do |meth|
                 next if pass.include?(meth)
 
                 if workspace.task_defined?(cmd = task_join(proj.name, meth))
@@ -1205,7 +1214,7 @@ module Squared
                   end
                   run(cmd, sync: false, banner: false)
                   ENV.delete(key) if key
-                elsif proj.has?(meth, tasks ? nil : workspace.baseref)
+                elsif proj.has?(meth, tasks || subtasks ? nil : workspace.baseref)
                   proj.__send__(meth.to_sym, sync: sync)
                 end
               end
@@ -1350,9 +1359,9 @@ module Squared
           warn log_message(loglevel, *args, **kwargs) if warning?
         end
 
-        def print_item(*val)
+        def print_item(*val, series: true)
           puts unless printfirst?
-          printsucc
+          printsucc if series
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
 
@@ -1387,7 +1396,7 @@ module Squared
             sub&.each { |h| s = sub_style(s, **h) }
             s
           end
-          ret = [sub_style(ARG[:BORDER][1] * n, styles: border), *lines]
+          ret = [sub_style(ARG[:BORDER][1] * n, styles: border)].concat(lines)
           ret.reverse! if reverse
           ret.join("\n")
         end
@@ -1488,7 +1497,7 @@ module Squared
           else
             pat = /\A(\s*\d+\.)(.+)\z/
             unless grep.empty?
-              footer = "#{out.size} found"
+              footer = "#{out.size} found "
               sub << { pat: /\A(\d+)( .+)\z/, styles: theme[:inline] }
             end
           end
@@ -1687,8 +1696,8 @@ module Squared
           confirm "#{a}: #{b}#{c} #{sub_style(ver.rjust(col1 > 0 ? 10 : 0), styles: theme[:inline])}   ", d
         end
 
-        def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil,
-                         multiple: false, force: true, **kwargs)
+        def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil, multiple: false,
+                         force: true, **kwargs)
           puts if !series && !printfirst?
           msg = "#{msg} (optional)" unless force
           unless (ret = choice(msg, list, multiple: multiple, force: force, **kwargs)) && !ret.empty?
@@ -1704,13 +1713,10 @@ module Squared
           if accept
             hint = Array(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
             accept = Array(accept).map { |val| Array(val) }
-            if accept.any? { |val| val[1] == true }
-              ret = [ret]
-              multiple = -1
-            end
+            ret = Array(ret) if accept.any? { |val| val[1] == true }
             loop do
               item = accept.first
-              c = confirm("#{item[0]}#{a ? " [#{hint}]" : ''}", item[2] ? 'Y' : 'N', timeout: 60)
+              c = confirm("#{item[0]}#{hint ? " [#{hint}]" : ''}", item[2] ? 'Y' : 'N', timeout: 60)
               if item[1] == true
                 ret << c
               elsif !c
@@ -1723,8 +1729,8 @@ module Squared
             exit 1 unless accept.empty?
           end
           if values
-            ret = [ret] unless accept && multiple == -1
-            values.each do |val|
+            ret = Array(ret)
+            Array(values).each do |val|
               if val.is_a?(Array)
                 val, force = val
               else
@@ -1757,21 +1763,17 @@ module Squared
         end
 
         def command(*args)
-          if workspace.powershell?
-            "powershell.exe -Command \"& {#{args.join(' ; ')}}\""
-          else
-            args.join(' && ')
-          end
+          return args.join(' && ') unless workspace.powershell?
+
+          "powershell.exe -Command #{shell_quote("& {#{args.join(' ; ')}}", option: false, double: true)}"
         end
 
         def relativepath(*list, all: false)
           return [] if list.empty?
 
           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
+            ret = (val.absolute? ? val.relative_path_from(path) : val.cleanpath).to_s
+            all && val.to_s.end_with?('/') ? "#{ret}/*" : ret
           end
         end
 
@@ -1813,16 +1815,14 @@ module Squared
 
         def semcmp(val, other)
           return 0 if val == other
-
-          a, b = [val, other].map! { |ver| ver.scan(SEM_VER) }
-          return -1 if b.empty?
-          return 1 if a.empty?
+          return -1 if (b = other.scan(SEM_VER)).empty?
+          return 1 if (a = val.scan(SEM_VER)).empty?
 
           a, b = [a.first, b.first].map! do |c|
-            begin
-              d = Integer(c[5]).to_s
+            d = begin
+              Integer(c[5]).to_s
             rescue StandardError
-              d = c[5] ? '-1' : '0'
+              c[5] ? '-1' : '0'
             end
             [c[0], c[2], c[4] || '0', d]
           end
@@ -1855,8 +1855,7 @@ module Squared
         end
 
         def color(val)
-          ret = theme[val]
-          ret && !ret.empty? ? ret : [val]
+          (ret = theme[val]) && !ret.empty? ? ret : [val]
         end
 
         def colormap(val)
@@ -2074,16 +2073,15 @@ module Squared
         end
 
         def projectpath?(val)
-          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
+          ret = Pathname.new(val).cleanpath
+          ret.absolute? ? ret.to_s.start_with?(File.join(path, '')) : !ret.to_s.start_with?(File.join('..', ''))
         end
 
         def checkdir?(val)
           if val.directory? && !val.empty?
             true
           else
-            log&.warn "directory \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
+            log&.warn "directory \"#{val}\" (#{val.directory? ? 'empty' : 'not found'})"
             false
           end
         end
@@ -2151,6 +2149,10 @@ module Squared
           !!verbose && !stdin?
         end
 
+        def verbose?
+          verbosetype > 1
+        end
+
         def warning?
           workspace.warning
         end
@@ -2182,6 +2184,10 @@ module Squared
           Workspace::Support.hashlist
         end
 
+        def hashdup
+          Workspace::Support.hashdup
+        end
+
         def borderstyle
           workspace.banner_get(*@ref, group: group)&.border || theme[:border]
         end