squared 0.5.0 → 0.5.1

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

@@ -99,7 +99,7 @@ module Squared
             last: last,
             error: error
           }
-          @envname = @name.gsub(/[^\w]+/, '_').upcase.freeze
+          @envname = env_key(@name).freeze
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
           @global = false
@@ -205,7 +205,7 @@ module Squared
             file &&= @workspace.home.join(env('LOG_DIR', ''), file).realdirpath
           rescue StandardError => e
             file = nil
-            warn log_message(Logger::WARN, e, pass: true) if warning?
+            warn log_message(Logger::WARN, e) if warning?
           end
           log[:progname] ||= @name
           if (val = env('LOG_LEVEL', ignore: false))
@@ -250,14 +250,14 @@ module Squared
           return 1 if a.include?(other)
 
           c, d = graph_deps other
-          e = b.reject { |val| d.include?(val) }
-          f = d.reject { |val| b.include?(val) }
+          e = b - d
+          f = d - b
           if parent == other.parent
             g = []
             h = []
           else
-            g = a.reject { |val| c.include?(val) }
-            h = c.reject { |val| a.include?(val) }
+            g = a - c
+            h = c - a
           end
           g << self
           h << other
@@ -411,7 +411,7 @@ module Squared
 
           out = obj.link(self, *args, **kwargs, &blk) if obj.respond_to?(:link)
           if !out
-            warn log_message(Logger::WARN, 'link not compatible', subject: obj.to_s, hint: name, pass: true)
+            warn log_message(Logger::WARN, 'link not compatible', subject: obj.to_s, hint: name)
           elsif out.respond_to?(:build)
             out.build
           end
@@ -466,9 +466,9 @@ module Squared
             case opts
             when Hash
               opts = append_hash(opts, build: true)
-              cmd = as_a(cmd).append(flags).concat(opts).compact.join(' ')
+              cmd = Array(cmd).append(flags).concat(opts).compact.join(' ')
             when Enumerable
-              cmd = as_a(cmd).concat(opts.to_a)
+              cmd = Array(cmd).concat(opts.to_a)
               cmd.map! { |val| "#{val} #{flags}" } if flags
               cmd = cmd.join(' && ')
             else
@@ -498,15 +498,13 @@ 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
                   end
                 end
-                if warning?
-                  warn log_message(Logger::WARN, name, 'method not found', subject: 'prereqs', hint: meth, pass: true)
-                end
+                warn log_message(Logger::WARN, name, 'method not found', subject: 'prereqs', hint: meth)
               end
             elsif proj.build?
               proj.build(sync: sync)
@@ -557,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
@@ -607,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
@@ -651,7 +649,7 @@ module Squared
             headers = headers.is_a?(Hash) ? headers.merge(val) : val
           end
           data = nil
-          (uri = as_a(uri)).each_with_index do |url, index|
+          (uri = Array(uri)).each_with_index do |url, index|
             URI.open(url, headers) do |f|
               data = f.read
               if algo && algo.hexdigest(data) != digest
@@ -689,7 +687,7 @@ module Squared
             file.write(data)
             file.close
             if create
-              warn log_message(Logger::WARN, 'force remove', subject: name, hint: target, pass: true)
+              warn log_message(Logger::WARN, 'force remove', subject: name, hint: target)
               target.rmtree
               target.mkpath
             end
@@ -809,6 +807,8 @@ module Squared
               exclude_set val
             when :parent
               parent_set val
+            when :archive
+              archive_set val
             when :run
               run_set(*args, **kwargs)
             when :script
@@ -963,16 +963,28 @@ module Squared
           puts_oe(*args, pipe: pipe)
         end
 
-        def run(cmd = @session, var = nil, exception: @exception, sync: true, from: nil, banner: true, chdir: path, **)
+        def run(cmd = @session, var = nil, exception: @exception, sync: true, from: nil, banner: true, chdir: path,
+                interactive: nil, **)
           unless cmd
-            if warning?
-              from &&= from.to_s
-              warn log_message(Logger::WARN, from || 'unknown', subject: project, hint: 'no command given', pass: true)
-            end
-            return
+            from = from&.to_s || 'unknown'
+            return warn log_message(Logger::WARN, 'no command given', subject: project, hint: from, pass: true)
           end
