squared 0.6.2 → 0.6.4

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

@@ -154,14 +154,15 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    ls = case command
-                         when 'image', 'container', 'network'
-                           'ls'
-                         when 'compose'
-                           'ps'
-                         else
-                           raise_error ArgumentError, 'unrecognized command', hint: command
-                         end
+                    cmd = docker_output(command, case command
+                                                 when 'image', 'container', 'network'
+                                                   'ls'
+                                                 when 'compose'
+                                                   'ps'
+                                                 else
+                                                   raise_error ArgumentError, 'unrecognized command', hint: command
+                                                 end)
+                    cmd << '-a' if has_value!(args, 'a', 'all') && command != 'network'
                     data = VAL_DOCKER[:ls][command.to_sym]
                     if has_value!(args, 's', 'standard')
                       cols = data.first(data.index('CreatedAt'))
@@ -180,8 +181,6 @@ module Squared
                         cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
                       end
                     end
-                    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
@@ -201,7 +200,7 @@ module Squared
 
                       case flag
                       when :build
-                        format_desc action, flag, 'opts*,target*,context?|:'
+                        format_desc action, flag, 'opts*,target*,context/:'
                         task flag do |_, args|
                           args = args.to_a
                           if args.first == ':'
@@ -222,7 +221,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)
@@ -374,9 +373,7 @@ module Squared
             end
             append_context
           when :bake, :compose
-            option(from == :bake ? 'target' : 'service', ignore: false) do |val|
-              ret.merge(split_escape(val).map! { |s| shell_quote(s) })
-            end
+            option(from == :bake ? 'target' : 'service', ignore: false) { |val| ret.merge(split_escape(val).quote!) }
           end
           ret
         end
@@ -477,8 +474,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
@@ -493,8 +490,8 @@ module Squared
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
                     args << "#{k}=#{q + v + q}"
-                  elsif verbose
-                    log_message(Logger::INFO, 'unrecognized option', subject: from, hint: k)
+                  elsif !silent?
+                    log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
                 raise_error TypeError, 'none specified', hint: flag unless type
@@ -523,7 +520,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?
@@ -804,14 +801,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
@@ -825,7 +822,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')
 
@@ -841,7 +838,7 @@ module Squared
 
         def list_empty(subject: name, hint: nil, **kwargs)
           hint = "status: #{hint.join(', ')}" if hint.is_a?(Array)
-          puts log_message(Logger::INFO, 'none detected', subject: subject, hint: hint, **kwargs)
+          puts log_message('none detected', subject: subject, hint: hint, **kwargs)
         end
 
         def confirm_command(*args, title: nil, target: nil, as: nil)
@@ -854,10 +851,8 @@ module Squared
             opt_style(theme[:caution], /\A(.+)\z/)
           ])
           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'
+          s = t.last.capitalize
+          confirm "#{s} #{sub_style(target, theme[:subject])}#{" as #{sub_style(as, theme[:inline])}" if as}?", 'N'
         end
 
         def choice_command(flag, *action)
@@ -880,8 +875,7 @@ module Squared
           lines = `#{docker_output(cmd)}`.lines
           header = lines.shift
           if lines.empty?
-            puts log_message(Logger::INFO, 'none found', subject: name,
-                                                         hint: "docker #{cmd.split(' ', 3)[0...2].join(' ')}")
+            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0...2].join(' ')}")
             return
           end
           puts " #  #{header}"
@@ -923,7 +917,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)

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

@@ -21,14 +21,17 @@ 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('/')}/" : rootpath(base)
@@ -144,6 +147,7 @@ module Squared
         @revlock = false
       end
     end
+
     Application.include Git
 
     module Project
@@ -323,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,
@@ -483,9 +487,9 @@ module Squared
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
                                                               when :push then 'pathspec*,:'
-                                                              when :branch then 'name,stash?|:'
+                                                              when :branch then 'name,stash/:'
                                                               when :clear, :list, :all then nil
-                                                              else 'stash?|:'
+                                                              else 'stash/:'
                                                               end)
                     task flag do |_, args|
                       stash flag, args.to_a
@@ -566,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
@@ -637,7 +672,7 @@ module Squared
                   when 'branch'
                     case flag
                     when :create
-                      format_desc action, flag, 'name,ref?|:'
+                      format_desc action, flag, 'name,ref/:'
                       task flag, [:name, :ref] do |_, args|
                         target = param_guard(action, flag, args: args, key: :name)
                         ref = commithead args.ref
@@ -659,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 == ':')
@@ -702,7 +737,7 @@ module Squared
                   when 'switch'
                     case flag
                     when :create
-                      format_desc action, flag, '(^)name,ref?|:'
+                      format_desc action, flag, '(^)name,ref/:'
                       task flag, [:name, :commit] do |_, args|
                         branch = param_guard(action, flag, args: args, key: :name)
                         commit = commithead args.commit
@@ -752,7 +787,7 @@ module Squared
                         reset(flag, flag == :index ? args.to_a : [])
                       end
                     when :mode
-                      format_desc action, flag, 'mode,ref?|:'
+                      format_desc action, flag, 'mode,ref/:'
                       task flag, [:mode, :ref] do |_, args|
                         mode = param_guard(action, flag, args: args, key: :mode)
                         ref = commithead args.ref
@@ -760,7 +795,7 @@ module Squared
                         reset(flag, mode: mode, ref: ref)
                       end
                     when :patch
-                      format_desc action, flag, 'ref?|:,pathspec*'
+                      format_desc action, flag, 'ref/:,pathspec*'
                       task flag, [:ref] do |_, args|
                         ref = commithead args.ref
                         ref = choice_commit(reflog: false) unless ref && ref != ':'
@@ -1031,7 +1066,7 @@ module Squared
             append_head branch
           else
             unless gitpath('REBASE_HEAD').exist?
-              puts log_message(Logger::INFO, name, 'no rebase in progress', hint: command) if stdout?
+              puts log_message('no rebase in progress', subject: name, hint: command) if stdout?
               exit 1
             end
             return unless VAL_GIT[:rebase][:send].include?(command)
@@ -1078,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
@@ -1099,7 +1143,7 @@ module Squared
               flag = :push
             end
             unless (file = gitpath('logs/refs/stash')).exist? || flag == :push
-              puts log_message(Logger::INFO, name, 'no stashes were found', hint: flag) if stdout?
+              puts log_message('no stashes were found', subject: name, hint: flag) if stdout?
               exit 1
             end
             cmd, opts = git_session('stash', flag, opts: opts)
@@ -1136,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
@@ -1193,11 +1237,11 @@ module Squared
           end
           out, banner, from = source(io: true)
           ret = write_lines(out, banner: banner, sub: sub)
-          list_result(ret, 'files', from: from, action: 'modified')
+          list_result(ret, 'files', action: 'modified', from: from)
         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)
@@ -1205,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
@@ -1215,7 +1259,7 @@ 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, VAL_GIT[:revbuild].map { |key| "#{key}=b?" }, project: self)
@@ -1233,17 +1277,17 @@ module Squared
             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} ago" if since))
+                puts log_message(['revbuild', 'no changes'], subject: name, 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
-          print_status(name, subject: 'revbuild', start: start, from: :completed)
+          print_status('revbuild', subject: name, start: start, from: :completed)
           workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
                               sync: sync, utc: 'build')
         end
@@ -1336,18 +1380,14 @@ module Squared
             out, banner, from = source(io: true)
             print_item banner
             ret = write_lines(out, grep: op.extras)
-            list_result(ret, 'tags', from: from, grep: op.extras)
+            list_result(ret, 'tags', grep: op.extras, from: from)
             return
           end
           remote ||= option('remote')
-          source.tap do |ret|
-            next unless ret && remote
-
-            git_spawn('push', ('-d' if flag == :delete), remote, *refs.map! { |val| shell_quote(val) })
-          end
+          source.tap { |ret| git_spawn('push', ('-d' if flag == :delete), remote, *refs.quote!) if ret && remote }
         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]),
@@ -1355,6 +1395,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
@@ -1442,7 +1484,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|
@@ -1461,7 +1503,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
@@ -1500,7 +1541,7 @@ module Squared
             if banner?
               puts 'Nothing to commit'
             elsif stdout?
-              puts log_message(Logger::INFO, name, 'nothing to commit', hint: flag)
+              puts log_message('nothing to commit', subject: name, hint: flag)
             end
             exit 1
           end
@@ -1522,7 +1563,7 @@ module Squared
             end
           else
             unless gitpath('MERGE_HEAD').exist?
-              puts log_message(Logger::INFO, name, 'no merge in progress', hint: command) if stdout?
+              puts log_message('no merge in progress', subject: name, hint: command) if stdout?
               exit 1
             end
             return unless VAL_GIT[:merge][:send].include?(command)
@@ -1562,9 +1603,7 @@ module Squared
               cmd << shell_quote(target) if target
             end
           when :delete
-            remote&.each do |val|
-              source git_output('push --delete', *val.split('/', 2).map! { |s| shell_quote(s) })
-            end
+            remote&.each { |val| source git_output('push --delete', *val.split('/', 2).quote!) }
             force, list = refs.partition { |val| val.start_with?(/[~^]/) }
             force.each do |val|
               r = '-r' if val.delete!('~')
@@ -1579,7 +1618,7 @@ module Squared
             s = +"-#{flag.to_s[0]}"
             s.upcase! if option('f', 'force')
             cmd << s
-            refs.compact.each { |val| cmd << shell_quote(val) }
+            cmd.merge(refs.compact.quote!)
             stdout = true
           when :current
             cmd << '--show-current'
@@ -1608,11 +1647,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)
@@ -1739,7 +1778,7 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
-          list_result(ret, flag.to_s, from: from, grep: op.extras)
+          list_result(ret, flag.to_s, grep: op.extras, from: from)
         end
 
         def ls_files(flag, opts = [])
@@ -1749,7 +1788,7 @@ module Squared
           out, banner, from = source(io: true)
           print_item banner
           ret = write_lines(out, grep: op.extras)
-          list_result(ret, 'files', from: from, grep: op.extras)
+          list_result(ret, 'files', grep: op.extras, from: from)
         end
 
         def git(flag, opts = [])
@@ -1788,7 +1827,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?
@@ -1917,7 +1956,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
@@ -1931,7 +1970,7 @@ module Squared
           ret
         end
 
-        def list_result(size, type, grep: [], action: 'found', from: nil)
+        def list_result(size, type, action: 'found', grep: [], from: nil)
           if size == 0
             puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
           elsif stdout?
@@ -1946,7 +1985,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/
@@ -2149,9 +2188,11 @@ 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 }
+          [origin[0..i.pred], branch].tap { |ret| ret.quote! if quote }
         end
 
         def commithash(val)