squared 0.8.8 → 0.9.0.pre1

data/lib/squared/workspace/application.rb

@@ -163,6 +163,9 @@ module Squared
                             end
         @pass.items.concat(kwargs[:pass].map { |val| val.is_a?(Regexp) ? val : val.to_s }) if kwargs[:pass]
         @series = Application.register(self, @base.to_a, exclude: kwargs.fetch(:exclude, []))
+        if (n = ARG[:APP][:series_ref_min])
+          @series.ref_min = n
+        end
         self.closed = 'begin'
         pb = @stage.key?('project:begin')
         pe = @stage.key?('project:end')
@@ -341,7 +344,7 @@ module Squared
               case val
               when Symbol
                 found = true
-                banner_include?(val)
+                banner_include?(val, ref: ref)
               when String
                 true
               else
@@ -353,7 +356,7 @@ module Squared
             elsif meth.size == 1
               meth = meth.first
             end
-          elsif !banner_include?(meth = meth.to_sym)
+          elsif !banner_include?(meth = meth.to_sym, ref: ref)
             next
           end
           data.order << meth
@@ -403,13 +406,17 @@ module Squared
         end
         unless ref.is_a?(Symbol) && (proj = @base.find { |item| item.ref == ref })
           proj = if !ref.is_a?(Class)
-                   find_project(ref: ref, path: path)
+                   require_project(ref) || Application.find(ref: ref, path: path)
                  elsif Application.extends(ref)
                    ref
                  end || @kind[name]&.last
           if proj
             @base << proj
-            @banner.items.concat(Array(proj.bannerargs))
+            args = Array(proj.bannerargs)
+            unless args.empty?
+              @banner.store[proj.ref] = args
+              @banner.items.concat(args)
+            end
           else
             proj = Application.impl_project
           end
@@ -447,16 +454,6 @@ module Squared
         self
       end
 
-      def assign(ref = @ref, &blk)
-        proj = ref && find_project(ref: ref)
-        if proj
-          proj.class_eval(&blk)
-        else
-          warn log_message(Logger::ERROR, 'class not found', subject: main, hint: ref)
-        end
-        self
-      end
-
       def stage(val, first: false, &blk)
         data = @stage[val]
         if first == true
@@ -484,7 +481,7 @@ module Squared
           obj = begin
             JSON.parse(homepath(obj).read, { symbolize_names: true })
           rescue => e
-            warn log_message(Logger::ERROR, e, subject: main)
+            warn log_message(Logger::ERROR, e)
           end
         end
         apply_style(data || theme, obj, args, empty: empty) if obj && (!target || data)
@@ -590,7 +587,7 @@ module Squared
       def task_namespace(val, first: false)
         return unless (ret = val.to_s.split(':')).size > 1
 
-        first ? ret.first : task_join(*ret[0..-2])
+        first ? ret.first : task_join(*ret[..-2])
       end
 
       def task_resolve(obj, key)
@@ -645,24 +642,16 @@ module Squared
         val = val.split(':') if val.is_a?(String)
         if before || after || opts
           pos = []
-          append = lambda do |data|
-            pos << case data
-                   when Array
-                     data.join(',')
-                   when Hash
-                     data.keys.join('|')
+          pos << (before.is_a?(Array) ? before.join(',') : before) if before
+          if opts
+            pos << if opts.is_a?(Array)
+                     arg ? "#{arg}=#{opts.join(',')}" : opts.join('|')
                    else
-                     data
+                     opts
                    end
           end
-          append.call(before)
-          pos << if opts.is_a?(Array)
-                   arg ? "#{arg}=#{opts.join(',')}" : opts.join('|')
-                 else
-                   opts
-                 end
-          append.call(after)
-          val << "#{val.pop}[#{pos.compact.join(',')}]"
+          pos << (after.is_a?(Array) ? after.join(',') : after) if after
+          val << "#{val.pop}[#{pos.join(',')}]"
         end
         out ? message(*val) : task_desc(*val)
       end
@@ -968,7 +957,7 @@ module Squared
               key = task_name(task_join(name, target))
               sync = true
               exception = exception?
-              if store && (kwargs = store["#{target}:#{name}"])
+              if store && (kwargs = store[task_join(target, name)])
                 sync = kwargs[:sync] if kwargs.key?(:sync)
                 exception = kwargs[:exception] if kwargs.key?(:exception)
               end
@@ -989,9 +978,11 @@ module Squared
                   end
                 end
               when Array
-                cmd = args.first
-                cmd = items.map { |proj| "#{proj.name}:#{cmd}" }
-                           .select { |val| task_defined?(val) }
+                cmd = items.filter_map do |proj|
+                  next unless task_defined?(out = task_join(proj.name, args.first))
+
+                  out
+                end
                 next if cmd.empty?
 
                 args = args.drop(1)