+          i = interactive && !(@session && option('y'))
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           cmd = session_done cmd
+          if i
+            title, y = case interactive
+                       when Array
+                         interactive
+                       when String
+                         [interactive, 'N']
+                       else
+                         ['Run', 'Y']
+                       end
+            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
@@ -996,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
@@ -1011,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
@@ -1033,7 +1045,7 @@ module Squared
             elsif obj.is_a?(Array) && obj.any? { |val| !val.is_a?(String) }
               build(*obj, **kwargs)
             elsif obj
-              run_s(obj.is_a?(Enumerable) ? obj.to_a : obj, **kwargs)
+              run_s(*Array(obj), **kwargs)
             end
           end
         end
@@ -1080,7 +1092,7 @@ module Squared
 
             t = dedupe.call(proj.name)
             j = if out
-                  if i == items.size - 1 || check.call(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?
@@ -1092,9 +1104,9 @@ module Squared
             end
             if !out
               if !tasks && (script = workspace.script_get(:graph, group: proj.group, ref: proj.allref))
-                group = script[:graph]
+                tasks = script[:graph]
               end
-              (tasks || group || (dev? ? ['build', 'copy'] : ['depend', 'build'])).each do |meth|
+              (tasks || (dev? ? ['build', 'copy'] : ['depend', 'build'])).each do |meth|
                 next if pass.include?(meth)
 
                 if workspace.task_defined?(cmd = task_join(proj.name, meth))
@@ -1105,7 +1117,7 @@ module Squared
                   end
                   run(cmd, sync: false, banner: false)
                   ENV.delete(key) if key
-                elsif proj.has?(meth, tasks || group ? nil : workspace.baseref)
+                elsif proj.has?(meth, tasks ? nil : workspace.baseref)
                   proj.__send__(meth.to_sym, sync: sync)
                 end
               end
@@ -1142,7 +1154,6 @@ module Squared
             else
               items = workspace.find(group: val, ref: val.to_sym)
             end
-
             items.each do |proj|
               next if pass.include?(proj.name)
 
@@ -1187,7 +1198,7 @@ module Squared
                 end
           return ret == equals.to_s unless equals.nil?
 
-          ret.empty? || (ignore && as_a(ignore).any? { |val| ret == val.to_s }) ? default : ret
+          ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s }) ? default : ret
         end
 
         def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
@@ -1235,10 +1246,9 @@ module Squared
         def option(*args, target: @session, prefix: target&.first, **kwargs)
           if prefix
             args.each do |val|
-              next unless (ret = env("#{stripext(prefix)}_#{val.gsub(/\W/, '_')}".upcase, **kwargs))
-              return ret unless block_given?
+              next unless (ret = env(env_key(stripext(prefix), val), **kwargs))
 
-              return yield ret
+              return block_given? ? yield(ret) : ret
             end
           end
           nil
@@ -1296,6 +1306,18 @@ module Squared
           ret.join("\n")
         end
 
+        def print_status(*args, from: nil)
+          return if stdin?
+
+          case from
+          when :outdated
+            out = print_footer("major #{args[0]} / minor #{args[1]} / patch #{args[2]}", right: true).split("\n")
+            out[1] = sub_style(out[1], pat: /^( +major )(\d+)(.+)$/, styles: theme[:major], index: 2)
+            out[1] = sub_style(out[1], pat: /^(.+)(minor )(\d+)(.+)$/, styles: theme[:active], index: 3)
+            puts out
+          end
+        end
+
         def format_desc(action, flag, opts = nil, **kwargs)
           return unless TASK_METADATA
 
@@ -1310,7 +1332,7 @@ module Squared
 
             client = true
           else
-            data = Workspace::Support::BannerData.new(true, [:path], theme[:banner], theme[:border])
+            data = Struct::BannerData.new(true, [:path], theme[:banner], theme[:border])
           end
           if verbose
             out = []
@@ -1356,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]
@@ -1368,7 +1390,7 @@ module Squared
               out << ''
             end
             if from
