squared 0.6.3 → 0.6.5

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

@@ -154,14 +154,15 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    ls = case command
-                         when 'image', 'container', 'network'
-                           'ls'
-                         when 'compose'
-                           'ps'
-                         else
-                           raise_error ArgumentError, 'unrecognized command', hint: command
-                         end
+                    cmd = docker_output(command, case command
+                                                 when 'image', 'container', 'network'
+                                                   'ls'
+                                                 when 'compose'
+                                                   'ps'
+                                                 else
+                                                   raise_error ArgumentError, 'unrecognized command', hint: command
+                                                 end)
+                    cmd << '-a' if has_value!(args, 'a', 'all') && command != 'network'
                     data = VAL_DOCKER[:ls][command.to_sym]
                     if has_value!(args, 's', 'standard')
                       cols = data.first(data.index('CreatedAt'))
@@ -180,8 +181,6 @@ module Squared
                         cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
                       end
                     end
-                    cmd = docker_output command, ls
-                    cmd << '-a' unless command == 'network' || !has_value!(args, 'a', 'all')
                     cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
@@ -201,7 +200,7 @@ module Squared
 
                       case flag
                       when :build
-                        format_desc action, flag, 'opts*,target*,context?|:'
+                        format_desc action, flag, 'opts*,target*,context|:'
                         task flag do |_, args|
                           args = args.to_a
                           if args.first == ':'
@@ -222,7 +221,7 @@ module Squared
 
                       case flag
                       when :exec, :run
-                        format_desc action, flag, "service|:,command#{'?' unless flag == :exec}|::,args*,opts*"
+                        format_desc action, flag, "service/:,command#{'?' unless flag == :exec}/::,args*,opts*"
                         task flag, [:service] do |_, args|
                           service = param_guard(action, flag, args: args, key: :service)
                           compose!(flag, args.extras, service: service)
@@ -374,9 +373,7 @@ module Squared
             end
             append_context
           when :bake, :compose
-            option(from == :bake ? 'target' : 'service', ignore: false) do |val|
-              ret.merge(split_escape(val).map! { |s| shell_quote(s) })
-            end
+            option(from == :bake ? 'target' : 'service', ignore: false) { |val| ret.merge(split_escape(val).quote!) }
           end
           ret
         end
@@ -494,7 +491,7 @@ module Squared
                     end
                     args << "#{k}=#{q + v + q}"
                   elsif !silent?
-                    log_message(Logger::INFO, 'unrecognized option', subject: from, hint: k)
+                    log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
                 raise_error TypeError, 'none specified', hint: flag unless type
@@ -714,7 +711,7 @@ module Squared
             when 2, 4
               return
             when 3
-              return unless COMPOSEFILE.select { |val| basepath(val).exist? }.size > 1
+              return unless COMPOSEFILE.select { |val| basepath!(val) }.size > 1
             end
           end
           files = Array(@file).map { |val| quote_option('file', basepath(val)) }
@@ -841,7 +838,7 @@ module Squared
 
         def list_empty(subject: name, hint: nil, **kwargs)
           hint = "status: #{hint.join(', ')}" if hint.is_a?(Array)
-          puts log_message(Logger::INFO, 'none detected', subject: subject, hint: hint, **kwargs)
+          puts log_message('none detected', subject: subject, hint: hint, **kwargs)
         end
 
         def confirm_command(*args, title: nil, target: nil, as: nil)
@@ -854,10 +851,8 @@ module Squared
             opt_style(theme[:caution], /\A(.+)\z/)
           ])
           printsucc
-          a = t.last.capitalize
-          b = sub_style target, theme[:subject]
-          c = sub_style as, theme[:inline] if as
-          confirm "#{a} #{b}#{" as #{c}" if c}?", 'N'
+          s = t.last.capitalize
+          confirm "#{s} #{sub_style(target, theme[:subject])}#{" as #{sub_style(as, theme[:inline])}" if as}?", 'N'
         end
 
         def choice_command(flag, *action)
@@ -880,8 +875,7 @@ module Squared
           lines = `#{docker_output(cmd)}`.lines
           header = lines.shift
           if lines.empty?
-            puts log_message(Logger::INFO, 'none found', subject: name,
-                                                         hint: "docker #{cmd.split(' ', 3)[0...2].join(' ')}")
+            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0...2].join(' ')}")
             return
           end
           puts " #  #{header}"

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

@@ -487,7 +487,7 @@ module Squared
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
                                                               when :push then 'pathspec*,:'
-                                                              when :branch then 'name,stash?|:'
+                                                              when :branch then 'name,stash/:'
                                                               when :clear, :list, :all then nil
                                                               else 'stash?|:'
                                                               end)
@@ -672,7 +672,7 @@ module Squared
                   when 'branch'
                     case flag
                     when :create
-                      format_desc action, flag, 'name,ref?|:'
+                      format_desc action, flag, 'name,ref/:'
                       task flag, [:name, :ref] do |_, args|
                         target = param_guard(action, flag, args: args, key: :name)
                         ref = commithead args.ref
@@ -737,7 +737,7 @@ module Squared
                   when 'switch'
                     case flag
                     when :create
-                      format_desc action, flag, '(^)name,ref?|:'
+                      format_desc action, flag, '(^)name,ref/:'
                       task flag, [:name, :commit] do |_, args|
                         branch = param_guard(action, flag, args: args, key: :name)
                         commit = commithead args.commit
@@ -751,7 +751,7 @@ module Squared
                         switch(flag, commit: commit)
                       end
                     when :branch
-                      format_desc action, flag, 'name|:,opts*'
+                      format_desc action, flag, 'name/:,opts*'
                       task flag, [:name] do |_, args|
                         args = if (branch = args.name)
                                  branch = nil if branch == ':'
@@ -765,7 +765,7 @@ module Squared
                   when 'reset'
                     case flag
                     when :commit
-                      format_desc action, flag, 'ref|:,opts*'
+                      format_desc action, flag, 'ref/:,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         args = if commit && commit != ':'
@@ -787,7 +787,7 @@ module Squared
                         reset(flag, flag == :index ? args.to_a : [])
                       end
                     when :mode
-                      format_desc action, flag, 'mode,ref?|:'
+                      format_desc action, flag, 'mode,ref/:'
                       task flag, [:mode, :ref] do |_, args|
                         mode = param_guard(action, flag, args: args, key: :mode)
                         ref = commithead args.ref
@@ -795,7 +795,7 @@ module Squared
                         reset(flag, mode: mode, ref: ref)
                       end
                     when :patch
-                      format_desc action, flag, 'ref?|:,pathspec*'
+                      format_desc action, flag, 'ref/:,pathspec*'
                       task flag, [:ref] do |_, args|
                         ref = commithead args.ref
                         ref = choice_commit(reflog: false) unless ref && ref != ':'
@@ -921,7 +921,7 @@ module Squared
                         restore(flag, args, commit: commit, files: files)
                       end
                     when :staged, :worktree
-                      format_desc action, flag, 'opts*,pathspec*,:?'
+                      format_desc action, flag, 'opts*,pathspec*|:'
                       task flag do |_, args|
                         args = args.to_a
                         if args.empty? || args.last == ':'
@@ -1066,7 +1066,7 @@ module Squared
             append_head branch
           else
             unless gitpath('REBASE_HEAD').exist?
-              puts log_message(Logger::INFO, name, 'no rebase in progress', hint: command) if stdout?
+              puts log_message('no rebase in progress', subject: name, hint: command) if stdout?
               exit 1
             end
             return unless VAL_GIT[:rebase][:send].include?(command)
@@ -1143,7 +1143,7 @@ module Squared
               flag = :push
             end
             unless (file = gitpath('logs/refs/stash')).exist? || flag == :push
-              puts log_message(Logger::INFO, name, 'no stashes were found', hint: flag) if stdout?
+              puts log_message('no stashes were found', subject: name, hint: flag) if stdout?
               exit 1
             end
             cmd, opts = git_session('stash', flag, opts: opts)
@@ -1237,14 +1237,14 @@ module Squared
           end
           out, banner, from = source(io: true)
           ret = write_lines(out, banner: banner, sub: sub)
-          list_result(ret, 'files', from: from, action: 'modified')
+          list_result(ret, 'files', action: 'modified', from: from)
         end
 
         def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
           kw = lambda do
             {
-              include: relativepath(Array(kwargs[:include]), all: true),
-              exclude: relativepath(Array(kwargs[:exclude]), all: true)
+              include: relativepath(*Array(kwargs[:include]), all: true),
+              exclude: relativepath(*Array(kwargs[:exclude]), all: true)
             }
           end
           unless workspace.closed
@@ -1277,7 +1277,7 @@ module Squared
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
               workspace.rev_timeutc(name, 'build') unless (since = workspace.rev_timesince(name, 'build'))
               if stdout?
-                puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: ("#{since} ago" if since))
+                puts log_message(['revbuild', 'no changes'], subject: name, hint: ("#{since} ago" if since))
               end
               return
             end
@@ -1287,7 +1287,7 @@ module Squared
         rescue StandardError => e
           print_error(e, pass: true)
         else
-          print_status(name, subject: 'revbuild', start: start, from: :completed)
+          print_status('revbuild', subject: name, start: start, from: :completed)
           workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
                               sync: sync, utc: 'build')
         end
@@ -1380,15 +1380,11 @@ module Squared
             out, banner, from = source(io: true)
             print_item banner
             ret = write_lines(out, grep: op.extras)
-            list_result(ret, 'tags', from: from, grep: op.extras)
+            list_result(ret, 'tags', grep: op.extras, from: from)
             return
           end
           remote ||= option('remote')
-          source.tap do |ret|
-            next unless ret && remote
-
-            git_spawn('push', ('-d' if flag == :delete), remote, *refs.map! { |val| shell_quote(val) })
-          end
+          source.tap { |ret| git_spawn('push', ('-d' if flag == :delete), remote, *refs.quote!) if ret && remote }
         end
 
         def log!(flag, opts = [], range: [], index: [], grep: [])
@@ -1545,7 +1541,7 @@ module Squared
             if banner?
               puts 'Nothing to commit'
             elsif stdout?
-              puts log_message(Logger::INFO, name, 'nothing to commit', hint: flag)
+              puts log_message('nothing to commit', subject: name, hint: flag)
             end
             exit 1
           end
@@ -1567,7 +1563,7 @@ module Squared
             end
           else
             unless gitpath('MERGE_HEAD').exist?
-              puts log_message(Logger::INFO, name, 'no merge in progress', hint: command) if stdout?
+              puts log_message('no merge in progress', subject: name, hint: command) if stdout?
               exit 1
             end
             return unless VAL_GIT[:merge][:send].include?(command)
@@ -1607,9 +1603,7 @@ module Squared
               cmd << shell_quote(target) if target
             end
           when :delete
-            remote&.each do |val|
-              source git_output('push --delete', *val.split('/', 2).map! { |s| shell_quote(s) })
-            end
+            remote&.each { |val| source git_output('push --delete', *val.split('/', 2).quote!) }
             force, list = refs.partition { |val| val.start_with?(/[~^]/) }
             force.each do |val|
               r = '-r' if val.delete!('~')
@@ -1624,7 +1618,7 @@ module Squared
             s = +"-#{flag.to_s[0]}"
             s.upcase! if option('f', 'force')
             cmd << s
-            refs.compact.each { |val| cmd << shell_quote(val) }
+            cmd.merge(refs.compact.quote!)
             stdout = true
           when :current
             cmd << '--show-current'
@@ -1784,7 +1778,7 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
-          list_result(ret, flag.to_s, from: from, grep: op.extras)
+          list_result(ret, flag.to_s, grep: op.extras, from: from)
         end
 
         def ls_files(flag, opts = [])
@@ -1794,7 +1788,7 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras)
-          list_result(ret, 'files', from: from, grep: op.extras)
+          list_result(ret, 'files', grep: op.extras, from: from)
         end
 
         def git(flag, opts = [])
@@ -1976,7 +1970,7 @@ module Squared
           ret
         end
 
-        def list_result(size, type, grep: [], action: 'found', from: nil)
+        def list_result(size, type, action: 'found', grep: [], from: nil)
           if size == 0
             puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
           elsif stdout?
@@ -2198,7 +2192,7 @@ module Squared
             raise_error(ArgumentError, "missing #{origin ? 'branch' : 'remote'} name", hint: origin)
           end
           branch = "#{branch}:#{origin[i.succ..-1]}" unless origin.end_with?("/#{branch}")
-          [origin[0..i.pred], branch].tap { |ret| ret.map! { |val| shell_quote(val) } if quote }
+          [origin[0..i.pred], branch].tap { |ret| ret.quote! if quote }
         end
 
         def commithash(val)

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

@@ -159,7 +159,7 @@ module Squared
           end
           @dependname = 'package.json'
           dependfile_set [@dependname]
-          @tsfile = basepath(ts).yield_self { |file| file if file.exist? }
+          @tsfile = basepath! ts
           @pm = { __: init }
         end
 
@@ -280,7 +280,7 @@ module Squared
                   flags.each do |flag|
                     case action
                     when 'outdated'
-                      format_desc action, flag, %w[u/pdate s/elect i/nteractive d/ry-run diff]
+                      format_desc action, flag, "#{shortname('i', 's', 'u', 'd')},diff"
                       task flag do |_, args|
                         outdated flag, args.to_a
                       end
@@ -331,11 +331,15 @@ module Squared
                       format_desc(action, flag, 'opts*', "#{flag == :project ? 'before' : 'after'}": 'config?')
                       task flag do |_, args|
                         args = args.to_a
-                        tsc(*args, banner: true, "#{flag}": if flag == :build
-                                                              true
-                                                            else
-                                                              exist?(args.first) ? args.shift : @tsfile
-                                                            end, watch: has_value!(args, 'w', 'watch'))
+                        if flag == :project
+                          project = if exist?(args.first)
+                                      args.shift
+                                    else
+                                      @tsfile
+                                    end
+                        end
+                        watch = has_value!(args, 'w', 'watch')
+                        tsc(*args, banner: true, project: project, build: flag == :build, watch: !watch.nil?)
                       end
                     end
                   end
@@ -499,7 +503,7 @@ module Squared
             add = flag == :add
             if add
               remove, packages = packages.partition { |val| val.delete_prefix!('-') }
-              remove.map! { |pkg| shell_quote(pkg) }
+              remove.quote!
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
@@ -598,7 +602,7 @@ module Squared
             if add
               return if packages.empty?
 
-              cmd.merge(packages.map { |pkg| shell_quote(pkg) })
+              cmd.merge(packages.quote!)
             end
             run(from: flag || :depend, sync: sync)
           end
@@ -626,13 +630,20 @@ module Squared
           end
           found = []
           avail = []
-          rev = flag || (prod? ? :patch : :minor)
+          flag ||= case (up = option('u', 'update'))
+                   when 'major', 'minor'
+                     up.to_sym
+                   else
+                     prod? ? :patch : :minor
+                   end
           if sync && !stdin?
-            if has_value?(opts, 's', 'select') && !dryrun
-              items = []
-            elsif has_value?(opts, 'i', 'interactive')
-              ia = true
-            end
+            items = if has_value?(opts, 's', 'select')
+                      se = true
+                      []
+                    elsif has_value?(opts, 'i', 'interactive')
+                      ia = true
+                      []
+                    end
           end
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
@@ -643,7 +654,7 @@ module Squared
               ch = file[0]
               if ch.match?(/[~^]/)
                 file = file[1..-1]
-              elsif ia && rev == :major
+              elsif ia && flag == :major
                 major = true
               else
                 avail << [key, file, latest, true]
@@ -652,7 +663,7 @@ module Squared
               current = val['current'] || file
               want = val['wanted']
               unless latest[SEM_VER, 6]
-                case rev
+                case flag
                 when :major
                   want = latest
                 when :minor
@@ -671,7 +682,7 @@ module Squared
               b = f[2]
               c = w[0]
               d = w[2]
-              upgrade = case rev
+              upgrade = case flag
                         when :major
                           a == '0' ? c == '0' || c == '1' : true
                         when :minor
@@ -713,6 +724,7 @@ module Squared
           if !found.empty?
             col1 = width.call(found, 0) + 4
             col2 = width.call(found, 1) + 4
+            col3 = pad.call(found.size, found).size + 2 + col1 + col2 + width.call(found, 2)
             packages = []
             pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
@@ -720,60 +732,57 @@ module Squared
               modified += 1
               "#{pkg}\"#{mod || (a[3] == 1 && a[4] ? '^' : '')}#{a[2]}\""
             end
-            kwargs = { col1: col1, col2: col2, col3: width.call(found, 2), timeout: 0 }
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              f = ia && (rev != :major || e || semmajor?(item[5], item[6]))
-              col0 = "#{pad.call(i, found)}. "
-              if f && !confirm_outdated(a, c, (d / 2.0).ceil, b, lock: e, col0: col0, **kwargs)
-                cur = -1
-              else
-                cur = modified
-                doc.send(items ? :sub : :sub!, pat.call(item)) do |capture|
-                  if $2 == '~' && rev != :patch
-                    cur = -1
-                    pending += 1
-                    capture
-                  else
-                    edit.call(item, $1, $2)
-                  end
+              cur = modified
+              doc.send(items ? :sub : :sub!, pat.call(item)) do |capture|
+                if $2 == '~' && flag != :patch
+                  cur = -1
+                  pending += 1
+                  capture
+                else
+                  edit.call(item, $1, $2)
                 end
               end
-              if f
-                a = ' ' * col1
-                b = ' ' * col2
-              else
-                a = a.ljust(col1)
-                b = b.ljust(col2)
-                sub_style! b, theme[:current] if theme[:current] && !stdin?
+              a = a.ljust(col1)
+              b = b.ljust(col2)
+              sub_style! b, theme[:current] if theme[:current] && !stdin?
+              if cur == -1
+                c = 'SKIP'
+              elsif modified == cur
+                c = 'FAIL'
+              elsif !stdin?
+                if d == 1
+                  sub_style! a, theme[:major]
+                  sub_style! c, :bold, color(:green)
+                else
+                  sub_style!(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
+                end
+                g = item
               end
-              c = if cur == -1
-                    'SKIP'
-                  elsif modified == cur
-                    'FAIL'
-                  elsif stdin?
-                    c
-                  else
-                    g = item
-                    if d == 1
-                      sub_style! a, theme[:major]
-                      sub_style c, :bold, color(:green)
-                    else
-                      sub_style(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
-                    end
-                  end
-              s = a + b + c
-              if !items
-                puts "#{f ? ' ' * col0.size : col0}#{s}"
-              elsif g
+              s = "#{pad.call(i, found)}. #{a}#{b}#{c}"
+              if se
                 items << [s, g]
+                next
+              elsif ia && g
+                items << [g]
+                if flag != :major || e || semmajor?(item[5], item[6])
+                  items.pop unless confirm_semver(s.ljust(col3 + s.size - s.stripstyle.size), (d / 2.0).ceil)
+                  next
+                end
               end
+              puts s
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
-            if dryrun || (modified == 0 && (pending > 0 || (items && pending == 0)))
+            if (dryrun && Array(items).empty?) || (modified == 0 && (pending > 0 || (items && pending == 0)))
               n = if items
-                    puts(items.empty? ? 'No updates were found' : items.map(&:first))
-                    items.size
+                    if items.empty?
+                      puts 'No updates were selected'
+                      0
+                    else
+                      puts items.map(&:first) if se
+                      items.size
+                    end
                   else
                     found.size
                   end
@@ -781,24 +790,32 @@ module Squared
             elsif modified > 0
               if items
                 packages.clear
-                choice('Select a package', items.map(&:first), multiple: true, force: false, index: true, border: true)
-                  .each do |n|
-                    item = items[n.pred].last
-                    doc.sub!(pat.call(item)) { edit.call(item, $1, $2) }
-                  end
+                if ia
+                  (1..items.size)
+                else
+                  choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                 border: true)
+                end.each do |n|
+                  item = items[n.pred].last
+                  doc.sub!(pat.call(item)) { edit.call(item, $1, $2) }
+                end
               end
               unless packages.empty?
-                File.write(dependfile, doc)
-                if sync && (opts.include?('diff') || option('diff'))
-                  run(git_output('diff', shell_quote(dependfile)), banner: false)
-                end
-                if has_value?(opts, 'u', 'update') || option('update')
-                  package(:update, packages: packages, from: :'outdated:update')
-                else
-                  modified = -1
+                modified = -1
+                if dryrun
                   footer.call(0, found.size)
+                else
+                  File.write(dependfile, doc)
+                  if sync && (opts.include?('diff') || option('diff'))
+                    run(git_output('diff', shell_quote(dependfile)), banner: false)
+                  end
+                  if has_value?(opts, 'u', 'update') || up
+                    package(:update, packages: packages, from: :'outdated:update')
+                  else
+                    footer.call(0, found.size)
+                  end
+                  commit(:add, [dependname], pass: true)
                 end
-                commit(:add, [dependname], pass: true)
               end
             end
           elsif !avail.empty?
@@ -1131,7 +1148,7 @@ module Squared
         end
 
         def outdated?
-          dependfile.exist?
+          dependfile.exist? && !task_pass?('outdated')
         end
 
         def update?