squared 0.4.2 → 0.4.4

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

@@ -145,16 +145,14 @@ module Squared
 
     module Project
       class Git < Base
-        include Prompt
-
         OPT_GIT = {
-          common: %w[bare p|paginate P|no-pager glob-pathspecs icase-pathspecs literal-pathspecs no-optional-locks
+          common: %w[bare paginate no-pager glob-pathspecs icase-pathspecs literal-pathspecs no-optional-locks
                      no-replace-objects noglob-pathspecs c=q config-env=q exec-path=p namespace=p].freeze,
           branch: %w[a|all create-reflog i|ignore-case 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=e u|set-upstream-to=e 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 orphan=e ours theirs conflict=b pathspec-from-file=p
+                       pathspec-file-nul q|quiet orphan=e ours theirs conflict=b pathspec-from-file=p
                        t|track=b].freeze,
           clean: %w[d x X f|force i|interactive n|dry-run q|quiet e|exlcude=q].freeze,
           diff: {
@@ -309,25 +307,26 @@ module Squared
           end
         end
 
-        @@tasks[ref] = {
+        subtasks({
           'branch' => %i[create set delete move copy list edit current].freeze,
           'checkout' => %i[commit branch track detach path].freeze,
           'commit' => %i[add all amend amend-orig].freeze,
           'diff' => %i[head branch files view between contain].freeze,
           'fetch' => %i[origin remote].freeze,
           'files' => %i[cached modified deleted others ignored].freeze,
-          'git' => %i[clean mv restore revert rm].freeze,
+          'git' => %i[clean mv revert rm].freeze,
           'log' => %i[view between contain].freeze,
           'merge' => %i[commit no-commit send].freeze,
           'pull' => %i[origin remote].freeze,
           'rebase' => %i[branch onto send].freeze,
           'refs' => %i[heads tags remote].freeze,
           'reset' => %i[commit index patch mode].freeze,
+          'restore' => %i[staged worktree].freeze,
           'rev' => %i[commit branch output parseopt build].freeze,
           'show' => %i[format oneline textconv].freeze,
           'stash' => %i[push pop apply drop clear list].freeze,
           'tag' => %i[add delete list].freeze
-        }.freeze
+        })
 
         def initialize(*, **)
           super
@@ -654,7 +653,7 @@ module Squared
                       format_desc action, flag, 'remote,opts*,pattern*'
                       task flag, [:remote] do |_, args|
                         remote = param_guard(action, flag, args: args, key: :remote)
-                        ls_remote(flag, args.to_a.drop(1), remote: remote)
+                        ls_remote(flag, args.extras, remote: remote)
                       end
                     else
                       format_desc action, flag, 'opts*,pattern*'
@@ -662,7 +661,7 @@ module Squared
                         __send__(action == 'refs' ? :ls_remote : :ls_files, flag, args.to_a)
                       end
                     end
-                  when 'git'
+                  when 'restore', 'git'
                     format_desc(action, flag, 'opts*', before: case flag
                                                                when :rm
                                                                  'source+,destination'
@@ -672,7 +671,7 @@ module Squared
                                                                  'pathspec*'
                                                                end)
                     task flag do |_, args|
-                      git(flag, args.to_a)
+                      __send__(action, flag, args.to_a)
                     end
                   end
                 end
@@ -698,7 +697,9 @@ module Squared
 
         def pull(flag = nil, opts = [], sync: invoked_sync?('pull', flag), remote: nil)
           cmd, opts = git_session('pull', flag && "--#{flag}", opts: opts)
-          if (val = option('rebase', ignore: false))
+          if flag == :rebase
+            cmd << '--autostash' if option('autostash')
+          elsif (val = option('rebase', ignore: false))
             cmd << case val
                    when '0'
                      '--no-rebase'
@@ -731,7 +732,7 @@ module Squared
               append_value(branch, delim: true)
             else
               append_value([branch.pop, branch.pop].reverse, delim: true)
-              option_clear branch
+              option_clear(branch, pass: false)
             end
           when :onto
             return unless upstream
@@ -857,7 +858,7 @@ module Squared
             end
             return
           end
-          sha = source(git_output('rev-parse --verify HEAD'), io: true, banner: false, stdout: true).first.to_s.chomp
+          sha = git_spawn('rev-parse --verify HEAD').first.to_s.chomp
           return if sha.empty?
 
           args = []
@@ -865,7 +866,7 @@ module Squared
           case flag
           when :build
             opts = option_sanitize(opts, OPT_GIT[:status], target: args).first
-            option_clear opts
+            option_clear(opts, append: true)
           else
             args << basic_option('untracked-files', flag) if (flag = option('untracked-files', prefix: 'git'))
             args << basic_option('ignore-submodules', flag) if (flag = option('ignore-submodules', prefix: 'git'))
@@ -900,13 +901,13 @@ module Squared
           cmd, opts = git_session('reset', opts: opts)
           case flag
           when :commit, :index
-            out = option_sanitize(opts, OPT_GIT[:reset] + VAL_GIT[:reset], no: OPT_GIT[:no][:reset]).first
+            files = option_sanitize(opts, OPT_GIT[:reset] + VAL_GIT[:reset], no: OPT_GIT[:no][:reset]).first
             if flag == :commit
               append_value(commit, delim: true)
-              option_clear out
+              option_clear(files, pass: false)
               ref = false
             else
-              (refs ||= []).concat(out)
+              (refs ||= []).concat(files)
             end
           when :mode
             return unless VAL_GIT[:reset].include?(mode)
@@ -923,7 +924,7 @@ module Squared
           end
           unless ref == false
             append_commit(ref, head: true)
-            append_pathspec refs if refs
+            append_pathspec(refs, pass: false) if refs
           end
           source
         end
@@ -935,12 +936,7 @@ module Squared
           when :branch
             cmd << '--detach' if detach == 'd' || option('detach')
             append_option('track', equals: true)
-            cmd << if create
-                     shell_option(create, branch)
-                   else
-                     branch
-                   end
-            cmd << commit
+            cmd << (create ? shell_option(create, branch) : branch) << commit
           when :track
             if branch
               if branch.start_with?('^')
@@ -953,13 +949,13 @@ module Squared
           when :detach
             cmd << '--detach' << commit
           else
-            out = option_sanitize(opts, OPT_GIT[:checkout], no: OPT_GIT[:no][:checkout]).first
+            refs = option_sanitize(opts, OPT_GIT[:checkout], no: OPT_GIT[:no][:checkout]).first
             if flag == :commit
               append_value(commit, delim: true)
-              option_clear out
+              option_clear(refs, pass: false)
             else
               append_head
-              append_pathspec out
+              append_pathspec refs
             end
           end
           source
@@ -1042,7 +1038,7 @@ module Squared
                 else
                   cmd.merge(index)
                 end
-              elsif (n = option('index'))
+              elsif (n = option('index', ignore: false))
                 cmd << "HEAD~#{n}"
               end
             end
@@ -1069,8 +1065,8 @@ module Squared
           origin = nil
           branch = nil
           upstream = nil
-          source(git_output('fetch --no-tags --quiet'), io: true, banner: false)
-          source(git_output('branch -vv --list'), io: true, banner: false).first.each do |val|
+          git_spawn 'fetch --no-tags --quiet'
+          git_spawn('branch -vv --list', stdout: false).first.each do |val|
             next unless (r = /^\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
 
             branch = r[1]
@@ -1078,7 +1074,7 @@ module Squared
               origin = r[3][%r{^(.+)/#{Regexp.escape(branch)}$}, 1]
             else
               unless (origin = option('repository', prefix: 'git', ignore: false))
-                out = source(git_output('log -n1 --format=%h%d'), io: true, banner: false, stdout: true).first
+                out = git_spawn('log -n1 --format=%h%d').first
                 if out =~ /^#{r[2]} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/
                   split_escape($1).each do |s|
                     next unless s.end_with?("/#{branch}")
@@ -1101,7 +1097,7 @@ module Squared
           end
           if message
             append_message message
-          elsif flag == :'amend-orig' || option('no-edit')
+          elsif flag == :'amend-orig' || option('edit', equals: '0')
             cmd << '--no-edit'
           end
           a = git_output 'add', '--verbose'
@@ -1111,7 +1107,7 @@ module Squared
             b << '--dry-run'
           end
           a << pathspec
-          b << '--force' if amend
+          b << '--force-with-lease' if amend
           b << origin << branch
           puts if pass
           source a
@@ -1184,16 +1180,9 @@ module Squared
           when :current
             cmd << '--show-current'
           when :list
-            grep = []
-            option_sanitize(opts, OPT_GIT[:branch], no: OPT_GIT[:no][:branch]).first.each do |opt|
-              if opt =~ /^(v+)$/
-                cmd << "-#{$1}"
-              else
-                grep << opt
-              end
-            end
+            opts = option_sanitize(opts, OPT_GIT[:branch], no: OPT_GIT[:no][:branch], single: /^v+$/).first
             cmd << '--list'
-            grep.each { |val| cmd << shell_quote(val) }
+            opts.each { |val| cmd << shell_quote(val) }
             out, banner, from = source(io: true)
             print_item banner
             ret = write_lines(out, sub: [
@@ -1203,10 +1192,11 @@ module Squared
             list_result(ret, 'branches', from: from)
             return
           else
-            head = source(git_output('rev-parse --abbrev-ref HEAD'), io: true, banner: false, stdout: true).first.chomp
+            head = git_spawn('rev-parse --abbrev-ref HEAD').first.chomp
             if head.empty?
               ret = 0
             else
+              git_spawn 'fetch --all --prune --quiet' if option('sync')
               out, banner, from = source(cmd << '-vv --no-abbrev --list', io: true)
               ret = write_lines(out, grep: /^\*\s+#{Regexp.escape(head)}\s/, banner: banner, first: true) do |line|
                 next line if stdin?
@@ -1215,7 +1205,16 @@ module Squared
                 a = sub_style(data[0], styles: theme[:inline])
                 b = sub_style(data[1], styles: theme[:extra])
                 r = /\A(?:\[(.+?)(?=\]\s)\]\s)?(.+)\z/m.match(data[2..-1].join(' '))
-                [" Branch: #{a + (r[1] ? " (#{r[1]})" : '')}", " Commit: #{b}", "Message: #{r[2]}"].compact.join("\n")
+                if (r1 = r[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
+                  write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, styles: theme[:warn])}" }
+                  r1 = $1
+                  r2 = $2 && write.($2, $3)
+                  r3 = write.($4, $5)
+                end
+                r1 = nil if r1 == "origin/#{data[0]}"
+                [" Branch: #{a + (r1 ? " (#{r1})" : '')}", r2, r3, " Commit: #{b}", "Message: #{r[2]}"]
+                  .compact
+                  .join("\n")
               end
               on :last, from
             end
@@ -1229,6 +1228,13 @@ module Squared
           source(stdout: stdout)
         end
 
+        def restore(flag, opts = [])
+          opts = git_session('restore', "--#{flag}", opts: opts).last
+          refs = option_sanitize(opts, OPT_GIT[:restore], no: OPT_GIT[:no][:restore]).first
+          append_pathspec(refs, pass: false)
+          source(sync: false, stderr: true)
+        end
+
         def show(flag, opts = [], format: nil, files: [])
           cmd, opts = git_session('show', opts: opts)
           case flag
@@ -1310,23 +1316,17 @@ module Squared
         def git(flag, opts = [])
           cmd, opts = git_session(flag, opts: opts)
           refs = option_sanitize(opts, OPT_GIT[flag], no: OPT_GIT[:no][flag]).first
-          refs = projectmap(refs) unless flag == :revert
           sync = false
           stderr = true
           case flag
           when :clean
+            refs = projectmap(refs)
             unless refs.empty?
               cmd << '--'
               cmd.merge(refs)
             end
             sync = true
             stderr = false
-          when :restore
-            if session_arg?('p', 'patch')
-              option_clear refs
-            else
-              append_pathspec(refs, expect: true)
-            end
           when :revert
             if VAL_GIT[:rebase][:send].any? { |val| session_arg?(val) }
               option_clear refs
@@ -1336,6 +1336,7 @@ module Squared
               append_commit(*refs)
             end
           when :mv
+            refs = projectmap(refs)
             raise_error 'no source/destination' unless refs.size > 1
             cmd.merge(refs)
           when :rm
@@ -1452,7 +1453,7 @@ module Squared
             if size > 0
               styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
               styles << :bold if styles.size <= 1
-              puts print_footer("#{size} #{size == 1 ? type.sub(/e?s\z/, '') : type}",
+              puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
                                 sub: { pat: /\A(\d+)(.+)\z/, styles: styles })
             else
               puts empty_status("No #{type} were #{action}", 'grep', grep.is_a?(Array) ? case grep.size
@@ -1470,17 +1471,22 @@ module Squared
           glob = kwargs.fetch(:include, [])
           pass = kwargs.fetch(:exclude, [])
           ret = {}
-          out = source(git_output('status -s --porcelain', *args), io: true, banner: false).first
-          out.each do |line|
-            next unless (file = line[/^[A-Z ?!]{3}"?(.+?)"?$/, 1])
-            next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
-            next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
-
-            ret[file] = algorithm.hexdigest(File.read(basepath(file)))
-          end
+          git_spawn('status -s --porcelain', *args, stdout: false)
+            .first
+            .each do |line|
+              next unless (file = line[/^[A-Z ?!]{3}"?(.+?)"?$/, 1])
+              next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
+              next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
+
+              ret[file] = algorithm.hexdigest(File.read(basepath(file)))
+            end
           ret
         end
 
+        def git_spawn(*cmd, stdout: true)
+          source(git_output(*cmd), io: true, banner: false, stdout: stdout)
+        end
+
         def append_pull(opts, list, target: @session, no: nil, flag: nil, remote: nil)
           cmd << '--force' if option('force')
           rsm = append_submodules(target: target)
@@ -1529,14 +1535,14 @@ module Squared
           end
         end
 
-        def append_pathspec(files = [], target: @session, expect: false, parent: false)
+        def append_pathspec(files = [], target: @session, expect: false, parent: false, pass: true)
           if session_arg?('pathspec-from-file')
             option_clear files
           else
             if files.empty? && (val = option('pathspec'))
               files = split_escape(val)
             end
-            files = projectmap(files, parent: parent)
+            files = projectmap(files, parent: parent, pass: pass)
             if !files.empty?
               target << '--' << files.join(' ')
             elsif expect
@@ -1577,11 +1583,11 @@ module Squared
 
         def git_session(*cmd, opts: nil, worktree: true, **kwargs)
           dir = worktree ? ["--work-tree=#{shell_quote(path)}", "--git-dir=#{shell_quote(gitpath)}"] : []
-          ret = session('git', *dir, **kwargs)
-          return ret.merge(cmd) unless opts
+          return session('git', *dir, *cmd, **kwargs) unless opts
 
-          opts = option_sanitize(opts, OPT_GIT[:common]).first
-          [ret.merge(cmd), opts]
+          opts = option_sanitize(opts, OPT_GIT[:common], target: dir).first
+          ret = session('git', *dir, *cmd, **kwargs)
+          [ret, opts]
         end
 
         def git_output(*cmd, **kwargs)

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

@@ -79,7 +79,7 @@ module Squared
           end
         end
 
-        @@tasks[ref] = {
+        subtasks({
           'package' => %i[install dedupe update].freeze,
           'outdated' => %i[major minor patch].freeze,
           'bump' => %i[version major minor patch].freeze,
@@ -87,7 +87,7 @@ module Squared
           'add' => nil,
           'run' => nil,
           'pack' => nil
-        }.freeze
+        })
 
         def initialize(*, **kwargs)
           super
@@ -145,8 +145,7 @@ module Squared
                     else
                       cmd = param_guard(action, 'command', args: args.to_a)
                       cmd.each do |val|
-                        if (data = indexitem(val))
-                          n, opts = data
+                        if (n, opts = indexitem(val))
                           if (item = list[n - 1])
                             val = opts ? "#{item.first} #{opts}" : item.first
                           elsif exception
@@ -593,42 +592,41 @@ module Squared
                                         end).first
             append_loglevel
             option_clear out
+            run(from: :"package:#{flag}")
+            return
           elsif pnpm?
             cmd = session 'pnpm', flag
             list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
             list += OPT_PNPM[:install_as] unless flag == :dedupe
-            out = option_sanitize(opts, list, no: OPT_PNPM[:"#{flag}_no"]).first
-            append_nocolor
-            append_loglevel
-            option_clear out
+            opts = option_sanitize(opts, list, no: OPT_PNPM[:"#{flag}_no"]).first
           else
             cmd = session 'npm', flag
             list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
             list += OPT_NPM[:install_as] unless flag == :dedupe
             opts, pat = option_sanitize(opts, list, no: OPT_NPM[:install_no])
-            out = []
-            err = []
-            opts.each do |opt|
-              if opt =~ pat
-                case $1
-                when 'w', 'workspace'
-                  cmd << (%r{[\\/]}.match?($2) ? quote_option($1, basepath($2)) : shell_option($1, $2))
-                end
-              elsif opt.include?('=')
-                err << opt
-              else
-                out << opt
+          end
+          out = []
+          err = []
+          opts.each do |opt|
+            if pat && opt =~ pat
+              case $1
+              when 'w', 'workspace'
+                cmd << (%r{[\\/]}.match?($2) ? quote_option($1, basepath($2)) : shell_option($1, $2))
               end
-            end
-            append_nocolor
-            append_loglevel
-            if flag == :dedupe
-              option_clear out
+            elsif opt.include?('=')
+              err << opt
             else
-              append_value(out, escape: true)
+              out << opt
             end
-            option_clear err
           end
+          append_nocolor
+          append_loglevel
+          if flag == :dedupe
+            option_clear out
+          else
+            append_value(out, escape: true)
+          end
+          option_clear err
           run(from: :"package:#{flag}")
         end