squared 0.4.14 → 0.5.1

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

@@ -103,6 +103,11 @@ module Squared
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
           @global = false
+          @log = nil
+          @dev = nil
+          @prod = nil
+          @withargs = nil
+          @session = nil
           @index = -1
           run_set(kwargs[:run], kwargs[:env], opts: kwargs.fetch(:opts, true))
           exception_set kwargs[:exception]
@@ -266,8 +271,8 @@ module Squared
             -1
           elsif f.any? { |val| e.include?(val) }
             1
-          elsif @index != -1 && (i = other.instance_variable_get(:@index)) != -1
-            @index < i ? -1 : 1
+          elsif @index >= 0 && (i = other.instance_variable_get(:@index)) >= 0
+            @index <= i ? -1 : 1
           else
             0
           end
@@ -296,31 +301,31 @@ module Squared
 
                     format_desc action, flag, '(-)project*'
                     task flag do |_, args|
-                      args = args.to_a.reject { |val| name == val.to_s }
+                      args = args.to_a.reject { |val| name == val }
                       if flag == :run
                         graph args
                       else
                         out, done = graph(args, out: [])
                         out.map! do |val|
                           done.each_with_index do |proj, i|
-                            next unless val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/)
-
-                            val += " (#{i.succ})"
-                            break
+                            if val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/)
+                              val += " (#{i.succ})"
+                              break
+                            end
                           end
                           val
                         end
                         emphasize(out, title: path, right: true, border: borderstyle, sub: [
                           { pat: /\A(#{Regexp.escape(path.to_s)})(.*)\z/, styles: theme[:header] },
                           { pat: /\A(#{Regexp.escape(name)})(.*)\z/, styles: theme[:active] },
-                          { pat: /\A(.+ )(\()(\d+)(\))(.*)\z/, styles: theme[:inline], index: 3 }
+                          { pat: /\A((?~ \() \()(\d+)(\).*)\z/, styles: theme[:inline], index: 2 }
                         ])
                       end
                     end
                   when 'unpack'
                     format_desc(action, flag, 'tag/url,dir,digest?,f|force?', before: flag == :ext ? 'ext' : nil)
                     params = %i[tag dir digest force]
-                    params.unshift(:ext) if flag == :ext
+                    params.prepend(:ext) if flag == :ext
                     task flag, params do |_, args|
                       ext = flag == :ext ? param_guard(action, flag, args: args, key: :ext) : flag.to_s
                       tag = param_guard(action, flag, args: args, key: :tag)
@@ -375,17 +380,8 @@ module Squared
             return self
           elsif !projectpath?(path = basepath(path)) || !checkdir?(path)
             return self
-          else
-            name = case name
-                   when String, Symbol
-                     name.to_s
-                   end
-          end
-          if @withargs
-            data = @withargs.dup
-            data.merge!(kwargs)
-            kwargs = data
           end
+          kwargs = @withargs.yield_self { |data| data.dup.update(kwargs) } if @withargs
           kwargs[:group] = group unless kwargs.key?(:group)
           kwargs[:ref] = ref unless kwargs.key?(:ref)
           parent = self
@@ -457,7 +453,7 @@ module Squared
 
                 cmd << a if (a = compose(as_get(b), d, script: true, args: e, from: from))
               end
-              var.merge!(c) if c.is_a?(Hash)
+              var.update(c) if c.is_a?(Hash)
             end
             cmd = cmd.join(' && ')
           else
@@ -470,7 +466,7 @@ module Squared
             case opts
             when Hash
               opts = append_hash(opts, build: true)
-              cmd = Array(cmd).push(flags).concat(opts).compact.join(' ')
+              cmd = Array(cmd).append(flags).concat(opts).compact.join(' ')
             when Enumerable
               cmd = Array(cmd).concat(opts.to_a)
               cmd.map! { |val| "#{val} #{flags}" } if flags
@@ -502,7 +498,7 @@ module Squared
                   begin
                     proj.__send__(meth, sync: sync)
                   rescue StandardError => e
-                    ret = on(:error, :prereqs, e)
+                    ret = on :error, :prereqs, e
                     raise unless ret == true
                   else
                     next
@@ -559,7 +555,7 @@ module Squared
               @clean.each { |cmd, opts| build(cmd.to_s, opts, sync: sync) }
             rescue StandardError => e
               log&.error e
-              ret = on(:error, from, e)
+              ret = on :error, from, e
               raise if exception && ret != true
             end
           else
@@ -609,7 +605,7 @@ module Squared
           end
           ret = graph_branch(self, data, tasks, out, sync: sync, pass: pass)
         rescue StandardError => e
-          ret = on(:error, :graph, e)
+          ret = on :error, :graph, e
           raise unless ret == true
         else
           if out
@@ -620,6 +616,7 @@ module Squared
         end
 
         def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {}, from: :unpack)
+          require 'open-uri'
           if !target.exist?
             target.mkpath
           elsif !target.directory?
@@ -653,7 +650,7 @@ module Squared
           end
           data = nil
           (uri = Array(uri)).each_with_index do |url, index|
-            fetch_uri(url, headers) do |f|
+            URI.open(url, headers) do |f|
               data = f.read
               if algo && algo.hexdigest(data) != digest
                 data = nil
@@ -725,7 +722,7 @@ module Squared
                 i += 1
               end
               FileUtils.mv(entry, dest)
-              dest.children.each { |child| FileUtils.mv(child, target) }
+              dest.each_child { |child| FileUtils.mv(child, target) }
               dest.rmdir
               target = entry
               depth -= 1
@@ -783,6 +780,13 @@ module Squared
         end
 
         def variable_set(key, *args, **kwargs, &blk)
+          if block_given?
+            if blocks.include?(key)
+              series key, &blk
+              return self
+            end
+            args = block_args args, &blk
+          end
           if variables.include?(key) || blocks.include?(key)
             val = case args.size
                   when 0
@@ -814,14 +818,7 @@ module Squared
             when :dependfile
               @dependfile = basepath(*args)
             else
-              if block_given?
-                if blocks.include?(key)
-                  series key, &blk
-                  return self
-                end
-                val = block_args val, &blk
-              end
-              instance_variable_set(:"@#{key}", val.first)
+              instance_variable_set(:"@#{key}", val)
             end
           else
             log&.warn "variable_set: @#{key} (private)"
@@ -984,14 +981,14 @@ module Squared
                        else
                          ['Run', 'Y']
                        end
-            unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}] #{y == 'Y' ? '[Y/n]' : '[y/N]'} ", y)
+            unless confirm("#{title}? [#{sub_style(cmd, styles: theme[:inline])}]", y)
               raise_error('user cancelled', hint: from)
             end
           end
           log&.info cmd
           on :first, from
           begin
-            if cmd.match?(/\A[^:]+:[^:]/) && workspace.task_defined?(cmd)
+            if cmd.start_with?(/[^:]+:[^:]/) && workspace.task_defined?(cmd)
               log&.warn "ENV discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
@@ -1003,7 +1000,7 @@ module Squared
                 when Enumerable
                   cmd = command(*pre.to_a, cmd)
                 else
-                  cmd = command(pre, cmd)
+                  cmd = command pre, cmd
                 end
               end
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
@@ -1011,7 +1008,7 @@ module Squared
             end
           rescue StandardError => e
             log&.error e
-            ret = on(:error, from, e)
+            ret = on :error, from, e
             raise unless ret == true
 
             false
@@ -1026,7 +1023,7 @@ module Squared
           begin
             cmd.flatten.each { |val| run(val, env, sync: sync, banner: banner, **kwargs) }
           rescue StandardError => e
-            ret = on(:error, from, e)
+            ret = on :error, from, e
             raise unless ret == true
           end
           on :last, from
@@ -1249,18 +1246,14 @@ module Squared
         def option(*args, target: @session, prefix: target&.first, **kwargs)
           if prefix
             args.each do |val|
-              ret = env(env_key(stripext(prefix), val), **kwargs)
-              return ret if ret
+              next unless (ret = env(env_key(stripext(prefix), val), **kwargs))
+
+              return block_given? ? yield(ret) : ret
             end
           end
           nil
         end
 
-        def option_sanitize(opts, list, target: @session, **kwargs)
-          op = OptionPartition.new(opts, list, target, project: self, **kwargs)
-          [op.extras, op.values]
-        end
-
         def option_clear(opts, target: @session, **kwargs)
           return unless target
 
@@ -1286,7 +1279,7 @@ module Squared
               styles = [:bold] + styles
             end
           end
-          n = Project.max_width(lines)
+          n = line_width lines
           ch = ' ' * pad
           index = -1
           lines.map! do |val|
@@ -1302,7 +1295,7 @@ module Squared
         end
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
-          n = Project.max_width(lines)
+          n = line_width lines
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
             sub&.each { |h| s = sub_style(s, **h) }
@@ -1328,31 +1321,30 @@ module Squared
         def format_desc(action, flag, opts = nil, **kwargs)
           return unless TASK_METADATA
 
-          ret = [@desc, action]
-          ret << flag if flag
-          workspace.format_desc(ret, opts, **kwargs)
+          workspace.format_desc([@desc, action, flag].compact, opts, **kwargs)
         end
 
         def format_banner(cmd, banner: true)
           return unless banner && banner?
 
           if (data = workspace.banner_get(*@ref, group: group))
-            return if data.empty?
+            return if !data.command && data.order.empty?
 
             client = true
           else
-            data = { command: true, order: [:path], styles: theme[:banner], border: theme[:border] }
+            data = Struct::BannerData.new(true, [:path], theme[:banner], theme[:border])
           end
           if verbose
             out = []
-            if data[:command]
+            if data.command
               if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+))( |\z)/
                 path = $3 || $2 || $1
