squared 0.8.4 → 0.8.6

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

@@ -16,19 +16,19 @@ module Squared
                       cgroup-parent=b iidfile=p label=q network=b no-cache-filter=b o|output=q platform=q q|quiet
                       resource=q secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
             bake: %w[print list=q set=qq var=qq].freeze,
-            shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p policy=q progress=b
-                       provenance=q sbom=q].freeze
+            shared: %w[check load no-cache provenance pull push sbom allow=qq call=b? f|file=p metadata-file=p policy=q
+                       progress=b].freeze
           }.freeze,
           compose: {
-            common: %w[all-resources ansi=b compatibility dry-run env-file=p f|file=p parallel=n profile=b progress=b
+            common: %w[1 all-resources compatibility dry-run ansi=b env-file=p f|file=p parallel=n profile=b progress=b
                        project-directory=p p|project-name=b].freeze,
             build: %w[check no-cache print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
                       provenance=q sbom=q ssh=qq].freeze,
             create: %w[build force-recreate no-build no-recreate quiet-pull remove-orphans y|yes pull=b scale=i].freeze,
             exec: %w[d|detach privileged e|env=qq index=i T|no-tty user=b w|workdir=q].freeze,
             run: %w[build d|detach no-deps q|quiet quiet-build quiet-pull remove-orphans rm P|service-ports use-aliases
-                    cap-add=b cap-drop=b entrypoint=q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b
-                    T|no-tty p|publish=q pull=b u|user=b v|volume=qq w|workdir=q].freeze,
+                    cap-add=b cap-drop=b entrypoint=q e|env=qq env-from-file=p i|interactive l|label=q name=b T|no-tty
+                    p|publish=q pull=b u|user=b v|volume=qq w|workdir=q].freeze,
             up: %w[abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
                    d|detach force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start quiet-build
                    quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch y|yes attach=b
@@ -50,7 +50,7 @@ module Squared
                        network-alias=b oom-score-adj=b pid=b pids-limit=n platform=q p|publish=q 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=qq volume-driver=b volumes-from=b w|workdir=q].freeze,
-            run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
+            run: %w[d|detach detach-keys=q sig-proxy].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=n pids-limit=n
                        restart=q].freeze,
@@ -81,16 +81,17 @@ module Squared
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
             create: %w[attachable config-only gateway=q ingress internal ipv4 ipv6 aux-address=q config-from=b
                        d|driver=b ip-range=q ipam-driver=b ipam-opt=q label=q o|opt=q scope=b subnet=q].freeze,
