squared 0.6.17 → 0.6.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2390f7c0bb110d16dd19ad08cd75e166953b9cccf7c57215301ae997fd05bbe2
-  data.tar.gz: e91ec4e023247fd9ce4faf5e4f95a8b2723f801fd2b15bccd47ba7c519c674da
+  metadata.gz: 610a359081c94c9a38364e97e392a3e8f380eeb5d4b676df490640e00f32c89b
+  data.tar.gz: 5cede396fcf2a352dddb44a2df4cb2befa87e87359c8093f3b909fe05cab58a4
 SHA512:
-  metadata.gz: b53882da825e403432228e0e83aa152ffb4846ae6a1f73a49b26ffc796b16c6cd78dcaafd356a39c26c96c77370c7a644bd20ca9329493dd6eeee4bc90323fd5
-  data.tar.gz: 2117e0d6c0bdcb1c31ad6acdf6aaa05322abe820060dd76683a93ed8d96f7c0b9183d37db5ca3df55949b852b83ea4713c9f7d99158ac44de1c1433102c0960e
+  metadata.gz: 47264b07af707f8053591cdce3d9dce6a9fdf8cd6fa051d41745e604cb89cd5c1de571da1dcb7ae816236989aafbb1d742b83cea9c937cb2e64dd4f92f362212
+  data.tar.gz: d2bbf7f1895fa7d4b1fb4017ad371adff3921b26fe6fb14d21d10306f1b8ca701b01ae5d1cf0dc0ceb454d1625a30f47e128165aae65c55e48c9ea9d10f799e7

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.6.18] - 2026-09-04
+
+### 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] - 2026-09-04
+
+### Fixed
+
+- Node command nvm did not quote executable path.
+
+## [0.4.41] - 2026-09-04
+
+### 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.6.17] - 2026-08-06
 
 ### Added
@@ -1757,6 +1791,7 @@
 
 - Changelog was created.
 
+[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
@@ -1775,6 +1810,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
@@ -1801,6 +1837,7 @@
 [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

data/lib/squared/common/base.rb

@@ -14,6 +14,7 @@ module Squared
       CHOICE: 25,
       QUOTE: "'",
       SPACE: ' => ',
+      SUCCESS: 'Success',
       GRAPH: %w[| - | \\ -].freeze,
       BORDER: %w[| - - - - - | | - -].freeze,
       VIEW: 'view',

data/lib/squared/common/prompt.rb

@@ -56,11 +56,12 @@ 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 do |val|
-            next if grep&.none? { |pat| pat.match?(line) }
+            next if grep&.none? { |pat| pat.match?(val) }
 
             items << val.to_s.chomp
             puts '%2d. %s' % [items.size, val]
@@ -77,7 +78,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
@@ -106,8 +107,8 @@ module Squared
                   k.flatten!
                   k.uniq!
                   k.sort!
-                  unless multiple.is_a?(::Numeric) && multiple != k.size
-                    return index || !items ? k : k.map! { |i| items[i.pred] }
+                  unless multiple.is_a?(::Array) && !multiple.include?(k.size)
+                    return index || !items ? k : k.map { |i| items[i.pred] }
                   end
                 end
               elsif between.call(ch)

data/lib/squared/common/utils.rb

@@ -136,7 +136,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_value(key, default = '', suffix: nil, strict: false)

data/lib/squared/version.rb

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

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

@@ -1532,7 +1532,7 @@ module Squared
         end
 
         def print_success
-          puts 'Success'
+          puts ARG[:SUCCESS]
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
@@ -1969,7 +1969,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
             loop do
               item = accept.first
               c = confirm("#{item[0]}#{" [#{hint}]" if hint}", item[2] ? 'Y' : 'N')
@@ -1985,7 +1988,7 @@ module Squared
             exit 1 unless 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

@@ -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
@@ -37,9 +37,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
@@ -47,13 +47,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 type=b].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
@@ -393,6 +394,10 @@ module Squared
             append_tag(tag || option('tag', ignore: false) || self.tag)
             append_context context
           when :bake
+            if op.first == '-'
+              op.shift
+              op << @output[4] if @output[4]
+            end
             unless op.empty?
               if !context && op.size > 1 && basepath(op.last).directory?
                 pat = /\btarget\s+"#{Regexp.escape(op.last)}"/
@@ -703,8 +708,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 << val
+          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)
@@ -923,7 +942,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,
@@ -210,7 +211,7 @@ module Squared
                      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 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 submodule=b?
@@ -268,7 +269,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: {
@@ -586,10 +587,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
@@ -1775,7 +1776,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
 

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

@@ -267,7 +267,7 @@ module Squared
                     version = param_guard(action, 'version', args: args, key: :version)
                     args = args.extras
                     args << readline('Enter command', force: true) if args.empty?
-                    args.unshift(File.join(ENV['NVM_DIR'], 'nvm-exec'))
+                    args.unshift(shell_quote(File.join(ENV['NVM_DIR'], 'nvm-exec')))
                     run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
                   end
                 when 'pack'

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

@@ -651,7 +651,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

@@ -88,8 +88,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)
@@ -141,7 +158,11 @@ module Squared
             end
 
             def pattern?(val)
-              val.match?(/\A\^|\$\z/) || val.match?(/[.)][*+?]|\(\?:|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
+              Regexp.new(val)
+              val.start_with?('\A', '^') || val.end_with?('\z', '$') ||
+              val.match?(/[.)][*+?]|\(\?[:=!><]|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
+            rescue RegexpError
+              false
             end
 
             private
@@ -282,7 +303,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) } }
@@ -317,8 +338,8 @@ module Squared
                   elsif q.include?(key)
                     add quote_option(key, val, double: qq.include?(key), merge: merge, sep: sep)
                   elsif p.include?(key)
-                    if val.match?(/\A(["']).+\1\z/)
-                      add shell_option(key, val, escape: false, merge: merge, sep: sep)
+                    if val =~ /\A(["']).+\1\z/
+                      add shell_option(key, val, double: $1 == '"', escape: false, merge: merge, sep: sep)
                     elsif path
                       add quote_option(key, path + val, merge: merge, sep: sep)
                     else

metadata

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