-                cmd = cmd.sub(path, stripext(path).upcase)
+                name = stripext path
+                cmd = cmd.sub(path, data.command == 0 ? name : name.upcase)
               end
               out << cmd
             end
-            data[:order].each do |val|
+            data.order.each do |val|
               if val.is_a?(Array)
                 s = ' '
                 found = false
@@ -1362,7 +1354,7 @@ module Squared
                     meth
                   elsif respond_to?(meth)
                     found = true
-                    __send__(meth)
+                    __send__ meth
                   end
                 end
                 val = val.compact.join(s)
@@ -1372,9 +1364,9 @@ module Squared
               end
               out << val.to_s
             end
-            print_banner(*out, styles: data[:styles], border: data[:border], client: client)
+            print_banner(*out, styles: data.styles, border: data.border, client: client)
           elsif workspace.series.multiple?
-            "## #{__send__(data[:order].first || :path)} ##"
+            "## #{__send__(data.order.first || :path)} ##"
           end
         end
 
@@ -1386,7 +1378,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.call(val) : val[0]}"
+              out << ('%*d. %s' % [pad, i.succ, each ? each.call(val) : val[0]])
             end
           end
           sub = [headerstyle]
@@ -1451,14 +1443,15 @@ module Squared
         end
 
         def append_any(val, target: @session, build: false, delim: false)
+          return unless val
+
           if delim && !target.include?('--')
             target << '--'
           else
             delim = false
           end
+          val = shell_split(val) if val.is_a?(String)
           case val
-          when String
-            target << val
           when Hash
             append_hash(val, target: target, build: build)
           when Enumerable
@@ -1489,7 +1482,7 @@ module Squared
             return target << (if flag
                                 shell_option(opt, equals ? val : nil, quote: quote, escape: escape, force: force)
                               else
-                                shell_quote(val)
+                                shell_quote val
                               end)
           end
           nil
@@ -1499,17 +1492,18 @@ module Squared
                           **kwargs)
           return if list.empty?
 
-          ret = []
-          list.flatten.each do |flag|
-            next unless (val = option(flag, target: target, **kwargs))
+          [].tap do |ret|
+            list.flatten.each do |flag|
+              next unless (val = option(flag, target: target, **kwargs))
 
-            if val == '0' && no
-              flag = "no-#{flag}"
-              val = nil
+              if val == '0' && no
+                flag = "no-#{flag}"
+                val = nil
+              end
+              ret << shell_option(flag, equals ? val : nil, escape: escape, quote: quote, force: force)
             end
-            ret << shell_option(flag, equals ? val : nil, escape: escape, quote: quote, force: force)
+            ret.each { |val| target << val } unless ret.empty?
           end
-          ret.each { |val| target << val } unless ret.empty?
         end
 
         def append_nocolor(target: @session)
@@ -1557,9 +1551,9 @@ module Squared
         end
 
         def collect_hash(data, pass: [])
-          ret = []
-          data.each { |key, val| ret.concat(val) unless pass.include?(key) }
-          ret
+          [].tap do |ret|
+            data.each { |key, val| ret.concat(val) unless pass.include?(key) }
+          end
         end
 
         def parse_json(val, kind: Hash, hint: nil)
@@ -1572,15 +1566,6 @@ module Squared
           ret
         end
 
-        def fetch_uri(*args, **kwargs, &blk)
-          require 'open-uri'
-          if RUBY_VERSION < '2.5'
-            open(*args, **kwargs, &blk)
-          else
-            URI.open(*args, **kwargs, &blk)
-          end
-        end
-
         def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
@@ -1595,7 +1580,7 @@ module Squared
           args
         end
 
-        def confirm_outdated(pkg, ver, rev, lock: false)
+        def confirm_outdated(pkg, ver, rev, cur = nil, lock: false, col1: 0)
           a = sub_style(case rev
                         when 1
                           'MAJOR'
@@ -1603,11 +1588,11 @@ module Squared
                           '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
+                        end, styles: (rev == 1 && theme[:major]) || theme[:header])
+          b = sub_style(pkg.ljust(col1), styles: theme[:inline])
+          c = lock ? sub_style((cur || 'locked').rjust(7), styles: color(:red)) : cur&.rjust(7)
+          d = rev == 1 || lock ? 'N' : 'Y'
+          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,
@@ -1637,8 +1622,7 @@ module Squared
             end
             loop do
               item = accept.first
-              d, e = item[2] ? ['Y', '[Y/n]'] : ['N', '[y/N]']
-              c = confirm("#{item[0]}#{a ? " [#{a}]" : ''} #{e} ", d, timeout: 60)
+              c = confirm("#{item[0]}#{a ? " [#{hint}]" : ''}", item[2] ? 'Y' : 'N', timeout: 60)
               if item[1] == true
                 ret << c
               elsif !c
@@ -1725,8 +1709,7 @@ module Squared
         end
 
         def semscan(val, fill: true)
-          ret = val.scan(SEM_VER).first
-          fill ? semver(ret) : ret
+          val.scan(SEM_VER).first.yield_self { |data| fill ? semver(data) : data }
         end
 
         def indexitem(val)
@@ -1789,40 +1772,22 @@ module Squared
           end
         end
 
-        def pwd_set(done = nil, pass: false, from: nil, dryrun: false)
-          pwd = Pathname.pwd
-          if block_given?
-            begin
-              pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
-              if (path == pwd || pass == true) && !workspace.jruby_win?
-                ret = yield
-              else
-                Dir.chdir(path)
-                ret = yield
-                Dir.chdir(pwd)
-              end
-            rescue StandardError => e
-              log&.error e
-              unless dryrun
-                ret = on(:error, from, e)
-                raise if exception && ret != true
-              end
-            else
-              ret
-            end
-          elsif @pwd == pwd
-            @pwd = nil
-            pwd unless done
-          elsif @pwd
-            return unless path == pwd
-
-            Dir.chdir(@pwd)
-            @pwd = nil
-          elsif !done && path != pwd
-            @pwd = pwd
+        def pwd_set(pass: false, from: nil)
+          pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
+          pwd = Dir.pwd
+          if (path.to_s == pwd || pass == true) && !workspace.jruby_win?
+            ret = yield
+          else
             Dir.chdir(path)
-            @pwd
+            ret = yield
+            Dir.chdir(pwd)
           end
+        rescue StandardError => e
+          log&.error e
+          ret = on :error, from, e
+          raise if exception && ret != true
+        else
+          ret
         end
 
         def run_set(cmd, val = nil, opts: nil, **)
@@ -1969,7 +1934,7 @@ module Squared
               unless @pass.include?(key.to_s) || ws.task_defined?(name, action) || ws.task_exclude?(action, self)
                 ws.task_desc(@desc, action)
                 task action do
-                  __send__(key)
+                  __send__ key
                 end
               end
               next if (items = @children.select { |item| item.task_include?(key) }).empty?
@@ -1981,8 +1946,9 @@ module Squared
         end
 
         def projectpath?(val)
-          val = Pathname.new(val).cleanpath
-          val.absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?(File.join('..', ''))
+          Pathname.new(val).cleanpath.yield_self do |file|
+            file.absolute? ? file.to_s.start_with?(File.join(path, '')) : !file.to_s.start_with?(File.join('..', ''))
+          end
         end
 
         def checkdir?(val)
@@ -2034,8 +2000,7 @@ module Squared
           return false if workspace.series.chain?(val = task_join(name, action))
           return true if task_invoked?(val) && (!task_invoked?(ac) || !workspace.task_defined?(ac, 'sync'))
 
-          val = workspace.series.name_get(action)
-          val != action && invoked_sync?(val)
+          workspace.series.name_get(action).yield_self { |name| name != action && invoked_sync?(name) }
         end
 
         def success?(ret)
@@ -2082,7 +2047,7 @@ module Squared
         end
 
         def borderstyle
-          ((data = workspace.banner_get(*@ref, group: group)) && data[:border]) || theme[:border]
+          workspace.banner_get(*@ref, group: group)&.border || theme[:border]
         end
 
         def headerstyle
@@ -2095,7 +2060,7 @@ module Squared
       end
 
       Application.implement(Base, base: true)
-      Application.attr_banner = Common::SymSet.new(%i[name project path ref group parent])
+      Application.attr_banner = Set.new(%i[name project path ref group parent])
     end
   end
 end