squared 0.6.5 → 0.6.6

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

@@ -154,33 +154,34 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    cmd = docker_output(command, case command
+                    cmd = docker_output command, case command
                                                  when 'image', 'container', 'network'
                                                    'ls'
                                                  when 'compose'
                                                    'ps'
                                                  else
                                                    raise_error ArgumentError, 'unrecognized command', hint: command
-                                                 end)
+                                                 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'))
-                    else
-                      cols = []
-                      args.each do |val|
-                        if val =~ /^(\d+)$/
-                          cols << data[$1.to_i.pred]
-                        elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
-                          j = $1.to_i.pred
-                          k = $3.to_i - ($2 == '..' ? 2 : 1)
-                          cols.concat(data[j..k]) if k > j
-                        end
-                      end
-                      if cols.empty?
-                        cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
-                      end
-                    end
+                    cols = if has_value!(args, 's', 'standard')
+                             data.first(data.index('CreatedAt'))
+                           else
+                             [].tap do |out|
+                               args.each do |val|
+                                 if val =~ /^(\d+)$/
+                                   out << data[$1.to_i.pred]
+                                 elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
+                                   j = $1.to_i.pred
+                                   k = $3.to_i - ($2 == '..' ? 2 : 1)
+                                   out.concat(data[j..k]) if k > j
+                                 end
+                               end
+                               next unless out.empty?
+
+                               out.replace(choice_index('Select a column', data, multiple: true, attempts: 1))
+                             end
+                           end
                     cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
@@ -417,7 +418,7 @@ module Squared
               lines = IO.popen(cmd.temp('--services')).map(&:strip).reject(&:empty?)
               return list_empty(hint: status) if lines.empty?
 
-              service = choice_index('Choose a service', lines, multiple: true, force: true, attempts: 1)
+              service = choice_index('Choose a service', lines, multiple: true, attempts: 1)
             end
             docker_session('compose', command, '--', *service)
           else
@@ -545,11 +546,12 @@ module Squared
             if opts.size == op.size
               index = 0
               name = nil
-              opts.reverse_each do |opt|
-                if (name = opt[/^name=["']?(.+?)["']?$/, 1])
-                  opts.delete(opt)
-                  break
-                end
+              opts.reverse_each do |val|
+                next unless (arg = OptionPartition.parse_arg!('name', val))
+
+                name = arg[1]
+                opts.delete(val)
+                break
               end
               list_image(:run, from: from) do |val|
                 container(:run, if name
@@ -732,21 +734,17 @@ module Squared
         end
 
         def append_tag(val, target: @session)
+          ver = option('version', target: target, ignore: false)
           case val
           when String
             split_escape val
-          when Array
-            val
           else
-            []
-          end.yield_self do |list|
-            ver = option('version', target: target, ignore: false)
-            list.each do |s|
-              s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
-              target << basic_option('tag', tagname(s))
-            end
-            target
+            Array(val)
+          end.each do |s|
+            s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
+            target << basic_option('tag', tagname(s))
           end
+          target
         end
 
         def filter_ps(flag, from = :'container:ps')
@@ -873,14 +871,12 @@ module Squared
                         "--format='table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}'"]
                      end
           lines = `#{docker_output(cmd)}`.lines
-          header = lines.shift
-          if lines.empty?
-            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0...2].join(' ')}")
+          if lines.size <= 1
+            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0, 2].join(' ')}")
             return
           end
-          puts " #  #{header}"
+          puts " #  #{lines.shift}"
           multiple = false
-          parse = ->(val) { val.split(/\s+/)[0] }
           ctx = flag.to_s
           case flag
           when :run, :exec
@@ -915,7 +911,7 @@ module Squared
           else
             cmd << opts << '--'
           end
-          cmd.merge(Array(out).map! { |val| parse.call(val) })
+          cmd.merge(Array(out).map! { |val| val.split(/\s+/, 2).first })
           cmd << args
           success?(run(cmd), ctx.start_with?(/network|tag|save/))
         end

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

@@ -29,7 +29,7 @@ module Squared
             base = name.to_s
             each { |proj| repo << proj if !proj.parent && check.call(proj) }
           else
-            warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid') if warning
+            warn log_warn(name, subject: 'git', hint: 'invalid') if warning
             return self
           end
         end
@@ -86,7 +86,7 @@ module Squared
         @revdoc = JSON.parse(@revfile.read) if @revfile.exist?
       rescue StandardError => e
         @revfile = nil
-        warn log_message(Logger::WARN, e, pass: true)
+        warn log_warn(e, pass: true)
         self
       else
         @revdoc = {} unless @revdoc.is_a?(Hash)
@@ -142,7 +142,7 @@ module Squared
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue StandardError => e
         log&.debug e
-        warn log_message(Logger::WARN, e, pass: true) if warning?
+        warn log_warn(e, pass: true) if warning
       ensure
         @revlock = false
       end
@@ -580,17 +580,17 @@ module Squared
                           when '--'
                             grep << '--' if grep.empty?
                             break
-                          when 'a', 'all-match'
+                          when /^a(ll-match)?$/
                             opts << 'all-match'
-                          when 'in', 'invert-grep'
+                          when /^in(vert-grep)?$/
                             opts << 'invert-grep'
                           when 'i', 'E', 'F', 'P'
                             opts << last
                           else
-                            if last =~ /^(?:f(?:-ormat)?)=(.+)$/
+                            if last =~ /^(f(-ormat)?)=(.+)$/
                               opts.shift
                               opts << "format=#{$1}"
-                            elsif last =~ /^(?:max(?:-count)?)=(\d+)$/
+                            elsif last =~ /^(max(-count)?)=(\d+)$/
                               opts << "max-count=#{$1}"
                             else
                               grep << last
@@ -1167,7 +1167,7 @@ module Squared
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
-                                   values: values, column: /^[^@]+@\{(\d+)}/, force: true)
+                                   values: values, column: /^[^@]+@\{(\d+)\}/)
                 if values
                   op.merge(out.reverse)
                 else
@@ -1276,9 +1276,7 @@ module Squared
             files = status_digest(*args, **kwargs)
             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(['revbuild', 'no changes'], subject: name, hint: ("#{since} ago" if since))
-              end
+              puts log_message(['revbuild', 'no changes'], subject: name, hint: ("#{since} ago" if since)) if stdout?
               return
             end
           end
@@ -1513,13 +1511,14 @@ module Squared
             append_pathspec op.extras
           end
           co = git_session('commit', options: false)
-          pu = git_output 'push', upstream && '--set-upstream'
+          pu = git_output 'push'
+          co << '--amend' if amend
+          pu << '--set-upstream' if upstream
           if dryrun?
-            op.delete('--dry-run')
+            op.adjoin('--dry-run')
             co << '--dry-run'
             pu << '--dry-run'
           end
-          co << '--amend' if amend
           if message
             append_message message
           elsif flag == :'amend-orig' || option('edit', equals: '0')
@@ -1527,13 +1526,12 @@ module Squared
           end
           pu << '--force-with-lease' if amend
           pu.merge(repotrack(origin, branch))
-          puts if pass
           adding = git_spawn 'diff --name-only --no-color'
           source op
           cached = git_spawn 'diff --cached --name-only --no-color'
           if amend || !cached.empty? || dryrun?
             if adding.empty? && !cached.empty? && banner?
-              puts(cached.lines.map! { |val| "cached #{shell_quote(val.chomp)}" })
+              puts(cached.lines(chomp: true).map! { |val| "cached #{shell_quote(val)}" })
             end
             source co
             source pu
@@ -1553,7 +1551,8 @@ module Squared
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            op << "--#{flag}" << '--'
+            op << "--#{flag}"
+            op.delim
             if branch
               op << branch
               op.clear(pass: false)
@@ -1643,13 +1642,15 @@ module Squared
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               cmd << '-vv --no-abbrev --list'
               out, banner, from = source(io: true)
-              ret = write_lines(out, grep: [/^\*\s+#{Regexp.escape(head)}\s/], banner: banner, first: true) do |line|
+              first = workspace.size > 1
+              grep = first ? [/^\*\s+#{Regexp.escape(head)}\s/] : []
+              ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, index|
                 next line if stdin?
 
-                data = line.sub(/^\*\s+/, '').split(/\s+/)
-                a = sub_style data[0], theme[:inline]
-                b = sub_style data[1], theme[:extra]
-                r = /\A(?:\[((?~\]\s))\]\s)?(.+)\z/m.match(data[2..-1].join(' '))
+                data = line.sub(/^\*?\s+/, '').split(/\s+/, 3)
+                a = sub_style(data[0], theme[:inline], styles: (:underline if !first && line.start_with?('*')))
+                b = commitstyle data[1]
+                r = /\A(?:\[((?~\]\s))\]\s)?(.+)\z/m.match(data[2])
                 if (r1 = r[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
                   write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, theme[:warn])}" }
                   r1 = $1
@@ -1657,7 +1658,7 @@ module Squared
                   r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[0]}"
-                [" Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{r[2]}"]
+                ["#{"\n" unless index == 0} Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{r[2]}"]
                   .compact
                   .join("\n")
               end
@@ -1690,7 +1691,7 @@ module Squared
                        basic_option 'track', track
                      end
             when :detach
-              cmd << "--#{flag}"
+              cmd << '--detach'
             end
             append_head commit
           end
@@ -1738,7 +1739,7 @@ module Squared
           case format
           when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
             cmd << basic_option('format', format)
-          when /(?:^t?format:|%)/
+          when /^t?format:|%/
             cmd << quote_option('pretty', format)
           else
             opts << format if format
@@ -1754,7 +1755,7 @@ module Squared
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
           when :commit
-            cmd << ((n = size.to_i) > 0 ? basic_option('short', [n, 5].max) : '--verify')
+            cmd << (size.to_i.zero? ? '--verify' : basic_option('short', [size.to_i, 5].max))
             append_commit(ref, head: true)
           when :branch
             cmd << '--abbrev-ref'
@@ -1823,15 +1824,14 @@ module Squared
               grep, pathspec = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !pathspec.empty?
                 grep.map! { |val| Regexp.new(val[1..-2]) }
-                files = [].tap do |out|
-                  status_data.each do |a, b|
-                    next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
+                files = []
+                status_data.each do |a, b|
+                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                    out << "#{sub_style(b, color(:red))} #{a}"
-                  end
+                  files << "#{sub_style(b, color(:red))} #{a}"
                 end
                 unless files.empty?
-                  files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
+                  files = choice_index('Select files', files, multiple: true, trim: /^\S+\s/,
                                                               accept: [accept_y('Add?')])
                 end
                 op.swap(pathspec + files)
@@ -1850,8 +1850,8 @@ module Squared
               if op.include?('--')
                 op.add_path(val)
               elsif op.exist?(val, glob: true)
-                op << '--'
-                op.add_path(val)
+                op.delim
+                  .add_path(val)
               else
                 op.add_quote(val)
               end
@@ -1951,7 +1951,7 @@ module Squared
           out = []
           data.each do |line|
             next if grep&.none? { |pat| pat.match?(line) }
-            next if block_given? && !(line = yield line)
+            next if block_given? && !(line = yield(line, ret))
 
             if loglevel
               log&.add loglevel, line
@@ -1993,16 +1993,24 @@ module Squared
           end
           args = []
           args << quote_option('sort', sort) if sort
-          args << shell_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
+          args << basic_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
         def choice_commit(count: true, reflog: true, force: true, **kwargs)
           kwargs[:attempts] ||= 1 unless force
           cmd = git_output(reflog && env('GIT_REFLOG') ? 'reflog' : 'log')
-          cmd << quote_option('format', '(%h) %s')
+          cmd << quote_option('format', "#{commitstyle('%h')} %s")
           cmd << basic_option('max-count', env('GIT_COUNT', ARG[:CHOICE])) if count
-          choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /\((\w+)\)/, force: force, **kwargs)
+          ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
+          case ret
+          when Array
+            ret.map!(&:stripstyle)
+          when String
+            ret.stripstyle
+          else
+            ret
+          end
         end
 
         def choice_remote(force: false, **kwargs)
@@ -2026,13 +2034,13 @@ module Squared
         end
 
         def status_data(*args)
-          [].tap do |ret|
-            git_spawn('status -z -uall', *args).split("\x0").each do |line|
-              next unless line =~ /^(.)(.) (.+)$/
+          ret = []
+          git_spawn('status -z -uall', *args).split("\x0").each do |line|
+            next unless line =~ /^(.)(.) (.+)$/
 
-              ret << [$3, $2, $1]
-            end
+            ret << [$3, $2, $1]
           end
+          ret
         end
 
         def append_pull(opts, list, flag:, from:, target: @session, no: nil, remote: nil)
@@ -2108,7 +2116,9 @@ module Squared
 
         def append_message(val = nil, target: @session)
           val = messageopt if val.to_s.empty?
-          target << quote_option('message', val) if val
+          return unless val
+
+          target << quote_option('message', val)
         end
 
         def append_head(val = nil, target: @session)
@@ -2205,6 +2215,10 @@ module Squared
           s.start_with?(/\d/) ? "@~#{s}" : "@#{s}"
         end
 
+        def commitstyle(val)
+          sub_style(val, theme[:extra] || color(:yellow))
+        end
+
         def matchhead(val)
           val =~ /^(?:(?:HEAD|@)([~^]\d*)?|H(\d+))$/ ? $2 || $1 || '' : nil
         end

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

@@ -246,11 +246,11 @@ module Squared
                       if op.empty?
                         op << package
                         if (args = readline('Enter arguments', force: false))
-                          op << '--' unless pnpm?
+                          op.delim unless pnpm?
                           op << args
                         end
                       else
-                        op << '--' unless pnpm?
+                        op.delim unless pnpm?
                         op << package << op.join(' ')
                       end
                     else
@@ -426,7 +426,7 @@ module Squared
                     Open3.capture2e(session_output('npm', 'pack --dry-run --no-color', npmname).to_s)
                          .first
                          .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
-                         .map { |item| Pathname.new(item.first) }
+                         .map! { |item| Pathname.new(item.first) }
                          .select(&:exist?)
                   end.concat(Array(files))
                   packed = true
@@ -507,22 +507,23 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
-            ci = -> { option('ci') }
-            is = -> { option('ignore-scripts') }
-            om = lambda do
-              next unless omit
-
-              save = case save
-                     when 'peer'
-                       'optional'
-                     when 'optional'
-                       'dev'
-                     when 'dev'
-                       'prod'
-                     end
+            om = lambda do |cmd|
+              if omit
+                save = case save
+                       when 'peer'
+                         'optional'
+                       when 'optional'
+                         'dev'
+                       when 'dev'
+                         'prod'
+                       end
+              end
+              return unless save && save != 'bundle'
+
+              cmd << "--#{save}"
             end
             rm = lambda do |target|
-              next if remove.empty?
+              return if remove.empty?
 
               run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), from: :remove, sync: sync)
             end
@@ -531,15 +532,15 @@ module Squared
               append_loglevel
               if yarn == 1
                 cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
-                cmd << '--ignore-scripts' if is.call
+                cmd << '--ignore-scripts' if option('ignore-scripts')
                 cmd << '--force' if option('force')
               else
-                cmd << '--mode=skip-build' if is.call
+                cmd << '--mode=skip-build' if option('ignore-scripts')
                 cmd << '--check-cache' if !flag && option('force')
               end
               if nolockfile?('yarn')
                 cmd << '--no-lockfile'
-              elsif ci.call
+              elsif option('ci')
                 if yarn == 1
                   cmd << '--frozen-lockfile'
                 elsif !flag
@@ -549,8 +550,7 @@ module Squared
               if add
                 cmd << '-W' if yarn == 1 && !option('w', 'ignore-workspace-root-check', equals: '0')
                 rm.call(cmd)
