squared 0.7.8 → 0.8.0

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

@@ -61,7 +61,8 @@ module Squared
             stop: %w[s|signal=b t|timeout=i].freeze,
             restart: %w[s|signal=b t|timeout=i].freeze,
             kill: %w[s|signal=b].freeze,
-            stats: %w[a|all no-stream no-trunc format|q].freeze
+            stats: %w[a|all no-stream no-trunc format|q].freeze,
+            attach: %w[no-stdin detach-keys=q sig-proxy=!?].freeze
           }.freeze,
           image: {
             ls: %w[a|all digests no-trunc q|quiet tree f|filter=q format=q].freeze,
@@ -114,8 +115,8 @@ module Squared
           'compose' => %i[build create publish run exec up down service].freeze,
           'bake' => %i[build compose check].freeze,
           'image' => %i[ls rm pull push tag save].freeze,
-          'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
-                            rm].freeze,
+          'container' => %i[attach commit create diff exec inspect kill pause restart rm run start stats stop top
+                            unpause update].freeze,
           'network' => %i[connect disconnect create].freeze,
           'ls' => nil
         })
@@ -165,7 +166,7 @@ module Squared
                                                  when 'compose'
                                                    'ps'
                                                  else
-                                                   raise_error ArgumentError, 'unrecognized command', hint: command
+                                                   raise ArgumentError, message('unrecognized command', hint: command)
                                                  end
                     cmd << '-a' if has_value!(args, 'a', 'all') && command != 'network'
                     data = VAL_DOCKER[:ls][command.to_sym]
@@ -226,19 +227,20 @@ module Squared
                         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)
+                          compose_(flag, args.extras, service: service)
                         end
                       when :service
                         cmds = %w[down kill pause restart rm start stop top unpause watch].freeze
                         format_desc(action, flag, cmds, arg: nil, after: 'name+|:')
                         task flag, [:command] do |_, args|
-                          command = param_guard(action, flag, args: args, key: :command)
-                          raise_error ArgumentError, 'unrecognized command', hint: command unless cmds.include?(command)
+                          cmd = param_guard(action, flag, args: args, key: :command)
+                          raise ArgumentError, message('unrecognized command', hint: cmd) unless cmds.include?(cmd)
+
                           service = args.extras
                           if service.first == ':'
-                            choice_command flag, command
+                            choice_command flag, cmd
                           else
-                            compose!(flag, [command], service: service.empty? || service)
+                            compose_(flag, [cmd], service: service.empty? || service)
                           end
                         end
                       when :publish
@@ -246,12 +248,12 @@ module Squared
 
                         format_desc action, flag, 'tag?,repository?,opts*'
                         task flag, [:tag] do |_, args|
-                          compose! flag, args.to_a
+                          compose_ flag, args.to_a
                         end
                       else
                         format_desc action, flag, 'opts*,service*|:'
                         task flag do |_, args|
-                          compose!(flag, args.to_a, multiple: true)
+                          compose_(flag, args.to_a, multiple: true)
                         end
                       end
                     when 'container'
@@ -434,7 +436,7 @@ module Squared
           run(from: from || symjoin('buildx', flag))
         end
 
-        def compose!(flag, opts = [], id: nil, service: nil, multiple: false)
+        def compose_(flag, opts = [], id: nil, service: nil, multiple: false)
           from = symjoin 'compose', flag
           if flag == :service
             command = opts.first
@@ -471,14 +473,14 @@ module Squared
                 op.concat(service) if service
                 op.append(delim: true, escape: true, strip: /^:/)
               else
-                raise_error ArgumentError, 'no service was selected', hint: flag unless service
+                raise ArgumentError, message('no service was selected', hint: flag) unless service
+
                 append_command(flag, service, op.extras, prompt: '::')
               end
             end
           end
           run(from: from)
         end
-        alias compose_ compose!
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
@@ -502,7 +504,7 @@ module Squared
                     when 'bind', 'volume', 'image', 'tmpfs'
                       type = v
                     else
-                      raise_error TypeError, "unknown: #{v || "''"}", hint: flag
+                      raise TypeError, message('unknown', v || "''", hint: flag)
                     end
                   elsif all.include?(k)
                     unless type
@@ -518,7 +520,8 @@ module Squared
                       out << k
                       next
                     when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
-                      raise_error ArgumentError, "#{k}: no path value", hint: flag unless v
+                      raise ArgumentError, message('no path value', k, hint: flag) unless v
+
                       v = basepath v
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
@@ -527,18 +530,20 @@ module Squared
                     log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
-                raise_error TypeError, 'none specified', hint: flag unless type
+                raise TypeError, message('none specified', hint: flag) unless type
+
                 cmd << "--mount type=#{type},#{args.join(',')}"
               end
             end
             append_command(flag, id || tagmain, op.extras)
           when :update
-            raise_error ArgumentError, 'missing container', hint: flag if op.empty?
+            raise ArgumentError, message('missing container', hint: flag) if op.empty?
+
             op.append(escape: true, strip: /^:/)
           when :commit
             latest = op.shift || tagmain
             cmd << id << latest
-            raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag unless op.empty?
+            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)
 
             registry = option('registry') || @registry
@@ -559,7 +564,9 @@ module Squared
             if op.empty?
               ps, status, no = filter_ps flag, from
               cmd << '--no-stream' if flag == :stats
-              list_image(flag, ps, no: no, hint: status, from: from) { |img| run(cmd.temp(img), from: from) }
+              list_image(flag, ps, no: no, hint: status, multiple: flag != :attach, from: from) do |img|
+                run(cmd.temp(img), from: from)
+              end
               return
             end
             op.append(escape: true, strip: /^:/)
@@ -620,7 +627,7 @@ module Squared
                 break
               end
             end
-            raise_error ArgumentError, 'target not specified', hint: flag unless found
+            raise ArgumentError, message('target not specified', hint: flag) unless found
           when :pull
             if !id
               id = tagmain
@@ -636,7 +643,8 @@ module Squared
             id ||= option('tag', ignore: false) || op.shift || tagmain
             registry ||= option('registry') || op.shift || @registry
             emptyargs op, flag
-            raise_error ArgumentError, 'username/registry not specified', hint: flag unless registry
+            raise ArgumentError, message('username/registry not specified', hint: flag) unless registry
+
             uri = shell_quote tagjoin(registry, id)
             op << uri
             img = docker_output 'image', 'tag', id, uri
@@ -739,7 +747,7 @@ module Squared
               target << basic_option('name', dnsname("#{name}_%s" % rand_s(6)))
             end
           when :exec
-            raise_error ArgumentError, 'nothing to execute', hint: flag if list.empty?
+            raise ArgumentError, message('nothing to execute', hint: flag) if list.empty?
           end
           target << val << list.shift
           target << list.join(' && ') unless list.empty?
@@ -793,7 +801,7 @@ module Squared
                      %w[running paused exited]
                    when :unpause
                      %w[paused]
-                   when :top, :stats, :watch
+                   when :top, :stats, :watch, :attach
                      %w[running]
                    when :kill
                      no = true
@@ -809,7 +817,8 @@ module Squared
           [cmd, status, no]
         end
 
