squared 0.1.0 → 0.1.2

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

@@ -4,8 +4,8 @@ module Squared
   module Workspace
     module Project
       class Git < Base
-        OPT_PULL = %w[all tags prune ff-only autostash dry-run].freeze
-        OPT_FETCH = %w[tags prune prune-tags depth=n dry-run].freeze
+        OPT_FETCH = %w[all tags prune append atomic unshallow dry-run depth=i deepen=i since=d jobs=i].freeze
+        OPT_PULL = %w[ff ff-only edit autostash squash verify <fetch].freeze
         private_constant :OPT_PULL, :OPT_FETCH
 
         class << self
@@ -17,7 +17,7 @@ module Squared
             namespace(name = ws.task_name('git')) do
               all = ws.task_join(name, 'all')
 
-              desc ws.task_name("#{all}[git?=rebase|stash,depend?]", desc: true)
+              desc Common::Format.message(*"#{all}[git?=rebase|stash,depend?]".split(':'))
               task 'all', [:git, :depend] do |_, args|
                 cmd = case args.git
                       when 'rebase'
@@ -63,7 +63,8 @@ module Squared
           reset: %i[head soft mixed hard merge keep submodules].freeze,
           restore: %i[worktree staged overlay].freeze,
           rev: %i[commit branch].freeze,
-          show: %i[oneline pretty format].freeze
+          show: %i[oneline pretty format].freeze,
+          tag: %i[add delete list merged].freeze
         }.freeze
 
         def initialize(*, **)
@@ -85,7 +86,7 @@ module Squared
                 flags.each do |flag|
                   case action
                   when :pull, :fetch
-                    desc format_desc(action, flag, flag == :pull ? OPT_PULL : OPT_FETCH)
+                    desc format_desc(action, flag, action == :pull ? OPT_PULL : OPT_FETCH)
                     task flag, [:opts] do |_, args|
                       __send__(action, flag, opts: args.to_a)
                     end
@@ -102,6 +103,32 @@ module Squared
                         __send__(action, flag, files)
                       end
                     end
+                  when :tag
+                    case flag
+                    when :list
+                      desc format_desc(action, flag, 'pattern*')
+                      task flag, [:pattern] do |_, args|
+                        tag(flag, args.to_a)
+                      end
+                    when :merged
+                      desc format_desc(action, flag, 'commit,pattern*')
+                      task flag, [:commit, :pattern] do |_, args|
+                        commit = guard_params(action, flag, args: args, key: :commit)
+                        tag(flag, args.to_a.drop(1), commit: commit)
+                      end
+                    when :delete
+                      desc format_desc(action, flag, 'name+')
+                      task flag, [:name] do |_, args|
+                        name = guard_params(action, flag, args: args.to_a)
+                        tag(flag, name)
+                      end
+                    else
+                      desc format_desc(action, flag, 'name,message?,commit?')
+                      task flag, [:name, :message, :commit] do |_, args|
+                        name = guard_params(action, flag, args: args, key: :name)
+                        tag(flag, [name], message: args.message, commit: args.commit)
+                      end
+                    end
                   when :stash
                     if flag == :push
                       desc format_desc(action, flag, 'pathspec*')
@@ -130,7 +157,7 @@ module Squared
                       desc format_desc(action, flag, 'index?=0,pathspec*')
                       task flag, [:pathspec] do |_, args|
                         files = args.to_a
-                        diff(flag, files, index: /^\d+$/.match?(files[0]) && !option('index') ? files.shift.to_i : 0)
+                        diff(flag, files, index: /\A\d+\z/.match?(files[0]) && !option('index') ? files.shift.to_i : 0)
                       end
                     when :cached
                       desc format_desc(action, flag, 'pathspec*')
@@ -139,9 +166,9 @@ module Squared
                       end
                     when :branch
                       desc format_desc(action, flag, 'name,pathspec*')
-                      task flag, [:name, :pathspec] do |_, args|
+                      task flag, [:name] do |_, args|
                         branch = guard_params(action, flag, args: args, key: :name)
-                        diff(flag, args.to_a[1..-1] || [], branch: branch)
+                        diff(flag, args.to_a.drop(1), branch: branch)
                       end
                     when :files
                       desc format_desc(action, flag, 'path1,path2')
@@ -173,7 +200,7 @@ module Squared
                           detach = args.detach
                           commit = args.commit
                         end
-                        guard_params(action, flag, args: { create: create }, key: :create, pat: /^b$/i) if create
+                        guard_params(action, flag, args: { create: create }, key: :create, pat: /\Ab\z/i) if create
                         checkout(flag, branch: branch, create: create, commit: commit, detach: detach)
                       end
                     when :detach
@@ -191,7 +218,7 @@ module Squared
                     if flag == :head
                       desc format_desc(action, flag, 'ref,pathspec+')
                       task flag, [:ref, :pathspec] do |_, args|
-                        files = guard_params(action, flag, args: args.to_a[1..-1] || [])
+                        files = guard_params(action, flag, args: args.to_a.drop(1))
                         reset(flag, files, ref: args.ref)
                       end
                     else
@@ -202,17 +229,14 @@ module Squared
                     end
                   when :show
                     if flag == :oneline
-                      desc format_desc(action, flag, 'object+')
+                      desc format_desc(action, flag, 'object*')
                       task flag, [:object] do |_, args|
-                        objs = guard_params(action, flag, args: args.to_a)
-                        show(objs, pretty: 'oneline', abbrev: true)
+                        show(args.to_a, pretty: 'oneline', abbrev: true)
                       end
                     else
-                      desc format_desc(action, flag, 'format,object+')
+                      desc format_desc(action, flag, 'format,object*')
                       task flag, [:format, :object] do |_, args|
-                        format = guard_params(action, flag, args: args, key: :format)
-                        objs = guard_params(action, flag, args: args.to_a[1..-1] || [])
-                        show(objs, "#{flag}": format)
+                        show(args.to_a.drop(1), "#{flag}": args.format)
                       end
                     end
                   end
@@ -237,8 +261,8 @@ module Squared
           append_pull opts, OPT_PULL, flag
           sub = if verbose
                   [
-                    { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: :red, index: 4 },
-                    { pat: /^(.+)(\|\s+\d+\s+)(\++)(-*)(.*)$/, styles: :green, index: 3 }
+                    { pat: /\A(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)\z/, styles: :red, index: 4 },
+                    { pat: /\A(.+)(\|\s+\d+\s+)(\++)(-*)(.*)\z/, styles: :green, index: 3 }
                   ]
                 end
           source(sync: sync, sub: sub, **threadargs)
@@ -272,16 +296,16 @@ module Squared
         def status
           cmd = git_session 'status', option('long') ? '--long' : '--short'
           if (val = option('ignore-submodules', ignore: false))
-            cmd << "--ignore-submodules=#{case val
-                                          when '0', 'none'
-                                            'none'
-                                          when '1', 'untracked'
-                                            'untracked'
-                                          when '2', 'dirty'
-                                            'dirty'
-                                          else
-                                            'all'
-                                          end}"
+            cmd << shell_option('ignore-submodules', case val
+                                                     when '0', 'none'
+                                                       'none'
+                                                     when '1', 'untracked'
+                                                       'untracked'
+                                                     when '2', 'dirty'
+                                                       'dirty'
+                                                     else
+                                                       'all'
+                                                     end, escape: false)
           end
           append_pathspec
           out, banner = source(io: true)
@@ -291,10 +315,10 @@ module Squared
           end
           ret = write_lines(out, banner: banner, sub: if verbose
                                                         [
-                                                          { pat: /^(.)([A-Z])(.+)$/, styles: :red, index: 2 },
-                                                          { pat: /^([A-Z])(.+)$/, styles: :green },
-                                                          { pat: /^(\?\?)(.+)$/, styles: :red },
-                                                          { pat: /^(## )(.+)(\.{3})(.+)$/,
+                                                          { pat: /\A(.)([A-Z])(.+)\z/, styles: :red, index: 2 },
+                                                          { pat: /\A([A-Z])(.+)\z/, styles: :green },
+                                                          { pat: /\A(\?\?)(.+)\z/, styles: :red },
+                                                          { pat: /\A(## )(.+)(\.{3})(.+)\z/,
                                                             styles: [nil, :green, nil, :red], index: -1 }
                                                         ]
                                                       end)
@@ -339,18 +363,39 @@ module Squared
             cmd << "--#{flag}" << commit
           else
             cmd << "--#{flag}"
-            append_ours
+            append_first %w[ours theirs]
             append_head
             append_pathspec files
           end
           source
         end
 
+        def tag(flag, refs, message: nil, commit: nil)
+          cmd = git_session 'tag'
+          case flag
+          when :add
+            if option('sign')
+              cmd << '--sign'
+            else
+              out = cmd.to_s
+              cmd << '--annotate' if %w[-s --sign -u --local-user].none? { |val| out.include?(" #{val}") }
+            end
+            append_message message
+            append_value(refs, escape: false)
+            append_head commit
+          when :delete, :list, :merged
+            cmd << shell_option(flag, commit)
+            append_option(%w[contains sort] + (flag == :list ? ['merged'] : []), equals: true) unless flag == :delete
+            append_value(refs, escape: false)
+          end
+          source
+        end
+
         def rev(flag, ref: nil, size: nil)
           git_session 'rev-parse', if flag == :branch
                                      '--abbrev-ref'
                                    else
-                                     (n = size.to_i) > 0 ? "--short=#{[n, 5].max}" : '--verify'
+                                     (n = size.to_i) > 0 ? shell_option('short', [n, 5].max, escape: false) : '--verify'
                                    end
           append_commit ref
           source
@@ -375,7 +420,7 @@ module Squared
         def diff(flag, files = [], branch: nil, index: 0)
           cmd = git_session 'diff'
           unless flag == :files
-            if /^#[0-9a-f]{5,40}\#$/.match?(sha = files.first)
+            if /\A#\h{5,40}\#\z/.match?(sha = files.first)
               sha = sha[1..-2]
               files.shift
             else
@@ -383,7 +428,7 @@ module Squared
             end
           end
           if (val = option('unified')).to_i > 0
-            cmd << "--unified=#{val}"
+            cmd << shell_option('unified', val, escape: false)
           end
           append_nocolor
           case flag
@@ -422,12 +467,29 @@ module Squared
                      end
           origin = nil
           branch = nil
+          upstream = false
           source('git fetch --no-tags --quiet', io: true, banner: false)
           source('git branch -vv --list', io: true, banner: false).first.each do |val|
-            next unless (data = %r{^\* [^\[]+(?<= )\[([\w.-/]+?)/([\w.-]+)\] }.match(val))
-
-            origin = data[1]
-            branch = data[2]
+            next unless (data = /\A\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
+
+            branch = data[1]
+            sha = data[2]
+            if !data[3]
+              unless (origin = option('repository', prefix: 'git', ignore: false))
+                out = source('git log -n1 --format=%h%d', io: true, stdout: true, banner: false).first
+                if (data = /\A#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)\z/.match(out))
+                  split_escape(data[1]).each do |val|
+                    next unless val.end_with?("/#{branch}")
+
+                    origin = val[0..val.size - branch.size - 2]
+                    break
+                  end
+                end
+              end
+              upstream = !origin.nil?
+            elsif (data = Regexp.new("\\A(.+)/#{Regexp.escape(branch)}\\z").match(data[3]))
+              origin = data[1]
+            end
             break
           end
           raise_error('commit', 'work tree is not usable') unless origin && branch
@@ -445,6 +507,7 @@ module Squared
           end
           a = ['git add --verbose']
           b = ['git push']
+          b << '--set-upstream' if upstream
           if dry_run?
             a << '--dry-run'
             b << '--dry-run'
@@ -460,27 +523,25 @@ module Squared
 
         def restore(flag, files)
           git_session 'restore', "--#{flag}"
-          append_ours
+          append_first %w[ours theirs]
           append_pathspec(files, expect: true)
           source(stdout: true)
         end
 
         def show(objs, pretty: nil, format: nil, abbrev: nil)
           cmd = git_session 'show'
-          case (flag = pretty&.downcase)
-          when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
-            cmd << "--pretty=#{flag}"
-          else
-            if pretty
-              cmd << "--pretty=#{shell_escape("tformat:#{pretty}", quote: true)}"
-            elsif format
-              cmd << "--format=#{shell_escape(format, quote: true)}"
-            end
+          if (flag = pretty || format)
+            cmd << case (val = flag.downcase)
+                   when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
+                     shell_option('format', val, escape: false)
+                   else
+                     shell_option('pretty', flag, escape: false, quote: true)
+                   end
           end
           if (abbrev ||= option('abbrev')) == true
             cmd << '--abbrev-commit'
           elsif abbrev.to_i > 0
-            cmd << "--abbrev=#{abbrev}"
+            cmd << shell_option('abbrev', abbrev, escape: false)
           end
           append_value objs
           source(exception: false)
@@ -493,10 +554,10 @@ module Squared
           cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner)
-          cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitpath)}")
+          cmd = cmd.sub(/\Agit\b/, "git --work-tree=#{shell_quote(path)} --git-dir=#{shell_quote(gitpath)}")
           begin
             if io
-              [IO.popen(cmd), banner]
+              [stdout ? `#{cmd}` : IO.popen(cmd), banner]
             elsif stdin? ? sync : stdout
               print_item banner
               ret = `#{cmd}`
@@ -562,8 +623,8 @@ 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(/s$/, '') : type}",
-                              sub: { styles: styles, pat: /^(\d+)(.+)$/ })
+            puts print_footer("#{size} #{size == 1 ? type.sub(/s\z/, '') : type}",
+                              sub: { styles: styles, pat: /\A(\d+)(.+)\z/ })
           else
             puts empty_status("No #{type} were #{action}", 'grep', grep)
           end
@@ -571,11 +632,14 @@ module Squared
 
         def append_pull(opts, list, flag = nil)
           append_submodules flag
+          list = list.grep_v(/[^a-z\-]/)
           opts.each do |opt|
-            if list.include?(opt)
+            if list.include?(opt) || opt.match(/^(?:de(?:pth|epen)|jobs)=\d+$/)
               @session << "--#{opt}"
-            elsif opt.match(/^depth=(\d+)$/)
-              @session << "--depth=#{$1}"
+            elsif opt.match(/^(?:shallow-)?since=(.+)$/) && (val = Date.parse($1))
+              @session << shell_option('shallow-since', val.strftime('%F %T'), escape: false, quote: true)
+            elsif opt.end_with?('!') && list.include?(opt = opt[0..-2])
+              @session << "--no-#{opt}"
             end
           end
         end
@@ -598,19 +662,13 @@ module Squared
         end
 
         def append_message(val)
-          @session << "--message \"#{double_quote(val)}\"" if val
+          @session << "--message=\"#{double_quote(val)}\"" unless val.to_s.empty?
         end
 
-        def append_head
-          @session << (option('head') || option('tree-ish'))
-        end
+        def append_head(val = nil)
+          return @session << val if val
 
-        def append_ours
-          if option('ours')
-            @session << '--ours'
-          elsif option('theirs')
-            @session << '--theirs'
-          end
+          append_first(%w[head tree-ish object], flag: false, ignore: false)
         end
 
         def append_submodules(flag = nil)

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

@@ -12,11 +12,11 @@ module Squared
           end
 
           def batchargs
-            [ref, { refresh: %i[build copy] }]
+            [ref, { refresh: %i[build copy] }].freeze
           end
 
           def aliasargs
-            [ref, { refresh: :build }]
+            [ref, { refresh: :build }].freeze
           end
 
           def bannerargs
@@ -38,6 +38,7 @@ module Squared
           install: %i[force frozen dedupe].freeze,
           outdated: %i[major minor patch].freeze,
           bump: %i[major minor patch].freeze,
+          update: nil,
           run: nil
         }.freeze
 
@@ -89,6 +90,11 @@ module Squared
                       end
                     end
                   end
+                when :update
+                  desc format_desc(action, nil, 'packages*')
+                  task action, [:packages] do |_, args|
+                    update args.to_a
+                  end
                 end
               else
                 namespace action do
@@ -97,7 +103,7 @@ module Squared
                     when :install
                       desc format_desc(action, flag)
                       task flag do
-                        depend(flag)
+                        depend flag
                       end
                     when :outdated
                       desc format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
@@ -128,7 +134,7 @@ module Squared
             into = @copy[:into] if @copy.key?(:into)
             workspace = @copy[:workspace] if @copy.key?(:workspace)
             glob = @copy[:include]
-            pass = @copy[:exclude]
+            exclude = @copy[:exclude]
             scope = @copy[:scope]
             also = @copy[:also]
             create = @copy[:create]
@@ -138,7 +144,7 @@ module Squared
           items += as_a(also) if also
           return if items.empty?
 
-          print_item unless @output[0] || !verbose || task_invoked?(/^copy(?::#{Node.ref}|$)/)
+          print_item unless @output[0] || !verbose || task_invoked?(/\Acopy(?::#{Node.ref}|$)/)
           items.each do |dir|
             case dir
             when Pathname
@@ -150,7 +156,7 @@ module Squared
               log.warn message("copy project :#{dir}", hint: 'not found') unless dest
             when Hash
               glob = dir[:include]
-              pass = dir[:exclude]
+              exclude = dir[:exclude]
               from = dir[:from] if dir.key?(:from)
               into = dir[:into] if dir.key?(:into)
               scope = dir[:scope] if dir.key?(:scope)
@@ -179,7 +185,7 @@ module Squared
                           doc = JSON.parse(file.read)
                           doc['name']
                         rescue StandardError => e
-                          log.warn e
+                          log.error e
                           raise if exception
                         end
                       end
@@ -194,7 +200,7 @@ module Squared
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from.join(val)} #{to}" }
-              copy_d(src, to, glob: glob, create: create, pass: pass, verbose: verbose)
+              copy_d(src, to, glob: glob, create: create, pass: exclude, verbose: verbose)
             end
           end
         end
@@ -237,7 +243,7 @@ module Squared
               end
               cmd << '--prod' if flag && prod?
               if (val = option('public-hoist-pattern', ignore: false))
-                split_escape(val).each { |opt| cmd << "--public-hoist-pattern=#{shell_escape(opt, quote: true)}" }
+                split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt, quote: true) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
               append_nocolor option('no-color')
@@ -262,7 +268,7 @@ module Squared
           end
         end
 
-        def outdated(rev = nil, opts: [])
+        def outdated(rev = nil, opts: [], sync: invoked_sync?('outdated', rev))
           dryrun = opts.include?('dry-run')
           if pnpm? && read_packagemanager(version: '7.15')
             cmd = 'pnpm outdated'
@@ -273,22 +279,28 @@ module Squared
           end
           log.info cmd
           banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}")
-          if invoked_sync?('outdated', rev)
-            print_item banner
-            banner = nil
+          print_item banner if sync
+          begin
+            data = pwd_set { `#{cmd} --json --loglevel=error` }
+            json = JSON.parse(doc = dependfile.read)
+          rescue StandardError => e
+            log.error e
+            raise if exception
+
+            warn log_message(Logger::WARN, e) if warning?
+            return
+          else
+            dep1 = json['dependencies'] || {}
+            dep2 = json['devDependencies'] || {}
+            target = json['name']
           end
-          data = nil
-          pwd_set { data = `#{cmd} --json --loglevel=error` }
-          json = JSON.parse(doc = dependfile.read)
-          dep1 = json['dependencies'] || {}
-          dep2 = json['devDependencies'] || {}
           found = []
           avail = []
           rev ||= (prod? ? :patch : :minor)
           inter = opts.include?('interactive')
           unless data.empty?
             JSON.parse(data).each_pair do |key, val|
-              val = val.find { |obj| obj['dependent'] == json['name'] } if val.is_a?(Array)
+              val = val.find { |obj| obj['dependent'] == target } if val.is_a?(Array)
               next unless val && (file = dep1[key] || dep2[key]) && file != '*'
 
               latest = val['latest']
@@ -301,8 +313,9 @@ module Squared
                 avail << [key, file, latest, true]
                 next
               end
+              current = val['current'] || file
               want = rev == :major && (ver = latest.match(SEM_VER)) && !ver[6] ? latest : val['wanted']
-              next unless (val['current'] != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
+              next unless (current != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
               f = semscan(file)
               w = semscan(want)
@@ -330,7 +343,7 @@ module Squared
                         end
                 found << [key, file, want, index, major, f, w]
               elsif !major
-                avail << [key, file, latest, false]
+                avail << [key, file, latest, latest != current]
               end
             end
           end
@@ -351,7 +364,7 @@ module Squared
                         end
             puts print_footer(empty_status(msg, hint, pending + val))
           end
-          print_item banner if banner
+          print_item banner unless sync
           if !found.empty?
             col1 = size_col.(found, 0) + 4
             col2 = size_col.(found, 1) + 4
@@ -417,7 +430,7 @@ module Squared
           end
         end
 
-        def bump(flag = nil, sync: invoked_sync?('bump', flag))
+        def bump(flag = nil)
           return unless (ver = version)
 
           seg = semscan(ver, fill: false)
@@ -450,8 +463,8 @@ module Squared
                 major = flag == :major
                 emphasize("version: #{out}", title: name, border: borderstyle, sub: [
                   headerstyle,
-                  { pat: /^(version:)( )(\S+)(.*)$/, styles: color(major ? :green : :yellow), index: 3 },
-                  { pat: /^(version:)(.*)$/, styles: theme[major ? :major : :active] }
+                  { pat: /\A(version:)( )(\S+)(.*)\z/, styles: color(major ? :green : :yellow), index: 3 },
+                  { pat: /\A(version:)(.*)\z/, styles: theme[major ? :major : :active] }
                 ])
               elsif stdin?
                 puts out
@@ -461,10 +474,33 @@ module Squared
             end
           rescue StandardError => e
             log.debug e
-            raise if sync
+            raise if exception
           end
         end
 
+        def update(pkgs = [])
+          if (yarn = dependtype(:yarn)) > 0
+            cmd = session 'yarn'
+            if yarn > 1
+              cmd << 'up'
+            else
+              cmd << 'upgrade'
+              cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
+            end
+          elsif pnpm?
+            cmd = session 'pnpm', 'update'
+            cmd << '--prod' if prod?
+            append_nocolor option('no-color')
+          else
+            cmd = session 'npm', 'update'
+            cmd << '--omit=dev' if prod?
+            append_nocolor option('no-color')
+          end
+          append_loglevel
+          append_value pkgs
+          run
+        end
+
         def compose(opts, flags = nil, script: false)
           return unless opts && script
 
@@ -615,19 +651,19 @@ module Squared
             end
           elsif pnpm?
             if silent
-              @session << '--reporter=silent'
+              @session << shell_option('reporter', 'silent', escape: false)
               level ||= 'error'
             end
             case level
             when 'debug', 'info', 'warn', 'error'
-              @session << "--loglevel=#{level}"
+              @session << shell_option('loglevel', level, escape: false)
             end
           elsif silent
-            @session << '--loglevel=silent'
+            @session << shell_option('loglevel', 'silent', escape: false)
           else
             case level
             when 'error', 'warn', 'notice', 'http', 'info', 'verbose', 'silly'
-              @session << "--loglevel=#{level}"
+              @session << shell_option('loglevel', level, escape: false)
             end
           end
         end