squared 0.6.1 → 0.6.3

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

@@ -154,12 +154,8 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    a = args.delete('a') || args.delete('all')
                     ls = case command
-                         when 'network'
-                           a = nil
-                           'ls'
-                         when 'image', 'container'
+                         when 'image', 'container', 'network'
                            'ls'
                          when 'compose'
                            'ps'
@@ -167,7 +163,7 @@ module Squared
                            raise_error ArgumentError, 'unrecognized command', hint: command
                          end
                     data = VAL_DOCKER[:ls][command.to_sym]
-                    if args.delete('s') || args.delete('standard')
+                    if has_value!(args, 's', 'standard')
                       cols = data.first(data.index('CreatedAt'))
                     else
                       cols = []
@@ -184,7 +180,8 @@ module Squared
                         cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
                       end
                     end
-                    cmd = docker_output(command, ls, a && '-a')
+                    cmd = docker_output command, ls
+                    cmd << '-a' unless command == 'network' || !has_value!(args, 'a', 'all')
                     cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
@@ -225,7 +222,7 @@ module Squared
 
                       case flag
                       when :exec, :run
-                        format_desc action, flag, "service|:,command#{flag == :exec ? '' : '?'}|::,args*,opts*"
+                        format_desc action, flag, "service|:,command#{'?' unless flag == :exec}|::,args*,opts*"
                         task flag, [:service] do |_, args|
                           service = param_guard(action, flag, args: args, key: :service)
                           compose!(flag, args.extras, service: service)
@@ -480,8 +477,8 @@ module Squared
                     end
                   elsif all.include?(k)
                     unless type
-                      VAL_DOCKER[:run].each_pair do |key, val|
-                        next unless val.include?(k)
+                      VAL_DOCKER[:run].each_pair do |key, a|
+                        next unless a.include?(k)
 
                         type = key.to_s unless key == :common
                         break
@@ -496,7 +493,7 @@ module Squared
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
                     args << "#{k}=#{q + v + q}"
-                  elsif verbose
+                  elsif !silent?
                     log_message(Logger::INFO, 'unrecognized option', subject: from, hint: k)
                   end
                 end
@@ -526,7 +523,7 @@ module Squared
                     else
                       '--disable-content-trust'
                     end
-            opts << '--quiet' unless verbose
+            opts << '--quiet' if silent?
             return image(:push, opts, id: latest, registry: registry)
           else
             if op.empty?
@@ -807,14 +804,14 @@ module Squared
               unless y
                 bb = index.to_s
                 cc = bb.size.succ
-                a = sub_style(ee, styles: theme[:inline])
-                b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a.subhint(ee == id ? nil : id)}"
+                a = sub_style ee, theme[:inline]
+                b = "Execute #{sub_style(flag, theme[:active])} on #{a.subhint(ee == id ? nil : id)}"
                 e = time_format(time_since(data['CreatedAt']), pass: ['ms'])
-                f = sub_style(ARG[:BORDER][0], styles: theme[:inline])
+                f = sub_style ARG[:BORDER][0], theme[:inline]
                 g = ' ' * cc.succ
-                h = "#{sub_style(bb.rjust(cc), styles: theme[:current])} #{f} "
+                h = "#{sub_style(bb.rjust(cc), theme[:current])} #{f} "
                 puts unless index == 1
-                puts (h + sub_style(aa, styles: theme[:subject])).subhint("created #{e} ago")
+                puts (h + sub_style(aa, theme[:subject])).subhint("created #{e} ago")
                 cols = %w[Tag Status Ports]
                 cols << case flag
                         when :connect, :disconnect
@@ -828,7 +825,7 @@ module Squared
                   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])
+                puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), theme[:inline])
                 index += 1
                 next unless confirm("#{h + b}?", no ? 'N' : 'Y')
 
@@ -858,9 +855,9 @@ module Squared
           ])
           printsucc
           a = t.last.capitalize
-          b = sub_style(target, styles: theme[:subject])
-          c = as && sub_style(as, styles: theme[:inline])
-          confirm "#{a} #{b}#{c ? " as #{c}" : ''}?", 'N'
+          b = sub_style target, theme[:subject]
+          c = sub_style as, theme[:inline] if as
+          confirm "#{a} #{b}#{" as #{c}" if c}?", 'N'
         end
 
         def choice_command(flag, *action)
@@ -926,7 +923,7 @@ module Squared
           end
           cmd.merge(Array(out).map! { |val| parse.call(val) })
           cmd << args