-              out << from
+              out << (from = from.to_s)
               pat = /\A(#{Regexp.escape(from)})(.*)\z/
             end
           else
@@ -1539,7 +1561,7 @@ module Squared
           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?
+          warn log_message(Logger::WARN, e, subject: name) if warning?
         else
           ret
         end
@@ -1568,9 +1590,9 @@ module Squared
                           'PATCH'
                         end, styles: (rev == 1 && theme[:major]) || theme[:header])
           b = sub_style(pkg.ljust(col1), styles: theme[:inline])
-          c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
-          e = lock ? sub_style((cur || 'locked').rjust(7), styles: color(:red)) : cur&.rjust(7)
-          confirm "#{a}: #{b}#{e} #{sub_style(ver.rjust(col1 > 0 ? 10 : 0), styles: theme[:inline])} [#{c}] ", d
+          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,
@@ -1587,25 +1609,27 @@ module Squared
           end
           ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
           if column
-            a, b = as_a column
-            ret = as_a(ret).map! { |val| val[a, b || 1] }
+            a, b = Array(column)
+            ret = Array(ret).map! { |val| val[a, b || 1] }
             ret = ret.first unless multiple
           end
           if accept
-            a = as_a(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
-            accept = as_a(accept).map { |val| as_a(val) }
+            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
             loop do
-              c = confirm("#{accept.first[0]}#{a ? " [#{a}]" : ''} [y/N] ", 'N', timeout: 60)
-              if accept.shift[1] == true
+              item = accept.first
+              c = confirm("#{item[0]}#{a ? " [#{hint}]" : ''}", item[2] ? 'Y' : 'N', timeout: 60)
+              if item[1] == true
                 ret << c
               elsif !c
                 break
               end
-              a = nil
+              hint = nil
+              accept.shift
               break if accept.empty?
             end
             exit 1 unless accept.empty?
@@ -1636,7 +1660,7 @@ module Squared
           if (ret = instance_eval(&blk)).nil?
             val
           else
-            ret.is_a?(Array) ? ret : [ret]
+            Array(ret)
           end
         end
 
@@ -1689,19 +1713,24 @@ module Squared
         end
 
         def indexitem(val)
-          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A\^(\d+)(:.+)?\z/
+          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
 
         def indexerror(val, list = nil)
           raise_error("requested index #{val}", hint: list && "of #{list.size}")
         end
 
+        def indexchar
+          workspace.windows? ? '=' : '^'
+        end
+
         def printsucc
           @@print_order += 1
         end
 
         def color(val)
-          theme[val].yield_self { |styles| styles && !styles.empty? ? styles : [val] }
+          ret = theme[val]
+          ret && !ret.empty? ? ret : [val]
         end
 
         def colormap(val)
@@ -1744,8 +1773,9 @@ module Squared
         end
 
         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 || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
+          if (path.to_s == pwd || pass == true) && !workspace.jruby_win?
             ret = yield
           else
             Dir.chdir(path)
@@ -1753,9 +1783,8 @@ module Squared
             Dir.chdir(pwd)
           end
         rescue StandardError => e
-          puts e
           log&.error e
-          ret = on(:error, from, e)
+          ret = on :error, from, e
           raise if exception && ret != true
         else
           ret
@@ -1852,7 +1881,7 @@ module Squared
 
         def graph_set(val)
           @graph = if val
-                     as_a(val).map { |s| workspace.prefix ? workspace.task_name(s).to_sym : s.to_sym }.freeze
+                     Array(val).map { |s| workspace.prefix ? workspace.task_name(s).to_sym : s.to_sym }.freeze
                    end
         end
 
@@ -1982,6 +2011,10 @@ module Squared
           ARG[:BANNER] && !env('BANNER', equals: '0')
         end
 
+        def pwd?
+          path == Pathname.pwd
+        end
+
         def stdin?
           pipe == 0
         end

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

@@ -21,7 +21,8 @@ module Squared
           compose: {
             common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=b profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
-            build: %w[no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b ssh=qq].freeze,
+            build: %w[check no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
+                      ssh=qq].freeze,
             exec: %w[dry-run privileged d|detach e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
             run: %w[build dry-run no-deps quiet-pull remove-orphans rm P|service-ports use-aliases cap-add=b cap-drop=b
                     d|detach entrypoint=q e|env=qq i|interactive=b? l|label=q name=b T|no-TTY=b? p|publish=e pull=b
@@ -160,7 +161,7 @@ module Squared
                         compose! flag, args.to_a
                       end
                     when :exec, :run
-                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'},args*,opts*"
+                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'}|:,args*,opts*"
                       task flag, [:service] do |_, args|
                         service = param_guard(action, flag, args: args, key: :service)
                         compose!(flag, args.extras, service: service)
@@ -278,12 +279,12 @@ module Squared
               ret << quote_option('secret', @secrets, double: true)
             when Hash
               append = lambda do |type|
-                as_a(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
+                Array(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
               end
               append.call(:file)
               append.call(:env)
             else
-              as_a(@secrets).each { |arg| ret << quote_option('secret', arg) }
+              Array(@secrets).each { |arg| ret << quote_option('secret', arg) }
             end
             if (val = option('tag', ignore: false))
               append_tag val
@@ -311,7 +312,7 @@ module Squared
           when :bake
             unless op.empty?
               args = op.dup
-              op.extras.clear
+              op.reset
               if Dir.exist?(args.last)
                 if projectpath?(val = args.pop)
                   context = val
@@ -358,7 +359,7 @@ module Squared
               both = run[:bind] + run[:tmpfs]
               diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
               delim = Regexp.new(",\\s*(?=#{both.join('|')})")
-              as_a(@mounts).each do |val|
+              Array(@mounts).each do |val|
                 args = []
                 tmpfs = true
                 val.split(delim).each do |opt|
@@ -564,7 +565,9 @@ module Squared
         end
 
         def append_command(flag, val, list, target: @session, from: nil)
-          if (args = env('DOCKER_ARGS'))
+          if list.delete(':')
+            list << readline('Enter command [args]', force: true)
+          elsif (args = env('DOCKER_ARGS'))
             list << args
           end
           case flag
@@ -587,7 +590,7 @@ module Squared
         def append_file(type, target: @session)
           return unless type == 2 || type == 4 || @file.is_a?(Array)
 
-          files = as_a(@file).map { |val| quote_option('file', path + val) }
+          files = Array(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
             target.merge(files)
           else
@@ -646,7 +649,6 @@ module Squared
                 cc = bb.size + 1
                 a = sub_style(ee, styles: theme[:inline])
                 b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a}#{ee == id ? '' : " (#{id})"}"
-                c, d = no ? ['y/N', 'N'] : ['Y/n', 'Y']
                 e = time_format(time_since(data['CreatedAt']), pass: ['ms'])
                 f = sub_style(ARG[:BORDER][0], styles: theme[:inline])
                 g = ' ' * (cc + 1)
@@ -663,13 +665,13 @@ module Squared
                 cols.each do |key|
                   next if (key == 'Tag' && !dd) || (key == 'Size' && data[key] == '0B')
 
-                  puts "#{g + f} #{key}: #{as_a(data[key]).join(', ')}" unless data[key].to_s.empty?
+                  puts "#{g + f} #{key}: #{Array(data[key]).join(', ')}" unless data[key].to_s.empty?
                 end
                 w = 9 + flag.to_s.size + 4 + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), styles: theme[:inline])
                 found = true
                 index += 1
-                next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
+                next unless confirm("#{h + b}?", no ? 'N' : 'Y', timeout: 60)
 
                 puts if printfirst?
               end
@@ -679,7 +681,7 @@ module Squared
           end
         rescue StandardError => e
           log.error e
-          ret = on(:error, from, e)
+          ret = on :error, from, e
           raise if exception && ret != true
 
           warn log_message(Logger::WARN, e, pass: true) if warning?
@@ -698,7 +700,7 @@ module Squared
           a = t.last.capitalize
           b = sub_style(target, styles: theme[:subject])
           c = as && sub_style(as, styles: theme[:inline])
-          confirm("#{a} #{b}#{c ? " as #{c}" : ''}? [y/N] ", 'N', timeout: 60)
+          confirm("#{a} #{b}#{c ? " as #{c}" : ''}?", 'N', timeout: 60)
         end
 
         def choice_command(flag)