squared 0.5.10 → 0.5.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1614a1b7a4674c33cbc895cc8ee6e475ec2ed577f431a52df251c9b1415b128f
-  data.tar.gz: f24f7926cda7af396f681670f35008473d56bd35f29b7c3a982826be9b2ffaa7
+  metadata.gz: 56af2850e96c00e48e1511b20fc61c5f0d9969220b4b070a6c61c02ce6489e97
+  data.tar.gz: 83749c3414fa0496dfa64fb3ec0846af2205b1c4483ecbd44e72ed2d976c7852
 SHA512:
-  metadata.gz: c8e181a06665254466e0fffc3cb1c00e33ebeaa56354689a1b40b4c7a302e5e3554ceca1b45dea389eff4fd8653eec8e756fc8fe9921447d28fd5cd62b100235
-  data.tar.gz: e6ed8bbcdb2a38741f0562bf5ff00ee638d359ea0af7674c5e6346dd125e692e350999e027c560641b708ec2dbcd3438f184ab4565387a5adbe942ef014a264d
+  metadata.gz: 4fbc69f9efe06c1d2ceba44c58854ca31b0a7e50a6fe89c01e3aeff05830efae2f7bf07f068163352f6c54f9d347a5db11b308a8f0b3f3b64914ac6b0035743b
+  data.tar.gz: 7aada08d98786700e652f0a78e5ddeda72ada420ec9d89cffc937f706b27da4800374231d086b67be8ae748199d0229a02fb95a9dfaac349fff6c40997ab5099

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [0.5.11] - 2025-10-18
+
+### Fixed
+
+- Ruby command version did not parse asdf output in Go.
+- Git command submodule action branch did not provide name argument.
+
+## [0.4.25] - 2025-10-18
+
+### Fixed
+
+- Project groups did not have their own copy of base events.
+
+## [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.5.10] - 2025-10-11
 
 ### Fixed
@@ -1121,6 +1153,7 @@
 
 - Changelog was created.
 