-          success?(run(cmd), ctx.start_with?(/(?:network|tag|save)/))
+          success?(run(cmd), ctx.start_with?(/network|tag|save/))
         end
 
         def filetype(val = dockerfile)
@@ -949,8 +946,7 @@ module Squared
         end
 
         def tagjoin(*args, char: '/')
-          args.compact!
-          args.join(char) unless args.empty?
+          args.join(char) unless (args = args.compact).empty?
         end
 
         def tagname(val)

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

@@ -21,17 +21,20 @@ module Squared
           end
         elsif uri
           data[name.to_s] = uri
-        elsif name.is_a?(Enumerable)
-          data = name.to_h
-        elsif name.is_a?(String) && name.match?(GIT_PROTO)
-          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') if warning
-          return self
+          case name
+          when Enumerable
+            data = name.to_h
+          when GIT_PROTO
+            base = name.to_s
+            each { |proj| repo << proj if !proj.parent && check.call(proj) }
+          else
+            warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid') if warning
+            return self
+          end
         end
         if base
-          base = base.match?(GIT_PROTO) ? "#{base.chomp('/')}/" : @root + base
+          base = base.match?(GIT_PROTO) ? "#{base.chomp('/')}/" : rootpath(base)
           repo.each do |target|
             if target.is_a?(Project::Git)
               data[target.localname] = target.project
@@ -50,7 +53,7 @@ module Squared
                 end
           unless uri.match?(GIT_PROTO) || Pathname.new(uri).absolute?
             if uri.start_with?('.')
-              uri = @root + uri
+              uri = rootpath uri
             elsif base
               uri = base + uri
             else
@@ -144,6 +147,7 @@ module Squared
         @revlock = false
       end
     end
+
     Application.include Git
 
     module Project
@@ -154,9 +158,9 @@ module Squared
                      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,
+          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,
           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,
           diff: {
@@ -183,9 +187,9 @@ module Squared
                      A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=i
                      open-files-in-pager=b threads=n].freeze,
             mv: %w[k f|force n|dry-run v|verbose].freeze,
-            revert: %w[e S=bm? abort continue n|no-commit quit reference skip 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 v|verbose
+            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
                    pathspec-from-file=p].freeze
           }.freeze,
           log: {
@@ -245,7 +249,7 @@ module Squared
             pop: %w[index].freeze,
             apply: %w[index].freeze
           }.freeze,
-          status: %w[z u=bm? b|branch long s|short show-stash v|verbose column=b find-renames=i? ignore-submodules=b?
+          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,
           submodule: {
             status: %w[cached recursive].freeze,
@@ -296,7 +300,8 @@ module Squared
             send: %w[continue skip abort quit].freeze,
             value: %w[true false merges interactive].freeze
           }.freeze,
-          reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze
+          reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze,
+          revbuild: %w[untracked-files ignore-submodules ignored].freeze
         }.freeze
         private_constant :OPT_GIT, :VAL_GIT
 
@@ -322,7 +327,7 @@ module Squared
           'fetch' => %i[origin remote all].freeze,
           'files' => %i[cached modified deleted others].freeze,
           'git' => %i[add blame clean grep mv revert rm status].freeze,
-          'log' => %i[view between contain].freeze,
+          'log' => %i[view grep between contain].freeze,
           'merge' => %i[commit no-commit send].freeze,
           'pull' => %i[origin remote all].freeze,
           'rebase' => %i[branch onto send].freeze,
@@ -565,6 +570,37 @@ module Squared
                         path2 = param_guard(action, flag, args: args, key: :path2)
                         diff(flag, refs: [path1, path2, args.patch])
                       end
+                    when :grep
+                      format_desc action, flag, 'pattern+,a/ll-match?,in/vert-grep?,i/E/F/P?,max-count?=i,f/ormat?=s'
+                      task flag do |_, args|
+                        grep = args.to_a
+                        opts = ['oneline']
+                        while (last = grep.pop)
+                          case last
+                          when '--'
+                            grep << '--' if grep.empty?
+                            break
+                          when 'a', 'all-match'
+                            opts << 'all-match'
+                          when 'in', 'invert-grep'
+                            opts << 'invert-grep'
+                          when 'i', 'E', 'F', 'P'
+                            opts << last
+                          else
+                            if last =~ /^(?:f(?:-ormat)?)=(.+)$/
+                              opts.shift
+                              opts << "format=#{$1}"
+                            elsif last =~ /^(?:max(?:-count)?)=(\d+)$/
+                              opts << "max-count=#{$1}"
+                            else
+                              grep << last
+                              break
+                            end
+                          end
+                        end
+                        param_guard(action, flag, args: grep)
+                        log!(flag, opts, grep: grep)
+                      end
                     end
                   when 'checkout'
                     case flag
@@ -658,7 +694,7 @@ module Squared
                         branch(flag, target: target, ref: ref, remote: remote)
                       end
                     when :delete
-                      format_desc action, flag, '(^~)name*,:?'
+                      format_desc action, flag, '[^~]name*,:?'
                       task flag do |_, args|
                         refs = args.to_a
                         if refs.empty? || (r = refs.last == ':')
@@ -1077,9 +1113,18 @@ module Squared
           end
           option('local', strict: true) { |val| opts[:local] = val != '0' }
           option('bare') { |val| opts[:bare] = val }
+          option('single-branch', ignore: false) do |val|
+            opts[:'single-branch'] = val != '0' && val != 'false'
+            opts.delete(:'no-single-branch')
+          end
+          option('no-checkout') do
+            opts[:'no-checkout'] = true
+            opts.delete(:n)
+          end
+          option('no-tags') { opts[:'no-tags'] = true }
           opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(from: :clone)
           append_hash opts
-          cmd << '--quiet' unless verbose
+          cmd << '--quiet' if option('quiet') || !verbose
           append_value(data[0], path, delim: true)
           source(banner: sync && !quiet?, multiple: !sync || quiet?)
         end
@@ -1135,8 +1180,8 @@ module Squared
               end
               op.clear
             when :clear
-              n = sub_style(file.read.lines.size, styles: theme[:inline])
-              s = sub_style(name, styles: theme[:active])
+              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
@@ -1151,7 +1196,7 @@ module Squared
             append_option(OptionPartition.select(OPT_GIT[:stash][:push], no: false), no: true, ignore: false)
             append_message
           end
-          source(banner: !quiet?, sync: sync, **threadargs)
+          source(sync: sync, banner: !quiet?, **threadargs)
         end
 
         def status(flag = nil, opts = [])
@@ -1196,7 +1241,7 @@ module Squared
         end
 
         def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
-          statusargs = lambda do
+          kw = lambda do
             {
               include: relativepath(Array(kwargs[:include]), all: true),
               exclude: relativepath(Array(kwargs[:exclude]), all: true)
@@ -1204,9 +1249,9 @@ module Squared
           end
           unless workspace.closed
             if @revbuild
-              statusargs.call.each { |key, val| @revbuild[key] += val }
+              kw.call.each { |key, val| @revbuild[key] += val }
             else
-              @revbuild = statusargs.call
+              @revbuild = kw.call
             end
             return
           end
@@ -1214,31 +1259,31 @@ module Squared
           return if sha.empty?
 
           sync = invoked_sync?('revbuild', flag) if sync.nil?
-          kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? statusargs.call : @revbuild || {}
+          kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? kw.call : @revbuild || {}
           case flag
           when :build
-            op = OptionPartition.new(opts, %w[ignore-submodules=b? ignored=b? untracked-files=b?], project: self)
+            op = OptionPartition.new(opts, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self)
             op.clear(append: true)
             args = op.to_a
           else
-            args = [
-              option('untracked-files', prefix: 'git') { |val| basic_option('untracked-files', val) },
-              option('ignore-submodules', prefix: 'git') { |val| basic_option('ignore-submodules', val) },
-              option('ignored', prefix: 'git') { |val| basic_option('ignored', val) }
-            ].compact
+            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) } })
+                   .compact
+            OptionPartition.uniq!(args)
           end
           if (cur = workspace.rev_entry(name)) && cur['revision'] == sha && !env('REVBUILD_FORCE')
             files = status_digest(*args, **kwargs)
             if cur['files'].size == files.size && cur['files'].find { |key, val| files[key] != val }.nil?
               workspace.rev_timeutc(name, 'build') unless (since = workspace.rev_timesince(name, 'build'))
               if stdout?
-                puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: since && "#{since} ago")
+                puts log_message(Logger::INFO, name, 'no changes', subject: 'revbuild', hint: ("#{since} ago" if since))
               end
               return
             end
           end
           start = time_epoch
-          build(@output, sync: sync, from: :'git:revbuild')
+          build(*@output, sync: sync, from: :'git:revbuild')
         rescue StandardError => e
           print_error(e, pass: true)
         else
@@ -1346,7 +1391,7 @@ module Squared
           end
         end
 
