squared 0.7.10 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf477ce6ea561419bddfea1572f95762934d01c5d5e94bd3cd65e027a96bdcc8
-  data.tar.gz: ffbdcaea4e1a2dc293b75fe99c8e121baa444c8784175aa6117134921fb59e46
+  metadata.gz: a1f82d48ab79c1dc869f6c34dbef07e57c7b1bd9cc0ce8b54582d2029d5e9889
+  data.tar.gz: 55526a1592b3b6ef2aec992288fd74b7772837abc733d4eb6dc69f9e7a208cc6
 SHA512:
-  metadata.gz: e86f20679d0f906ed3ae080963014c88f2b747dd5570d3e8bf0037f7f0d4670ce257dc6720b13d94fc8f044f16e89a535f09634f7cee8bc5d7061a2f8d2b7485
-  data.tar.gz: 41c08e924735c9626889f6075a3eb3b5a00bf8f9e9b487ccf29f9de161a3b93702ee1658ea9a73d323bceea31671ea08ab74f58ad83151a5e5bd2929351c6c60
+  metadata.gz: 4b60c4bd1db9d601b87ae2e686c3d7ec2190cf766307186a682e10f0e200e5e5280196a7eb55d3c9821707189e9953b6ba1a76c2757ad1f10fec3c96e0d88a83
+  data.tar.gz: b4527aff9694bf17460b65f0395d30147faaf5ccaee9042ac47e5d81d5f988470ff8e878e20f6a8dc22c39d7bcc166e15e953443a0785d46a71c5cb2aece8871

data/CHANGELOG.md

@@ -1,5 +1,76 @@
 # Changelog
 
+## [0.7.12] - 2026-09-23
+
+### Fixed
+
+- See `0.4.42`.
+
+## [0.6.19]
+
+### Fixed
+
+- See `0.4.42`.
+
+## [0.5.27]
+
+### Fixed
+
+- See `0.4.42`.
+
+## [0.4.42]
+
+### Fixed
+
+- OptionPartition did not strip pre-existing quotes when parsing options.
+- Node command outdated did not strip styling from semver in package.json.
+- Git command show did not recognize object names.
+- Docker destination mounts that are not absolute are treated as errors.
+- Docker source mounts for any named volumes or images were inoperable.
+
+## [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.
+
+## [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
@@ -1947,6 +2018,8 @@
 
 - Changelog was created.
 