+[0.5.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.11
 [0.5.10]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.10
 [0.5.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.9
 [0.5.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.8
@@ -1132,6 +1165,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.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.25
+[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

data/README.md

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

@@ -180,8 +180,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
@@ -200,7 +201,7 @@ module Squared
       def log_console(*args, pipe: 1)
         return if args.first == false && args.size == 1
 
-        if pipe.is_a?(Pathname)
+        if pipe.is_a?(::Pathname)
           begin
             File.open(pipe, 'a') do |f|
               br = File::SEPARATOR == '\\' ? "\r\n" : "\n"
@@ -219,7 +220,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,
@@ -233,7 +235,7 @@ module Squared
           lines = val.map(&:to_s)
         else
           lines = val.to_s.lines(chomp: true)
-          lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(StandardError))
+          lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(::StandardError))
         end
         n = cols || max.call(lines)
         if $stdout.tty?

data/lib/squared/common/prompt.rb

@@ -56,7 +56,7 @@ module Squared
           min = [min, max].min
           if auto
             msg = "#{msg}: [1-#{max}#{if multiple
-                                        "|,#{multiple.is_a?(Numeric) ? "{#{multiple}}" : ''}"
+                                        "|,#{multiple.is_a?(::Numeric) ? "{#{multiple}}" : ''}"
                                       end}] "
           end
         end
@@ -113,18 +113,18 @@ module Squared
           elsif block_given?
             Readline.readmultiline(msg, history, &blk)
           else
-            Readline.readmultiline(msg, history) { |line| multiline.any? { |val| line.split.last.end_with?(val) } }
+            Readline.readmultiline(msg, history) { |line| multiline.any? { |val| line.split.last.end_with?(val.to_s) } }
           end
         end
         case force
         when ::TrueClass, ::FalseClass
           msg = "#{msg} %s " % if multiline
-                                 multiline.is_a?(::Enumerable) ? "{#{multiline.join('|')}}" : multiline
+                                 multiline.is_a?(::Enumerable) ? "{#{multiline.to_a.join('|')}}" : multiline
                                else
                                  "(#{force ? 'required' : 'optional'}):"
                                end
           ret = (prompt.call || '').strip
-          multiline.each { |val| break if ret.delete_suffix!(val) } if multiline.is_a?(::Enumerable)
+          multiline.each { |val| break if ret.delete_suffix!(val.to_s) } if multiline.is_a?(::Enumerable)
           exit 1 if force && ret.empty?
           ret
         else

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)
@@ -69,15 +69,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.5.10'
+  VERSION = '0.5.11'
 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
 
@@ -323,17 +323,9 @@ module Squared
       end
 
       def add(path, project = nil, **kwargs, &blk)
-        kwargs = @withargs.yield_self { |data| data.dup.update(kwargs) } if @withargs
-        ref = if kwargs.key?(:ref)
-                kwargs = kwargs.dup unless @withargs
-                kwargs.delete(:ref)
-              elsif @ref.is_a?(Symbol)
-                @ref
-              end
-        if @group.is_a?(String) && !kwargs.key?(:group)
-          kwargs = kwargs.dup unless @withargs
-          kwargs[:group] = @group
-        end
+        kwargs = Support.hashdup(@withargs).update(kwargs) if @withargs
+        ref = kwargs.key?(:ref) ? kwargs.delete(:ref) : @ref
+        kwargs[:group] = @group if @group && !kwargs.key?(:group)
         path = root + path
         project = (project || path.basename).to_s
         name = task_name project

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

@@ -65,11 +65,13 @@ module Squared
 
         @@tasks = {}
         @@graph = { _: [] }
-        @@asdf = if File.exist?("#{Dir.home}/.asdf/asdf.sh")
-                   [Pathname.new("#{Dir.home}/.asdf"), 15]
-                 elsif ENV['ASDF_DATA_DIR']
-                   [Pathname.new(ENV['ASDF_DATA_DIR']), 16]
-                 end
+        @@asdf = Pathname.new("#{Dir.home}/.asdf").yield_self do |path|
+          if path.join('asdf.sh').exist?
+            [path, 15]
+          elsif ENV['ASDF_DATA_DIR']
+            [Pathname.new(ENV['ASDF_DATA_DIR']), 16]
+          end
+        end
         @@print_order = 0
 
         subtasks({
@@ -389,6 +391,7 @@ module Squared
                                  version, opts = choice_index('Select a version',
                                                               @asdf[1].children
                                                                       .map(&:basename)
+                                                                      .sort { |a, b| b <=> a }
                                                                       .append('latest', 'system'),
                                                               force: true, accept: [['Confirm?', false, true]],
                                                               values: ['Options'])
@@ -437,10 +440,11 @@ module Squared
           end
           return self unless projectpath?(path = basepath(path)) && checkdir?(path)
 
-          kwargs = @withargs.yield_self { |data| data.dup.update(kwargs) } if @withargs
-          kwargs[:group] = group unless kwargs.key?(:group)
+          kwargs = hashdup(@withargs).update(kwargs) if @withargs
+          kwargs[:group] = group if group && !kwargs.key?(:group)
           kwargs[:ref] = ref unless kwargs.key?(:ref)
           parent = self
+          proj = nil
           name = case name
                  when String, Symbol
                    name.to_s
@@ -449,9 +453,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
 
@@ -477,9 +482,9 @@ module Squared
           if args.empty?
             return unless from == :run
 
-            run_b(@run, sync: sync, from: from) if series?(@run)
-            args = @output
             banner = verbosetype > 1 if from_base?('build')
+            run_b(@run, sync: sync, from: from, banner: banner) if series?(@run)
+            args = @output
           end
           if args.first.is_a?(Struct)
             f, blk = args.first.to_a
@@ -513,11 +518,9 @@ 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, target: []).join(' ') if flags.is_a?(Hash)
@@ -559,7 +562,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)
@@ -579,7 +582,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: from_base?('doc') ? verbose? : verbosetype > 0, from: :doc)
         end
 
         def lint(*, sync: invoked_sync?('lint'), **)
@@ -600,9 +603,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
@@ -620,7 +623,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|
@@ -659,7 +662,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]
@@ -718,7 +721,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'
@@ -780,9 +783,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.each_child { |child| FileUtils.mv(child, target) }
               dest.rmdir
@@ -822,7 +823,7 @@ module Squared
             cmd << '--no-header' unless legacy
             cmd << name
           end
-          print_success if success?(run(from: :"asdf:#{flag}")) && flag == :set
+          print_success if success?(run(from: :"asdf:#{flag}"), flag == :set)
         end
 
         def first(key, *args, **kwargs, &blk)
@@ -870,7 +871,7 @@ module Squared
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, from: nil, banner: true, chdir: path,
                 interactive: nil, hint: nil, **)
           unless cmd
