squared 0.4.12 → 0.5.0

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

@@ -91,13 +91,13 @@ module Squared
 
         data = @revdoc
         last = keys.pop
-        for key in keys
+        keys.each do |key|
           if data[key].is_a?(Hash)
             data = data[key]
           elsif create
             data = data[key] = {}
           else
-            return
+            return nil
           end
         end
         data[last] = val
@@ -157,13 +157,14 @@ module Squared
       class Git < Base
         OPT_GIT = {
           common: %w[c=q bare glob-pathspecs icase-pathspecs literal-pathspecs no-optional-locks no-pager
-                     no-replace-objects noglob-pathspecs paginate config-env=q exec-path=p namespace=p].freeze,
+                     no-replace-objects noglob-pathspecs paginate attr-source=b config-env=q exec-path=p
+                     namespace=p].freeze,
           add: %w[A|all e|edit f|force ignore-errors ignore-missing ignore-removal i|interactive no-all
                   no-ignore-removal n|dry-run p|patch pathspec-file-nul renormalize sparse u|update v|verbose
                   chmod=b pathspec-from-file=p].freeze,
-          branch: %w[a|all create-reflog i|ignore-case q|quiet r|remotes v|verbose vv 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 vv 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: {
@@ -171,7 +172,8 @@ module Squared
             show: %w[s exit-code histogram].freeze
           }.freeze,
           fetch: {
-            base: %w[multiple progress P|prune-tags refetch stdin u|update-head-ok recurse-submodules-default=b].freeze,
+            base: %w[multiple porcelain progress P|prune-tags refetch stdin u|update-head-ok
+                     recurse-submodules-default=b].freeze,
             pull: %w[4 6 n t a|append atomic dry-run f|force k|keep negotiate-only prefetch p|prune q|quiet
                      set-upstream unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q
                      recurse-submodules=v refmap=q o|server-option=q shallow-exclude=b shallow-since=v
@@ -196,9 +198,9 @@ module Squared
                      branches=q? committer=q decorate=b decorate-refs=q decorate-refs-exclude=q exclude=q
                      exclude-hidden=b glob=q grep=q grep-reflog=q n|max-count=i max-parents=i min-parents=i no-walk=b?
                      remotes=q? since=q since-as-filter=q skip=i tags=q? until=q].freeze,
-            format: %w[t children combined-all-paths oneline left-right no-diff-merges parents relative-date
-                       show-signature date=q diff-merges=b encoding=b expand-tabs=i format=q notes=b pretty=q?
-                       show-linear-break=q?].freeze,
+            format: %w[t children combined-all-paths dd oneline left-right no-diff-merges parents relative-date
+                       show-notes-by-default show-signature date=q diff-merges=b encoding=b expand-tabs=i format=q
+                       notes=b pretty=q? show-linear-break=q?].freeze,
             diff: %w[p R u z B=bm? C=bm? l=im G=qm I=qm M=bm? O=qm S=qm U=im binary check compact-summary cumulative
                      find-copies-harder full-index W|function-context w|ignore-all-space ignore-blank-lines
                      ignore-cr-at-eol ignore-space-at-eol b|ignore-space-change D|irreversible-delete graph
@@ -228,12 +230,13 @@ module Squared
                       theirs W|worktree conflict=b pathspec-from-file=p s|source=b].freeze,
           rev_parse: %w[absolute-git-dir all git-common-dir git-dir is-bare-repository is-inside-git-dir
                         is-inside-work-tree is-shallow-repository local-env-vars no-revs not q|quiet revs-only
-                        shared-index-path show-cdup show-prefix show-superproject-working-tree show-toplevel sq sq-quote
-                        symbolic symbolic-full-name verify abbrev-ref=b? after=q before=q branches=q? default=q
-                        disambiguate=b exclude=q exclude-hidden=b git-path=p glob=q path-format=b? prefix=q remotes=q?
-                        resolve-git-dir=p short=i? show-object-format=b? since=q tags=q? until=q].freeze,
-          show: %w[t combined-all-paths no-diff-merges remerge-diff show-signature diff-merges=b encoding=b
-                   expand-tabs=i notes=q show-notes=q?].freeze,
+                        shared-index-path show-cdup show-prefix show-ref-format show-superproject-working-tree
+                        show-toplevel sq sq-quote symbolic symbolic-full-name verify abbrev-ref=b? after=q before=q
+                        branches=q? default=q disambiguate=b exclude=q exclude-hidden=b git-path=p glob=q
+                        output-object-format=b path-format=b? prefix=q remotes=q? resolve-git-dir=p short=i?
+                        show-object-format=b? since=q tags=q? until=q].freeze,
+          show: %w[t combined-all-paths no-diff-merges remerge-diff show-notes-by-default show-signature diff-merges=b
+                   encoding=b expand-tabs=i notes=q show-notes=q?].freeze,
           stash: {
             common: %w[q|quiet].freeze,
             push: %w[a|all u|include-untracked k|keep-index no-keep-index no-include-untracked pathspec-file-nul
@@ -242,8 +245,8 @@ module Squared
             apply: %w[index].freeze
           }.freeze,
           status: %w[u|ignore-submodules=bm? ignored=b? untracked-files=b?],
-          tag: %w[n=im cleanup=b create-reflog i|ignore-case color=b? column=b contains=b? format=q merged=b?
-                  no-contains=b? no-merged=b? points-at=q sort=q].freeze,
+          tag: %w[n=im cleanup=b create-reflog i|ignore-case omit-empty color=b? column=b contains=b? format=q merged=b?
+                  no-contains=b? no-merged=b? points-at=q sort=q trailer=q].freeze,
           no: {
             branch: %w[color color-moved column track].freeze,
             checkout: %w[overwrite-ignore guess overlay progress recurse-submodules track].freeze,
@@ -913,7 +916,7 @@ module Squared
             cmd << '--autostash' if option('autostash')
           else
             cmd << '--autostash' if flag == :autostash
-            if (val = option('rebase', ignore: false))
+            option('rebase', ignore: false) do |val|
               cmd << case val
                      when '0', 'false'
                        '--no-rebase'
@@ -976,16 +979,26 @@ module Squared
 
           cmd = git_session('clone', worktree: false)
           opts = data[1].dup
-          if (val = option('depth', ignore: false))
+          option('depth', ignore: false) do |val|
             if (n = val.to_i) > 0
               opts[:depth] = n
             else
               opts.delete(:depth)
             end
           end
-          opts[:origin] = val if (val = option('origin', ignore: false))
-          opts[:branch] = val if (val = option('branch', strict: true))
-          opts[:local] = val != '0' if (val = option('local', strict: true))
+          option('origin', ignore: false) { |val| opts[:origin] = val }
+          if (branch = option('branch', strict: true))
+            opts[:branch] = branch
+            opts.delete(:revision)
+          else
+            option('revision', strict: true) do |val|
+              opts[:revision] = val
+              opts.delete(:branch)
+              opts.delete(:mirror)
+            end
+          end
+          option('local', strict: true) { |val| opts[:local] = val != '0' }
+          option('bare') { |val| opts[:bare] = val }
           opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(from: :clone)
           append_hash opts
           cmd << '--quiet' unless verbose
@@ -1037,7 +1050,7 @@ module Squared
           cmd = git_session 'status'
           cmd << (option('long') ? '--long' : '--short')
           cmd << '--branch' if option('branch')
-          if (val = option('ignore-submodules', ignore: false))
+          option('ignore-submodules', ignore: false) do |val|
             cmd << basic_option('ignore-submodules', case val
                                                      when '0', 'none'
                                                        'none'
@@ -1058,7 +1071,7 @@ module Squared
                       { pat: /^(.)([A-Z?!])(.+)$/, styles: r, index: 2 },
                       { pat: /^([A-Z?!])(.+)$/, styles: g },
                       { pat: /^(\?\?)(.+)$/, styles: r },
-                      { pat: /^(## )(.+?)(\.{3})(.+)$/, styles: [nil, g, nil, r], index: -1 }
+                      { pat: /^(## )((?~\.{3}))(\.{3})(.+)$/, styles: [nil, g, nil, r], index: -1 }
                     ]
                   else
                     [pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2]
@@ -1096,9 +1109,9 @@ module Squared
             args = op.to_a
           else
             args = []
-            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'))
-            args << basic_option('ignored', flag) if (flag = option('ignored', prefix: 'git'))
+            option('untracked-files', prefix: 'git') { |val| args << basic_option('untracked-files', val) }
+            option('ignore-submodules', prefix: 'git') { |val| args << basic_option('ignore-submodules', val) }
+            option('ignored', prefix: 'git') { |val| args << basic_option('ignored', val) }
           end
           if (cur = workspace.rev_entry(name)) && cur['revision'] == sha && !env('REVBUILD_FORCE')
             files = status_digest(*args, **kwargs)
@@ -1221,7 +1234,7 @@ module Squared
             list_result(ret, 'tags', from: from, grep: op.extras)
             return
           end
-          remote ||= option('remote')
+          remote ||= option 'remote'
           source
           git_spawn('push', flag == :delete ? '-d' : nil, remote, *refs.map { |val| shell_quote(val) }) if remote
         end
@@ -1388,12 +1401,12 @@ module Squared
           stdout = false
           case flag
           when :create
-            if (arg = option('track', ignore: false))
-              cmd << case arg
+            option('track', ignore: false) do |val|
+              cmd << case val
                      when '0', 'false'
                        '--no-track'
                      when 'direct', 'inherit'
-                       basic_option('track', arg)
+                       basic_option 'track', val
                      else
                        '--track'
                      end
@@ -1415,7 +1428,7 @@ module Squared
             remote&.each do |val|
               source git_output('push', '--delete', *val.split('/', 2).map { |s| shell_quote(s) })
             end
-            force, list = refs.partition { |val| val.match?(/^[~^]/) }
+            force, list = refs.partition { |val| val.start_with?(/[~^]/) }
             force.each do |val|
               dr = val[0, 2]
               d = dr.include?('^') ? '-D' : '-d'
@@ -1461,7 +1474,7 @@ module Squared
                 data = line.sub(/^\*\s+/, '').split(/\s+/)
                 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(' '))
+                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])}" }
                   r1 = $1
@@ -1505,7 +1518,7 @@ module Squared
                    when 'y', 'Y', '1', 'true'
                      '--track'
                    when 'direct', 'inherit'
-                     basic_option('track', track)
+                     basic_option 'track', track
                    end
           when :detach, :merge
             cmd << "--#{flag}"
@@ -1541,7 +1554,7 @@ module Squared
             when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
               cmd << basic_option('format', val)
             else
-              if format.match?(/^t?format:/) || format.include?('%')
+              if format.start_with?(/t?format:/) || format.include?('%')
                 cmd << quote_option('pretty', format)
               else
                 opts << format
@@ -1629,7 +1642,7 @@ module Squared
                 op.swap(list + files)
               end
             end
-            append_pathspec(op.extras)
+            append_pathspec op.extras
             verbose = flag == :add && !op.arg?('verbose')
             print_success if success?(source) && verbose
             return
@@ -1760,15 +1773,13 @@ module Squared
         end
 
         def list_result(size, type, grep: [], action: 'found', from: nil)
-          if verbose
-            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(/(?:(?<!l)e)?s\z/, '') : type}",
-                                sub: [pat: /^(\d+)(.+)$/, styles: styles])
-            else
-              puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
-            end
+          if size == 0
+            puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
+          elsif verbose
+            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(/(?:(?<!l)e)?s\z/, '') : type}",
+                              sub: [pat: /^(\d+)(.+)$/, styles: styles])
           end
           on :last, from
         end
@@ -1885,9 +1896,7 @@ module Squared
           if session_arg?('pathspec-from-file', target: target)
             option_clear files
           else
-            if files.empty? && (val = option('pathspec', target: target))
-              files = split_escape val
-            end
+            option('pathspec', target: target) { |val| files = split_escape val } if files.empty?
             files = projectmap(files, parent: parent, pass: pass)
             if !files.empty?
               target << '--' << files.join(' ')
@@ -1909,28 +1918,28 @@ module Squared
         end
 
         def append_submodules(target: @session, from: nil)
-          return unless (val = option('recurse-submodules', target: target, ignore: false))
-
-          if from == :clone
-            case val
-            when '0', 'false'
-              target << '--no-recurse-submodules'
-            when '1', 'true'
-              target << '--recurse-submodules'
-            else
-              projectmap(split_escape(val)).each do |path|
-                target << basic_option('recurse-submodules', path)
+          option('recurse-submodules', target: target, ignore: false) do |val|
+            if from == :clone
+              case val
+              when '0', 'false'
+                target << '--no-recurse-submodules'
+              when '1', 'true'
+                target << '--recurse-submodules'
+              else
+                projectmap(split_escape(val)).each do |path|
+                  target << basic_option('recurse-submodules', path)
+                end
               end
+            else
+              target << case val
+                        when 'no', '0', 'false'
+                          '--no-recurse-submodules'
+                        when 'yes', 'on-demand'
+                          "--recurse-submodules=#{val}"
+                        else
+                          '--recurse-submodules'
+                        end
             end
-          else
-            target << case val
-                      when 'no', '0', 'false'
-                        '--no-recurse-submodules'
-                      when 'yes', 'on-demand'
-                        "--recurse-submodules=#{val}"
-                      else
-                        '--recurse-submodules'
-                      end
           end
         end
 
@@ -1975,22 +1984,21 @@ module Squared
         def repotrack(origin, branch, quote: true)
           i = origin.index('/')
           branch = "#{branch}:#{origin[i + 1..-1]}" unless origin.end_with?("/#{branch}")
-          ret = [origin[0..i - 1], branch]
-          quote ? ret.map! { |val| shell_quote(val) } : ret
+          [origin[0..i - 1], branch].tap { |ret| ret.map! { |val| shell_quote(val) } if quote }
         end
 
         def commithash(val)
-          val[/\A:(\h{5,40})\z/, 1] || val[/\A#\{(\h{5,40})\}\z/, 1]
+          val[/\A:(\h{5,40})\z/, 1]
         end
 
         def commithead(val)
           return val unless (s = matchhead(val))
 
-          s.match?(/^\d/) ? "@~#{s}" : "@#{s}"
+          s.start_with?(/\d/) ? "@~#{s}" : "@#{s}"
         end
 
         def matchhead(val)
-          val && val =~ /^(?:(?:HEAD|@)([~^]\d*)?|H(\d+))$/ ? $2 || $1 || '' : nil
+          val =~ /^(?:(?:HEAD|@)([~^]\d*)?|H(\d+))$/ ? $2 || $1 || '' : nil
         end
 
         def matchpathspec

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

@@ -12,6 +12,7 @@ module Squared
           install_as: %w[foreground-scripts g|global no-save save save-bundle save-dev E|save-exact save-optional
                          save-peer S|save-prod].freeze,
           run: %w[foreground-scripts if-present ignore-scripts script-shell=p].freeze,
+          exec: %w[c|call=q package=b].freeze,
           pack: %w[json ignore-scripts pack-destination=p].freeze
         }.freeze
         OPT_PNPM = {
@@ -30,6 +31,7 @@ module Squared
           dedupe: %w[check].freeze,
           run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from sequential
                   stream use-stderr].freeze,
+          exec: %w[no-reporter-hide-prefix parallel r|recursive report-summary resume-from c|shell-mode].freeze,
           pack: %w[json pack-destination=p pack-gzip-level=i].freeze
         }.freeze
         OPT_YARN = {
@@ -91,6 +93,8 @@ module Squared
           'publish' => %i[latest tag].freeze,
           'add' => nil,
           'run' => nil,
+          'exec' => nil,
+          'nvm' => nil,
           'pack' => nil
         })
 
@@ -103,8 +107,8 @@ module Squared
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
-          @pm = {}
           @dependfile = @path + 'package.json'
+          @pm = {}
         end
 
         def ref
@@ -178,6 +182,46 @@ module Squared
                       run(from: :run)
                     end
                   end
+                when 'exec'
+                  format_desc action, nil, 'pkg/cmd,opts*,args*'
+                  task action, [:package] do |_, args|
+                    if (package = args.package)
+                      args = args.to_a.drop(1)
+                      if pnpm?
+                        pre = ->(ch) { "-#{ch}" if (ch = args.delete(ch)) }
+                        cmd = session 'pnpm', pre.call('r'), pre.call('c'), 'exec'
+                        list = OPT_PNPM[:exec] + OPT_PNPM[:filter] + OPT_PNPM[:common]
+                      else
+                        cmd = session 'npm', 'exec'
+                        list = OPT_NPM[:exec] + OPT_NPM[:common]
+                      end
+                      op = OptionPartition.new(args, list, cmd, project: self)
+                      if op.empty?
+                        op << package
+                        if (args = readline('Enter arguments', force: false))
+                          op << '--' unless pnpm?
+                          op << args
+                        end
+                      else
+                        op << '--' unless pnpm?
+                        op << package << op.join(' ')
+                      end
+                    else
+                      session 'npm', 'exec', quote_option('c', readline('Enter command', force: true), double: true)
+                    end
+                    run(from: :exec)
+                  end
+                when 'nvm'
+                  next unless ENV['NVM_DIR']
+
+                  format_desc action, nil, 'version,args*'
+                  task action, [:version] do |_, args|
+                    version = param_guard(action, 'version', args: args, key: :version)
+                    args = args.to_a.drop(1)
+                    args << readline('Enter command', force: true) if args.empty?
+                    args.prepend(File.join(ENV['NVM_DIR'], 'nvm-exec'))
+                    run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
+                  end
                 when 'pack'
                   format_desc action, nil, 'opts*'
                   task action do |_, args|
@@ -215,7 +259,7 @@ module Squared
                       format_desc(action, flag, 'otp?,dry-run?,public|restricted?', before: flag == :tag ? 'tag' : nil)
                       task flag do |_, args|
                         args = args.to_a
-                        dryrun = true if args.delete('dry-run') || args.delete('true') || args.delete('d')
+                        dryrun = true if args.delete('dry-run') || args.delete('d')
                         if args.delete('public') || args.delete('p')
                           access = 'public'
                         elsif args.delete('restricted') || args.delete('r')
@@ -307,12 +351,12 @@ module Squared
             glob = as_a(glob || '**/*')
             target = []
             if workspace
-              Dir.glob(from + '*').each do |path|
-                next unless (path = Pathname.new(path)).directory?
+              from.glob('*').each do |entry|
+                next unless entry.directory?
 
-                sub = if (proj = @workspace.find(path))
+                sub = if (proj = @workspace.find(entry))
                         proj.packagename
-                      elsif (file = path + 'package.json').exist?
+                      elsif (file = entry + 'package.json').exist?
                         begin
                           doc = JSON.parse(file.read)
                         rescue StandardError => e
@@ -323,9 +367,9 @@ module Squared
                         end
                       end
                 if sub
-                  target << [path, dest.join(into, sub)]
+                  target << [entry, dest.join(into, sub)]
                 else
-                  log.debug message("package.json in \"#{path}\"", hint: 'not found')
+                  log.debug message("package.json in \"#{entry}\"", hint: 'not found')
                 end
               end
             else
@@ -365,13 +409,12 @@ module Squared
             elsif pnpm?
               cmd = session 'pnpm'
               if flag == :add
-                cmd << 'add'
-                cmd << "--save-#{save}"
+                cmd << 'add' << "--save-#{save}"
                 cmd << '--save-exact' if exact
               else
                 cmd << 'install'
               end
-              if (val = option('public-hoist-pattern', ignore: false))
+              option('public-hoist-pattern', ignore: false) do |val|
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
@@ -501,7 +544,7 @@ module Squared
             found.each_with_index do |item, i|
               a, b, c, d, e = item
               f = inter && (rev != :major || e || semmajor?(item[5], item[6]))
-              if f && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
+              if f && !confirm_outdated(a, c, (d / 2.0).ceil, b, lock: e, col1: col1)
                 cur = -1
               else
                 cur = modified
@@ -527,7 +570,7 @@ module Squared
                     a = sub_style(a, styles: theme[:major])
                     sub_style(c, :bold, styles: color(:green))
                   else
-                    sub_style(c, pat: SEM_VER, styles: color(:green), index: d)
+                    sub_style(c, pat: SEM_VER, styles: color(d == 3 ? :green : :yellow), index: d)
                   end
               puts "#{pad_ord.call(i, found)}. #{a + b + c}"
             end
@@ -590,13 +633,12 @@ module Squared
             end
             unless sync
               on :first, :publish unless dryrun
-              pwd_set(from: :publish, dryrun: dryrun) do
+              pwd_set(from: :publish) do
                 require 'open3'
-                banner = format_banner(cmd.to_s)
+                banner = format_banner cmd.to_s
                 Open3.popen2e(cmd.done) do |_, out|
-                  write_lines(out, banner: banner, sub: npmnotice + [
-                    { pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2 }
-                  ])
+                  write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
+                                   banner: banner)
                 end
               end
               on :last, :publish unless dryrun
@@ -749,9 +791,9 @@ module Squared
           if script
             ret = session dependbin, 'run'
             raise_error("#{dependbin} run: given #{target}", hint: from) unless append_any(target, build: true)
-            append_any opts if opts
+            append_any opts
             append_loglevel
-            append_any(args, delim: true) if args
+            append_any(args, delim: true)
             ret
           else
             case target
@@ -893,7 +935,7 @@ module Squared
         end
 
         def append_loglevel(target: @session)
-          level = env('NODE_LOGLEVEL')
+          level = env 'NODE_LOGLEVEL'
           silent = !verbose || level == 'silent'
           return unless silent || level