squared 0.4.22 → 0.4.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f67ab37dd0b66feaeb78631ac257ba860df78acba313f2e5fe2ffeb01136acf
-  data.tar.gz: 8d0570c44cbdf41ba282b5c2fd9a0196b4c5678d595ca5774393b442b88eb854
+  metadata.gz: c07babae909a985bae708b8a2bec453b223d9889af828da70d990609e9966142
+  data.tar.gz: 5375a660bbcc0f49b5a3eaad5ab2740b103beeb3823a0d7b027b9005bf39faa9
 SHA512:
-  metadata.gz: 01b00bf5afdd80a370ef363c0d546f76d8f2533474b25029fc37c9bb0bfb1b2104ea4aa78c38cb044cf8d2f194630496b6d1b48ad4d94e8be284b28dd5dfa03c
-  data.tar.gz: 3968c3a15796f1c41939b95b4e50c8a8830f7f95fb6570a193c24c0043e259c82c6ac28571bd4cdbcddd2b77d6b47f38b55a963c3e567bad6e8e949a41ba8698
+  metadata.gz: 23cd1e57c7d0039fed851d6d426eec51022dba2c26bbce9faafddd20ded4aad3d00d6db023c3a99e2aa485aace597567df4f603130746daa5dc5e2d661c658dd
+  data.tar.gz: cb9556662d393d458413df3669f9859b4b3df9d9ca3e659b9098fac0d550349eaf8b414e6cb85b0828f522f3b78f1627c282350eb6b9b62218f76413ebcaabb8

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [0.4.24] - 2025-10-17
+
+### Added
+
+- Repo task [init|all] can bypass dev? copy requirement with REPO_STAGE=4.
+
+### Changed
+
+- Node command outdated does not check PNPM minimum version.
+
+### Fixed
+
+- Project base rescue error handling used reversed parameters.
+- Project absolute paths did not append wildcard with trailing slash.
+- Powershell commands did not escape nested double quotes.
+- OptionPartition did not strip flags without a value.
+- Project base method add did not use parent context.
+- Application property pipe did not parse numeric values.
+
+## [0.4.23] - 2025-10-11
+
+### Fixed
+
+- Node task outdated did not compare wanted and latest by semver.
+- Project base method append_hash did not have target when joined.
+- Docker build for compose and bake was completely incapacitated.
+
 ## [0.4.22] - 2025-10-08
 
 ### Added
@@ -1010,6 +1037,8 @@
 
 - Changelog was created.
 
+[0.4.24]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.24
+[0.4.23]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.23
 [0.4.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.22
 [0.4.21]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.21
 [0.4.20]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.20

data/README.md

@@ -723,7 +723,7 @@ REPO_SYNC            # 0,1
 REPO_URL             # manifest repository
 REPO_MANIFEST        # e.g. latest,nightly,prod
 REPO_GROUPS          # e.g. base,prod,docs
-REPO_STAGE           # 0,1,2,3
+REPO_STAGE           # 0,1,2,3,4
 REPO_SUBMODULLES     # 0,1
 REPO_TIMEOUT         # confirm dialog (seconds)
 ```

data/lib/squared/common/format.rb

@@ -178,8 +178,9 @@ module Squared
         args = args.map(&:to_s)
         if level.is_a?(::Numeric)
           if append && respond_to?(:log)
-            ref = log rescue nil
-            ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(Logger)
+            (log rescue nil).tap do |ref|
+              ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(Logger)
+            end
           end
           return false if !pass && level < ARG[:LEVEL]
         end
@@ -217,7 +218,8 @@ module Squared
       module_function
 
       def message(*args, hint: nil, empty: false, space: ARG[:SPACE])
-        (empty ? args.reject { |val| val.nil? || val.empty? } : args).join(space) + (hint ? " (#{hint})" : '')
+        (empty ? args.reject { |val| val.nil? || (val.respond_to?(:empty?) && val.empty?) } : args)
+          .join(space) + (hint ? " (#{hint})" : '')
       end
 
       def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, pipe: nil,

data/lib/squared/common/shell.rb

@@ -16,15 +16,15 @@ module Squared
           elsif !r[3] || r[6]
             return val
           end
-          if r[7].match?(/\A["']/)
-            opt = "#{r[7]}#{r[7][0]}"
-          elsif r[7].match?(/["']\z/)
-            opt = "#{r[7][-1]}#{r[7]}"
-          else
-            return val unless r[7].match?(/\s/)
-
-            opt = r[7]
-          end
+          opt = if r[7].match?(/\A["']/)
+                  "#{r[7]}#{r[7][0]}"
+                elsif r[7].match?(/["']\z/)
+                  "#{r[7][-1]}#{r[7]}"
+                else
+                  return val unless r[7].match?(/\s/)
+
+                  r[7]
+                end
           r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, double: double, force: force, override: override)
         elsif option && val =~ /\A([^=]+)=(.+)\z/m
           return val if $2.match?(/\A(["']).+\1\z/m)
@@ -65,15 +65,15 @@ module Squared
           escape = false
           override = true
         end
-        if flag[0] == '-'
-          b = flag[1] == '-' ? '=' : ' '
-        elsif flag.size == 1
-          a = '-'
-          b = merge ? '' : ' '
-        else
-          a = '--'
-          b = '='
-        end
+        b = if flag[0] == '-'
+              flag[1] == '-' ? '=' : ' '
+            elsif flag.size == 1
+              a = '-'
+              merge ? '' : ' '
+            else
+              a = '--'
+              '='
+            end
         "#{a}#{flag}#{unless val.nil?
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote, double: double, override: override)

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -140,7 +140,7 @@ module Squared
         return unless @pipe.is_a?(Pathname)
 
         msg = "Session started on #{Time.now} by #{@main}"
-        bord = '#' * s.size
+        bord = '#' * msg.size
         puts bord, msg, bord
       end
 

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

@@ -2,7 +2,6 @@
 
 require 'json'
 require 'date'
-require 'time'
 require 'logger'
 
 module Squared
@@ -209,7 +208,7 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          unless @output[2] == false || !(val = env('BUILD', suffix: 'ENV'))
+          if (val = env('BUILD', suffix: 'ENV')) && @output[2] != false
             @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
           end
           unless @output[0] == false || @output[0].is_a?(Array)
@@ -411,6 +410,7 @@ module Squared
           kwargs[:group] = group unless kwargs.key?(:group)
           kwargs[:ref] = ref unless kwargs.key?(:ref)
           parent = self
+          proj = nil
           name = case name
                  when String, Symbol
                    name.to_s
@@ -419,9 +419,10 @@ module Squared
                  end
           workspace.add(path, name, **kwargs) do
             __send__ :parent_set, parent
-            @children << self
+            proj = self
             instance_eval(&blk) if block_given?
           end
+          @children << proj
           self
         end
 
@@ -465,11 +466,11 @@ module Squared
               a, b, c, d, e = val
               case b
               when Hash
-                b = append_hash(b, build: true).join(' ')
+                b = append_hash(b, target: [], build: true).join(' ')
               when Enumerable
                 b = b.to_a.join(' ')
               end
-              d = append_hash(d).join(' ') if d.is_a?(Hash)
+              d = append_hash(d, target: []).join(' ') if d.is_a?(Hash)
               if a
                 cmd << [a, d, b].compact.join(' ')
               else
@@ -483,18 +484,18 @@ module Squared
           else
             cmd, opts, var, flags, extra = args
           end
-          if cmd.is_a?(Proc) || cmd.is_a?(Method)
-            run_b(cmd, sync: sync, from: from)
-            return
-          end
           if cmd
+            return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
+
             cmd = as_get(cmd, from)
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
-            flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
+            flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
             case opts
             when Hash
-              opts = append_hash(opts, build: true)
-              cmd = Array(cmd).push(flags).concat(opts).compact.join(' ')
+              cmd = Array(cmd).push(flags)
+                              .concat(append_hash(opts, target: [], build: true))
+                              .compact
+                              .join(' ')
             when Enumerable
               cmd = Array(cmd).concat(opts.to_a)
               cmd.map! { |val| "#{val} #{flags}" } if flags
@@ -527,7 +528,7 @@ module Squared
                     proj.__send__(meth, sync: sync)
                     next
                   rescue StandardError => e
-                    on_error(:prereqs, e, exception: true)
+                    on_error(e, :prereqs, exception: true)
                   end
                 end
                 print_error(name, 'method not found', subject: 'prereqs', hint: meth)
@@ -547,7 +548,7 @@ module Squared
         end
 
         def doc(*, sync: invoked_sync?('doc'), **)
-          run_b(@doc, sync: sync, from: :doc, banner: from_base?('doc') ? verbosetype > 1 : verbose)
+          run_b(@doc, sync: sync, banner: verbosetype > (from_base?('doc') ? 1 : 0), from: :doc)
         end
 
         def lint(*, sync: invoked_sync?('lint'), **)
@@ -568,9 +569,9 @@ module Squared
           on :first, :clean unless pass
           case @clean
           when Struct
-            if (any = instance_eval(&@clean.block) || @clean.run)
+            if (val = instance_eval(&@clean.block) || @clean.run)
               temp = @clean
-              @clean = any
+              @clean = val
               clean(*args, sync: sync, pass: true, **kwargs)
               @clean = temp
             end
@@ -588,7 +589,7 @@ module Squared
                 entry = basepath(val = val.to_s)
                 if entry.directory? && val.match?(%r{[\\/]\z})
                   log&.warn "rm -rf #{entry}"
-                  rm_rf(entry, verbose: verbose)
+                  rm_rf(entry, verbose: verbosetype > 0)
                 else
                   log&.warn "rm #{entry}"
                   (val.include?('*') ? Dir[entry] : [entry]).each do |file|
@@ -629,7 +630,7 @@ module Squared
           end
           ret = graph_branch(self, data, tasks, out, sync: sync, pass: pass)
         rescue StandardError => e
-          on_error(:graph, e, exception: true)
+          on_error(e, :graph, exception: true)
         else
           if out
             [out, ret]
@@ -687,7 +688,7 @@ module Squared
                 case f.content_type
                 when 'application/zip'
                   ext = 'zip'
-                when 'application/x-gzip'
+                when %r{application/(?:x-)?gzip}
                   ext = 'tgz'
                 when 'application/x-xz'
                   ext = 'txz'
@@ -749,9 +750,7 @@ module Squared
               break unless entry.directory?
 
               i = 0
-              while (dest = target + "#{File.basename(file)}-#{i}").exist?
-                i += 1
-              end
+              i += 1 while (dest = target + "#{File.basename(file)}-#{i}").exist?
               FileUtils.mv(entry, dest)
               dest.children.each { |child| FileUtils.mv(child, target) }
               dest.rmdir
@@ -851,7 +850,7 @@ module Squared
               ret = shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
-            on_error(from, e, exception: true)
+            on_error(e, from, exception: true)
             false
           else
             on :last, from
@@ -1267,11 +1266,11 @@ module Squared
         end
 
         def option(*args, target: @session, prefix: target&.first, **kwargs)
-          if prefix
-            args.each do |val|
-              ret = env(env_key(stripext(prefix), val), **kwargs)
-              return ret if ret
-            end
+          return unless prefix
+
+          args.each do |val|
+            ret = env(env_key(stripext(prefix), val), **kwargs)
+            return ret if ret
           end
           nil
         end
@@ -1450,7 +1449,7 @@ module Squared
           opts.each { |val| target << shell_option(flag, val) }
         end
 
-        def append_hash(data, target: @session, build: false)
+        def append_hash(data, target: @session || [], build: false)
           if build && (type = env('BUILD', suffix: 'TYPE') || ENV['BUILD_TYPE'])
             type = "__#{type}__"
             if (extra = data[type] || data[type.to_sym]).is_a?(Hash)
@@ -1553,7 +1552,7 @@ module Squared
             when String
               "#{base} #{data}"
             when Hash
-              "#{append_hash(base).join(' ')} #{data}"
+              "#{append_hash(base, target: []).join(' ')} #{data}"
             when Enumerable
               "#{base.to_a.join(' ')} #{data}"
             else
@@ -1562,11 +1561,11 @@ module Squared
           when Hash
             case base
             when String
-              "#{base} #{append_hash(data).join(' ')}"
+              "#{base} #{append_hash(data, target: []).join(' ')}"
             when Hash
               base.merge(data)
             when Enumerable
-              Set.new(base.to_a + append_hash(data)).to_a
+              Set.new(base.to_a + append_hash(data, target: [])).to_a
             else
               data
             end
@@ -1575,7 +1574,7 @@ module Squared
             when String
               "#{base} #{data.to_a.join(' ')}"
             when Hash
-              "#{append_hash(base).join(' ')} #{data.to_a.join(' ')}"
+              "#{append_hash(base, target: []).join(' ')} #{data.to_a.join(' ')}"
             when Enumerable
               Set.new(base.to_a + data.to_a).to_a
             else
@@ -1640,8 +1639,8 @@ module Squared
           confirm "Upgrade to #{a}? #{b + e} [#{c}] ", d
         end
 
-        def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil,
-                         multiple: false, force: true, **kwargs)
+        def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil, multiple: false,
+                         force: true, **kwargs)
           puts if !series && !printfirst?
           msg = "#{msg} (optional)" unless force
           unless (ret = choice(msg, list, multiple: multiple, force: force, **kwargs)) && !ret.empty?
@@ -1657,14 +1656,11 @@ module Squared
           if accept
             hint = Array(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
             accept = Array(accept).map { |val| Array(val) }
-            if accept.any? { |val| val[1] == true }
-              ret = [ret]
-              multiple = -1
-            end
+            ret = Array(ret) if accept.any? { |val| val[1] == true }
             loop do
               item = accept.first
               d, e = item[2] ? ['Y', '[Y/n]'] : ['N', '[y/N]']
-              c = confirm("#{item[0]}#{a ? " [#{a}]" : ''} #{e} ", d, timeout: 60)
+              c = confirm("#{item[0]}#{hint ? " [#{hint}]" : ''} #{e} ", d, timeout: 60)
               if item[1] == true
                 ret << c
               elsif !c
@@ -1677,7 +1673,7 @@ module Squared
             exit 1 unless accept.empty?
           end
           if values
-            ret = [ret] unless accept && multiple == -1
+            ret = Array(ret)
             values.each do |val|
               if val.is_a?(Array)
                 val, force = val
@@ -1711,21 +1707,17 @@ module Squared
         end
 
         def command(*args)
-          if workspace.powershell?
-            "powershell.exe -Command \"& {#{args.join(' ; ')}}\""
-          else
-            args.join(' && ')
-          end
+          return args.join(' && ') unless workspace.powershell?
+
+          "powershell.exe -Command #{shell_quote("& {#{args.join(' ; ')}}", option: false, double: true)}"
         end
 
         def relativepath(*list, all: false)
           return [] if list.empty?
 
           list.flatten.map! { |val| Pathname.new(val) }.select { |val| projectpath?(val) }.map! do |val|
-            val = val.absolute? ? val.relative_path_from(path).to_s : val.to_s
-            val = val[2..-1] if val.start_with?('./')
-            val = "#{val}*" if all && val.end_with?('/')
-            val
+            ret = (val.absolute? ? val.relative_path_from(path) : val.cleanpath).to_s
+            all && val.to_s.end_with?('/') ? "#{ret}/*" : ret
           end
         end
 
@@ -1810,8 +1802,7 @@ module Squared
         end
 
         def color(val)
-          ret = theme[val]
-          ret && !ret.empty? ? ret : [val]
+          (ret = theme[val]) && !ret.empty? ? ret : [val]
         end
 
         def colormap(val)
@@ -2040,8 +2031,8 @@ module Squared
         end
 
         def projectpath?(val)
-          val = Pathname.new(val).cleanpath
-          val.absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?(File.join('..', ''))
+          ret = Pathname.new(val).cleanpath
+          ret.absolute? ? ret.to_s.start_with?(File.join(path, '')) : !ret.to_s.start_with?(File.join('..', ''))
         end
 
         def checkdir?(val)

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

@@ -113,7 +113,7 @@ module Squared
           return unless dockerfile(file).exist?
 
           @context = context
-          @tag = tag || tagname("#{@project}:#{@version || 'latest'}")
+          self.tag = tag || tagname("#{@project}:#{@version || 'latest'}")
           @mounts = mounts
           @secrets = secrets
           @registry = tagjoin registry, kwargs[:username]
@@ -206,7 +206,7 @@ module Squared
                         end
                       end
                     else
-                      format_desc(action, flag, 'opts*,id/name', after: flag == :update ? '+' : '*')
+                      format_desc action, flag, "opts*,id/name#{flag == :update ? '+' : '*'}"
                       task flag do |_, args|
                         container flag, args.to_a
                       end
@@ -264,11 +264,11 @@ module Squared
           ret = docker_session
           if from == :run
             if bake?(n = filetype)
-              ret << 'buildx' << 'bake'
+              ret << 'buildx bake'
               append_file n
               from = :bake
             elsif compose?(n)
-              ret << 'compose' << 'build'
+              ret << 'compose build'
               append_file n
               from = :compose
             else
@@ -281,7 +281,7 @@ module Squared
           when String
             ret << opts
           when Hash
-            ret.merge(append_hash(opts, build: true))
+            ret.merge(append_hash(opts, target: [], build: true))
           when Enumerable
             ret.merge(opts.to_a)
           end
@@ -522,7 +522,7 @@ module Squared
             list_image(flag, docker_output('image ls -a'), from: from) do |val|
               op << val
               if flag == :tag
-                op << tagname("#{@project}:#{op.first}")
+                op << tagname("#{project}:#{op.first}")
                 break
               end
             end
@@ -622,7 +622,7 @@ module Squared
           target << list.join(' && ') unless list.empty?
         end
 
-        def append_file(type, target: @session)
+        def append_file(type, target: @session, index: 2)
           return if !@file || (ENV['COMPOSE_FILE'] && compose?(type))
 
           unless @file.is_a?(Array)
@@ -635,10 +635,10 @@ module Squared
           end
           files = Array(@file).map { |val| quote_option('file', basepath(val)) }
           if target.is_a?(Set)
-            opts = target.to_a.insert(2, *files)
+            opts = target.to_a.insert(index, *files)
             target.clear.merge(opts)
           else
-            target.insert(2, *files)
+            target.insert(index, *files)
           end
         end
 
@@ -653,7 +653,7 @@ module Squared
           ver = option('version', target: target, ignore: false)
           list = case val
                  when String
-                   val.split(',')
+                   split_escape val
                  when Array
                    val
                  else

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

@@ -604,7 +604,7 @@ module Squared
                             detach = args.detach
                             commit = commithead args.commit
                           end
-                          param_guard(action, flag, args: { create: create }, key: :create, pat: /\Ab\z/i) if create
+                          param_guard(action, flag, args: { create: create }, key: :create, pat: /\A[Bb]\z/) if create
                         else
                           branch = choice_refs 'Choose a branch to switch'
                         end
@@ -637,7 +637,7 @@ module Squared
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         unless commit
-                          commit, merge = choice_commit(values: ['Merge? [y|N]'])
+                          commit, merge = choice_commit(values: ['Merge? [y/N]'])
                           merge = merge&.upcase == 'Y'
                         end
                         checkout(flag, commit: commit, merge: merge)
@@ -721,7 +721,7 @@ module Squared
                       task flag, [:name, :commit] do |_, args|
                         branch = param_guard(action, flag, args: args, key: :name)
                         commit = commithead args.commit
-                        commit, track = choice_commit(values: ['Track? [Y|n]'], force: false) if commit == ':'
+                        commit, track = choice_commit(values: ['Track? [Y/n]'], force: false) if commit == ':'
                         switch(flag, branch: branch, commit: commit, track: track)
                       end
                     when :detach
@@ -824,7 +824,7 @@ module Squared
                                  []
                                else
                                  commit = choice_refs 'Choose "onto" branch'
-                                 target, opts = choice_commit(multiple: 2, values: ['Options'], reflog: false)
+                                 target, opts = choice_commit(reflog: false, multiple: 2, values: ['Options'])
                                  branch, upstream = target
                                  OptionPartition.strip(opts)
                                end

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

@@ -134,13 +134,13 @@ module Squared
                       exact = true
                       save = save[1..-1]
                     end
-                    case save
-                    when 'prod', 'dev', 'optional', 'peer'
-                      packages = args.extras
-                    else
-                      save = 'prod'
-                      packages = args.to_a
-                    end
+                    packages = case save
+                               when 'prod', 'dev', 'optional', 'peer'
+                                 args.extras
+                               else
+                                 save = 'prod'
+                                 args.to_a
+                               end
                     param_guard(action, 'name', args: packages)
                     depend(:add, packages: packages, save: save, exact: exact)
                   end
@@ -366,7 +366,7 @@ module Squared
                     subdir << target.to_s
                   end
                   begin
-                    FileUtils.cp(basepath(s), dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                    FileUtils.cp(basepath(s), dest, verbose: verbosetype > 0)
                   rescue StandardError => e
                     print_error e
                     errors += 1
@@ -410,7 +410,7 @@ module Squared
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from + val} #{to}" }
               begin
-                copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
+                copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbosetype > 0)
               rescue StandardError => e
                 on_error e, :copy
               end
@@ -482,7 +482,7 @@ module Squared
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           dryrun = opts.include?('dry-run') || opts.include?('d')
-          if pnpm? && read_packagemanager(version: '7.15', update: true)
+          if pnpm?
             cmd = session 'pnpm', 'outdated'
             dryrun ||= dryrun?('pnpm')
           else
@@ -527,7 +527,19 @@ module Squared
                 next
               end
               current = val['current'] || file
-              want = rev == :major && !latest[SEM_VER, 6] ? latest : val['wanted']
+              want = val['wanted']
+              unless latest[SEM_VER, 6]
+                case rev
+                when :major
+                  want = latest
+                when :minor
+                  want = latest if latest[SEM_VER, 1] == want[SEM_VER, 1]
+                when :patch
+                  if (g = latest.match(SEM_VER)) && (h = want.match(SEM_VER)) && g[1] == h[1] && g[3] == h[3]
+                    want = latest
+                  end
+                end
+              end
               next unless (current != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
               f = semscan file
@@ -845,7 +857,7 @@ module Squared
             when String
               target
             when Hash
-              append_hash(target).join(' ')
+              append_hash(target, target: []).join(' ')
             when Enumerable
               target.to_a.join(' ')
             else

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

@@ -7,7 +7,7 @@ module Squared
         DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
-          common: %w[b B d E h i I O OO P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
+          common: %w[b B d E h i I O P q s S u v x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
           build: %w[n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel C|config-setting=q installer=b
                     o|outdir=p].freeze,
           venv: %w[clear copies symlinks system-site-packages upgrade upgrade-deps without-scm-ignore-files without-pip
@@ -614,7 +614,7 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\Av+\z/)
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\A(?:v+|OO)\z/)
           ret = session('python', *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
@@ -874,7 +874,7 @@ module Squared
           op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
           op.append(dir, delim: true)
             .clear(pass: false)
-          status = op.arg?(/\A-v+\z/, 'verbose')
+          status = op.arg?(/\A-v+\z/)
           run(op, env, exception: true, banner: banner)
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end

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

@@ -312,7 +312,7 @@ module Squared
             c = glob[i] || glob.first
             log.info "cp #{a + c} #{b}"
             begin
-              copy_dir(a, b, c, pass: pass, verbose: verbose)
+              copy_dir(a, b, c, pass: pass, verbose: verbosetype > 0)
             rescue StandardError => e
               on_error e, :copy
             end

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

@@ -10,9 +10,10 @@ module Squared
           include Common::Shell
           extend Forwardable
 
+          OPT_NAME = /\A(?:(--)|-)((?(1)[A-Za-z\d]+|[A-Za-z\d]))\z/
           OPT_VALUE = /\A-{0,2}([^= ]+)(?: *= *| +)(.+)\z/
           OPT_SINGLE = /\A-([A-Za-z\d])(.+)\z/
-          private_constant :OPT_VALUE, :OPT_SINGLE
+          private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
           class << self
             include Common::Format
@@ -70,14 +71,14 @@ module Squared
             def strip(val)
               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') }.reject(&:empty?)
+              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?)
             end
 
             def select(list, bare: true, no: true, single: false, double: false)
               ret = bare ? list.grep_v(/=/) : list.grep(/=/).map! { |val| val.split('=', 2).first }
               ret.map! { |val| val.split('|', 2).last }
-              ret = ret.grep_v(/^no-/) unless no
+              ret = ret.grep_v(/\Ano-/) unless no
               return ret if single == double
 
               ret.select { |val| single ? val.size == 1 : val.size > 1 }

data/lib/squared/workspace/repo.rb

@@ -132,19 +132,20 @@ module Squared
           task 'all' do |_, args|
             stage ||= 'all'
             ns['sync'].invoke(*args.to_a)
-            next if env('REPO_STAGE', equals: '1')
+            next if (stage = env('REPO_STAGE')) == '1'
 
             @project.select do |_, proj|
               next unless proj.enabled?(proj.workspace.baseref)
 
               proj.depend(sync: true) if proj.depend?
-              next if env('REPO_STAGE', equals: '2')
+              next if stage == '2'
 
               proj.build?
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next unless proj.dev? && proj.copy? && !env('REPO_STAGE', equals: '3')
+              next if stage == '3'
+              next unless proj.copy? && (proj.dev? || stage == '4')
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)

metadata

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