+[0.7.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.12
+[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
@@ -1958,6 +2031,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.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.19
+[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
@@ -1976,6 +2051,8 @@
 [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.27]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.27
+[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
@@ -2002,6 +2079,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.42]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.42
+[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

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',

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,7 +77,7 @@ 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
@@ -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/version.rb

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

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

@@ -1703,7 +1703,7 @@ module Squared
         end
 
         def print_success
-          puts 'Success'
+          puts ARG[:SUCCESS]
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
@@ -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

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

@@ -16,19 +16,19 @@ module Squared
                       cgroup-parent=b iidfile=p label=q network=b no-cache-filter=b o|output=q platform=q
                       q|quiet secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
             bake: %w[print list=q set=q].freeze,
-            shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p progress=b provenance=q
-                       sbom=q].freeze
+            shared: %w[check load no-cache pull push allow=qq call=b? f|file=p metadata-file=p progress=b provenance=b?
+                       sbom=b?].freeze
           }.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,
+            common: %w[1 all-resources compatibility dry-run ansi=b env-file=p f|file=p parallel=n profile=b progress=b
+                       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,
@@ -81,10 +82,10 @@ module Squared
         VAL_DOCKER = {
           run: {
             common: %w[source src destination dst target readonly ro].freeze,
-            bind: %w[bind-propagation].freeze,
+            bind: %w[bind-create-src bind-propagation].freeze,
             volume: %w[volume-subpath volume-nocopy volume-opt].freeze,
             tmpfs: %w[tmpfs-size tmpfs-mode].freeze,
-            image: %w[image-path].freeze
+            image: %w[image-subpath].freeze
           }.freeze,
           ls: {
             compose: %w[Name Image Command Service RunningFor Status Ports CreatedAt ExitCode Health ID Labels
@@ -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
@@ -520,21 +527,33 @@ module Squared
                       end
                     end
                     case k
-                    when 'readonly', 'ro'
-                      out << k
+                    when 'readonly', 'ro', 'volume-nocopy', 'bind-create-src'
+                      out << k if %w[bind volume].include?(type)
                       next
-                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
-                      raise_error ArgumentError, "#{k}: no path value", hint: flag unless v
-                      v = basepath v
+                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-subpath'
+                      raise_error ArgumentError, "no path value: #{k}", hint: flag unless v
+                      case k
+                      when 'source', 'src'
+                        if type == 'bind'
+                          v = basepath v
+                        elsif type == 'tmpfs'
+                          next
+                        end
+                      when 'destination', 'dst', 'target'
+                        unless v.start_with?('/')
+                          print_error(Logger::ERROR, "path is not absolute: #{v}", subject: from, hint: k)
+                          next
+                        end
+                      end
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
                     out << "#{k}=#{q}#{v}#{q}"
                   elsif !silent?
-                    log_message('unrecognized option', subject: from, hint: k)
+                    puts log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
                 raise_error TypeError, 'none specified', hint: flag unless type
-                cmd << "--mount type=#{type},#{args.join(',')}"
+                op << "--mount type=#{type},#{args.join(',')}"
               end
             end
             append_command(flag, id || tagmain, op.extras)
@@ -543,7 +562,7 @@ module Squared
             op.append(escape: true, strip: /^:/)
           when :commit
             latest = op.shift || tagmain
-            cmd << id << latest
+            op << id << latest
             raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag unless op.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
 
@@ -564,7 +583,7 @@ module Squared
           else
             if op.empty?
               ps, status, no = filter_ps flag, from
-              cmd << '--no-stream' if flag == :stats
+              op << '--no-stream' if flag == :stats
               list_image(flag, ps, no: no, hint: status, from: from) { |img| run(cmd.temp(img), from: from) }
               return
             end
@@ -637,7 +656,7 @@ module Squared
               registry = op.shift
               registry ||= option('registry') || @registry unless id.include?('/')
             end
-            cmd << shell_quote(tagjoin(registry, id))
+            op << shell_quote(tagjoin(registry, id))
           when :push
             id ||= option('tag', ignore: false) || op.shift || tagmain
             registry ||= option('registry') || op.shift || @registry
@@ -645,7 +664,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 +755,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 +769,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 +855,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 +996,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

@@ -169,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,
@@ -211,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
@@ -276,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: {
@@ -309,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
@@ -600,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
@@ -1200,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(':')
@@ -1816,7 +1821,7 @@ module Squared
             cmd << '--textconv'
             append_value(files.flat_map { |val| Dir[val] }
                               .select { |val| projectpath?(val) }
-                              .map { |val| shell_quote("HEAD:#{val}") })
+                              .map { |val| "HEAD:#{val}" })
             source(banner: false)
             return
           when :oneline
@@ -1830,11 +1835,11 @@ module Squared
           else
             opts << format if format
           end
-          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + OPT_GIT[:log][:diff] + OPT_GIT[:log][:diff_context]
+          list = OPT_GIT[:show] + OPT_GIT[:diff][:show] + collect_hash(OPT_GIT[:log], pass: [:base])
           op = OptionPartition.new(opts, list, cmd,
                                    project: self, strict: strict?,
                                    no: OPT_GIT[:no][:show] + collect_hash(OPT_GIT[:no][:log], pass: [:base]))
-          op.append(delim: true)
+          op.append
           source(exception: false, banner: flag != :oneline)
         end
 
@@ -1885,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
 
@@ -1910,8 +1915,7 @@ module Squared
           when :'sparse-checkout'
             cmd << 'set'
           end
-          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?,
-                                                    no: OPT_GIT[:no][flag], single: /\A\d+\z/,
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, no: OPT_GIT[:no][flag],
                                                     first: case flag
                                                            when :blame, :revert, :'sparse-checkout' then nil
                                                            else matchpathspec
@@ -2185,9 +2189,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?

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

@@ -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
@@ -830,17 +859,17 @@ module Squared
               end
               a = a.ljust(col1)
               b = b.ljust(col2)
-              sub_style! b, theme[:current] if theme[:current] && !stdin?
+              b = sub_style b, theme[:current] if theme[:current] && !stdin?
               if cur == -1
                 c = 'SKIP'
               elsif modified == cur
                 c = 'FAIL'
               elsif !stdin?
                 if d == 1
-                  sub_style! a, theme[:major]
-                  sub_style! c, :bold, color(:green)
+                  a = sub_style a, theme[:major]
+                  c = sub_style c, :bold, color(:green)
                 else
-                  sub_style!(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
+                  c = sub_style(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
                 end
                 g = item
               end
@@ -913,8 +942,8 @@ module Squared
               b = sub_style b.ljust(col2), color(d ? :red : :yellow)
               c = c.ljust(col3)
               unless d
-                sub_style! a, theme[:active]
-                sub_style! c, color(:green)
+                a = sub_style a, theme[:active]
+                c = sub_style c, color(:green)
                 pending += 1
               end
               puts "#{pad.call(i, avail)}. #{(a + c + b).subhint(d ? 'locked' : 'latest')}"

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

@@ -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

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) } }
@@ -348,6 +364,10 @@ module Squared
                 if opt =~ OPT_VALUE
                   key = $1
                   val = $2
+                  if val =~ /\A(["'])(.+)\1\z/
+                    val = $2
+                    double = $1 == '"'
+                  end
                   has = lambda do |a|
                     return true if a.include?(key)
                     return false unless (k = a.find { |s| s.end_with?(':*') })
@@ -355,12 +375,14 @@ module Squared
                     key.start_with?(k.chomp('*')) && !key.end_with?(':')
                   end
                   kwargs = { sep: se[key] || sep, merge: has.call(m), switch: sw[key] }
+                  kwargs[:double] = double unless double.nil?
                   if has.call(e) || (has.call(bl) && %w[true false].include?(val))
                     add shell_option(key, val, **kwargs)
                   elsif has.call(q)
-                    add quote_option(key, val, double: has.call(qq), **kwargs)
+                    kwargs[:double] = true if has.call(qq, key)
+                    add quote_option(key, val, **kwargs)
                   elsif has.call(p)
-                    if val.match?(/\A(["']).+\1\z/)
+                    if !double.nil?
                       add shell_option(key, val, escape: false, **kwargs)
                     elsif path
                       add quote_option(key, path + val, **kwargs)

data/lib/squared/workspace/repo.rb

@@ -280,7 +280,7 @@ module Squared
         env('REPO_OPTIONS', **kwargs) { |val| cmd << val } if options
         cmd = cmd.join(' ')
         puts log_message(cmd, subject: main, hint: root) if verbose
-        Common::System.shell(cmd, chdir: root, exception: exception)
+        Common::System.shell(cmd, chdir: root, exception: exception || env('REPO_FAIL', equals: %w[1 true]))
       end
 
       def repo_bin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.12
 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.15
+rubygems_version: 4.0.21
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []