squared 0.7.9 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6c6ff7f1f5a649c84d9fb799e3da482e39b75823629b78fcb5fa476473cbb43
-  data.tar.gz: 29559d83bf196111dd046905b88f1680287524589deabdc4a80b8fb23ca0de0c
+  metadata.gz: b2815cc0583f2f21107460840d1e73cbb74b7013d77c9f1ae65e6b4cd72bfe07
+  data.tar.gz: c321afc376c0b219967d6318650143588099f0d734461c470970919bc03cf00b
 SHA512:
-  metadata.gz: 1987e693d59692f782d6c6b08c75b385efd384d96be5d73757d6068964408888d61e274dcc9444342d8d12a28cfc8628e186fbc71759e76a9cee9eef197c86ac
-  data.tar.gz: 3cca9732ab404591931ccad9b48946d15e22cf1fc6d9fd06529a3b8b9216c0e3c9b8fafca79dab97c10e6d8917c656f7c9529182140e48cb47f7cd712e7157c7
+  metadata.gz: 76adacb4694911e5b587c0f9871d8adc8cab9770cf9173d82452d58ad142e171b2a284f93f35769869b42a43f374e005daa595a6698537c07b74847a46e99df2
+  data.tar.gz: 92f875447ab1969fb3374a686ec5766e0980f6536fa3859737d16207e763f6e68db07ad350419b85d53846e65e3f87aed29546eb182066ab27be9bd09f4f34cc

data/CHANGELOG.md

@@ -1,5 +1,72 @@
 # Changelog
 
+## [0.7.11] - 2026-09-04
+
+### Added
+
+- Node command package action [approve|deny] is interactive.
+
+### Fixed
+
+- Docker container commands [run|exec] did not sanitize input prompt.
+
+## [0.6.18]
+
+### Added
+
+- Docker command bake action buildx with first arg "-" inherits base args.
+
+### Fixed
+
+- Git action grep did not recognize format and max-count.
+- Node command nvm did not quote executable path.
+
+## [0.5.26]
+
+### Fixed
+
+- Node command nvm did not quote executable path.
+
+## [0.4.41]
+
+### Added
+
+- Common base argument SUCCESS for command confirmation was created.
+
+### Changed
+
+- Program options prefer using quotes instead of escape.
+- Docker container run arguments with a leading dash are concatenated.
+
+### Fixed
+
+- Common prompt method choice did not grep list items.
+- OptionPartition static method strip did not parse flags with dashes.
+- Project base method choice_index did not support multiple selections.
+
+## [0.7.10] - 2026-08-06
+
+### Fixed
+
+- See `0.6.17`.
+
+## [0.6.17]
+
+### Added
+
+- NPM command install can bypass engines with ENV and engine-strict=false.
+
+### Fixed
+
+- Ruby command gem action push interactive file selector did nothing.
+- Git choice prompt did not permit optional empty values.
+
+## [0.4.40]
+
+### Changed
+
+- Series method exclude? was made compatible with v0.8 signature.
+
 ## [0.7.9] - 2026-07-04
 
 ### Added
@@ -1924,6 +1991,8 @@
 
 - Changelog was created.
 
+[0.7.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.11
+[0.7.10]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.10
 [0.7.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.9
 [0.7.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.8
 [0.7.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.7
@@ -1934,6 +2003,8 @@
 [0.7.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.2
 [0.7.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.1
 [0.7.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.0
+[0.6.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.18
+[0.6.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.17
 [0.6.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.16
 [0.6.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.15
 [0.6.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.14
@@ -1951,6 +2022,7 @@
 [0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2
 [0.6.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.1
 [0.6.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.0
+[0.5.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.26
 [0.5.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.25
 [0.5.24]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.24
 [0.5.23]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.23
@@ -1977,6 +2049,8 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.41]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.41
+[0.4.40]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.40
 [0.4.39]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.39
 [0.4.38]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.38
 [0.4.37]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.37

data/lib/squared/common/base.rb

@@ -15,6 +15,7 @@ module Squared
       CHOICE: 25,
       QUOTE: "'",
       SPACE: ' => ',
+      SUCCESS: 'Success',
       GRAPH: %w[| - | \\ -].freeze,
       BORDER: %w[| - - - - - | | - -].freeze,
       VIEW: 'view',
@@ -92,6 +93,13 @@ module Squared
       VAR[key.is_a?(::String) ? key.to_sym : key] = val
     end
 
+    def __arg__(key, name = nil, &blk)
+      ret = ARG[key.to_sym]
+      return ret unless name && ret.is_a?(::Hash)
+
+      ret[name = name.downcase] || (block_given? ? ret.fetch(name.to_sym, &blk) : ret[name.to_sym])
+    end
+
     def __freeze__
       PATH.freeze
       ARG.freeze

data/lib/squared/common/prompt.rb

@@ -56,10 +56,11 @@ module Squared
       def choice(msg, list = nil, min: 1, max: 1, multiple: false, index: false, grep: nil, border: nil, auto: true,
                  force: true, attempts: 3, timeout: 0)
         require 'timeout'
+        multiple = Array(multiple) if multiple.is_a?(::Numeric)
         if list
           grep &&= Array(grep).map { |val| Regexp.new(val) }
           items = list.each_with_object([]) do |val, out|
-            next if grep&.none? { |pat| pat.match?(line) }
+            next if grep&.none? { |pat| pat.match?(val) }
 
             out << val.to_s.chomp
             puts '%2d. %s' % [out.size, val]
@@ -76,11 +77,11 @@ module Squared
               puts print_footer(border: border)
             end
             msg = "#{msg + (force ? ':' : '?')} [#{min}-#{max}#{if (n = multiple)
-                                                                  "|,#{n.is_a?(::Numeric) ? "{#{n}}" : '*'}"
+                                                                  "|,#{n.is_a?(::Array) ? "{#{n.join(',')}}" : '*'}"
                                                                 end}] "
           end
         end
-        between = ->(s) { s.match?(/^\d+$/) && s.to_i.between?(min, max) }
+        between = ->(s) { s.match?(/^\d+$/) && s.to_i.between?(min, max <= min ? Float::INFINITY : max) }
         Timeout.timeout(timeout) do
           while (ch = Readline.readline(msg))
             ch.strip!
@@ -105,7 +106,7 @@ module Squared
                 unless k.include?(nil)
                   k.uniq!
                   k.sort!
-                  unless multiple.is_a?(::Numeric) && multiple != k.size
+                  unless multiple.is_a?(::Array) && !multiple.include?(k.size)
                     return index || !items ? k : k.map { |i| items[i.pred] }
                   end
                 end

data/lib/squared/common/utils.rb

@@ -140,7 +140,7 @@ module Squared
       end
 
       def env_key(*val)
-        val.join('_').gsub(/\W+/, '_').upcase
+        val.join('_').sub(/\A\d+\W*/, '__').gsub(/\W+/, '_').upcase
       end
 
       def env_bool(key, default = false, index: false, **kwargs)

data/lib/squared/config.rb

@@ -332,8 +332,7 @@ module Squared
           'yaml'
         when 'js'
           'json'
-        when ''
-          nil
+        when '' then nil
         else
           ret
         end

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.7.9'
+  VERSION = '0.7.11'
 end

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

@@ -1545,7 +1545,7 @@ module Squared
         def env(key, default = nil, suffix: nil, strict: false, ignore: nil, **kwargs, &blk)
           name = "#{key}_#{envname_get}"
           ret = if suffix
-                  ENV.fetch("#{name}_#{suffix}", '')
+                  ENV["#{name}_#{suffix}"] || (ignore == false && ENV["#{key}_#{suffix}"]) || ''
                 elsif strict
                   ENV[name].to_s
                 else
@@ -1703,7 +1703,7 @@ module Squared
         end
 
         def print_success
-          puts 'Success'
+          puts ARG[:SUCCESS]
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
@@ -1897,7 +1897,7 @@ module Squared
         end
 
         def append_hash(data, target: @session || [], build: false)
-          if build && (type = env('BUILD', suffix: 'TYPE') || ENV['BUILD_TYPE'])
+          if build && (type = env('BUILD', suffix: 'TYPE', ignore: false))
             if (extra = data[type = "__#{type}__"] || data[type.to_sym]).is_a?(Hash)
               data = data.merge(extra)
             else
@@ -2086,8 +2086,8 @@ module Squared
           args
         end
 
-        def confirm_basic(msg, hint, default = 'Y', style: :inline, target: @session, prefix: nil, **kwargs)
-          return true if prefix ? option('y', prefix: prefix) : target && option('y', target: target)
+        def confirm_basic(msg, hint, default = 'Y', style: :inline, target: @session, prefix: target&.first, **kwargs)
+          return true if option('y', prefix: prefix)
 
           confirm("#{msg} [#{sub_style(hint.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", default, **kwargs)
         end
@@ -2121,7 +2121,10 @@ module Squared
           if accept
             hint = Array(ret).map { |val| sub_style(val.to_s, theme[:inline]) }.join(', ')
             accept = Array(accept).map { |val| Array(val) }
-            ret = Array(ret) if accept.any? { |val| val[1] == true }
+            if accept.any? { |val| val[1] == true }
+              ret = [ret]
+              multiple = -1
+            end
             begin
               item = accept.shift
               c = confirm("#{item[0]}#{" [#{hint}]" if hint}", item[2] ? 'Y' : 'N')
@@ -2134,7 +2137,7 @@ module Squared
             end until accept.empty?
           end
           if values
-            ret = Array(ret)
+            ret = [ret] unless accept && multiple == -1
             Array(values).each do |val|
               if val.is_a?(Array)
                 val, force = val
@@ -2700,6 +2703,10 @@ module Squared
           end
         end
 
+        def dryrun?(*, target: @session, prefix: target&.first)
+          Array(target).include?('--dry-run') || !option('dry-run', target: target, prefix: prefix).nil?
+        end
+
         def pwd?
           path == Pathname.pwd
         end

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

@@ -21,14 +21,14 @@ module Squared
           }.freeze,
           compose: {
             common: %w[all-resources ansi=b compatibility dry-run env-file=p f|file=p parallel=n profile=b progress=b
-                       project-directory=p p|project-name=e].freeze,
+                       project-directory=p p|project-name=b].freeze,
             build: %w[check no-cache print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
                       provenance=q sbom=q ssh=qq].freeze,
             create: %w[build force-recreate no-build no-recreate quiet-pull remove-orphans y|yes pull=b scale=i].freeze,
-            exec: %w[d|detach privileged e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
+            exec: %w[d|detach privileged e|env=qq index=i T|no-tty=!? user=b w|workdir=q].freeze,
             run: %w[build d|detach no-deps q|quiet quiet-build quiet-pull remove-orphans rm P|service-ports use-aliases
                     cap-add=b cap-drop=b entrypoint=q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b
-                    T|no-TTY=b? p|publish=q pull=b u|user=e v|volume=q w|workdir=q].freeze,
+                    T|no-tty=!? p|publish=q pull=b u|user=b v|volume=qq w|workdir=q].freeze,
             up: %w[abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
                    d|detach force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start quiet-build
                    quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch y|yes attach=b
@@ -38,9 +38,9 @@ module Squared
           }.freeze,
           container: {
             create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
-                       rm t|tty use-api-socket add-host=q annotation=q a|attach=b blkio-weight=i blkio-weight-device=i
-                       cap-add=b cap-drop=b cgroup-parent=b cgroupns=b cidfile=p device=q device-cgroup-rule=q
-                       device-read-bps=q device-read-iops=q device-write-bps=q device-write-iops=q
+                       rm t|tty=!? use-api-socket add-host=q annotation=q a|attach=b blkio-weight=i
+                       blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b cidfile=p device=q
+                       device-cgroup-rule=q device-read-bps=q device-read-iops=q device-write-bps=q device-write-iops=q
                        dns=q dns-option=q dns-search=q domainname=b entrypoint=q e|env=qq env-file=p expose=q gpus=q
                        group-add=b health-cmd=q health-interval=b health-retries=i health-start-interval=q
                        health-start-period=q health-timeout=q hostname=q io-maxbandwidth=b io-maxiops=b ip=b ip6=q ipc=b
@@ -48,13 +48,14 @@ module Squared
                        m|memory=b memory-reservation=b memory-swap=n memory-swappiness=n mount=qq name=b network=b
                        network-alias=b oom-score-adj=b pid=b pids-limit=n platform=q p|publish=q pull=b restart=b
                        runtime=b security-opt=q shm-size=b stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q
-                       ulimit=q u|user=b userns=b uts=b v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+                       ulimit=q u|user=b userns=b uts=b v|volume=qq volume-driver=b volumes-from=b w|workdir=q].freeze,
             run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
             update: %w[blkio-weight=i cpu-period=i cpu-quota=i cpu-rt-period=i cpu-rt-runtime=i c|cpu-shares=i cpus=f
                        cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=n pids-limit=n
                        restart=q].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p u|user=e
+            exec: %w[d|detach i|interactive privileged t|tty=!? detach-keys=q e|env=qq env-file=p u|user=b
                      w|workdir=q].freeze,
+            rm: %w[f|force l|link v|volumes].freeze,
             commit: %w[no-pause a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
@@ -405,15 +406,15 @@ module Squared
         end
 
         def buildx(flag, opts = [], tag: nil, context: nil, from: nil)
+          bx = OPT_DOCKER[:buildx]
           if flag == :bake && context&.match?(%r{^["']?(https?|git)://}i)
-            shared = data[:shared].dup.push('f|file=q')
+            shared = bx[:shared].dup.push('f|file=q')
             shared.delete('f|file=p')
           end
           cmd, opts = docker_session('buildx', opts: opts)
-          data = OPT_DOCKER[:buildx]
-          op = OptionPartition.new(opts, data[:common], cmd, project: self, strict: strict?)
+          op = OptionPartition.new(opts, bx[:common], cmd, project: self, strict: strict?)
           op.append(flag, quote: false)
-            .parse(data[flag == :bake ? :bake : :build] + (shared || data[:shared]))
+            .parse(bx[flag == :bake ? :bake : :build] + (shared || bx[:shared]))
           case flag
           when :build, :context
             append_tag(tag || option('tag', ignore: false) || self.tag)
@@ -424,6 +425,10 @@ module Squared
             end
           when :bake
             append_file(0, index: 3) unless from || op.arg?('f', 'file') || !anypath?(*COMPOSEFILE)
+            if op.first == '-'
+              op.shift
+              op << @output[4] if @output[4]
+            end
             unless op.empty?
               if !context && op.size > 1 && exist?(op.last, type: 'd')
                 pat = /\btarget\s+"#{Regexp.escape(op.last)}"/
@@ -454,10 +459,11 @@ module Squared
             docker_session('compose', command, '--', *service)
           else
             cmd, opts = docker_session('compose', opts: opts)
-            op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self, strict: strict?)
+            cp = OPT_DOCKER[:compose]
+            op = OptionPartition.new(opts, cp[:common], cmd, project: self, strict: strict?)
             append_file(filetype, force: flag == :publish) unless op.arg?('f', 'file')
             op << flag
-            op.parse(OPT_DOCKER[:compose].fetch(flag, []))
+            op.parse(cp.fetch(flag, []))
             if flag == :publish
               id ||= option('tag', ignore: false) || op.shift || tagmain
               registry ||= option('registry') || op.shift || @oci
@@ -488,10 +494,11 @@ module Squared
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
-          data = OPT_DOCKER[:container]
-          list = data.fetch(flag, [])
-          list += data[:create] if (rc = flag == :run)
-          list += data[:update] if rc ||= flag == :create
+          rc = flag == :run
+          ct = OPT_DOCKER[:container]
+          list = ct.fetch(flag, [])
+          list += ct[:create] if rc
+          list += ct[:update] if rc ||= flag == :create
           op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, args: rc || flag == :exec)
           from = symjoin 'container', flag
           case flag
@@ -645,7 +652,7 @@ module Squared
             raise_error ArgumentError, 'username/registry not specified', hint: flag unless registry
             uri = shell_quote tagjoin(registry, id)
             op << uri
-            img = docker_output 'image', 'tag', id, uri
+            img = docker_output 'image tag', id, uri
             return unless confirm_command(img.to_s, cmd.to_s, target: id, as: registry, title: from)
 
             @session = img
@@ -736,12 +743,12 @@ module Squared
           session('docker', *cmd, main: false, options: false, **kwargs)
         end
 
-        def append_command(flag, val, list, target: @session, prompt: ':')
-          list << if list.delete(prompt)
-                    readline('Enter command [args]', force: flag == :exec)
-                  else
-                    env('DOCKER_ARGS')
-                  end
+        def append_command(flag, id, list, target: @session, prompt: ':')
+          if list.delete(prompt)
+            list << readline('Enter command [args]', force: flag == :exec)
+          elsif (val = env('DOCKER_ARGS'))
+            list << val
+          end
           case flag
           when :run
             unless session_arg?('name', target: target)
@@ -750,8 +757,22 @@ module Squared
           when :exec
             raise_error ArgumentError, 'nothing to execute', hint: flag if list.empty?
           end
-          target << val << list.shift
-          target << list.join(' && ') unless list.empty?
+          target << id
+          case list.first
+          when '--'
+            target.merge(list.drop(1))
+          when /\A(--|&&)(\s|\z)/
+            target.merge(list)
+          else
+            target << list.shift
+            unless list.empty?
+              if list.first.start_with?('-')
+                target.merge(list)
+              else
+                target << list.join(' && ')
+              end
+            end
+          end
         end
 
         def append_file(type, target: @session, index: 2, force: false)
@@ -822,7 +843,7 @@ module Squared
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
-            y = from == :'image:rm' && option('y', prefix: 'docker')
+            y = from.to_s.end_with?(':rm') && option('y', prefix: 'docker')
             filter = env('DOCKER_FILTER', filter).to_s
             pat = if OptionPartition.pattern?(filter)
                     Regexp.new(filter)
@@ -963,7 +984,7 @@ module Squared
           end
           cmd.merge(Array(out).map { |val| val.split(/\s+/, 2).first })
           cmd << args
-          success?(run(cmd), ctx.start_with?('network', 'tag', 'save'))
+          success?(run(cmd, { 'NO_COLOR' => 'true' }), ctx.start_with?('network', 'tag', 'save'))
         end
 
         def filetype(val = dockerfile)

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

@@ -141,7 +141,6 @@ module Squared
         end
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue => e
-        log&.debug e
         warn log_warn(e, pass: true) if warning
       ensure
         @revlock = false
@@ -170,9 +169,10 @@ module Squared
           fetch: {
             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 upload-pack=q].freeze
+            pull: %w[n t 4|ipv4 6|ipv6 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
+                     upload-pack=q].freeze
           }.freeze,
           git: {
             add: %w[N|intent-to-add].freeze,
@@ -212,7 +212,7 @@ module Squared
                      graph ita-invisible-in-index minimal name-only name-status no-color-moved-ws no-prefix no-renames
                      numstat patch-with-raw patch-with-stat patience pickaxe-all pickaxe-regex raw shortstat summary
                      a|text abbrev=i? anchored=q break-rewrites=b? color=b color-moved=b color-moved-ws=b color-words=q?
-                     diff-algorithm=b diff-filter=e? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
+                     diff-algorithm=b diff-filter=q? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
                      find-object=b find-renames=b? ignore-matching-lines=q ignore-submodules=b? line-prefix=q
                      max-depth=n output=p output-indicator-context=q output-indicator-new=q output-indicator-old=q
                      relative=p rotate-to=p skip-to=p src-prefix=q stat=b? stat-count=i stat-width=i stat-name-width=i
@@ -277,7 +277,7 @@ module Squared
             checkout: %w[overwrite-ignore guess overlay progress recurse-submodules track].freeze,
             fetch: {
               base: %w[auto-gc auto-maintenance write-commit-graph write-fetch-head].freeze,
-              pull: %w[all ipv4 ipv6 recurse-submodules show-forced-updates tags].freeze
+              pull: %w[all recurse-submodules show-forced-updates tags].freeze
             },
             grep: %w[color exclude-standard recursive textconv].freeze,
             log: {
@@ -310,7 +310,7 @@ module Squared
           }.freeze,
           rebase: {
             send: %w[continue skip abort quit].freeze,
-            value: %w[true false merges interactive].freeze
+            value: %w[false true merges interactive].freeze
           }.freeze,
           reset: %w[soft mixed hard merge keep recurse-submodules no-recurse-submodules].freeze,
           revbuild: %w[untracked-files ignore-submodules ignored].freeze
@@ -601,10 +601,10 @@ module Squared
                           when 'i', 'E', 'F', 'P'
                             opts << last
                           else
-                            if last =~ /^(f(-ormat)?)=(.+)$/
+                            if last =~ /^f(?:-ormat)?=(.+)$/
                               opts.shift
                               opts << "format=#{$1}"
-                            elsif last =~ /^(max(-count)?)=(\d+)$/
+                            elsif last =~ /^max(?:-count)?=(\d+)$/
                               opts << "max-count=#{$1}"
                             else
                               grep << last
@@ -1201,7 +1201,11 @@ module Squared
                                                       first: (matchpathspec if flag == :push))
             case flag
             when :push
-              op.readline('Enter message', option: 'message', quote: true) if op.remove(':')
+              if op.remove(':')
+                op.readline('Enter message', option: 'message', quote: true)
+              else
+                append_message
+              end
               append_pathspec op.extras
             when :pop, :apply, :drop, :branch
               if op.remove(':')
@@ -1886,7 +1890,7 @@ module Squared
           op.add_quote(remote) if remote
           out, banner, from = source(io: true)
           print_item banner
-          ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
+          ret = write_lines(out, grep: op.extras)
           list_result(ret, flag.to_s, grep: op.extras, banner: banner, from: from)
         end
 
@@ -2101,7 +2105,7 @@ module Squared
           ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
           case ret
           when Array
-            ret.map(&:stripstyle)
+            ret.map { |val| val&.stripstyle }
           when String
             ret.stripstyle
           else
@@ -2186,9 +2190,9 @@ module Squared
           end
         end
 
-        def append_pathspec(files = [], target: @session, expect: false, **kwargs)
+        def append_pathspec(files = [], target: @session, expect: false, strict: strict?, **kwargs)
           if session_arg?('pathspec-from-file', target: target)
-            OptionPartition.clear(target, files, styles: theme[:inline])
+            OptionPartition.clear(target, files, strict: strict, styles: theme[:inline])
             true
           else
             option('pathspec', target: target) { |val| files = split_escape(val) } if files.empty?
@@ -2279,10 +2283,6 @@ module Squared
                                                                       stdout: stdout, banner: banner, **kwargs)
         end
 
-        def dryrun?(*, target: @session, prefix: target&.first)
-          Array(target).include?('--dry-run') || !option('dry-run', target: target, prefix: prefix).nil?
-        end
-
         def quiet?(*, target: @session, **)
           return silent? unless target
 

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

@@ -8,8 +8,8 @@ module Squared
           common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
           common_scripts: %w[dangerously-allow-all-scripts=!? strict-allow-scripts=!? allow-scripts=q].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
-          install_a: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
-                        package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
+          install_a: %w[audit=! bin-links=! engine-strict=!? foreground-scripts=!? fund=! ignore-scripts=!?
+                        install-links=!? package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
                         S|save=!?].freeze,
           install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
@@ -18,6 +18,7 @@ module Squared
           pack: %w[ignore-scripts=!? json=!? pack-destination=p].freeze,
           rebuild: %w[bin-links=! foreground-scripts=!? global=!? ignore-scripts=!? install-links=!?].freeze,
           'approve-scripts': %w[a|all allow-scripts-pending allow-scripts-pin=!? no-allow-scripts-pin json].freeze,
+          'deny-scripts': %w[a|all json].freeze,
           no: {
             install: %w[audit bin-links fund package-lock].freeze
           }.freeze
@@ -285,7 +286,7 @@ module Squared
 
                   format_desc action, nil, 'version?,args*'
                   task action, [:version] do |_, args|
-                    path = ->(s) { File.join(ENV['NVM_DIR'], s) }
+                    path = ->(s) { shell_quote(File.join(ENV['NVM_DIR'], s)) }
                     unless (version = args.version)
                       cmd = ". #{path.call('nvm.sh')} && nvm list --no-colors --no-alias"
                       version = pwd_set(from: :nvm) do
@@ -313,13 +314,41 @@ module Squared
                         outdated flag, args.to_a
                       end
                     when 'package'
-                      format_desc(action, flag, 'opts*', before: case flag
-                                                                 when :dedupe, :rebuild then nil
-                                                                 when :reinstall then 'f/orce?'
-                                                                 else 'name*'
-                                                                 end)
-                      task flag do |_, args|
-                        package flag, args.to_a
+                      case flag
+                      when :approve, :deny
+                        format_desc action, flag, 'name*|:,opts*'
+                        task flag do |_, args|
+                          args = args.to_a
+                          if args.first == ':'
+                            args.shift
+                            pwd_set do
+                              pad = 0
+                              list = IO.popen(npm_output('approve-scripts --allow-scripts-pending').to_s)
+                                       .each_with_object([]) do |line, out|
+                                         next unless line =~ /^\s+([a-z\d@][^@]*)@(\S+)/
+
+                                         pad = [pad, $1.size].max
+                                         out << [$1, $2]
+                                       end
+                                       .map { |name, ver| name.ljust(pad + 4) + ver }
+                              if list.empty?
+                                puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
+                                exit 0
+                              end
+                              args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
+                            end
+                          end
+                          package flag, args
+                        end
+                      else
+                        format_desc(action, flag, 'opts*', before: case flag
+                                                                   when :dedupe, :rebuild then nil
+                                                                   when :reinstall then 'f/orce?'
+                                                                   else 'name*'
+                                                                   end)
+                        task flag do |_, args|
+                          package flag, args.to_a
+                        end
                       end
                     when 'bump'
                       break unless version
@@ -627,8 +656,7 @@ module Squared
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session 'npm'
-              cmd << (ci = option('ci') ? 'ci' : 'install')
+              cmd = session('npm', (ci = option('ci', prefix: 'npm')) ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
                 cmd << case val
@@ -654,6 +682,14 @@ module Squared
                          quote_option 'allow-scripts', val
                        end
               end
+              option('engine-strict', ignore: false) do |val|
+                cmd << case val
+                       when '0', 'false'
+                         '--engine-strict=false'
+                       else
+                         '--engine-strict'
+                       end
+              end
               cmd << '--workspaces=false' if ws
               cmd << '--force' if option('force')
               append_nocolor
@@ -1463,8 +1499,7 @@ module Squared
                     next if yarntype(exist: true) == 0
                   when /^pnpm/
                     next if pnpmtype(exist: true) == 0
-                  when /^npm/
-                    nil
+                  when /^npm/ then nil
                   else
                     next
                   end
@@ -1518,8 +1553,8 @@ module Squared
         end
 
         def remove_modules(prefix = dependbin)
-          modules = basepath 'node_modules'
-          return false unless modules.directory? && confirm_basic('Remove?', modules, prefix: prefix)
+          modules = basepath!('node_modules', type: 'd')
+          return false unless modules && confirm_basic('Remove?', modules, prefix: prefix)
 
           modules.rmtree
         rescue Timeout::Error => e

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

@@ -36,9 +36,9 @@ module Squared
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
           install_a: %w[no-index pre prefer-binary all-releases=b extra-index-url=q f|find-links=q i|index-url=q
                         no-binary=q only-binary=q only-final=b].freeze,
-          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps require-hashes
-                        use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p requirements-from-script=p
-                        src=p].freeze,
+          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps require-hashes use-pep517
+                        build-constraint=p c|constraint=p group=q progress-bar=b r|requirement=p
+                        requirements-from-script=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
           install_d: %w[ignore-requires-python uploaded-prior-to=q].freeze,
           hash: %w[a|algorithm].freeze,
@@ -181,8 +181,8 @@ module Squared
                   format_desc action, nil, "script+|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     found = 0
-                    %w[tool.poetry.scripts tool.pdm.scripts project.scripts].each_with_index do |table, i|
-                      next if (list = read_pyproject(table)).empty?
+                    %w[tool.poetry tool.pdm project].each_with_index do |table, i|
+                      next if (list = read_pyproject("#{table}.scripts")).empty?
 
                       if args.command == '#'
                         format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: pyprojectfile)
@@ -208,7 +208,7 @@ module Squared
                               log.warn "run script #{n} of #{list.size}".subhint('out of range')
                             end
                           else
-                            case i
+                            case (i > 1 && poetry? ? 0 : i)
                             when 0
                               found |= 1
                               run(session_output('poetry', 'run', val), from: :run)
@@ -297,7 +297,7 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/uninstall,opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/ninstall?,opts*"
                         task flag do |_, args|
                           opts = args.to_a
                           if has_value!(opts, 'u', 'uninstall')
@@ -312,7 +312,7 @@ module Squared
                           end
                           file = pip(flag, opts: opts, banner: requirement.nil?, requirement: requirement)
                           puts File.read(file) unless silent?
-                          if requirement && confirm_basic('Uninstall?', file)
+                          if requirement && confirm_basic('Uninstall?', file, prefix: 'pip')
                             pip(:uninstall, opts: ['y', "r=#{shell_quote(file)}"])
                           end
                         end
@@ -482,7 +482,7 @@ module Squared
                               :patch
                             end
                    end
-                   '--not-required' if option('not-required', notequals: '0') && !env('PYTHON_DEFAULT')
+                   '--not-required' if option('not-required', notequals: '0')
                  end
           cmd << '--local' if option('l', 'local')
           append_global
@@ -607,17 +607,17 @@ module Squared
                                 project: self, strict: strict?, single: singleopt(flag))
           else
             op = append_pip(flag, opts, pipopts(:install), target: pip_session('install'))
-          end
-          case flag
-          when :editable
-            op << quote_option('e', op.pop || editable || '.')
-            op.clear
-          when :user, :upgrade
-            op.concat(packages)
-            raise_error ArgumentError, 'no packages listed', hint: flag if op.empty?
-            op << "--#{flag}"
-            op.append
-            python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
+            case flag
+            when :editable
+              op << quote_option('e', op.pop || editable || '.')
+              op.clear
+            when :user, :upgrade
+              op.concat(packages)
+              raise_error ArgumentError, 'no packages listed', hint: flag if op.empty?
+              op << "--#{flag}"
+              op.append
+              python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
+            end
           end
           run(banner: banner, from: :install)
         end
@@ -726,7 +726,7 @@ module Squared
             op.clear(pass: false)
           else
             if op.empty?
-              op << "#{dist.call}/*"
+              op.add_path(dist.call, '*')
             else
               op.add_path
             end
@@ -798,8 +798,7 @@ module Squared
             raise_error 'no subcommand', hint: flag if op.empty?
             op << (action = op.shift)
             case action
-            when 'dir', 'info', 'purge'
-              nil
+            when 'dir', 'info', 'purge' then nil
             when 'list', 'remove'
               op.add_first(quote: true)
             else
@@ -811,8 +810,7 @@ module Squared
             raise_error 'no subcommand', hint: flag if op.empty?
             op << (action = op.shift)
             case action
-            when 'list', 'edit', 'debug'
-              nil
+            when 'list', 'edit', 'debug' then nil
             when 'get', 'unset', 'set'
               op.add_first
               op.add_first(quote: true, expect: true) if action == 'set'
@@ -1091,8 +1089,7 @@ module Squared
             /\A(?:v+|q+|b+|V+|O+)\z/
           when :pdm, :poetry
             /\Av+\z/
-          when :twine, :meson
-            nil
+          when :twine, :meson then nil
           else
             /\A(?:v+|q+)\z/
           end

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

@@ -510,8 +510,7 @@ module Squared
                           opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath!('Gemfile.lock'))
                             case (val = ENV['BUNDLE_FROZEN'])
-                            when '0', 'false'
-                              nil
+                            when '0', 'false' then nil
                             else
                               if val
                                 print_error("BUNDLE_FROZEN: #{val}", loglevel: Logger::INFO, subject: name, hint: flag)
@@ -782,8 +781,7 @@ module Squared
                 next if val == '0' || val == 'false'
 
                 run(bundle_output('binstubs --all', case val
-                                                    when '1', 'true'
-                                                      nil
+                                                    when '1', 'true' then nil
                                                     else
                                                       if val.start_with?('~')
                                                         val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..-1])
@@ -1074,6 +1072,7 @@ module Squared
             buffer = []
             filter = kwargs.fetch(:filter, {})
             semver = filter[:semver]
+            dryrun = filter[:dryrun] || dryrun?(prefix: 'gem')
             update = if sync && filter[:select]
                        semver ||= 'major'
                        items = []
@@ -1226,7 +1225,7 @@ module Squared
                             'user-install'
                           end
                 end
-                if filter[:dryrun]
+                if dryrun
                   print_run gem_output('update -f', *update.quote!(escape: true)), false
                 else
                   gem(:update, *update, opts: opts)
@@ -1268,8 +1267,8 @@ module Squared
                 .clear(pass: false)
             end
           when :push
-            if op.empty? || (n = op.index(':'))
-              file = basepath(if !n && (spec = gemspec)
+            if op.empty? || ia
+              file = basepath(if !ia && (spec = gemspec)
                                 "#{spec.name}-#{spec.version}.gem"
                               else
                                 choice_index 'Select a file', Dir.glob('*.gem', base: path)
@@ -1922,8 +1921,7 @@ module Squared
               val = case (val = $2)
                     when 'true'
                       true
-                    when '', '[]'
-                      nil
+                    when '', '[]' then nil
                     else
                       if val =~ /\A\[:(.+)\]\z/
                         $1.split(', :').map { |s| (s[/\A"(.+)"\z/, 1] || s).to_sym }

data/lib/squared/workspace/project/support/optionpartition.rb

@@ -87,8 +87,25 @@ module Squared
 
             def strip(val)
               val = shell_split val if val.is_a?(String)
-              Array(val).map { |s| s.sub(OPT_SINGLE, '\1=\2').sub(OPT_VALUE, '\1=\2').sub(OPT_NAME, '\2') }
-                        .reject(&:empty?)
+              ret = []
+              pass = -1
+              (args = Array(val)).each_with_index do |s, i|
+                next if s.empty? || pass == i
+
+                if s == '--'
+                  ret << s << args[i.succ..-1].join(' ')
+                  break
+                end
+                next ret << s unless s.start_with?('-')
+
+                if !s.include?('=') && (j = args[i.succ]) && !j.start_with?('-')
+                  ret << "#{s.sub(/^-{1,2}/, '')}=#{j}"
+                  pass = i.succ
+                else
+                  ret << s.sub(OPT_SINGLE, '\1=\2').sub(OPT_VALUE, '\1=\2').sub(OPT_NAME, '\2')
+                end
+              end
+              ret
             end
 
             def select(list, bare: true, no: true, single: false, double: false)
@@ -152,8 +169,11 @@ module Squared
             end
 
             def pattern?(val)
+              Regexp.new(val)
               val.start_with?('\A', '^') || val.end_with?('\z', '$') ||
               val.match?(/[.)][*+?]|\(\?[:=!><]|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
+            rescue RegexpError
+              false
             end
 
             private
@@ -251,13 +271,13 @@ module Squared
                       else
                         [flag]
                       end
+                bare.concat(mod) if val.chomp!('?')
+                m.concat(mod) if val.chomp!('m')
                 case val[n.succ]
                 when 'e'
                   e.concat(mod)
                 when 'b'
                   b.concat(mod)
-                when 'm'
-                  m.concat(mod)
                 when 'q'
                   qq.concat(mod) if val[n + 2] == 'q'
                   q.concat(mod)
@@ -276,11 +296,7 @@ module Squared
                 when '+'
                   ml.concat(mod)
                   bare.concat(mod)
-                else
-                  next
                 end
-                m.concat(mod) if val[n + 2] == 'm'
-                bare.concat(mod) if val.end_with?('?')
               else
                 bare << val
                 mod = [val]
@@ -315,7 +331,7 @@ module Squared
             end
             numtype = [
               [i, /\A\d+\z/],
-              [f, /\A\d*(?:\.\d+)?\z/],
+              [f, /\A(\d+(\.\d*)?|\d*\.\d+)\z/],
               [si, /\A-?\d+\z/]
             ].freeze
             numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && v.match?(pat) } }
@@ -360,8 +376,8 @@ module Squared
                   elsif has.call(q)
                     add quote_option(key, val, double: has.call(qq), **kwargs)
                   elsif has.call(p)
-                    if val.match?(/\A(["']).+\1\z/)
-                      add shell_option(key, val, escape: false, **kwargs)
+                    if val =~ /\A(["']).+\1\z/
+                      add shell_option(key, val, double: $1 == '"', escape: false, **kwargs)
                     elsif path
                       add quote_option(key, path + val, **kwargs)
                     else

data/lib/squared/workspace/repo.rb

@@ -184,8 +184,7 @@ module Squared
               end
               env('REPO_GROUPS', **envargs) do |val|
                 g = case val
-                    when '0', 'false'
-                      nil
+                    when '0', 'false' then nil
                     else
                       val
                     end

data/lib/squared/workspace/series.rb

@@ -209,8 +209,9 @@ module Squared
         already_invoked? parallel, val
       end
 
-      def exclude?(key, empty = false)
-        @exclude.include?(key) || (empty && (!key?(key) || self[key].empty?))
+      def exclude?(key, fallback = false, empty: nil)
+        fallback = empty unless empty.nil?
+        @exclude.include?(key) || (fallback && (!key?(key) || self[key].empty?))
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.11
 platform: ruby
 authors:
 - An Pham
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []