squared 0.6.4 → 0.6.6

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

@@ -29,7 +29,7 @@ module Squared
             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
+            warn log_warn(name, subject: 'git', hint: 'invalid') if warning
             return self
           end
         end
@@ -86,7 +86,7 @@ module Squared
         @revdoc = JSON.parse(@revfile.read) if @revfile.exist?
       rescue StandardError => e
         @revfile = nil
-        warn log_message(Logger::WARN, e, pass: true)
+        warn log_warn(e, pass: true)
         self
       else
         @revdoc = {} unless @revdoc.is_a?(Hash)
@@ -142,7 +142,7 @@ module Squared
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue StandardError => e
         log&.debug e
-        warn log_message(Logger::WARN, e, pass: true) if warning?
+        warn log_warn(e, pass: true) if warning
       ensure
         @revlock = false
       end
@@ -489,7 +489,7 @@ module Squared
                                                               when :push then 'pathspec*,:'
                                                               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
@@ -580,17 +580,17 @@ module Squared
                           when '--'
                             grep << '--' if grep.empty?
                             break
-                          when 'a', 'all-match'
+                          when /^a(ll-match)?$/
                             opts << 'all-match'
-                          when 'in', 'invert-grep'
+                          when /^in(vert-grep)?$/
                             opts << 'invert-grep'
                           when 'i', 'E', 'F', 'P'
                             opts << last
                           else
-                            if last =~ /^(?:f(?:-ormat)?)=(.+)$/
+                            if last =~ /^(f(-ormat)?)=(.+)$/
                               opts.shift
                               opts << "format=#{$1}"
-                            elsif last =~ /^(?:max(?:-count)?)=(\d+)$/
+                            elsif last =~ /^(max(-count)?)=(\d+)$/
                               opts << "max-count=#{$1}"
                             else
                               grep << last
@@ -751,7 +751,7 @@ module Squared
                         switch(flag, commit: commit)
                       end
                     when :branch
-                      format_desc action, flag, 'name|:,opts*'
+                      format_desc action, flag, 'name/:,opts*'
                       task flag, [:name] do |_, args|
                         args = if (branch = args.name)
                                  branch = nil if branch == ':'
@@ -765,7 +765,7 @@ module Squared
                   when 'reset'
                     case flag
                     when :commit
-                      format_desc action, flag, 'ref|:,opts*'
+                      format_desc action, flag, 'ref/:,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         args = if commit && commit != ':'
@@ -921,7 +921,7 @@ module Squared
                         restore(flag, args, commit: commit, files: files)
                       end
                     when :staged, :worktree
-                      format_desc action, flag, 'opts*,pathspec*,:?'
+                      format_desc action, flag, 'opts*,pathspec*|:'
                       task flag do |_, args|
                         args = args.to_a
                         if args.empty? || args.last == ':'
@@ -1167,7 +1167,7 @@ module Squared
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
-                                   values: values, column: /^[^@]+@\{(\d+)}/, force: true)
+                                   values: values, column: /^[^@]+@\{(\d+)\}/)
                 if values
                   op.merge(out.reverse)
                 else
@@ -1243,8 +1243,8 @@ module Squared
         def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
           kw = lambda do
             {
-              include: relativepath(Array(kwargs[:include]), all: true),
-              exclude: relativepath(Array(kwargs[:exclude]), all: true)
+              include: relativepath(*Array(kwargs[:include]), all: true),
+              exclude: relativepath(*Array(kwargs[:exclude]), all: true)
             }
           end
           unless workspace.closed
@@ -1276,9 +1276,7 @@ module Squared
             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(['revbuild', 'no changes'], subject: name, hint: ("#{since} ago" if since))
-              end
+              puts log_message(['revbuild', 'no changes'], subject: name, hint: ("#{since} ago" if since)) if stdout?
               return
             end
           end
@@ -1513,13 +1511,14 @@ module Squared
             append_pathspec op.extras
           end
           co = git_session('commit', options: false)
-          pu = git_output 'push', upstream && '--set-upstream'
+          pu = git_output 'push'
+          co << '--amend' if amend
+          pu << '--set-upstream' if upstream
           if dryrun?
-            op.delete('--dry-run')
+            op.adjoin('--dry-run')
             co << '--dry-run'
             pu << '--dry-run'
           end
-          co << '--amend' if amend
           if message
             append_message message
           elsif flag == :'amend-orig' || option('edit', equals: '0')
@@ -1527,13 +1526,12 @@ module Squared
           end
           pu << '--force-with-lease' if amend
           pu.merge(repotrack(origin, branch))
-          puts if pass
           adding = git_spawn 'diff --name-only --no-color'
           source op
           cached = git_spawn 'diff --cached --name-only --no-color'
           if amend || !cached.empty? || dryrun?
             if adding.empty? && !cached.empty? && banner?
-              puts(cached.lines.map! { |val| "cached #{shell_quote(val.chomp)}" })
+              puts(cached.lines(chomp: true).map! { |val| "cached #{shell_quote(val)}" })
             end
             source co
             source pu
@@ -1553,7 +1551,8 @@ module Squared
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            op << "--#{flag}" << '--'
+            op << "--#{flag}"
+            op.delim
             if branch
               op << branch
               op.clear(pass: false)
@@ -1643,13 +1642,15 @@ module Squared
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               cmd << '-vv --no-abbrev --list'
               out, banner, from = source(io: true)
-              ret = write_lines(out, grep: [/^\*\s+#{Regexp.escape(head)}\s/], banner: banner, first: true) do |line|
+              first = workspace.size > 1
+              grep = first ? [/^\*\s+#{Regexp.escape(head)}\s/] : []
+              ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, index|
                 next line if stdin?
 
-                data = line.sub(/^\*\s+/, '').split(/\s+/)
-                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(' '))
+                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+)$/
                   write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, theme[:warn])}" }
                   r1 = $1
@@ -1657,7 +1658,7 @@ module Squared
                   r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[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: #{r[2]}"]
                   .compact
                   .join("\n")
               end
@@ -1690,7 +1691,7 @@ module Squared
                        basic_option 'track', track
                      end
             when :detach
-              cmd << "--#{flag}"
+              cmd << '--detach'
             end
             append_head commit
           end
@@ -1738,7 +1739,7 @@ module Squared
           case format
           when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
             cmd << basic_option('format', format)
-          when /(?:^t?format:|%)/
+          when /^t?format:|%/
             cmd << quote_option('pretty', format)
           else
             opts << format if format
@@ -1754,7 +1755,7 @@ module Squared
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
           when :commit
-            cmd << ((n = size.to_i) > 0 ? basic_option('short', [n, 5].max) : '--verify')
+            cmd << (size.to_i.zero? ? '--verify' : basic_option('short', [size.to_i, 5].max))
             append_commit(ref, head: true)
           when :branch
             cmd << '--abbrev-ref'
@@ -1823,15 +1824,14 @@ module Squared
               grep, pathspec = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !pathspec.empty?
                 grep.map! { |val| Regexp.new(val[1..-2]) }
-                files = [].tap do |out|
-                  status_data.each do |a, b|
-                    next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
+                files = []
+                status_data.each do |a, b|
+                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                    out << "#{sub_style(b, color(:red))} #{a}"
-                  end
+                  files << "#{sub_style(b, color(:red))} #{a}"
                 end
                 unless files.empty?
-                  files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
+                  files = choice_index('Select files', files, multiple: true, trim: /^\S+\s/,
                                                               accept: [accept_y('Add?')])
                 end
                 op.swap(pathspec + files)
@@ -1850,8 +1850,8 @@ module Squared
               if op.include?('--')
                 op.add_path(val)
               elsif op.exist?(val, glob: true)
-                op << '--'
-                op.add_path(val)
+                op.delim
+                  .add_path(val)
               else
                 op.add_quote(val)
               end
@@ -1951,7 +1951,7 @@ module Squared
           out = []
           data.each do |line|
             next if grep&.none? { |pat| pat.match?(line) }
-            next if block_given? && !(line = yield line)
+            next if block_given? && !(line = yield(line, ret))
 
             if loglevel
               log&.add loglevel, line
@@ -1993,16 +1993,24 @@ module Squared
           end
           args = []
           args << quote_option('sort', sort) if sort
-          args << shell_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
+          args << basic_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
         def choice_commit(count: true, reflog: true, force: true, **kwargs)
           kwargs[:attempts] ||= 1 unless force
           cmd = git_output(reflog && env('GIT_REFLOG') ? 'reflog' : 'log')
-          cmd << quote_option('format', '(%h) %s')
+          cmd << quote_option('format', "#{commitstyle('%h')} %s")
           cmd << basic_option('max-count', env('GIT_COUNT', ARG[:CHOICE])) if count
-          choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /\((\w+)\)/, force: force, **kwargs)
+          ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
+          case ret
+          when Array
+            ret.map!(&:stripstyle)
+          when String
+            ret.stripstyle
+          else
+            ret
+          end
         end
 
         def choice_remote(force: false, **kwargs)
@@ -2026,13 +2034,13 @@ module Squared
         end
 
         def status_data(*args)
-          [].tap do |ret|
-            git_spawn('status -z -uall', *args).split("\x0").each do |line|
-              next unless line =~ /^(.)(.) (.+)$/
+          ret = []
+          git_spawn('status -z -uall', *args).split("\x0").each do |line|
+            next unless line =~ /^(.)(.) (.+)$/
 
-              ret << [$3, $2, $1]
-            end
+            ret << [$3, $2, $1]
           end
+          ret
         end
 
         def append_pull(opts, list, flag:, from:, target: @session, no: nil, remote: nil)
@@ -2108,7 +2116,9 @@ module Squared
 
         def append_message(val = nil, target: @session)
           val = messageopt if val.to_s.empty?
-          target << quote_option('message', val) if val
+          return unless val
+
+          target << quote_option('message', val)
         end
 
         def append_head(val = nil, target: @session)
@@ -2205,6 +2215,10 @@ module Squared
           s.start_with?(/\d/) ? "@~#{s}" : "@#{s}"
         end
 
+        def commitstyle(val)
+          sub_style(val, theme[:extra] || color(:yellow))
+        end
+
         def matchhead(val)
           val =~ /^(?:(?:HEAD|@)([~^]\d*)?|H(\d+))$/ ? $2 || $1 || '' : nil
         end