@@ -1032,7 +1023,7 @@ module Squared
             @events[label][name][task] = on
           end
           data[label][name][task] = val
-          (data.store[label] ||= {})["#{name}:#{task}"] = store if store
+          (data.store[label] ||= {})[task_join(name, task)] = store if store
         end
         self
       end
@@ -1046,7 +1037,7 @@ module Squared
           Array(group).each do |val|
             val = val.to_s
             if val.start_with?('-')
-              target[:exclude] << val[1..-1]
+              target[:exclude] << val[1..]
             else
               target[:group][val] = data
             end
@@ -1055,7 +1046,7 @@ module Squared
           Array(ref).each do |val|
             val = val.to_s
             if val.start_with?('-')
-              target[:exclude] << val[1..-1].to_sym
+              target[:exclude] << val[1..].to_sym
             else
               target[:ref][val.to_sym] = data
             end
@@ -1100,10 +1091,6 @@ module Squared
         nil
       end
 
-      def find_project(ref:, path: nil)
-        require_project(ref) || Application.find(ref: ref, path: path)
-      end
-
       def root?(path, pass: [])
         return false unless path.directory?
 
@@ -1133,8 +1120,10 @@ module Squared
         exception != false && exception != Logger::INFO
       end
 
-      def banner_include?(val)
-        Application.attr_banner.include?(val) || @banner.items.include?(val)
+      def banner_include?(val, ref: nil)
+        return true if Application.attr_banner.include?(val)
+
+        ref ? Array(ref).any? { |proj| @banner.store[proj]&.include?(val) } : @banner.items.include?(val)
       end
 
       def scriptobj

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

@@ -102,7 +102,7 @@ module Squared
 
         @@tasks = {}
         @@graph = { _: [] }
-        @@asdf = Pathname.new(ENV['ASDF_DIR'] || "#{Dir.home}/.asdf").yield_self do |path|
+        @@asdf = Pathname.new(ENV['ASDF_DIR'] || "#{Dir.home}/.asdf").then do |path|
           version = if path.join('asdf.sh').exist?
                       15
                     elsif ENV['ASDF_DATA_DIR'] && (path = Pathname.new(ENV['ASDF_DATA_DIR'])).exist?
@@ -640,7 +640,7 @@ module Squared
           end
           env('GRAPH', suffix: 'PASS') { |val| pass.concat(split_escape(val)) }
           start, neg = start.partition { |name| !name.start_with?('-') }
-          data = graph_collect(self, start, pass: neg.map { |name| name[1..-1] })
+          data = graph_collect(self, start, pass: neg.map { |name| name[1..] })
           unless out
             data[name] << self
             on :first, :graph
@@ -700,7 +700,7 @@ module Squared
             headers = headers.is_a?(Hash) ? headers.merge(data) : data
           end
           if file
-            ext ||= File.extname(file)[1..-1]
+            ext ||= File.extname(file)[1..]
           else
             require 'open-uri'
             data = nil
@@ -876,7 +876,7 @@ module Squared
             return
           end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          if interactive && sync && (!@session || !option('y'))
+          if interactive && sync && !(@session && option('y'))
             print_item(series: true)
             msg, y, h = case interactive
                         when Array
@@ -924,9 +924,9 @@ module Squared
           end
         end
 
-        def scope(*args, **kwargs, &blk)
+        def scope(...)
           namespace name do
-            task(*args, **kwargs, &blk)
+            task(...)
           end
         end
 
@@ -1174,20 +1174,10 @@ module Squared
           ret = basepath(*args)
           return ret unless ascend && !ret.exist?
 
-          case ascend
-          when String, Pathname
-            root = Pathname.new(ascend).cleanpath
-            root = nil unless root.absolute? && root.directory?
-          end
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-
-            if root
-              break if dir == root
-            elsif workspace.root == dir || parent&.path == dir || (ascend.is_a?(String) && dir.join(ascend).exist?)
-              break
-            end
+            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
           end
           ret
         end
@@ -1298,26 +1288,25 @@ module Squared
           file = if (val = env('LOG_FILE'))
                    Time.now.strftime(val)
                  elsif (val = env('LOG_AUTO'))
-                   require 'date'
+                   d = Time.now
                    "#{@name}-%s.log" % [case val
                                         when 'y', 'year'
-                                          Date.today.year
+                                          d.year
                                         when 'm', 'month'
-                                          Date.today.strftime('%Y-%m')
+                                          d.strftime('%Y-%m')
                                         when 'd', 'day', '1'
-                                          Date.today
+                                          d.strftime('%Y-%m-%d')
                                         else
-                                          val.include?('%') ? Time.now.strftime(val) : Time.now.strftime('%FT%T%:z')
+                                          val.include?('%') ? d.strftime(val) : d.strftime('%FT%T%:z')
                                         end]
                  elsif (val = log[:file])
                    if val.is_a?(String)
                      Time.now.strftime(val)
                    else
-                     require 'date'
-                     "#{@name}-#{Date.today}.log"
+                     "#{@name}-#{Time.now.strftime('%Y-%m-%d')}.log"
                    end
                  end
-                 .yield_self do |path|
+                 .then do |path|
                    next unless path
 
                    @workspace.home.join(env('LOG_DIR', ''), path).realdirpath
@@ -1375,7 +1364,7 @@ module Squared
               run(val, var, sync: sync, banner: banner, **kwargs)
             end
           rescue => e
-            on_error(e, exception: exception?(**kwargs))
+            on_error(e, exception: kwargs.fetch(:exception, exception?))
           end
           on :last, from
         end
@@ -1476,7 +1465,7 @@ module Squared
 
             t = uniq.call(name = proj.name)
             j = if out
-                  if i == items.size.pred || (post = items[i.succ..-1] - done).empty?
+                  if i == items.size.pred || (post = items[i.succ..] - done).empty?
                     true
                   elsif !t.empty? && depth > 0
                     (post - t).empty?
@@ -1582,14 +1571,18 @@ module Squared
         end
 
         def env(key, default = nil, suffix: nil, strict: false, ignore: nil, **kwargs, &blk)
-          name = "#{key}_#{envname_get}"
+          name = suffix == false ? key : "#{key}_#{envname_get}"
           ret = if suffix
                   ENV["#{name}_#{suffix}"] || (ignore == false && ENV["#{key}_#{suffix}"]) || ''
                 elsif strict
                   ENV[name].to_s
                 else
                   ignore = ['0'].freeze if ignore.nil?
-                  ENV[name] || ENV.fetch(key, '')
+                  if key =~ /^(.+)_(FORCE|YES|Y)$/ && !(ret = __arg__($2 == 'Y' ? 'YES' : $2, $1)).nil?
+                    ret
+                  else
+                    ENV[name] || ENV.fetch(key, '')
+                  end
                 end
           env_yield(ret, default, ignore: ignore, **kwargs, &blk)
         end
@@ -1693,19 +1686,38 @@ module Squared
                    **kwargs)
           return unless prefix
 
+          getarg = ->(key) { ARG[key][s = prefix.downcase] || ARG[key][s.to_sym] }
           args.each do |key|
-            next unless (ret = env(env_key(prefix.to_s.stripext, key), **kwargs)) && (!pat || ret.match?(pat))
-
-            if target
-              if path
-                target << quote_option(key, basepath(ret))
-              elsif quote
-                target << quote_option(key, ret)
-              elsif escape
-                target << shell_option(key, ret)
+            ret = case key.downcase
+                  when 'force'
+                    getarg.call(:FORCE)
+                  when 'y'
+                    getarg.call(:YES)
+                  end
+            return yield(ret) if !ret.nil? && block_given?
+
+            case ret.to_s
+            when '0'
+              next
+            when 'true'
+              return true
+            when 'false'
+              return false
+            else
+              ret ||= env(env_key(prefix.to_s.stripext, key), **kwargs)
+              next unless ret && (!pat || ret.match?(pat))
+
+              if target
+                if path
+                  target << quote_option(key, basepath(ret))
+                elsif quote
+                  target << quote_option(key, ret)
+                elsif escape
+                  target << shell_option(key, ret)
+                end
               end
+              return block_given? ? yield(ret) : ret
             end
-            return block_given? ? yield(ret) : ret
           end
           nil
         end
@@ -1818,6 +1830,8 @@ module Squared
 
           case from
           when :outdated
+            return if ENV['BANNER'] == 'false'
+
             out = print_footer("major #{args[0]} / minor #{args[1]} / patch #{args[2]}", right: true).split("\n")
             sub_style!(out[1], **opt_style(theme[:major], /^( +major )(\d+)(.+)$/, 2))
             sub_style!(out[1], **opt_style(theme[:active], /^(.+)(minor )(\d+)(.+)$/, 3))
@@ -1911,7 +1925,7 @@ module Squared
                     out << ''
                   end
                   if from
