squared 0.4.12 → 0.4.14

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
@@ -32,22 +33,24 @@ module Squared
                    no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze
           }.freeze,
           container: {
-            run: %w[d|detach init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet
-                    read-only rm runtime t|tty add-host=q annotation=q a|attach=b blkio-weight-device=i cap-add=b
-                    cap-drop=b cgroup-parent=b cgroupns=b cidfile=p detach-keys=q device=q device-cgroup-rule=q
-                    device-read-bps=q device-read-iops=q device-write-bps=q device-write-iops=q disable-content-trust=b?
-                    dns=e dns-option=e dns-search=e domainname=b entrypoint=q e|env=qq env-file=p expose=e gpus=q
-                    group-add=b health-cmd=q health-interval=b health-retries=i health-start-interval=b
-                    health-start-period=b health-timeout=b h|hostname=e io-maxbandwidth=b io-maxiops=b ip=b ip6=e ipc=b
-                    isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b log-driver=b log-opt=q
-                    mac-address=e memory-swappiness=b mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b
-                    platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b sig-proxy=b?
-                    stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q user=e userns=b uts=b
-                    v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+            create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
+                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b add-host=q annotation=q
+                       a|attach=b blkio-weight=i blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b
+                       cidfile=p device=q device-cgroup-rule=q device-read-bps=q device-read-iops=q device-write-bps=q
+                       device-write-iops=q disable-content-trust=b? dns=e dns-option=e dns-search=e domainname=b
+                       entrypoint=q e|env=qq env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b
+                       health-retries=i health-start-interval=b health-start-period=b health-timeout=b h|hostname=e ip=b
+                       ip6=e ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b
+                       log-driver=b log-opt=q mac-address=e m|memory=b memory-reservation=b memory-swap=n
+                       memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n
+                       platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b
+                       stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q
+                       volume-driver=b volumes-from=b w|workdir=q].freeze,
+            run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
             exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
                      w|workdir=q].freeze,
             update: %w[blkio-weight=i cpu-period=i cpu-quota=i cpu-rt-period=i cpu-rt-runtime=i c|cpu-shares=i cpus=f
-                       cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=b
+                       cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
                        restart=q].freeze,
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q].freeze,
@@ -60,7 +63,8 @@ module Squared
           image: {
             list: %w[a|all digests no-trunc f|filter=q format=q].freeze,
             push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
-            rm: %w[f|force no-prune].freeze
+            rm: %w[f|force no-prune].freeze,
+            save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=b link=b link-local-ip=b].freeze,
@@ -90,8 +94,8 @@ module Squared
         subtasks({
           'build' => %i[tag context bake].freeze,
           'compose' => %i[build run exec up].freeze,
-          'image' => %i[list rm push].freeze,
-          'container' => %i[run exec update commit inspect diff start stop restart pause unpause top stats kill
+          'image' => %i[list rm push tag save].freeze,
+          'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
                             rm].freeze,
           'network' => %i[connect disconnect].freeze
         })
@@ -107,7 +111,7 @@ module Squared
           @tag = tag || tagname("#{@project}:#{@version || 'latest'}")
           @mounts = mounts
           @secrets = secrets
-          @registry = [registry, kwargs[:username]].compact.join('/')
+          @registry = tagjoin registry, kwargs[:username]
           initialize_ref Docker.ref
           initialize_logger(**kwargs)
           initialize_env(**kwargs)
@@ -156,7 +160,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)
@@ -174,7 +178,7 @@ module Squared
                           container(flag, args.extras, id: id)
                         end
                       end
-                    when :run
+                    when :run, :create
                       format_desc action, flag, 'image,opts*,args*'
                       task flag, [:image] do |_, args|
                         if args.image
@@ -197,12 +201,15 @@ module Squared
                         tag = param_guard(action, flag, args: args, key: :tag)
                         image(flag, args.extras, id: tag)
                       end
-                    when :list, :rm
-                      format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
+                    else
+                      format_desc(action, flag, case flag
+                                                when :rm, :save then 'id*,opts*'
+                                                when :tag then 'version?'
+                                                else 'opts*,args*' end)
                       task flag do |_, args|
                         args = args.to_a
-                        if flag == :rm && args.empty?
-                          choice_command :rm
+                        if args.empty? && flag != :list
+                          choice_command flag
                         else
                           image flag, args
                         end
@@ -273,12 +280,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
@@ -306,7 +313,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
@@ -340,18 +347,20 @@ module Squared
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
+          rc = flag == :run || flag == :create
           list = OPT_DOCKER[:container].fetch(flag, [])
-          list += OPT_DOCKER[:container][:update] if flag == :run
-          op = OptionPartition.new(opts, list, cmd, project: self, args: flag == :run || flag == :exec)
+          list += OPT_DOCKER[:container][:create] if flag == :run
+          list += OPT_DOCKER[:container][:update] if rc
+          op = OptionPartition.new(opts, list, cmd, project: self, args: rc || flag == :exec)
           from = :"container:#{flag}"
           case flag
-          when :run, :exec
-            if flag == :run && !op.arg?('mount')
+          when :run, :create, :exec
+            if rc && !op.arg?('mount')
               run = VAL_DOCKER[:run]
               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|
@@ -378,7 +387,7 @@ module Squared
                 cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
               end
             end
-            append_command(flag, id.to_s.empty? ? tagmain : id, op.extras, from: from)
+            append_command(flag, id || tagmain, op.extras, from: from)
           when :update
             raise_error('missing container', hint: from) if op.empty?
             op.append(escape: true)
@@ -442,7 +451,7 @@ module Squared
 
         def image(flag, opts = [], sync: true, id: nil, registry: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:image][flag], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self)
           exception = @exception
           banner = true
           from = :"image:#{flag}"
@@ -473,7 +482,7 @@ module Squared
               end
             else
               if op.empty?
-                list_image(flag, docker_output('image ls -a'), from: from) do |val|
+                list_image(:rm, docker_output('image ls -a'), from: from) do |val|
                   image(:rm, opts, sync: sync, id: val)
                 end
               else
@@ -481,6 +490,14 @@ module Squared
               end
               return
             end
+          when :tag, :save
+            list_image(flag, docker_output('image ls -a'), from: from) do |val|
+              op << val
+              if flag == :tag
+                op << tagname("#{@project}:#{op.extras.first}")
+                break
+              end
+            end
           when :push
             id ||= option('tag', ignore: false) || tagmain
             registry ||= op.shift || option('registry') || @registry
@@ -497,7 +514,8 @@ module Squared
             exception = true
             banner = false
           end
-          run(cmd, sync: sync, exception: exception, banner: banner, from: from)
+          ret = run(cmd, sync: sync, exception: exception, banner: banner, from: from)
+          print_success if success?(ret) && (flag == :tag || flag == :save)
         end
 
         def network(flag, opts = [], target: nil)
@@ -548,7 +566,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
@@ -571,7 +591,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
@@ -645,7 +665,7 @@ 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])
@@ -685,14 +705,14 @@ module Squared
 
         def choice_command(flag)
           msg, cmd, index = case flag
-                            when :run, :rm
-                              ['Choose an image', 'images -a', 2]
                             when :exec
                               ['Choose a container', 'ps -a', 0]
                             when :bake
                               ['Choose a target', 'buildx bake --list=type=targets', 0]
-                            else
+                            when :connect, :disconnect
                               ['Choose a network', 'network ls', 0]
+                            else
+                              ['Choose an image', 'images -a', 2]
                             end
           lines = `#{docker_output(cmd)}`.lines
           header = lines.shift
@@ -702,25 +722,43 @@ module Squared
             puts " #  #{header}"
             multiple = false
             parse = ->(val) { val.split(/\s+/)[index] }
+            ctx = flag.to_s
             case flag
             when :run, :exec
               values = [['Options', flag == :run], ['Arguments', flag == :exec]]
-              cmd = flag.to_s
             when :rm, :bake
               values = ['Options']
               multiple = true
