squared 0.1.1 → 0.1.3

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

@@ -4,8 +4,8 @@ module Squared
   module Workspace
     module Project
       class Git < Base
-        OPT_PULL = %w[all ff-only autostash prune tags depth=n since=d jobs=n dry-run].freeze
-        OPT_FETCH = %w[prune-tags].concat(OPT_PULL[3..-1]).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
@@ -204,15 +231,12 @@ module Squared
                     if flag == :oneline
                       desc format_desc(action, flag, 'object*')
                       task flag, [:object] do |_, args|
-                        objs = 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*')
                       task flag, [:format, :object] do |_, args|
-                        format = guard_params(action, flag, args: args, key: :format)
-                        objs = args.to_a[1..-1] || []
-                        show(objs, "#{flag}": format)
+                        show(args.to_a.drop(1), "#{flag}": args.format)
                       end
                     end
                   end
@@ -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)
@@ -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
@@ -425,14 +470,14 @@ module Squared
           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 = /^\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
+            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 = /^#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/m.match(out))
+                if (data = /\A#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)\z/.match(out))
                   split_escape(data[1]).each do |val|
                     next unless val.end_with?("/#{branch}")
 
@@ -442,7 +487,7 @@ module Squared
                 end
               end
               upstream = !origin.nil?
-            elsif (data = Regexp.new("^(.+)/#{Regexp.escape(branch)}$").match(data[3]))
+            elsif (data = Regexp.new("\\A(.+)/#{Regexp.escape(branch)}\\z").match(data[3]))
               origin = data[1]
             end
             break
@@ -469,7 +514,7 @@ module Squared
           end
           a << pathspec
           b << '--force' if amend
-          b << @origin << @branch
+          b << origin << branch
           puts if pass
           source a.join(' ')
           source cmd
@@ -478,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)
@@ -511,7 +554,7 @@ 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
               [stdout ? `#{cmd}` : IO.popen(cmd), banner]
@@ -580,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: { pat: /\A(\d+)(.+)\z/, styles: styles })
           else
             puts empty_status("No #{type} were #{action}", 'grep', grep)
           end
@@ -589,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) || opt.match(/^(?:depth|jobs)=\d+$/)
+            if list.include?(opt) || opt.match(/^(?:de(?:pth|epen)|jobs)=\d+$/)
               @session << "--#{opt}"
-            elsif opt.match(/^since=(.+)$/) && (val = Date.parse($1))
-              @session << "--shallow-since=\"#{val.strftime('%F %T')}\""
+            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
@@ -616,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
@@ -103,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?')
@@ -144,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
@@ -243,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')
@@ -279,10 +279,7 @@ module Squared
           end
           log.info cmd
           banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}")
-          if sync
-            print_item banner
-            banner = nil
-          end
+          print_item banner if sync
           begin
             data = pwd_set { `#{cmd} --json --loglevel=error` }
             json = JSON.parse(doc = dependfile.read)
@@ -316,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)
@@ -345,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
@@ -366,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
@@ -465,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
@@ -510,7 +508,7 @@ module Squared
           append_loglevel
           case opts
           when Enumerable
-            ret += opts.to_a
+            ret.merge(opts.to_a)
           when String
             ret << opts
           else
@@ -653,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

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

@@ -80,7 +80,7 @@ module Squared
                     if flag == :target
                       task flag, [:dir, :opts] do |_, args|
                         dir = guard_params(action, flag, args: args, key: :dir)
-                        depend(flag, dir: dir, opts: args.to_a[1..-1] || [])
+                        depend(flag, dir: dir, opts: args.to_a.drop(1))
                       end
                     else
                       task flag do |_, args|
@@ -106,7 +106,7 @@ module Squared
                 cmd << '--user'
                 append_pip opts, OPT_USER
               when :target
-                cmd << "--target=#{shell_escape(basepath(dir), quote: true)}"
+                cmd << shell_option('target', basepath(dir), quote: true)
                 append_pip opts, OPT_USER + ['upgrade']
                 append_eager opts
               when :upgrade
@@ -122,7 +122,7 @@ module Squared
               cmd << (type == 1 ? '-r requirements.txt' : '.')
               run(sync: sync)
             when 3
-              run_s("#{@bin} setup.py install", sync: sync)
+              run_s('python setup.py install', sync: sync)
             end
           end
         end
@@ -164,21 +164,21 @@ module Squared
 
         def append_pip(opts = [], list = [])
           opts.each do |opt|
-            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^v+$/))
+            data = nil
+            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (data = opt.match(/^verbose|(v+)$/))
 
             @session << case opt
                         when 'venv'
                           '--require-virtualenv'
                         else
-                          (v ? "-#{v[0]}" : "--#{opt}")
+                          (data && data[1] ? "-#{data[1]}" : "--#{opt}")
                         end
           end
-          if (val = option('proxy', ignore: false))
-            @session << "--proxy=#{shell_escape(val, quote: true)}"
-          end
-          @session << "--python=#{shell_escape(basepath(val), quote: true)}" if (val = option('python', ignore: false))
-          @session << "--log=#{shell_escape(basepath(val), quote: true)}" if (val = option('log', ignore: false))
-          @session << '--user' if option('user')
+          val = nil
+          @session << shell_option('proxy', val, quote: true) if (val = option('proxy'))
+          @session << shell_option('python', basepath(val), quote: true) if (val = option('python'))
+          @session << shell_option('log', basepath(val), quote: true) if (val = option('log', ignore: false))
+          @session << '--user' if !list.empty? && option('user')
           @session << '--no-input' if option('no-input')
           append_nocolor option('no-color')
         end