-            print_error('no command given', subject: project, hint: from || 'unknown', pass: true)
+            print_error('no command session started', subject: project, hint: from, pass: true)
             return
           end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
@@ -908,7 +909,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
@@ -1120,8 +1121,8 @@ module Squared
         def run_b(obj, **kwargs)
           case obj
           when Struct
-            if (any = instance_eval(&obj.block) || obj.run)
-              run_b(any, **kwargs)
+            if (val = instance_eval(&obj.block) || obj.run)
+              run_b(val, **kwargs)
             end
           when Proc
             instance_eval(&obj)
@@ -1687,8 +1688,8 @@ module Squared
           confirm "#{a}: #{b}#{c} #{sub_style(ver.rjust(col1 > 0 ? 10 : 0), styles: theme[:inline])}   ", 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?
@@ -1704,13 +1705,10 @@ 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
-              c = confirm("#{item[0]}#{a ? " [#{hint}]" : ''}", item[2] ? 'Y' : 'N', timeout: 60)
+              c = confirm("#{item[0]}#{hint ? " [#{hint}]" : ''}", item[2] ? 'Y' : 'N', timeout: 60)
               if item[1] == true
                 ret << c
               elsif !c
@@ -1723,8 +1721,8 @@ module Squared
             exit 1 unless accept.empty?
           end
           if values
-            ret = [ret] unless accept && multiple == -1
-            values.each do |val|
+            ret = Array(ret)
+            Array(values).each do |val|
               if val.is_a?(Array)
                 val, force = val
               else
@@ -1757,21 +1755,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
 
@@ -1819,10 +1813,10 @@ module Squared
           return 1 if a.empty?
 
           a, b = [a.first, b.first].map! do |c|
-            begin
-              d = Integer(c[5]).to_s
+            d = begin
+              Integer(c[5]).to_s
             rescue StandardError
-              d = c[5] ? '-1' : '0'
+              c[5] ? '-1' : '0'
             end
             [c[0], c[2], c[4] || '0', d]
           end
@@ -1855,8 +1849,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)
@@ -2074,9 +2067,8 @@ module Squared
         end
 
         def projectpath?(val)
-          Pathname.new(val).cleanpath.yield_self do |file|
-            file.absolute? ? file.to_s.start_with?(File.join(path, '')) : !file.to_s.start_with?(File.join('..', ''))
-          end
+          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)
@@ -2151,6 +2143,10 @@ module Squared
           !!verbose && !stdin?
         end
 
+        def verbose?
+          verbosetype > 1
+        end
+
         def warning?
           workspace.warning
         end
@@ -2182,6 +2178,10 @@ module Squared
           Workspace::Support.hashlist
         end
 
+        def hashdup
+          Workspace::Support.hashdup
+        end
+
         def borderstyle
           workspace.banner_get(*@ref, group: group)&.border || theme[:border]
         end

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
@@ -533,7 +533,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
@@ -554,7 +554,7 @@ module Squared
             banner = false
           end
           ret = run(cmd, sync: sync, exception: exception, banner: banner, from: from)
-          print_success if success?(ret) && (flag == :tag || flag == :save)
+          print_success if success?(ret, flag == :tag || flag == :save)
         end
 
         def network(flag, opts = [], target: nil)
@@ -656,13 +656,14 @@ module Squared
             when 2, 4
               return
             when 3
-              return unless COMPOSEFILE.map { |val| basepath(val) }.select(&:exist?).size > 1
+              return unless COMPOSEFILE.select { |val| basepath(val).exist? }.size > 1
             end
           end
           files = Array(@file).map { |val| quote_option('file', basepath(val)) }
           if target.is_a?(Set)
             opts = target.to_a.insert(index, *files)
-            target.clear.merge(opts)
+            target.clear
+                  .merge(opts)
           else
             target.insert(index, *files)
           end
@@ -678,7 +679,7 @@ module Squared
         def append_tag(val, target: @session)
           case val
           when String
-            val.split(',')
+            split_escape val
           when Array
             val
           else
@@ -820,7 +821,7 @@ module Squared
             end
             cmd.merge(Array(out).map! { |val| parse.call(val) })
             cmd << args
-            print_success if success?(run(cmd)) && ctx.start_with?(/(?:network|tag|save)/)
+            print_success if success?(run(cmd), ctx.start_with?(/(?:network|tag|save)/))
           end
         end
 

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

@@ -408,10 +408,11 @@ module Squared
 
                     case flag
                     when :branch
-                      format_desc action, flag, 'path,opts*'
-                      task flag, [:path] do |_, args|
+                      format_desc action, flag, 'path,name?'
+                      task flag, [:path, :name] do |_, args|
                         path = param_guard(action, flag, args: args, key: :path)
-                        submodule(flag, args.extras, path: path)
+                        branch = args.name
+                        submodule(flag, [branch ? 'b' : 'd'], branch: branch, path: path)
                       end
                     when :url
                       format_desc action, flag, 'path,url,opts*'
@@ -498,7 +499,7 @@ module Squared
                           remote = choice_remote
                         end
                         ret = tag(flag, refs: [name], message: message, commit: commit, remote: remote)
-                        print_success if success?(ret) && !remote
+                        print_success if success?(ret, !remote)
                       end
                     end
                   when 'stash'
@@ -640,7 +641,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 +722,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
@@ -1476,7 +1477,9 @@ module Squared
           source op
           cached = git_spawn 'diff --cached --name-only --no-color'
           if amend || !cached.empty? || dryrun?
-            puts cached if adding.empty? && !cached.empty? && banner?
+            if adding.empty? && !cached.empty? && banner?
+              puts(cached.lines.map! { |val| "cached #{shell_quote(val.chomp)}" })
+            end
             source co
             source pu
           elsif banner?
@@ -1642,21 +1645,19 @@ module Squared
           source
         end
 
-        def submodule(flag, opts = [], path: nil, url: nil)
+        def submodule(flag, opts = [], branch: nil, path: nil, url: nil)
           cmd, opts = git_session('submodule', opts: opts)
           op = OptionPartition.new(opts, OPT_GIT[:submodule].fetch(flag, []), cmd, project: self)
           case flag
           when :branch, :url
             op.adjoin("set-#{flag}")
-            op << '--'
-            op.add_path(path) if path
-            op.add_quote(url) if url
+            op.add_quote(branch, '--', path, url)
           else
             op.adjoin(flag)
             op << '--recursive' if option('recursive', 'r')
             op.splice(path: true)
           end
-          source
+          print_success if success?(source, flag == :branch)
         end
 
         def restore(flag, opts = [], commit: nil, files: nil)

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

@@ -374,7 +374,7 @@ module Squared
                     target.mkpath
                     subdir << target.to_s
                   end
-                  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
@@ -416,7 +416,7 @@ module Squared
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from + val} #{to}" }
-              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
@@ -487,7 +487,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

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
@@ -528,7 +528,9 @@ module Squared
                                    if @asdf
                                      cmd = 'asdf'
                                      ver = '.tool-versions'
-                                     `asdf current #{@asdf.first}`[/\A\S+\s+\S+/, 0].sub(/\s+/, ' ')
+                                     opt = [@asdf.first]
+                                     opt.unshift('--no-header') unless @@asdf[1] == 15
+                                     `asdf current #{opt.join(' ')}`[/^\S+\s+\S+/, 0].sub(/\s+/, ' ')
                                    else
                                      ver = nil
                                      `ruby --version`

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,8 +71,8 @@ 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)
@@ -247,9 +248,9 @@ module Squared
                     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, sep: sep)
+                      add shell_option(key, val, escape: false, merge: merge)
                     elsif path
-                      add quote_option(key, path + val, merge: merge, sep: sep)
+                      add quote_option(key, path + val, merge: merge)
                     else
                       push opt
                     end
@@ -414,7 +415,7 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
-            merge(args.map! { |val| shell_quote(val, **kwargs) })
+            merge(args.compact.map! { |val| val == '--' ? val : shell_quote(val, **kwargs) })
             self
           end
 

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)

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

@@ -11,6 +11,26 @@ module Squared
         def hashlist
           Hash.new { |data, key| data[key] = [] }
         end
+
+        def hashdup(data, pass: [])
+          ret = {}
+          data.each do |key, val|
+            ret[key] = case val
+                       when Hash
+                         if pass.include?(val)
+                           val
+                         else
+                           pass << val
+                           hashdup(val, pass: pass)
+                         end
+                       when Proc, Method
+                         val
+                       else
+                         val.dup
+                       end
+          end
+          ret
+        end
       end
     end
   end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors:
 - An Pham
+autorequire:
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -110,6 +111,7 @@ metadata:
   homepage_uri: https://github.com/anpham6/squared-ruby
   source_code_uri: https://github.com/anpham6/squared-ruby
   documentation_uri: https://squared.readthedocs.io
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -124,7 +126,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []