squared 0.4.39 → 0.4.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba521fe28499cd80a453a06d45ad6e7f3561fbeb7e346731b3c90a570e5d1d8c
-  data.tar.gz: 3f1a4dc8c680f53bb44ba3e48560858ead77a61dbb4d962e8be7f26e123d9abb
+  metadata.gz: 0137c48f9621363ac233e21140260861850c84e7b443c9f57b9b1b4b08a2a975
+  data.tar.gz: 85b0d24ef514398a93dd28fe6ba08620647023344eed66eb1aef0540610f9afc
 SHA512:
-  metadata.gz: a783109febd933dda7e85b97196e4085910b28067946c07fefe565c7bfe2f728acfe7bc88b1ac6b99ae1cd8c76ec3cfef9635f74e7c7fe9c3e2e4fd4ec77e117
-  data.tar.gz: 2cb847e0e72dc274b567b37a4f6e91f21a850c0ecc4c787fecfa022d2f858fcc9a67d0a0d75a6788c551abe02e8409c8ba4e429b274a9069d5dc6b5e18d27ea4
+  metadata.gz: 1a6e89292a3c9e1c1cc1536750aa499f4d7c09981d5ffefa8da42879071d9861d23c03e761acd3762e08045827020050e302e07ecfd419fb9180173eae1597a7
+  data.tar.gz: e41b4bbbb2b42091ebe9429e0cf4f413b44bbf25da37bc07a2afdb06b96c59f52d1670605dece335b485b2d9bfdc7f2097bebdc22824489ae1f136e516b42975

data/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## [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.4.40] - 2026-08-06
+
+### Changed
+
+- Series method exclude? was made compatible with v0.8 signature.
+
 ## [0.4.39] - 2026-07-04
 
 ### Changed
@@ -1240,6 +1263,8 @@
 
 - Changelog was created.
 
+[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

@@ -14,6 +14,7 @@ module Squared
       CHOICE: 25,
       QUOTE: "'",
       SPACE: ' => ',
+      SUCCESS: 'Success',
       GRAPH: ['|', '-', '|', '\\', '-'].freeze,
       BORDER: ['|', '-', '-', '-', '-', '-', '|', '|', '-', '-'].freeze,
       VIEW: 'view',
@@ -90,6 +91,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

@@ -40,7 +40,7 @@ module Squared
           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 "#{items.size.to_s.rjust(2)}. #{val}"
@@ -54,7 +54,7 @@ module Squared
                                            end}] "
           end
         end
-        valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
+        valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max <= min ? Float::INFINITY : max) }
         Timeout.timeout(timeout) do
           begin
             while (ch = Readline.readline(msg))

data/lib/squared/common/utils.rb

@@ -122,7 +122,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.4.39'
+  VERSION = '0.4.41'
 end

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

@@ -1232,7 +1232,7 @@ module Squared
         def env(key, default = nil, suffix: nil, equals: nil, ignore: nil, strict: false)
           a = "#{key}_#{@envname}"
           ret = if suffix
-                  ENV.fetch("#{a}_#{suffix}", '')
+                  ENV["#{a}_#{suffix}"] || (ignore == false && ENV["#{key}_#{suffix}"]) || ''
                 elsif strict
                   ENV[a].to_s
                 else
@@ -1300,7 +1300,7 @@ module Squared
         end
 
         def print_success(*)
-          puts 'Success'
+          puts ARG[:SUCCESS]
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
@@ -1465,7 +1465,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))
             type = "__#{type}__"
             if (extra = data[type] || data[type.to_sym]).is_a?(Hash)
               data = data.merge(extra)
@@ -1681,7 +1681,10 @@ module Squared
           if accept
             hint = Array(ret).map { |val| sub_style(val, styles: 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
               d, e = item[2] ? ['Y', '[Y/n]'] : ['N', '[y/N]']
@@ -1698,7 +1701,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,13 +21,13 @@ module Squared
           }.freeze,
           compose: {
             common: %w[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=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,
-            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
@@ -36,9 +36,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
                        disable-content-trust=b? 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
@@ -47,13 +47,14 @@ module Squared
                        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,
+                       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=b pids-limit=n
                        restart=q].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
+            exec: %w[d|detach i|interactive privileged t|tty=!? detach-keys=q e|env=qq env-file=p user=b
                      w|workdir=q].freeze,
+            rm: %w[f|force l|link v|volumes].freeze,
             commit: %w[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,
@@ -607,8 +608,22 @@ module Squared
           when :exec
             raise_error('no command args', 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)
@@ -783,7 +798,7 @@ module Squared
             end
             cmd.merge(Array(out).map! { |val| parse.call(val) })
             cmd << args
-            print_success if success?(run(cmd)) && ctx.match?(/\A(?:network|tag|save)/)
+            print_success if success?(run(cmd, { 'NO_COLOR' => 'true' })) && ctx.match?(/\A(?:network|tag|save)/)
           end
         end
 

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

@@ -133,7 +133,6 @@ module Squared
         end
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue StandardError => e
-        log&.debug e
         warn log_message(Logger::WARN, e, pass: true) if warning
       ensure
         @revlock = false
@@ -172,7 +171,7 @@ module Squared
           }.freeze,
           fetch: {
             base: %w[multiple 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
+            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
@@ -208,7 +207,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? inter-hunk-context=i
                      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
@@ -263,7 +262,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
             },
             log: {
               base: %w[decorate mailmap merges use-mailmap].freeze,
@@ -1718,7 +1717,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/python.rb

@@ -159,7 +159,7 @@ module Squared
                               log.warn "run script #{n} of #{list.size} (out of range)"
                             end
                           else
-                            case index
+                            case (index > 1 && poetry? ? 0 : index)
                             when 0
                               found |= 1
                               run(session_output('poetry', 'run', val), from: :run)
@@ -542,7 +542,7 @@ module Squared
           case flag
           when :hatch, :twine
             if op.empty?
-              op.push("#{dist.call}/*")
+              op.push(dist.call.join('*'))
             else
               op.map! { |val| basepath(val) }
             end

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

@@ -74,7 +74,25 @@ module Squared
               return [] unless val
 
               val = shell_split val if val.is_a?(String)
-              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)
@@ -103,7 +121,11 @@ module Squared
             end
 
             def pattern?(val)
-              val.match?(/(?:\A\^|\$\z)/) || val.match?(/(?:\.[*+]|\(\?:|\\[dsw]|\[.+\]|\{\d+,?\d*})/)
+              Regexp.new(val)
+              val.start_with?('\A', '^') || val.end_with?('\z', '$') ||
+              val.match?(/[.)][*+?]|\(\?[:=!><]|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
+            rescue RegexpError
+              false
             end
 
             private
@@ -233,7 +255,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) && pat.match?(v) } }
@@ -258,8 +280,8 @@ module Squared
                   elsif q.include?(key)
                     add quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key)
-                    if val.match?(/\A(["']).+\1\z/)
-                      add shell_option(key, val, escape: false, merge: merge)
+                    if val =~ /\A(["']).+\1\z/
+                      add shell_option(key, val, double: $1 == '"', escape: false, merge: merge)
                     elsif path
                       add quote_option(key, path + val, merge: merge)
                     else

data/lib/squared/workspace/series.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.39
+  version: 0.4.41
 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: []