-        def log!(flag, opts = [], range: [], index: [])
+        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,
                                                                            no: collect_hash(OPT_GIT[:no][:log]),
@@ -1354,6 +1399,8 @@ module Squared
           case flag
           when :between, :contain
             op.add_quote(range.join(flag == :between ? '..' : '...'))
+          when :grep
+            op.merge(grep.map { |val| quote_option('grep', val) })
           else
             op.merge(index)
           end
@@ -1441,7 +1488,7 @@ module Squared
           cmd, opts = git_session('add', opts: opts)
           op = OptionPartition.new(opts, OPT_GIT[:add] + OPT_GIT[:log][:diff_context], cmd,
                                    project: self, no: OPT_GIT[:no][:add], first: matchpathspec)
-          op << '--verbose' if verbose
+          op << '--verbose' unless silent?
           format = '%(if)%(HEAD)%(then)%(refname:short)...%(upstream:short)...%(upstream:track)%(end)'
           git_spawn 'fetch --no-tags --quiet'
           foreachref('heads', format: format).each do |line|
@@ -1460,7 +1507,6 @@ module Squared
                 end
                 origin = readline('Enter an upstream', force: true)
               end
-              raise_error ArgumentError, 'missing remote name', hint: origin unless origin.include?('/')
               upstream = true
             end
             break
@@ -1607,11 +1653,11 @@ module Squared
                 next line if stdin?
 
                 data = line.sub(/^\*\s+/, '').split(/\s+/)
-                a = sub_style(data[0], styles: theme[:inline])
-                b = sub_style(data[1], styles: theme[:extra])
+                a = sub_style data[0], theme[:inline]
+                b = sub_style data[1], theme[:extra]
                 r = /\A(?:\[((?~\]\s))\]\s)?(.+)\z/m.match(data[2..-1].join(' '))
                 if (r1 = r[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
-                  write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, styles: theme[:warn])}" }
+                  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)
@@ -1754,7 +1800,12 @@ module Squared
         def git(flag, opts = [])
           cmd, opts = git_session(flag, opts: opts)
           list = OPT_GIT[:git].fetch(flag, []) + OPT_GIT.fetch(flag, [])
-          list.concat(OPT_GIT[:log][:diff_context]) if flag == :add
+          case flag
+          when :add
+            list.concat(OPT_GIT[:log][:diff_context])
+          when :revert
+            list.concat(VAL_GIT[:rebase][:send])
+          end
           op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GIT[:no][flag], single: /\A\d+\z/,
                                                     first: case flag
                                                            when :blame, :revert then nil
@@ -1766,7 +1817,7 @@ module Squared
             op.append(basepath(op.remove_at(n)), delim: true)
               .clear
           when :revert
-            if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
+            if op.arg?(*VAL_GIT[:rebase][:send])
               op.clear
             elsif op.empty?
               raise_error 'no commit target'
@@ -1782,7 +1833,7 @@ module Squared
                   status_data.each do |a, b|
                     next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                    out << "#{sub_style(b, styles: color(:red))} #{a}"
+                    out << "#{sub_style(b, color(:red))} #{a}"
                   end
                 end
                 unless files.empty?
@@ -1911,7 +1962,7 @@ module Squared
             if loglevel
               log&.add loglevel, line
             else
-              sub&.each { |h| line = sub_style(line, **h) }
+              sub&.each { |h| sub_style!(line, **h) }
               if banner
                 out << line
               else
@@ -1940,7 +1991,7 @@ module Squared
         def choice_refs(msg, *type, format: nil, sort: '-creatordate', count: true, short: true, **kwargs)
           type << 'heads' if type.empty?
           unless format
-            format = +"%(refname#{short ? ':short' : ''})"
+            format = +"%(refname#{':short' if short})"
             if type.include?('heads') || type.include?('tags')
               format += '%(if)%(HEAD)%(then) *%(end)'
               trim = /\s+\*\z/
@@ -2143,7 +2194,9 @@ module Squared
         end
 
         def repotrack(origin, branch, quote: true)
-          i = origin.index('/')
+          unless origin && branch && (i = origin.index('/'))
+            raise_error(ArgumentError, "missing #{origin ? 'branch' : 'remote'} name", hint: origin)
+          end
           branch = "#{branch}:#{origin[i.succ..-1]}" unless origin.end_with?("/#{branch}")
           [origin[0..i.pred], branch].tap { |ret| ret.map! { |val| shell_quote(val) } if quote }
         end