-        def list_image(flag, cmd = docker_output('image ls -a'), filter: nil, hint: nil, no: true, from: nil)
+        def list_image(flag, cmd = docker_output('image ls -a'), filter: nil, hint: nil, no: true, multiple: true,
+                       from: nil)
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
@@ -820,8 +829,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}/
+                    filter = filter.empty? ? '([:_-]|$)' : "[:_-]#{filter}"
+                    /\b(#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})#{filter}/
                   end
             IO.popen(cmd.temp('--format=json')).each do |line|
               data = JSON.parse(line)
@@ -868,6 +877,7 @@ module Squared
                 puts if printfirst?
               end
               yield id
+              break unless multiple
             end
             list_empty(hint: hint || from) if index == 1 && !y
           end
@@ -1001,7 +1011,7 @@ module Squared
         end
 
         def emptyargs(list, hint = nil)
-          raise_error ArgumentError, "unrecognized args: #{list.join(', ')}", hint: hint unless list.empty?
+          raise ArgumentError, message('unrecognized args', list.join(', '), hint: hint) unless list.empty?
         end
 
         def anypath?(*args)

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

@@ -2,10 +2,12 @@
 
 module Squared
   module Workspace
+    GIT_PROTO = %r{\A(https?|ssh|git|file)://}i.freeze
+    private_constant :GIT_PROTO
+
     module Git
       GIT_REPO = Support.hashobj
-      GIT_PROTO = %r{\A(https?|ssh|git|file)://}i.freeze
-      private_constant :GIT_REPO, :GIT_PROTO
+      private_constant :GIT_REPO
 
       attr_reader :revfile
 
@@ -187,6 +189,7 @@ module Squared
                      A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=n
                      open-files-in-pager=b threads=n].freeze,
             mv: %w[k f|force n|dry-run v|verbose].freeze,
+            remote: %w[f m=b t=b no-tags tags mirror=b].freeze,
             revert: %w[e S=bm? n|no-commit reference cleanup=b gpg-sign=b? m|mainline=i s|signoff strategy=b
                        X|strategy-option=b].freeze,
             rm: %w[r cached f|force n|dry-run ignore-unmatch pathspec-file-nul q|quiet sparse
@@ -233,6 +236,16 @@ module Squared
                      f|force-rebase ignore-date ignore-whitespace i|interactive keep-base m|merge no-ff q|quiet quit
                      reset-author-date root show-current-patch signoff v|verbose empty=b x|exec=q gpg-sign=b? onto=b
                      r|rebase-merges=b s|strategy=b X|strategy-option=b trailer=q whitespace=b].freeze,
+          remote: {
+            rename: %w[no-progress progress].freeze,
+            remove: [].freeze,
+            'set-head': %w[a|auto d|delete].freeze,
+            'set-branches': %w[add].freeze,
+            'get-url': %w[all push].freeze,
+            'set-url': %w[add delete push].freeze,
+            show: %w[n].freeze,
+            prune: %w[n dry-run].freeze
+          }.freeze,
           reset: %w[N pathspec-file-nul q|quiet pathspec-from-file=p].freeze,
           restore: %w[ignore-skip-worktree-bits ignore-unmerged m|merge ours p|patch pathspec-file-nul q|quiet S|staged
                       theirs W|worktree conflict=b pathspec-from-file=p s|source=b].freeze,
@@ -345,12 +358,13 @@ module Squared
           'pull' => %i[origin remote all].freeze,
           'rebase' => %i[branch onto send].freeze,
           'refs' => %i[heads tags remote].freeze,
+          'remote' => %i[add select].freeze,
           'reset' => %i[commit index patch mode undo].freeze,
           'restore' => %i[source staged worktree].freeze,
           'rev' => %i[commit branch build output].freeze,
           'show' => %i[format oneline textconv].freeze,
           'sparse-checkout' => %i[add reapply list clean disable].freeze,
-          'stash' => %i[push pop apply branch drop clear list all staged worktree].freeze,
+          'stash' => %i[push pop apply drop command].freeze,
           'submodule' => %i[status update branch url sync].freeze,
           'switch' => %i[branch create detach].freeze,
           'tag' => %i[add sign delete list].freeze
@@ -481,31 +495,37 @@ module Squared
                     when :add, :sign
                       format_desc action, flag, 'name,message?,commit?,remote?'
                       task flag, [:name, :message, :commit, :remote] do |_, args|
-                        remote = if (name = args.name)
-                                   message = args.message
-                                   commit = commithead args.commit
-                                   args.remote
-                                 else
-                                   commit, name, message = choice_commit(reflog: false, series: true,
-                                                                         values: [
-                                                                           ['Enter tag name', true],
-                                                                           'Enter message'
-                                                                         ])
-                                   choice_remote
-                                 end
+                        if (name = args.name)
+                          message = args.message
+                          commit = commithead args.commit
+                          remote = args.remote
+                          if !remote && commit && !commit.start_with?('@') && !git_grep('remote', commit).empty?
+                            remote = commit
+                            commit = nil
+                          end
+                        else
+                          commit, name, message = choice_commit(reflog: false, series: true,
+                                                                values: [['Enter tag name', true], 'Enter message'])
+                          remote = choice_remote
+                        end
                         ret = tag(flag, refs: [name], message: message, commit: commit, remote: remote)
                         success?(ret, !remote)
                       end
                     end
                   when 'stash'
-                    format_desc(action, flag, 'opts*', after: case flag
+                    format_desc(action, flag, 'opts*', before: ('clear|list|all|staged|worktree' if flag == :command),
+                                                       after: case flag
                                                               when :push then 'pathspec*,:'
-                                                              when :branch then 'name,stash/:'
-                                                              when :clear, :list, :all then nil
+                                                              when :command then nil
                                                               else 'stash?|:'
                                                               end)
                     task flag do |_, args|
-                      stash flag, args.to_a
+                      args = args.to_a
+                      if flag == :command
+                        param_guard(action, flag, args: args)
+                        flag = args.shift.to_sym
+                      end
+                      stash flag, args
                     end
                   when 'log', 'diff', 'range-diff'
                     case flag
@@ -531,7 +551,7 @@ module Squared
                             end
                             args = args.drop(index.size)
                           end
-                          log!(flag, args, index: index)
+                          log_(flag, args, index: index)
                         end
                         next
                       end
@@ -549,7 +569,7 @@ module Squared
                           opts.concat(refs.shellsplit) if refs
                         end
                         if action == 'log'
-                          log!(flag, opts, range: range)
+                          log_(flag, opts, range: range)
                         else
                           diff(flag, opts, range: range, from: action.to_sym)
                         end
@@ -613,7 +633,7 @@ module Squared
                           end
                         end
                         param_guard(action, flag, args: grep)
-                        log!(flag, opts, grep: grep)
+                        log_(flag, opts, grep: grep)
                       end
                     end
                   when 'checkout'
@@ -794,10 +814,10 @@ module Squared
                                end
                         success?(reset(flag, args, commit: commit))
                       end
-                    when :index, :undo
-                      format_desc(action, flag, ('opts*,pathspec*' if flag == :index))
+                    when :index
+                      format_desc action, flag, 'opts*,pathspec*'
                       task flag do |_, args|
-                        reset(flag, flag == :index ? args.to_a : [])
+                        reset(flag, args.to_a, refs: [])
                       end
                     when :mode
                       format_desc action, flag, 'mode,ref/:'
@@ -812,6 +832,11 @@ module Squared
                         ref = commithead args.ref
                         reset(flag, refs: args.extras, ref: !ref || ref == ':' ? choice_commit(reflog: false) : ref)
                       end
+                    when :undo
+                      format_desc action, flag
+                      task flag do
+                        reset flag
+                      end
                     end
                   when 'show'
                     case flag
@@ -976,6 +1001,51 @@ module Squared
                     task flag do |_, args|
                       sparse_checkout flag, args.to_a
                     end
+                  when 'remote'
+                    if flag == :add
+                      format_desc action, flag, 'name,url,opts*'
+                      task flag, [:name, :url] do |_, args|
+                        name = param_guard(action, flag, args: args, key: :name)
+                        url = param_guard(action, flag, args: args, key: :url)
+                        raise ArgumentError, message('invalid url', hint: url) unless url.match?(GIT_PROTO)
+
+                        git(:remote, args.extras, extras: [name, url])
+                      end
+                    else
+                      format_desc action, flag, "#{OPT_GIT[:remote].keys.join('|')},opts*" if TASK_METADATA
+                      task flag, [:command] do |_, args|
+                        command = param_guard(action, flag, args: args, key: :command)
+                        cmd, opts = git_session('remote', opts: args.extras)
+                        param = case command
+                                when 'rename'
+                                  'New name'
+                                when 'set-branches'
+                                  'Branches'
+                                when 'set-head'
+                                  'Branch' if opts.empty?
+                                when 'set-url'
+                                  'URL'
+                                end
+                        remote, target = choice_remote(force: true, values: param ? [[param, true]] : [])
+                        cmd << '-v' if has_value!(opts, 'v', 'verbose') && command == 'show'
+                        cmd << command << remote
+                        op = OptionPartition.new(opts, OPT_GIT[:remote].fetch(command.to_sym, []), cmd,
+                                                 project: self, strict: strict?)
+                        case command
+                        when 'remove'
+                          exit 1 unless confirm_basic('Remove?', remote, 'N')
+                        when 'get-url', 'show', 'prune'
+                          status = false
+                        else
+                          raise ArgumentError, message('unrecognized command', command, hint: action) unless param
+                          raise ArgumentError, message('missing target', command, hint: action) unless target
+
+                          op << target
+                        end
+                        op.clear
+                        success?(source(banner: !quiet?), status)
+                      end
+                    end
                   when 'git'
                     before = case flag
                              when :blame
@@ -1056,7 +1126,8 @@ module Squared
                 cur ||= line.delete_prefix!('* ')
                 heads << line if matchany?(reg, line)
               end
-              raise_error 'head not found', hint: 'for-each-ref' unless cur
+              raise message('head not found', hint: 'for-each-ref') unless cur
+
               opts << 'ff-only' if opts.empty? && option('ff-only', notequals: '0')
               (heads.dup << cur).each_with_index do |branch, i|
                 next unless (i < heads.size && cur != branch) || i == heads.size
@@ -1219,18 +1290,17 @@ module Squared
                 else
                   op << out
                 end
-              elsif !op.empty?
-                op.add_first(prefix: ':')
               elsif flag == :branch
-                raise ArgumentError, 'no branch name'
+                op.add_first(prefix: ':', expect: 'no branch name')
               end
-              op.clear
+              op.add_first
+                .clear
             when :clear
               n = sub_style file.read.lines.size, theme[:inline]
               s = sub_style name, theme[:active]
               source(stdout: true) if confirm("Remove #{n} stash entries from #{s}?", 'N')
               return
-            when :list
+            else
               op.clear
               out, banner, from = source(io: true)
               print_item banner
@@ -1321,6 +1391,7 @@ module Squared
 
           sync = kwargs.fetch(:sync) { invoked_sync?('revbuild', flag) }
           kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? kw.call : @revbuild || { pass: true }
+          from = symjoin 'git', 'revbuild'
           case flag
           when :build
             op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self, strict: strict?)
@@ -1333,7 +1404,7 @@ module Squared
                    .compact
             OptionPartition.uniq!(args)
           end
-          run_p(*Array(kwargs[:before]), sync: sync, from: :revbuild) if kwargs[:before]
+          run_p(*Array(kwargs[:before]), sync: sync, from: symjoin(from, 'before')) if kwargs[:before]
           force = if (force = env('REVBUILD_FORCE', strict: true))
                     force != '0' && force != 'false'
                   elsif (force = ENV['GIT_FORCE'] || ENV['REVBUILD_FORCE'])
@@ -1348,7 +1419,7 @@ module Squared
             end
           end
           start = time_epoch
-          ret = build(*@output, sync: sync, from: symjoin('git', 'revbuild'))
+          ret = build(*@output, sync: sync, from: from)
         rescue => e
           print_error(e, pass: true)
         else
@@ -1356,7 +1427,7 @@ module Squared
             print_status('revbuild', subject: name, start: start, loglevel: Logger::WARN, from: :failed)
             workspace.rev_timeutc name, 'build'
           else
-            run_p(*Array(kwargs[:after]), sync: sync, from: :revbuild) if kwargs[:after] && ret != false
+            run_p(*Array(kwargs[:after]), sync: sync, from: symjoin(from, 'after')) if kwargs[:after] && ret != false
             print_status('revbuild', subject: name, start: start)
             workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
                                 sync: sync, utc: 'build')
@@ -1463,7 +1534,7 @@ module Squared
           ret
         end
 
-        def log!(flag, opts = [], range: [], index: [], grep: [])
+        def log_(flag, opts = [], range: [], index: [], grep: [])
           cmd, opts = git_session('log', opts: opts)
           op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd, project: self, strict: strict?,
                                                                            no: collect_hash(OPT_GIT[:no][:log]),
@@ -1480,7 +1551,6 @@ module Squared
           append_pathspec op.extras
           source(exception: false)
         end
-        alias log_ log!
 
         def diff(flag, opts = [], refs: [], branch: nil, range: [], index: [], from: :diff)
           cmd, opts = git_session(from, opts: opts)
@@ -1513,7 +1583,8 @@ module Squared
               op.add_quote(branch) if branch
               if !index.empty?
                 if op.arg?('cached')
-                  raise_error "single commit: #{index.join(', ')}", hint: 'cached' unless index.size == 1
+                  raise message('single commit only', index.join(', '), hint: flag) unless index.size == 1
+
                   op << index.first
                 else
                   op.merge(index)
@@ -1576,9 +1647,9 @@ module Squared
             next if line.empty?
 
             branch, origin, hint = line.split('...')
-            if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
-              raise_error 'work tree is not usable', hint: hint[1..-2]
-            elsif (!origin || origin.empty?) && !dryrun?
+            raise message('work tree is not usable', hint: hint[1..-2]) if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
+
+            if (!origin || origin.empty?) && !dryrun?
               return nil if pass
 
               unless (origin = option('upstream', prefix: 'git', ignore: false))
@@ -1681,7 +1752,8 @@ module Squared
             cmd << shell_quote(target)
             cmd << shell_quote(ref) if ref
           when :track
-            raise_error 'invalid upstream', hint: ref unless ref.include?('/')
+            raise message('invalid upstream', hint: ref) unless ref.include?('/')
+
             if ref.delete_prefix!('^')
               cmd << '--unset-upstream' << shell_quote(ref)
               remote = false
@@ -1739,15 +1811,15 @@ module Squared
                 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+)$/
+                md = /\A(?:\[((?~\]\s))\]\s)?(.+)\z/m.match(data[2])
+                if (r1 = md[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
                   write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, theme[:warn])}" }
                   r1 = $1
                   r2 = $2 && write.call($2, $3)
                   r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[0]}"
-                ["#{"\n" unless index == 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: #{md[2]}"]
                   .compact
                   .join("\n")
               end
@@ -1903,9 +1975,9 @@ module Squared
           list_result(ret, 'files', grep: op.extras, from: from)
         end
 
-        def git(flag, opts = [])
+        def git(flag, opts = [], extras: [])
           cmd, opts = git_session(flag, opts: opts)
-          list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, [])
+          list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, []).yield_self { |a| a.is_a?(Array) ? a : [] }
           case flag
           when :add
             list.concat(OPT_GIT[:log][:diff_context])
@@ -1954,6 +2026,12 @@ module Squared
               end
             end
             return source(git_session('status -s'), banner: false) unless append_pathspec(op.extras)
+          when :remote
+            op.unshift(*extras)
+            op.adjoin('add')
+              .add_first(expect: 'missing name')
+              .add_first(expect: 'missing URL', quote: true)
+              .clear
           when :mv
             refs = projectmap op.extras
             raise 'no source/destination' unless refs.size > 1
@@ -1982,7 +2060,7 @@ module Squared
           when :revert, :mv, :rm
             source(sync: false, stderr: true)
           else
-            success?(source, flag == :'sparse-checkout' || (flag == :add && !op.arg?('verbose')))
+            success?(source, %i[remote sparse-checkout].include?(flag) || (flag == :add && !op.arg?('verbose')))
           end
         end
 
@@ -1994,7 +2072,7 @@ module Squared
           build? && !!workspace.revfile
         end
 
-        def enabled?(*, **kwargs)
+        def enabled?(**kwargs)
           super || (kwargs[:base] == false && !!clone?)
         end
 
@@ -2075,7 +2153,7 @@ module Squared
           elsif stdout?
             styles = theme.fetch(:banner, []).reject { |val| val.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
-            puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
+            puts print_footer("#{size} #{size == 1 ? type.sub(/((?<!l)e)?s\z/, '') : type}",
                               sub: opt_style(styles, /^(\d+)(.+)$/))
           end
           on :last, from
@@ -2282,11 +2360,21 @@ module Squared
                                                                       stdout: stdout, banner: banner, **kwargs)
         end
 
-        def dryrun?(*, target: @session, prefix: target&.first)
+        def git_grep(cmd, *grep, equals: true, **kwargs)
+          ret = []
+          git_spawn(cmd, **kwargs).lines(chomp: true).each do |line|
+            if grep.any? { |val| val.is_a?(Regexp) ? val.match?(line) : equals ? line == val : line.include?(val) }
+              ret << line
+            end
+          end
+          ret
+        end
+
+        def dryrun?(target: @session, prefix: target&.first, **)
           Array(target).include?('--dry-run') || !option('dry-run', target: target, prefix: prefix).nil?
         end
 
-        def quiet?(*, target: @session, **)
+        def quiet?(target: @session, **)
           return silent? unless target
 
           silent? || target.include?('--quiet') || (target.include?('-q') && target.first.stripext == 'git')
@@ -2298,7 +2386,8 @@ module Squared
 
         def repotrack(origin, branch, quote: true)
           n = origin&.index('/')
-          raise_error "missing #{origin ? 'branch' : 'remote'} name", hint: origin unless n && branch
+          raise message("missing #{origin ? 'branch' : 'remote'} name", hint: origin) unless n && branch
+
           branch = "#{branch}:#{origin[n.succ..-1]}" unless origin.end_with?("/#{branch}")
           ret = [origin[0..n.pred], branch]
           ret.quote! if quote