-                om.call
-                cmd << "--#{save}" if save && save != 'bundle'
+                om.call(cmd)
                 cmd << '--exact' if exact
               end
             elsif pnpm?
@@ -558,8 +558,7 @@ module Squared
               append_nocolor
               append_loglevel
               if add
-                om.call
-                cmd << "--save-#{save}" if save && save != 'bundle'
+                om.call(cmd)
                 rm.call(cmd)
                 cmd << '--save-exact' if exact
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
@@ -574,17 +573,18 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif ci.call
+                     elsif option('ci')
                        '--frozen-lockfile'
                      end
-              cmd << '--ignore-scripts' if is.call
+              cmd << '--ignore-scripts' if option('ignore-scripts')
             else
-              cmd = session('npm', (ci = ci.call) ? 'ci' : 'install')
+              cmd = session 'npm'
+              cmd << (ci = option('ci') ? 'ci' : 'install')
               cmd << '--workspaces=false' if ws
               append_nocolor
               append_loglevel
               if omit
-                cmd << "--omit=#{save}"
+                cmd << "--omit=#{save || omit}"
                 save = nil
               end
               unless ci
@@ -597,7 +597,7 @@ module Squared
                 end
               end
               cmd << '--package-lock=false' << 'save=false' if nolockfile?('npm')
-              cmd << '--ignore-scripts' if is.call
+              cmd << '--ignore-scripts' if option('ignore-scripts')
             end
             if add
               return if packages.empty?
@@ -710,7 +710,7 @@ module Squared
           width = ->(a, i) { a.map { |aa| aa[i] }.max_by(&:size).size }
           pad = ->(val, ord) { val.succ.to_s.rjust([ord.size.to_s.size, 2].max) }
           footer = lambda do |val, size|
-            next unless verbose
+            return unless verbose
 
             msg, hint = if modified == -1
                           ['Packages were updated', 'more possible']
@@ -814,6 +814,7 @@ module Squared
                   else
                     footer.call(0, found.size)
                   end
+                  printsucc
                   commit(:add, [dependname], pass: true)
                 end
               end
@@ -961,7 +962,7 @@ module Squared
                      case flag
                      when :install, :update
                        opts.unshift('package-lock=false', 'save=false') if nolockfile?('npm')
-                       spec = 0
+                       spec = flag == :install ? 0 : 2
                      when :add
                        spec = 1
                        flag = :install
@@ -1000,17 +1001,17 @@ module Squared
           end
           append_loglevel
           case spec
-          when 0, 1
+          when Numeric
             op.each do |opt|
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
                   op << quotepath($1, $2)
                 end
-              elsif opt.include?('=') || opt.start_with?('-')
+              elsif opt.match?(/^-|=/)
                 op.errors << opt
               else
-                op.found << opt
+                op.found << (spec == 2 && (n = opt.index('@')) ? opt[0, n] : opt)
               end
             end
             op.swap
@@ -1112,7 +1113,7 @@ module Squared
           print_run(cmd, banner, **kwargs)
           session 'npx', cmd
           start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
-          run(sync: sync, banner: banner, from: from).tap do |ret|
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: from).tap do |ret|
             next unless success?(ret, banner, start.nil?) && start
 
             print_status(name, subject: 'tsc', start: start, from: :completed)
@@ -1326,7 +1327,7 @@ module Squared
 
         def remove_modules(prefix = dependbin)
           modules = basepath 'node_modules'
-          return false unless modules.directory? && (option('Y', prefix: prefix) || confirm_basic('Remove?', modules))
+          return false unless modules.directory? && (option('y', prefix: prefix) || confirm_basic('Remove?', modules))
 
           modules.rmtree
         rescue Timeout::Error => e
@@ -1373,7 +1374,11 @@ module Squared
         end
 
         def append_platform(target: @session)
-          %w[cpu os libc].each { |name| option(name) { |val| target << basic_option(name, val) } }
+          %w[cpu os libc].each do |name|
+            next unless (val = option(name))
+
+            target << basic_option(name, val)
+          end
         end
 
         def quotepath(name, val)