-                    out << (from = from.to_s)
+                    out << from
                     /\A(#{Regexp.escape(from)})(.*)\z/
                   end
                 else
@@ -2040,27 +2054,27 @@ module Squared
                          val
                        end
           end
-          base.update(data)
-              .update(ret)
+          base.update(data, ret)
         end
 
         def merge_opts(base, data)
+          s = '%s %s'
           case data
           when String
             case base
             when String
-              "#{base} #{data}"
+              s % [base, data]
             when Hash
-              "#{append_hash(base, target: []).join(' ')} #{data}"
+              s % [append_hash(base, target: []).join(' '), data]
             when Enumerable
-              "#{base.to_a.join(' ')} #{data}"
+              s % [base.to_a.join(' '), data]
             else
               data
             end
           when Hash
             case base
             when String
-              "#{base} #{append_hash(data, target: []).join(' ')}"
+              s % [base, append_hash(data, target: []).join(' ')]
             when Hash
               base.merge(data)
             when Enumerable
@@ -2071,9 +2085,9 @@ module Squared
           when Enumerable
             case base
             when String
-              "#{base} #{data.to_a.join(' ')}"
+              s % [base, data.to_a.join(' ')]
             when Hash
-              "#{append_hash(base, target: []).join(' ')} #{data.to_a.join(' ')}"
+              s % [append_hash(base, target: []).join(' '), data.to_a.join(' ')]
             when Enumerable
               Set.new(base.to_a + data.to_a).to_a
             else
@@ -2107,6 +2121,17 @@ module Squared
           end || []
         end
 
+        def parse_select(kwargs = {})
+          pa, ch = ENV.fetch('SELECT', '0:0').split(':').map(&:to_i)
+          if pa > 0
+            kwargs[:page] = pa
+          elsif !kwargs.key?(:page)
+            kwargs[:page] = ARG[:PAGE]
+          end
+          kwargs[:max] = ch if ch > 0
+          kwargs
+        end
+
         def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
@@ -2140,9 +2165,9 @@ module Squared
         end
 
         def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil, multiple: false,
-                         force: true, **kwargs)
+                         force: true, pipe: self.pipe, **kwargs)
           puts unless series || printfirst?
-          ret = choice(msg, list, multiple: multiple, force: force, **kwargs)
+          ret = choice(msg, list, multiple: multiple, force: force, pipe: pipe, **parse_select(kwargs))
           unless ret && !ret.empty?
             exit 1 if force
             return
@@ -2226,12 +2251,12 @@ module Squared
         end
 
         def relativepath(*list, all: false)
-          list.map { |val| Pathname.new(val) }
-              .select { |val| projectpath?(val) }
-              .map do |val|
-                ret = (val.absolute? ? val.relative_path_from(path) : val.cleanpath).to_s
-                all && val.to_s.end_with?('/') ? "#{ret}/*" : ret
-              end
+          list.filter_map do |val|
+            next unless projectpath?(file = Pathname.new(val))
+
+            out = (file.absolute? ? file.relative_path_from(path) : file.cleanpath).to_s
+            all && file.to_s.end_with?('/') ? "#{out}/*" : out
+          end
         end
 
         def projectmap(files, resolve: true, parent: false, pass: true)
@@ -2334,6 +2359,19 @@ module Squared
           cur[2] == lat[2] ? 3 : 2
         end
 
+        def semapp(name, *args, minor: true, patch: true, pre: false, env: false)
+          if args.empty?
+            args << '--version'
+          else
+            args.map! { |s| shell_quote(s, force: false) }
+          end
+          n = minor ? patch ? pre ? -1 : 4 : 2 : 0
+          IO.popen([shell_bin(name, env: env), *args], chdir: path, &:read).scan(SEM_VER).first
+            &.slice(0..n)&.join or raise
+        rescue
+          '0.0.0'
+        end
+
         def semmajor?(cur, want)
           (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[6]
         end
@@ -2347,7 +2385,7 @@ module Squared
         end
 
         def indexitem(val)
-          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
+          [$1.to_i, $2 && $2[1..]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
 
         def indexerror(val, list = nil)
@@ -2451,7 +2489,6 @@ module Squared
         def pwd_set(cmd = nil, pass: false, timeout: nil, from: @on[:from].last, **kwargs, &blk)
           return if from == false
 
-          require 'timeout'
           unless (path.to_s == Dir.pwd || pass) && (mri? || !windows?)
             pwd = Dir.pwd
             Dir.chdir(path)
@@ -2748,7 +2785,15 @@ module Squared
         end
 
         def dryrun?(target: @session, prefix: target&.first, **)
-          Array(target).include?('--dry-run') || !option('dry-run', target: target, prefix: prefix).nil?
+          val = ENV['DRY_RUN'] if (val = option('dry-run', target: target, prefix: prefix)).nil?
+          case val.to_s
+          when '0' then nil
+          when 'false'
+            return false
+          else
+            return true if val
+          end
+          Array(target).include?('--dry-run')
         end
 
         def pwd?
@@ -2775,9 +2820,7 @@ module Squared
           workspace.warning
         end
 
-        def exception?(*level, **kwargs)
-          return kwargs[:exception] if kwargs.key?(:exception)
-
+        def exception?(*level)
           ret = exception
           return ret unless ret.is_a?(Numeric)