-            disconnect: %w[f|force].freeze
+            disconnect: %w[f|force].freeze,
+            rm: %w[f|force].freeze
           }.freeze
         }.freeze
         VAL_DOCKER = {
           run: {
             common: %w[source src destination dst target readonly ro].freeze,
-            bind: %w[bind-propagation].freeze,
+            bind: %w[bind-create-src bind-propagation].freeze,
             volume: %w[volume-subpath volume-nocopy volume-opt].freeze,
             tmpfs: %w[tmpfs-size tmpfs-mode].freeze,
-            image: %w[image-path].freeze
+            image: %w[image-subpath].freeze
           }.freeze,
           ls: {
             compose: %w[Name Image Command Service RunningFor Status Ports CreatedAt ExitCode Health ID Labels
@@ -127,7 +128,7 @@ module Squared
           'image' => %i[ls rm pull push tag save inspect history].freeze,
           'container' => %i[attach commit create diff exec inspect kill logs pause restart rm run start stats stop top
                             unpause update].freeze,
-          'network' => %i[connect disconnect create].freeze,
+          'network' => %i[connect disconnect create rm].freeze,
           'ls' => nil
         })
 
@@ -139,8 +140,7 @@ module Squared
           self.global = nil
           return unless dockerfile(kwargs[:file]).exist?
 
-          @tag = env('TAG', strict: true,
-                            ignore: false) || kwargs[:tag] || tagname(@project, @version || 'latest')
+          @tag = env('TAG', strict: true, ignore: false) || kwargs[:tag] || tagname(@project, @version || 'latest')
           @context = kwargs[:context]
           @client = kwargs[:client]&.each_with_object([]) do |(key, val), out|
             val = case (key = key.to_s)
@@ -149,7 +149,7 @@ module Squared
                   when 'tlscacert', 'tlscert', 'tlskey'
                     basepath!(val, type: 'f')
                   when 'context', 'host', 'log-level'
-                    quote_option(key, val)
+                    quote_option key, val
                   when 'debug', 'tls', 'tlsverify'
                     out << key
                     next
@@ -158,7 +158,7 @@ module Squared
           end
           @mounts = Array(kwargs[:mounts])
           @secrets = kwargs[:secrets]
-          self.registry = tagjoin kwargs[:registry], kwargs[:username]
+          @registry = tagjoin kwargs[:registry], kwargs[:username]
           @oci = tagjoin kwargs[:oci], kwargs[:username]
           initialize_ref Docker.ref
           initialize_logger kwargs[:log]
@@ -359,11 +359,15 @@ module Squared
                         end
                       end
                     when 'network'
-                      format_desc action, flag, 'target,opts*'
-                      task flag, [:target] do |_, args|
-                        target = flag == :create ? param_guard(action, flag, args: args, key: :target) : args.target
-                        if target
-                          network(flag, args.extras, target: target)
+                      format_desc action, flag, 'name,opts*'
+                      task flag, [:name] do |_, args|
+                        name = if flag == :create || flag == :rm
+                                 param_guard(action, flag, args: args, key: :name)
+                               else
+                                 args.name
+                               end
+                        if name
+                          network(flag, args.extras, name: name)
                         else
                           choice_command flag
                         end
@@ -530,6 +534,7 @@ module Squared
           list += ct[:create] if rc
           list += ct[:update] if rc ||= flag == :create
           op = OptionPartition.new(opts, list, cmd, args: rc || flag == :exec, **dockerinit)
+          option('entrypoint') { |val| op.add_option('entrypoint', val, escape: false, double: true) } if flag == :run
           from = symjoin 'container', flag
           case flag
           when :run, :create, :exec
@@ -557,23 +562,35 @@ module Squared
                       end
                     end
                     case k
-                    when 'readonly', 'ro'
-                      out << k
+                    when 'readonly', 'ro', 'volume-nocopy', 'bind-create-src'
+                      out << k if %w[bind volume].include?(type)
                       next
-                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
+                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-subpath'
                       raise ArgumentError, message('no path value', k, hint: flag) unless v
 
-                      v = basepath v
+                      case k
+                      when 'source', 'src'
+                        if type == 'bind'
+                          v = basepath v
+                        elsif type == 'tmpfs'
+                          next
+                        end
+                      when 'destination', 'dst', 'target'
+                        unless v.start_with?('/')
+                          print_error(Logger::ERROR, "path is not absolute: #{v}", subject: from, hint: k)
+                          next
+                        end
+                      end
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
                     out << "#{k}=#{q}#{v}#{q}"
                   elsif !silent?
-                    log_message('unrecognized option', subject: from, hint: k)
+                    puts log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
                 raise TypeError, message('none specified', hint: flag) unless type
 
-                cmd << "--mount type=#{type},#{args.join(',')}"
+                op << "--mount type=#{type},#{args.join(',')}"
               end
             end
             append_command(flag, id || tagmain, op.extras)
@@ -583,7 +600,7 @@ module Squared
             op.append(escape: true, strip: ':')
           when :commit
             latest = op.shift || tagmain
-            cmd << id << latest
+            op << id << latest
             raise ArgumentError, message('unrecognized args', op.join(', '), hint: flag) unless op.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
 
@@ -604,7 +621,7 @@ module Squared
           else
             if op.empty?
               ps, status, no = filter_ps(flag, from: from)
-              cmd << '--no-stream' if flag == :stats
+              op << '--no-stream' if flag == :stats
               list_image(flag, ps, no: no, hint: status, multiple: flag != :attach, from: from) do |img|
                 run(cmd.temp(img), from: from)
               end
@@ -633,11 +650,12 @@ module Squared
           op = OptionPartition.new(opts, list, cmd, **dockerinit)
           exception = exception?
           banner = true
+          status = false
           from = symjoin 'image', flag
           case flag
           when :ls
             if opts.size == op.size
-              index = 0
+              index = -1
               name = nil
               opts.reverse_each do |val|
                 next unless (arg = OptionPartition.parse_arg!('name', val))
@@ -648,6 +666,7 @@ module Squared
               end
               list_image(:run, filter: filter, from: from) do |val|
                 args = if name
+                         index += 1
                          opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
                        elsif choice!(opts, only: true)
                          OptionPartition.strip(readline('Enter arguments', force: false))
@@ -659,7 +678,6 @@ module Squared
                   break
                 end
                 container(:run, args, id: val)
-                index += 1
               end
               return
             end
@@ -679,16 +697,15 @@ module Squared
               banner = false
             end
           when :tag, :save
-            found = false
             list_image(flag, filter: filter, from: from) do |val|
               op << val
-              found = true
+              status = true
               if flag == :tag
                 op << tagname(project, op.first)
                 break
               end
             end
-            raise ArgumentError, message('target not specified', hint: flag) unless found
+            raise ArgumentError, message('target not specified', hint: flag) unless status
           when :pull
             if !id
               id = tagmain
@@ -699,7 +716,7 @@ module Squared
               registry = op.shift
               registry ||= option('registry') || self.registry unless id.include?('/')
             end
-            cmd << shell_quote(tagjoin(registry, id))
+            op << shell_quote(tagjoin(registry, id))
           when :push
             id ||= option('tag', ignore: false) || op.shift || tagmain
             registry ||= option('registry') || op.shift || self.registry
@@ -725,16 +742,17 @@ module Squared
               op.append(escape: true, strip: ':')
             end
           end
-          success?(run(sync: sync, exception: exception, banner: banner, from: from), flag == :tag || flag == :save)
+          success?(run(sync: sync, exception: exception, banner: banner, from: from), status)
         end
 
-        def network(flag, opts = [], target: nil)
+        def network(flag, opts = [], target: nil, name: target)
           cmd, opts = docker_session('network', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, **dockerinit)
                               .clear
           from = symjoin 'network', flag
-          if flag == :create
-            op.add_quote(target)
+          case flag
+          when :create, :rm
+            op.add_quote(name)
             run(from: from)
           else
             list_image(flag, docker_output('ps -a'), from: from) do |id|
@@ -752,13 +770,13 @@ module Squared
         end
 
         def compose?(file = dockerfile)
-          return file == 3 || file == 4 if file.is_a?(Numeric)
+          return file.between?(3, 4) if file.is_a?(Numeric)
 
           COMPOSEFILE.include?(File.basename(file))
         end
 
         def bake?(file = dockerfile)
-          return file == 1 || file == 2 if file.is_a?(Numeric)
+          return file.between?(1, 2) if file.is_a?(Numeric)
 
           BAKEFILE.include?(File.basename(file))
         end
@@ -770,11 +788,11 @@ module Squared
                       val.size > 1 ? val : val.first
                     elsif val == true
                       DIR_DOCKER.find { |file| exist?(file) }
-                    elsif val != 'Dockerfile'
+                    elsif val != DIR_DOCKER.last
                       val
                     end
           end
-          basepath((@file.is_a?(Array) ? @file.first : @file) || 'Dockerfile')
+          basepath((@file.is_a?(Array) ? @file.first : @file) || DIR_DOCKER.last)
         end
 
         private
@@ -790,7 +808,7 @@ module Squared
               yield data
             end
           rescue => e
-            log.debug e
+            print_error(e, subject: name, hint: 'compose')
           end
         end
 
@@ -873,7 +891,7 @@ module Squared
           target
         end
 
-        def filter_ps(flag, meth = nil, from: meth || :'container:ps')
+        def filter_ps(flag, meth = nil, column: nil, from: meth || :'container:ps')
           no = false
           status = case flag.to_sym
                    when :start
@@ -899,6 +917,8 @@ module Squared
                    end
           cmd = docker_output("#{from.to_s.split(':').first} ps -a",
                               *status.map { |s| quote_option('filter', "status=#{s}") })
+          return IO.popen(cmd.temp("--format=\"{{.#{column}}}\"")).map(&:chomp) if column
+
           [cmd, status, no]
         end
 
@@ -914,8 +934,8 @@ module Squared
                   elsif filter.match?(/[:_-]$/)
                     /\b#{Regexp.escape(filter)}/
                   else
-                    filter = filter.empty? ? '([:_-]|$)' : "[:_-]#{filter}"
-                    /\b(#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})#{filter}/
+                    names = [dnsname(name), subdomainname(name), tagname(project), tagmain.split(':').first]
+                    /\b(#{names.join('|')})#{filter.empty? ? '([:_-]|$)' : "[:_-]#{filter}"}/
                   end
             IO.popen(cmd.temp('--format=json')).each do |line|
               data = JSON.parse(line)
@@ -1079,7 +1099,7 @@ module Squared
           val = val.compact
                    .join(':')
                    .split(':')
-                   .map { |s| charname(s.sub(/^\W+/, '')) }
+                   .map { |s| subdomainname(s) }
           ret = val.join(':')
           return ret unless ret.size > max
 
@@ -1091,8 +1111,16 @@ module Squared
           ret[0...max]
         end
 
-        def dnsname(val)
-          charname(val[/^[^a-z\d]*(.*?)[^a-z\d]*$/i, 1].gsub(/-{2,}/, '-'))[0..62].downcase
+        def dnsname(val, max: 63, char: nil)
+          ret = val.sub(/^[^a-z]+/i, '')
+                   .sub(/[^a-z\d]+$/i, '')
+                   .gsub(/[^a-z\d#{char}]+/i, '-')
+                   .gsub(/-{2,}/, '-')[0...max]
+          char ? ret : ret.downcase
+        end
+
+        def subdomainname(val)
+          dnsname(val, max: 128, char: '.').gsub(/\.{2,}/, '.')
         end
 
         def charname(val)
@@ -1104,7 +1132,7 @@ module Squared
         end
 
         def dockerinit
-          { project: self, strict: strict?, explicit: '=', bool: %w[true false 1 0] }
+          { project: self, strict: strict?, explicit: '=', bool: %w[1 0 true false] }
         end
 
         def emptyargs(list, hint = nil)

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

@@ -158,10 +158,10 @@ module Squared
                      no-replace-objects noglob-pathspecs paginate attr-source=b config-env=q exec-path=p
                      namespace=p].freeze,
           add: %w[A e|edit f|force ignore-errors ignore-missing i|interactive n|dry-run p|patch pathspec-file-nul
-                  refresh renormalize sparse u|update v|verbose chmod=b pathspec-from-file=p].freeze,
-          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose=+ abbrev=i color=b
-                     column=b contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b
-                     sort=q t|track=b].freeze,
+                  refresh renormalize resolved sparse u|update v|verbose chmod=b pathspec-from-file=p].freeze,
+          branch: %w[a|all create-reflog dry-run i|ignore-case omit-empty q|quiet r|remotes v|verbose=+ abbrev=i color=b
+                     column=b contains=b delete-merged=q forked=q format=q merged=b no-contains=b no-merged=b
+                     points-at=b u|set-upstream-to=b sort=q t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
                        pathspec-file-nul q|quiet ours theirs conflict=b orphan=b pathspec-from-file=p t|track=b].freeze,
           clone: %w[also-filter-submodules bare dissociate l|local mirror no-hardlinks n|no-checkout no-tags o|origin=b
@@ -214,8 +214,9 @@ module Squared
                      i|regexp-ignore-case remove-empty reverse right-only simplify-by-decoration simplify-merges
                      single-worktree show-pulls source sparse stdin topo-order g|walk-reflogs after=q ancestry-path=b?
                      author=q before=q branches=q? committer=q decorate=b decorate-refs=q decorate-refs-exclude=q
-                     exclude=q exclude-hidden=b glob=q grep=q grep-reflog=q n|max-count=i max-parents=i min-parents=i
-                     no-walk=b? remotes=q? since=q since-as-filter=q skip=i tags=q? until=q].freeze,
+                     exclude=q exclude-hidden=b glob=q grep=q grep-reflog=q n|max-count=i max-count-oldest=i
+                     max-parents=i min-parents=i no-walk=b? remotes=q? since=q since-as-filter=q skip=i tags=q?
+                     until=q].freeze,
             format: %w[t children combined-all-paths dd oneline left-right no-diff-merges parents relative-date
                        show-notes-by-default show-signature date=q diff-merges=b encoding=b expand-tabs=i format=q
                        notes=b pretty=q? show-linear-break=q?].freeze,
@@ -280,7 +281,7 @@ module Squared
             push: %w[a|all u|include-untracked k|keep-index no-keep-index no-include-untracked pathspec-file-nul p|patch
                      S|staged m|message=q pathspec-from-file=p].freeze,
             pop: %w[index].freeze,
-            apply: %w[index].freeze
+            apply: %w[index label-base=b label-ours=b label-theirs=b].freeze
           }.freeze,
           status: %w[z u=bm? b|branch long s|short show-stash v|verbose=+ column=b find-renames=i? ignore-submodules=b?
                      ignored=b? porcelain=b? untracked-files=b?].freeze,