-              cmd = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
-            else
+              ctx = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
+            when :save
+              values = [['Output', true], 'Platform']
+              multiple = true
+            when :connect, :disconnect
               values = ['Options', ['Container', true]]
-              cmd = "network #{flag}"
+              ctx = "network #{flag}"
             end
             out, opts, args = choice_index(msg, lines, multiple: multiple, values: values)
-            ret = run docker_output(cmd, opts, '--', *(if out.is_a?(Array)
-                                                         out.map! { |val| parse.call(val) }
-                                                       else
-                                                         [parse.call(out)]
-                                                       end), args)
-            print_success if success?(ret && cmd.start_with?('network'))
+            cmd = docker_output ctx
+            case flag
+            when :tag
+              args = tagjoin @registry, @tag
+            when :save
+              opts = "#{opts}.tar" unless opts.end_with?('.tar')
+              cmd << quote_option('output', File.expand_path(opts))
+              if args
+                cmd << basic_option('platform', args)
+                args = nil
+              end
+            else
+              cmd << opts << '--'
+            end
+            cmd.merge(if out.is_a?(Array)
+                        out.map! { |val| parse.call(val) }
+                      else
+                        [parse.call(out)]
+                      end)
+            cmd << args
+            print_success if success?(run(cmd)) && ctx.match?(/\A(?:network|tag|save)/)
           end
         end
 
@@ -743,6 +781,11 @@ module Squared
           val && projectpath?(val) ? shell_quote(path + val) : '.'
         end
 
+        def tagjoin(*args, char: '/')
+          args.compact!
+          args.join(char) unless args.empty?
+        end
+
         def tagname(val)
           val = val.split(':').map! { |s| charname(s.sub(/^\W+/, '')) }
           ret = val.join(':')

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

@@ -27,7 +27,7 @@ module Squared
           base = name
           @project.each_value { |proj| repo << proj if !proj.parent && check.call(proj) }
         else
-          warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid', pass: true) if warning
+          warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid') if warning
           return self
         end
         if base
@@ -340,7 +340,7 @@ module Squared
           'restore' => %i[source staged worktree].freeze,
           'rev' => %i[commit build output].freeze,
           'show' => %i[format oneline textconv].freeze,
-          'stash' => %i[push pop apply drop clear list].freeze,
+          'stash' => %i[push pop apply branch drop clear list].freeze,
           'switch' => %i[create detach merge].freeze,
           'tag' => %i[add sign delete list].freeze
         })
@@ -367,13 +367,13 @@ module Squared
                   case action
                   when 'pull', 'fetch'
                     if flag == :remote
-                      format_desc action, flag, 'remote,opts*'
+                      format_desc action, flag, 'remote?,opts*'
                       task flag, [:remote] do |_, args|
                         if (remote = args.remote)
                           args = args.extras
                         else
                           remote = choice_remote
-                          args = args.to_a.drop(1)
+                          args = args.to_a
                         end
                         __send__(action, flag, args, remote: remote)
                       end
@@ -459,6 +459,7 @@ module Squared
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
                                                               when :push then 'pathspec*'
+                                                              when :branch then 'name,stash?|:'
                                                               when :clear, :list then nil
                                                               else 'stash?|:' end)
                     task flag do |_, args|
@@ -927,7 +928,7 @@ module Squared
           source(sync: sync, sub: if verbose
                                     [
                                       { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: color(:red), index: 4 },
-                                      { pat: /^(.+)(\|\s+\d+\s+)(\++)(-*)(.*)$/, styles: color(:green), index: 3 }
+                                      { pat: /^(.+)(\|\s+\d+\s+)(\++)(.*)$/, styles: color(:green), index: 3 }
                                     ]
                                   end, **threadargs)
         end
@@ -942,7 +943,7 @@ module Squared
             return unless upstream
 
             op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, no: OPT_GIT[:no][:rebase])
-            cmd << shell_escape(upstream)
+            cmd << upstream
             append_head op.shift
             op.clear(pass: false)
           when :onto
