squared 0.6.2 → 0.6.3

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,
@@ -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
@@ -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 == ':')
@@ -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
@@ -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
@@ -1197,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)
@@ -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)
@@ -1239,7 +1283,7 @@ module Squared
             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
@@ -1347,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]),
@@ -1355,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
@@ -1442,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|
@@ -1461,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
@@ -1608,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)
@@ -1788,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?
@@ -1917,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
@@ -1946,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/
@@ -2149,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