@@ -967,10 +968,13 @@ module Squared
                     when :commit, :'no-commit'
                       format_desc action, flag, 'branch|:,ours|theirs?,opts*'
                       task flag, [:branch] do |_, args|
-                        branch = args.branch
-                        current = git_spawn('branch --show-current').chomp
+                        branch = if args.branch == ':'
+                                   choice_refs('Choose a branch', accept: "#{action.capitalize}?")
+                                 else
+                                   args.branch
+                                 end
+                        current = git_value 'branch --show-current'
                         if branch
-                          branch = choice_refs('Choose a branch', accept: "#{action.capitalize}?") if branch == ':'
                           opts = args.extras
                           if has_value!(opts, 'ours')
                             opts << 's=ort' << 'X=ours'
@@ -1222,7 +1226,7 @@ module Squared
               (heads.dup << cur).each_with_index do |branch, i|
                 next unless (i < heads.size && cur != branch) || i == heads.size
 
-                git_spawn 'switch --quiet', force && '--force', shell_quote(branch)
+                git_spawn('switch --quiet', force && '--force', shell_quote(branch))
                 pull(nil, opts, sync: false, hint: branch) if heads.include?(branch)
               end
               return
@@ -1298,13 +1302,13 @@ module Squared
           if flag
             return unless dir && ref
 
-            url = git_spawn("config --get remote.#{remotetrack}.url")
+            url = git_value "config --get remote.#{remotetrack}.url"
             cmd, opts = git_session('clone', worktree: false, opts: opts)
             op = OptionPartition.new(opts, OPT_GIT[:clone], cmd, project: self, strict: strict?,
                                                                  no: OPT_GIT[:no][:clone])
             op.add_option('b', ref)
               .delim
-              .add_quote(url.chomp)
+              .add_quote(url)
               .add_path(dir)
               .clear
             source
@@ -1497,7 +1501,7 @@ module Squared
             end
             return
           end
-          sha = git_spawn('rev-parse --verify HEAD').chomp
+          sha = git_value 'rev-parse --verify HEAD'
           return if sha.empty?
 
           sync = kwargs.fetch(:sync) { invoked_sync?('revbuild', flag) }
@@ -1511,7 +1515,7 @@ module Squared
           else
             args = parse_env('GIT_OPTIONS')
                    .grep(/\A--#{Regexp.union(*VAL_GIT[:revbuild])}/)
-                   .concat(VAL_GIT[:revbuild].map { |key| option(key, prefix: 'git') { |val| basic_option(key, val) } })
+                   .concat(VAL_GIT[:revbuild].map { |key| option(key, prefix: 'git') { |val| basic_option key, val } })
                    .compact
             OptionPartition.uniq!(args)
           end
@@ -1532,7 +1536,7 @@ module Squared
           start = time_epoch
           ret = build(*@output, sync: sync, from: from)
         rescue => e
-          print_error(e, pass: true)
+          print_error(e, subject: name, pass: true)
         else
           if ret == false && !kwargs[:pass]
             print_status('revbuild', subject: name, start: start, loglevel: Logger::WARN, from: :failed)
@@ -1560,7 +1564,7 @@ module Squared
               .clear(pass: false)
           when :commit
             exit 1 unless ref
-            branch ||= git_spawn('name-rev --name-only', ref).chomp
+            branch ||= git_value('name-rev --name-only', ref)
             raise ArgumentError, message('could not resolve upstream branch', hint: ref) if branch.empty?
 
             op.append(remotetrack, "#{ref}:#{branch}")
@@ -1755,7 +1759,7 @@ module Squared
             end
             if (n = op.index('>'))
               patch = op.slice!(n, 2)[1]
-            elsif !op.exist?(op.last)
+            elsif !op.last.include?('*') && !op.exist?(op.last)
               patch ||= op.pop
             end
             append_pathspec op.extras
@@ -1967,7 +1971,8 @@ module Squared
             list_result(ret, 'branches', banner: banner, from: from)
             return
           else
-            if (head = git_spawn('rev-parse --abbrev-ref HEAD').chomp).empty?
+            head = git_value 'rev-parse --abbrev-ref HEAD'
+            if head.empty?
               ret = 0
             else
               git_spawn 'fetch --all --prune --quiet' if option('sync')
@@ -1995,7 +2000,7 @@ module Squared
               end
               on :last, from
             end
-            print_error(name, 'no ref found', subject: 'branch', hint: 'head', pass: true) if ret == 0
+            print_error('no ref found', subject: name, hint: 'branch: head', pass: true) if ret == 0
             return
           end
           return unless success?(source(stdout: stdout), !ref && flag == :create) && !ref && remote && target
@@ -2059,7 +2064,7 @@ module Squared
             cmd << '--textconv'
             append_value(files.flat_map { |val| Dir[val] }
                               .select { |val| projectpath?(val) }
-                              .map { |val| shell_quote("HEAD:#{val}") })
+                              .map { |val| "HEAD:#{val}" })
             source(banner: false)
             return
           when :oneline
@@ -2073,11 +2078,11 @@ module Squared
           else
             opts << format if format
           end
-          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
+          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + collect_hash(OPT_GIT[:log], pass: [:base])
           op = OptionPartition.new(opts, list, cmd,
                                    project: self, strict: strict?,
                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
-          op.append(delim: true)
+          op.append
           source(exception: false, banner: flag != :oneline)
         end
 
@@ -2094,7 +2099,7 @@ module Squared
                                                                            else
                                                                              ref
                                                                            end)
-            return git_spawn(cmd, exception: false).chomp
+            return git_value(cmd, exception: false)
           when :output
             if opts.delete('sq-quote')
               cmd << '--sq-quote'
@@ -2153,8 +2158,7 @@ module Squared
           when :'sparse-checkout'
             cmd << 'set'
           end
-          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?,
-                                                    no: OPT_GIT[:no][flag], single: /\A\d+\z/,
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: OPT_GIT[:no][flag],
                                                     first: case flag
                                                            when :blame, :revert, :'sparse-checkout' then nil
                                                            else matchpathspec
@@ -2303,7 +2307,7 @@ module Squared
               run_e(cmd, stderr: stderr, banner: banner, **kwargs)
             end
           rescue Timeout::Error => e
-            print_error(Logger::ERROR, cmd, subject: name, hint: e)
+            print_error(Logger::ERROR, e, subject: name, hint: cmd)
             exit 1 unless exception?(Logger::DEBUG, Logger::INFO)
           rescue => e
             on_error(e, pass: true)
@@ -2349,7 +2353,7 @@ module Squared
           ret = choice_index(msg, git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
           case ret
           when Array
-            ret.map { |val| val&.stripstyle }
+            ret.map { |val| val.is_a?(Array) ? val.map { |s| s&.stripstyle } : val&.stripstyle }
           when String
             ret.stripstyle
           else
@@ -2527,6 +2531,10 @@ module Squared
                                                                       stdout: stdout, banner: banner, **kwargs)
         end
 
+        def git_value(*cmd, exception: true)
+          git_spawn(*cmd, exception: exception).chomp
+        end
+
         def git_grep(cmd, *grep, equals: true, **kwargs)
           ret = []
           git_spawn(cmd, **kwargs).lines(chomp: true).each do |line|