@@ -950,7 +951,7 @@ module Squared
 
             cmd << '--interactive' if option('interactive', 'i')
             cmd << shell_option('onto', commit) if commit
-            cmd << shell_escape(upstream)
+            cmd << upstream
             append_head branch
           else
             return unless VAL_GIT[:rebase][:send].include?(command)
@@ -984,7 +985,14 @@ module Squared
             end
           end
           opts[:origin] = val if (val = option('origin', ignore: false))
-          opts[:branch] = val if (val = option('branch', strict: true))
+          if (val = option('branch', strict: true))
+            opts[:branch] = val
+            opts.delete(:revision)
+          elsif (val = option('revision', strict: true))
+            opts[:revision] = val
+            opts.delete(:branch)
+            opts.delete(:mirror)
+          end
           opts[:local] = val != '0' if (val = option('local', strict: true))
           opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(from: :clone)
           append_hash opts
@@ -1005,12 +1013,26 @@ module Squared
             case flag
             when :push
               append_pathspec op.extras
-            when :pop, :apply, :drop
+            when :pop, :apply, :drop, :branch
               if op.extras.delete(':')
-                op << choice_index('Choose a stash', git_spawn('stash list', stdout: false),
-                                   column: /^[^@]+@\{(\d+)\}/, force: true)
+                if flag == :branch
+                  if op.empty?
+                    values = [['Branch name', true]]
+                  else
+                    op << op.pop
+                  end
+                end
+                out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
+                                   values: values, column: /^[^@]+@\{(\d+)\}/, force: true)
+                if values
+                  op.merge(out.reverse)
+                else
+                  op << out
+                end
               elsif !op.empty?
-                op << shell_escape(op.pop)
+                op << op.pop
+              elsif flag == :branch
+                raise_error 'no branch name'
               end
               op.clear
             when :clear
@@ -1072,8 +1094,8 @@ module Squared
         def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
           statusargs = lambda do
             {
-              include: relativepath(as_a(kwargs[:include]), all: true),
-              exclude: relativepath(as_a(kwargs[:exclude]), all: true)
+              include: relativepath(Array(kwargs[:include]), all: true),
+              exclude: relativepath(Array(kwargs[:exclude]), all: true)
             }
           end
           unless workspace.closed
@@ -1182,13 +1204,14 @@ module Squared
           else
             op = OptionPartition.new(opts, OPT_GIT[:checkout], cmd, project: self, no: OPT_GIT[:no][:checkout],
                                                                     first: flag == :path ? matchpathspec : nil)
-            if flag == :commit
-              op.append(commit)
-                .clear(pass: false)
-            else
+            if flag == :path
               append_head
               append_pathspec(op.extras, pass: false)
+              print_success if success?(source)
+              return
             end
+            op.append(commit)
+              .clear(pass: false)
           end
           source
         end
@@ -1228,9 +1251,9 @@ module Squared
 
         def log!(flag, opts = [], range: [], index: [])
           cmd, opts = git_session('log', opts: opts)
-          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd,
-                                   project: self, no: collect_hash(OPT_GIT[:no][:log]),
-                                   first: matchpathspec)
+          op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd, project: self,
+                                                                           no: collect_hash(OPT_GIT[:no][:log]),
+                                                                           first: matchpathspec)
           case flag
           when :between, :contain
             op << shell_quote(range.join(flag == :between ? '..' : '...'))
@@ -1617,19 +1640,20 @@ module Squared
                 red = color(:red)
                 grep.map! { |val| Regexp.new(val[1..-2]) }
                 files = status_data.map! do |a, b|
-                  next unless grep.empty? || grep.any? { |pat| pat.match?(a) }
+                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
                   "#{sub_style(b, styles: red)} #{a}"
                 end
                 .compact
                 unless files.empty?
                   files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
-                                                              accept: 'Add?')
+                                                              accept: [['Add?', false, true]])
                 end
                 op.swap(list + files)
               end
             end
-            append_pathspec(op.extras)
+            return source(git_session('status', '-s'), banner: false) unless append_pathspec(op.extras)
+
             verbose = flag == :add && !op.arg?('verbose')
             print_success if success?(source) && verbose
             return
@@ -1658,30 +1682,36 @@ module Squared
         private
 
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
-                   multiple: false, **kwargs)
+                   multiple: false, from: nil, **kwargs)
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          banner = nil if banner && (multiple || !banner?)
-          if cmd.respond_to?(:done)
-            if io && banner == false
-              from = nil
-            elsif !from && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z\-]*\z/) })
-              from = :"git:#{from}"
+          if io && banner == false
+            from = nil
+            banner = nil
+          else
+            banner = nil if banner && (multiple || !banner?)
+            if cmd.respond_to?(:done)
+              if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z\-]*\z/) })
+                from = :"git:#{from}"
+              end
+              banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
             end
-            banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
+            from = nil if from == false
           end
           cmd = session_done cmd
           log&.info cmd
-          on :first, from
           banner = if banner
                      format_banner((banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), ''), banner: true)
                    end
+          on :first, from
           begin
             if io
-              return `#{cmd}` if stdout
-
-              return banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
-            end
-            if stdin? ? sync : stdout
+              ret = if stdout
+                      `#{cmd}`
+                    else
+                      banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
+                    end
+              return ret
+            elsif stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`
               if !ret.empty?
@@ -1689,7 +1719,7 @@ module Squared
               elsif success?(!banner.nil?)
                 print_success
               end
-            elsif sync || (!exception && !stderr)
+            elsif !kwargs[:sub] && (sync || (!exception && !stderr))
               print_item banner unless multiple
               ret = shell(cmd, exception: exception)
             else
@@ -1760,15 +1790,13 @@ module Squared
         end
 
         def list_result(size, type, grep: [], action: 'found', from: nil)
-          if verbose
-            if size > 0
-              styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
-              styles << :bold if styles.size <= 1
-              puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
-                                sub: [pat: /^(\d+)(.+)$/, styles: styles])
-            else
-              puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
-            end
+          if size == 0
+            puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
+          elsif verbose
+            styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
+            styles << :bold if styles.size <= 1
+            puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
+                              sub: [pat: /^(\d+)(.+)$/, styles: styles])
           end
           on :last, from
         end
@@ -1884,6 +1912,7 @@ module Squared
         def append_pathspec(files = [], target: @session, expect: false, parent: false, pass: true)
           if session_arg?('pathspec-from-file', target: target)
             option_clear files
+            true
           else
             if files.empty? && (val = option('pathspec', target: target))
               files = split_escape val
@@ -1891,8 +1920,11 @@ module Squared
             files = projectmap(files, parent: parent, pass: pass)
             if !files.empty?
               target << '--' << files.join(' ')
+              true
             elsif expect
               raise_error(parent ? 'pathspec not present' : 'pathspec not within worktree')
+            else
+              false
             end
           end
         end
@@ -1935,8 +1967,10 @@ module Squared
         end
 
         def foreachref(path, *args, format: nil)
-          path = as_a(path).map! { |val| "refs/#{val}" }
-          git_spawn('for-each-ref', format && quote_option('format', format), *args, *path, stdout: false)
+          path = Array(path).map! { |val| "refs/#{val}" }
+          format &&= quote_option('format', format)
+          ret = git_spawn('for-each-ref', format, *args, *path, stdout: workspace.windows?)
+          ret.is_a?(String) ? ret.lines : ret
         end
 
         def git_session(*cmd, opts: nil, worktree: true, **kwargs)
@@ -1974,8 +2008,8 @@ module Squared
 
         def repotrack(origin, branch, quote: true)
           i = origin.index('/')
-          branch = "#{branch}:#{origin[i + 1..-1]}" unless origin.end_with?("/#{branch}")
-          ret = [origin[0..i - 1], branch]
+          branch = "#{branch}:#{origin[(i + 1)..-1]}" unless origin.end_with?("/#{branch}")
+          ret = [origin[0..(i - 1)], branch]
           quote ? ret.map! { |val| shell_quote(val) } : ret
         end