squared 0.4.20 → 0.4.22

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

@@ -161,7 +161,7 @@ module Squared
           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
+          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=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
@@ -992,7 +992,7 @@ module Squared
               cur = nil
               foreachref('heads', format: '%(if)%(HEAD)%(then)* %(end)%(refname:short)').each do |line|
                 line.chomp!
-                cur ||= line.delete_prefix!('* ')
+                cur ||= line.sub!(/\A\* /, '')
                 heads << line if matchany?(line, reg)
               end
               raise_error('head not found', hint: 'for-each-ref') unless cur
@@ -1234,7 +1234,7 @@ module Squared
           start = epochtime
           build(@output, sync: sync, from: :'git:revbuild')
         rescue StandardError => e
-          warn log_message(Logger::WARN, e, pass: true) if warning?
+          print_error(e, pass: true)
         else
           print_status(name, subject: 'revbuild', start: start, from: :completed)
           workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
@@ -1597,9 +1597,7 @@ module Squared
               end
               on :last, from
             end
-            if ret == 0
-              warn log_message(Logger::WARN, name, 'no ref found', subject: 'branch', hint: 'head', pass: true)
-            end
+            print_error(name, 'no ref found', subject: 'branch', hint: 'head', pass: true) if ret == 0
             return
           end
           return unless success?(source(stdout: stdout))
@@ -1747,8 +1745,8 @@ module Squared
                                                                                  end)
           case flag
           when :blame
-            raise_error 'no file found' unless (n = op.index { |s| (path + s).file? })
-            op << '--' << shell_quote(path + op.delete_at(n))
+            raise_error 'no file found' unless (n = op.index { |s| basepath(s).file? })
+            op << '--' << shell_quote(basepath(op.delete_at(n)))
             op.clear
           when :revert
             if VAL_GIT[:rebase][:send].any? { |val| op.arg?(val) }
@@ -1758,7 +1756,7 @@ module Squared
             else
               append_commit(*op.extras)
             end
-          when :add, :clean
+          when :add
             if flag == :add && !op.arg?('pathspec-from-file')
               grep, list = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !list.empty?
@@ -1785,8 +1783,8 @@ module Squared
             refs = projectmap op.extras
             raise_error 'no source/destination' unless refs.size > 1
             op.merge(refs)
-          when :rm
-            append_pathspec(op.extras, expect: true)
+          when :rm, :clean
+            append_pathspec(op.extras, expect: flag == :rm)
           end
           source(sync: false, stderr: true)
         end
@@ -1951,7 +1949,7 @@ module Squared
             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(path + file))
+            ret[file] = algorithm.hexdigest(File.read(basepath(file)))
           end
           ret
         end
@@ -1983,7 +1981,7 @@ module Squared
               when 'recurse-submodules'
                 op.append?($1, $2, type: :basic)
               when 'refspec'
-                refspec << shell_escape($2, quote: true)
+                refspec << shell_quote($2)
               end
             elsif op.arg?('multiple')
               op.found << opt
@@ -2001,12 +1999,12 @@ module Squared
             end
             op.delete('--all')
           elsif op.arg?('multiple')
-            op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
+            op.add_quote(*op.found)
             return
           elsif option('all')
             op << '--all'
           end
-          op.clear(errors: true, subject: flag.to_s) if flag
+          op.clear(errors: true, subject: flag) if flag
         end
 
         def append_commit(*val, target: @session, head: false)
@@ -2145,7 +2143,7 @@ module Squared
         end
 
         def matchpathspec
-          [/\A[^a-z\d-]+/i, %r{\A[^=\\/*]*[\\/*]}]
+          [/\A[^a-z\d-]+/i, %r{\A[^=\\/*]*[\\/*]}, /\A--\z/]
         end
 
         def messageopt

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

@@ -5,34 +5,34 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
-          install: %w[prefer-dedupe=!? package-lock-only=!? audit=! bin-links=! cpu=b fund=! libc=b os=b
-                      package-lock=!].freeze,
-          install_base: %w[ignore-scripts=!? install-links=!? strict-peer-deps=!? include=b omit=b
-                           install-strategy=b].freeze,
+          common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
+          install: %w[package-lock-only=!? prefer-dedupe=!? cpu=b libc=b os=b].freeze,
+          install_base: %w[audit=! bin-links=! fund=! ignore-scripts=!? install-links=!? package-lock=!
+                           strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
-          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod foreground-scripts=!?
+          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod before=q foreground-scripts=!?
                          g|global=!? S|save=!? E|save-exact=!?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
-          pack: %w[json=!? pack-destination=p].freeze
+          pack: %w[ignore-scripts=!? json=!? pack-destination=p].freeze
         }.freeze
         OPT_PNPM = {
           common: %w[aggregate-output color no-color stream use-stderr C|dir=p loglevel=b w|workspace-root].freeze,
+          cpu: %w[cpu=b libc=b os=b].freeze,
           filter: %w[fail-if-no-match changed-files-ignore-pattern=q filter=q filter-prod=q test-pattern=q].freeze,
           install: %w[fix-lockfile force ignore-pnpmfile ignore-workspace lockfile-only merge-git-branch-lockfiles
-                      no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only shamefully-hoist
-                      side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
+                      optimistic-repeat-install no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only
+                      shamefully-hoist side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
                       use-running-store-server use-store-server child-concurrency=i hoist-pattern=q lockfile-dir=p
                       modules-dir=p network-concurrency=i package-import-method=b public-hoist-pattern=q
                       reporter=b].freeze,
           install_base: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
           install_no: %w[frozen-lockfile verify-store-integrity].freeze,
           install_as: %w[D|dev global-dir no-optional P|prod r|recursive].freeze,
-          update: %w[global interactive latest depth=i].freeze,
+          update: %w[g|global i|interactive L|latest depth=i].freeze,
           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,
+          run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from
+                  sequential].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
@@ -108,7 +108,7 @@ module Squared
             initialize_build(Node.ref, prod: prod?, **kwargs)
             initialize_env(**kwargs)
           end
-          @dependfile = @path + 'package.json'
+          @dependfile = basepath 'package.json'
           @pm = { __: init }
         end
 
@@ -223,7 +223,7 @@ module Squared
                   flags.each do |flag|
                     case action
                     when 'outdated'
-                      format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
+                      format_desc(action, flag, %w[update interactive dry-run], arg: 'opts?')
                       task flag do |_, args|
                         outdated flag, args.to_a
                       end
@@ -259,11 +259,6 @@ module Squared
                           otp = args.first
                         else
                           tag, otp = param_guard(action, flag, args: args)
-                          unless SEM_VER.match?(tag)
-                            a = sub_style(project, styles: theme[:active])
-                            b = sub_style(tag, styles: theme[:inline])
-                            exit 1 unless confirm("Publish #{a}@#{b}? [y/N] ", 'N')
-                          end
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
@@ -371,7 +366,7 @@ module Squared
                     subdir << target.to_s
                   end
                   begin
-                    FileUtils.cp(path + s, dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                    FileUtils.cp(basepath(s), dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
                   rescue StandardError => e
                     print_error e
                     errors += 1
@@ -386,7 +381,7 @@ module Squared
             end
             glob = Array(glob || '**/*')
             target = []
-            from = path + from
+            from = basepath from
             if workspace
               Dir.glob(from + '*').each do |path|
                 next unless (path = Pathname.new(path)).directory?
@@ -460,6 +455,7 @@ module Squared
                 cmd << '--save-exact' if exact
               else
                 cmd << 'install'
+                append_platform
               end
               if (val = option('public-hoist-pattern', ignore: false))
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
@@ -471,7 +467,9 @@ module Squared
               if flag == :add
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
-                cmd.merge(packages.map { |pkg| shell_escape(pkg) })
+                cmd.merge(packages.map { |pkg| shell_quote(pkg) })
+              else
+                append_platform
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
               cmd << '--package-lock=false' if option('package-lock', equals: '0')
@@ -621,10 +619,13 @@ module Squared
               footer.call(modified, found.size)
             elsif modified > 0
               modified = -1
-              footer.call(0, found.size)
               File.write(dependfile, doc)
+              if opts.include?('update') || opts.include?('u') || option('update')
+                update
+              else
+                footer.call(0, found.size)
+              end
               commit(:add, refs: ['package.json'], pass: true)
-              install if opts.include?('prune') || opts.include?('p')
             end
           elsif !avail.empty?
             col1 = size_col.call(avail, 0) + 4
@@ -650,18 +651,23 @@ module Squared
         end
 
         def update(*)
-          package('update', from: :update)
+          package(:update, from: :update)
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
-          if !version || read_packagemanager(:private)
-            warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: version ? 'private' : nil)
+          unless version && !read_packagemanager(:private)
+            print_error('invalid task "publish"', subject: name, hint: version ? 'private' : nil)
             return
           end
           cmd = session 'npm', 'publish'
           cmd << basic_option('otp', otp) if otp ||= option('otp')
-          cmd << basic_option('tag', tag) if tag ||= option('tag')
-          cmd << basic_option('access', access) if access ||= option('access')
+          cmd << basic_option('tag', tag.tr(' ', '-')) if tag ||= option('tag')
+          case access || option('access')
+          when 'p', 'public'
+            cmd << '--access=public'
+          when 'r', 'restricted'
+            cmd << '--access=restricted'
+          end
           dryrun ||= dryrun?('npm')
           if dryrun
             cmd << '--dry-run'
@@ -689,15 +695,16 @@ module Squared
           workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
-                                    flag = yarn == 1 ? 'upgrade' : 'up'
+                                    yarn == 1 ? 'upgrade' : 'up'
                                   else
-                                    flag
+                                    yarn == 1 && flag == :dedupe ? 'install' : flag
                                   end
             op = OptionPartition.new(opts, if yarn == 1
-                                             OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
+                                             OPT_YARN.fetch(flag == :dedupe ? :install : flag, []) + OPT_YARN[:common]
                                            else
                                              OPT_BERRY[flag]
                                            end, cmd, project: self)
+            op << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
             op.clear
             append_loglevel
           else
@@ -705,20 +712,20 @@ module Squared
               cmd = session 'pnpm', flag
               list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
               list.concat(OPT_PNPM[:install_as] + OPT_PNPM[:filter]) unless flag == :dedupe
+              list.concat(OPT_PNPM[:cpu]) unless flag == :update
               no = OPT_PNPM[:"#{flag}_no"]
             else
               cmd = session 'npm', flag
               list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
               list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
               no = OPT_NPM[:install_no]
-              cmd << '--save=true' if option('save')
             end
             op = OptionPartition.new(opts, list, cmd, no: no, project: self)
             op.each do |opt|
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                 end
               elsif opt.include?('=')
                 op.errors << opt
@@ -727,12 +734,13 @@ module Squared
               end
             end
             op.swap
+            append_platform if flag == :install
             append_nocolor
             append_loglevel
             if flag == :dedupe
               op.clear
             else
-              op.append(escape: true)
+              op.append(quote: true)
             end
             op.clear(errors: true)
           end
@@ -811,7 +819,7 @@ module Squared
 
                 case $1
                 when 'w', 'workspace'
-                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, path + $2) : shell_option($1, $2))
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
                   op.found << opt
                 end
               end
@@ -929,6 +937,14 @@ module Squared
           respond_to?(meth) && __send__(meth) ? @pm[prog] : 0
         end
 
+        def dependbin
+          if yarn?
+            'yarn'
+          else
+            pnpm? ? 'pnpm' : 'npm'
+          end
+        end
+
         def version
           @version ||= read_packagemanager(:version)
         end
@@ -1009,11 +1025,11 @@ module Squared
           end
         end
 
-        def dependbin
-          if yarn?
-            'yarn'
-          else
-            pnpm? ? 'pnpm' : 'npm'
+        def append_platform(target: @session)
+          %w[cpu os libc].each do |name|
+            next unless (val = option(name))
+
+            target << basic_option(name, val)
           end
         end
 

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

@@ -207,7 +207,7 @@ module Squared
                       if flag == :create
                         format_desc action, flag, 'dir,opts*'
                         task flag, [:dir] do |_, args|
-                          dir = path + param_guard(action, flag, args: args, key: :dir)
+                          dir = basepath param_guard(action, flag, args: args, key: :dir)
                           venv_create dir, args.extras
                         end
                       elsif venv
@@ -245,10 +245,7 @@ module Squared
                       when :upgrade
                         format_desc action, flag, 'opts*'
                         task flag do |_, args|
-                          args = args.to_a
-                          args.unshift('upgrade')
-                          args << 'pip'
-                          install flag, args
+                          install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
@@ -351,7 +348,7 @@ module Squared
                 when :user
                   cmd << '--user'
                 when :target
-                  cmd << quote_option('target', path + target)
+                  cmd << quote_option('target', basepath(target))
                 when :force
                   cmd << '--force-reinstall'
                 end
@@ -474,11 +471,7 @@ module Squared
             cmd << '--user' if user
             cmd << basic_option('upgrade-strategy', strategy) if strategy
             append_value out
-            if workspace.windows?
-              pip = cmd.to_a.drop(1)
-              cmd = python_session '-m pip'
-              cmd.merge(pip)
-            end
+            python_session('-m pip', *cmd.to_a.drop(1)) if workspace.windows?
           end
           run(from: :install)
         end
@@ -515,7 +508,7 @@ module Squared
               if op.arg?(*args)
                 op.push(srcdir)
               else
-                op << quote_option(args.last, path + srcdir)
+                op << quote_option(args.last, basepath(srcdir))
               end
               srcdir = nil
             end
@@ -549,7 +542,7 @@ module Squared
           end
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
-            (path + 'dist').tap do |dir|
+            basepath('dist').tap do |dir|
               raise_error('no source files found', hint: dir) unless dir.directory? && !dir.empty?
             end
           end
@@ -558,7 +551,7 @@ module Squared
             if op.empty?
               op.push("#{dist.call}/*")
             else
-              op.map! { |val| path + val }
+              op.map! { |val| basepath(val) }
             end
             op.append
           else
@@ -629,7 +622,7 @@ module Squared
         def poetry_session(*cmd)
           ret = session('poetry', *cmd, *preopts)
           if (val = option('project', ignore: false))
-            ret << quote_option('project', path + val)
+            ret << quote_option('project', basepath(val))
           end
           ret
         end
@@ -651,7 +644,7 @@ module Squared
         end
 
         def append_pip(flag, opts, target: @session, from: nil)
-          if !from || opts.empty?
+          unless from && !opts.empty?
             append_global(target: target)
             return []
           end
@@ -674,11 +667,11 @@ module Squared
             end
             op.swap
             if edit
-              edit = path + edit unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
+              edit = basepath(edit) unless %r{\A[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
                 op.push(edit)
               else
-                target << quote_option('e', edit)
+                op << quote_option('e', edit)
               end
             end
             case flag
@@ -689,25 +682,25 @@ module Squared
               []
             end
           else
-            opts
+            op.extras
           end
         end
 
         def append_editable(target: @session)
-          return if requirements?
+          return if requirements? && editable == '.'
 
           if (val = option('editable', 'e', target: target, ignore: false))
-            session_delete('e', 'editable', target: target)
+            OptionPartition.delete_key(target, 'e', 'editable')
             case val
             when '0', 'false'
               return
             else
-              val = path + val
+              val = basepath val
             end
           elsif session_arg?('e', 'editable', target: target) || !(val = editable)
             return
           end
-          target << quote_option('e', val)
+          target << quote_option('e', basepath(val))
         end
 
         def append_global(target: @session)
@@ -716,11 +709,11 @@ module Squared
                       when '0', 'false'
                         '--no-cache-dir'
                       else
-                        quote_option('cache-dir', path + val)
+                        quote_option('cache-dir', basepath(val))
                       end
           end
           target << shell_option('proxy', val) if (val = option('proxy', target: target))
-          target << quote_option('python', path + val) if (val = option('python', target: target))
+          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
 
@@ -842,7 +835,7 @@ module Squared
                       when '.', Pathname
                         val
                       when String
-                        Pathname.new(editable)
+                        Pathname.new(val) unless val.empty?
                       end
         end
 
@@ -853,8 +846,7 @@ module Squared
             val, *opts = val
             @venvopts = opts
           end
-          @venv = Pathname.new(val)
-          @venv = @path + @venv unless @venv.absolute?
+          @venv = basepath(val)
           if projectpath?(@venv)
             if @venv.exist?
               log.debug "venv found: #{@venv}"