squared 0.4.24 → 0.4.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c07babae909a985bae708b8a2bec453b223d9889af828da70d990609e9966142
-  data.tar.gz: 5375a660bbcc0f49b5a3eaad5ab2740b103beeb3823a0d7b027b9005bf39faa9
+  metadata.gz: 31cca2889400b4e4b51df7249ac426d782a9905cc69e731d0766ef1012002651
+  data.tar.gz: 4353d4d765dc14916e6db6c9605cc0b02fe48b353adc0ed274c08f01e0cc6f25
 SHA512:
-  metadata.gz: 23cd1e57c7d0039fed851d6d426eec51022dba2c26bbce9faafddd20ded4aad3d00d6db023c3a99e2aa485aace597567df4f603130746daa5dc5e2d661c658dd
-  data.tar.gz: cb9556662d393d458413df3669f9859b4b3df9d9ca3e659b9098fac0d550349eaf8b414e6cb85b0828f522f3b78f1627c282350eb6b9b62218f76413ebcaabb8
+  metadata.gz: 6fda0932de949193edfc82bb533c3b21b39624b2d1d8fc3b1762b0c8e93ce47807e9a34c8b378896d6f4f92c18d06ae82b217dfd42539667cb0df3de5d98cd5c
+  data.tar.gz: 411bba4daeb35c641b67306bba13502a78cab65c09e94d3a5fcef0f7ad213f5a8a75886b641a32d4e1dce83b6c697784ca438d4c570a30dd3d331ae8b25541c0

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## [0.4.26] - 2025-10-31
+
+### Added
+
+- Docker command options were updated to 28.5.
+
+### Changed
+
+- Node package manager does not override package.json with NODE_INSTALL.
+- Node workspaces can specify more than one package manager through NODE_INSTALL.
+
+### Fixed
+
+- Node command add did not provide optional save argument.
+- Python command outdated did not detect synchronous output.
+- Node command outdated auto-commit was completely dysfunctional.
+- Project workspaces caused a complete meltdown on TruffleRuby.
+- Project build initialization global flag was always incoherent.
+- Project base setters did not accept direct values.
+- Project base global graph tasks are not definable by a sub-project.
+
+## [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
@@ -1037,6 +1064,8 @@
 
 - Changelog was created.
 
+[0.4.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.26
+[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

data/README.md

@@ -686,7 +686,7 @@ GIT_AUTOSTASH_${NAME}=0     # rebase (project only)
 
 ### Docker
 
-* Version: 28.3
+* Version: [28.5](https://docs.docker.com/engine/release-notes/28)
 
 ```sh
 DOCKER_OPTIONS=q,no-cache                # all

data/lib/squared/common/format.rb

@@ -108,7 +108,7 @@ module Squared
         ret = wrap.call(ret, code) unless code.empty?
         return ret unless data
 
-        out = ''.dup
+        out = +''
         data.to_a.each_with_index do |group, i|
           next if i == 0
 
@@ -179,7 +179,7 @@ module Squared
         if level.is_a?(::Numeric)
           if append && respond_to?(:log)
             (log rescue nil).tap do |ref|
-              ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(Logger)
+              ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
             end
           end
           return false if !pass && level < ARG[:LEVEL]
@@ -199,7 +199,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"
@@ -233,7 +233,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

@@ -47,11 +47,11 @@ module Squared
           end
           max = items.size
           raise_error 'empty selection list' if max == 0
-          min = [min, max].min
+          min = grep ? 1 : [min, max].min
           if auto
-            msg = "#{msg}: [1-#{max}#{if multiple
-                                        "|,#{multiple.is_a?(Numeric) ? "{#{multiple}}" : ''}"
-                                      end}] "
+            msg = "#{msg + (force ? ':' : '?')} [#{min}-#{max}#{if (n = multiple)
+                                                                  "|,#{n.is_a?(::Numeric) ? "{#{n}}" : ''}"
+                                                                end}] "
           end
         end
         valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
@@ -63,10 +63,7 @@ module Squared
                   a = ch.split(/\s*,\s*/)
                   b = a.select { |s| valid.call(s) }.map!(&:to_i).sort
                   next unless a.size == b.size
-                  return b unless items
-                  next if multiple.is_a?(::Numeric) && multiple != b.size
-
-                  return b.map! { |i| items[i - 1] }
+                  return items ? b.map! { |i| items[i - 1] } : b unless multiple.is_a?(::Numeric) && multiple != b.size
                 elsif valid.call(ch)
                   return items ? items[ch.to_i - 1] : ch.to_i
                 end
@@ -97,18 +94,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/version.rb

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

data/lib/squared/workspace/application.rb

@@ -147,13 +147,12 @@ module Squared
       def build(parallel: [], pass: nil, **kwargs)
         return self unless enabled? && !@closed
 
-        if kwargs[:pattern].is_a?(Array)
-          kwargs[:parallel] = parallel.map(&:to_s)
-        else
-          kwargs[:pattern] = []
-          kwargs[:parallel] = parallel.reject { |val| val.is_a?(Regexp) && (kwargs[:pattern] << val) }
-                                      .map(&:to_s)
-        end
+        kwargs[:parallel] = if kwargs[:pattern].is_a?(Array)
+                              parallel.map(&:to_s)
+                            else
+                              kwargs[:pattern] = []
+                              parallel.reject { |val| kwargs[:pattern] << val if val.is_a?(Regexp) }.map!(&:to_s)
+                            end
         @pass[:pattern].concat(pass.map { |val| val.is_a?(Regexp) ? val : val.to_s }) if pass
         @project.each_value do |proj|
           if proj.enabled?
@@ -322,21 +321,9 @@ module Squared
       end
 
       def add(path, project = nil, **kwargs, &blk)
-        if @withargs
-          data = @withargs.dup
-          data.merge!(kwargs)
-          kwargs = data
-        end
-        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
@@ -629,9 +616,7 @@ module Squared
       end
 
       def home?
-        return false unless (proj = find(home))
-
-        proj.enabled?
+        !!find(home)&.enabled?
       end
 
       def windows?

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

@@ -74,6 +74,7 @@ module Squared
 
         attr_reader :name, :project, :workspace, :path, :theme, :group, :parent, :dependfile,
                     :exception, :pipe, :verbose
+        attr_accessor :global
 
         def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
                        **kwargs)
@@ -91,9 +92,14 @@ module Squared
           @clean = kwargs[:clean]
           @release = kwargs[:release]
           self.version = kwargs[:version]
-          self.exception = kwargs[:exception]
-          self.pipe = kwargs[:pipe]
-          self.verbose = kwargs[:verbose]
+          self.exception = env_bool(kwargs[:exception], workspace.exception, strict: true)
+          self.pipe = env_pipe(kwargs[:pipe], workspace.pipe, strict: true)
+          self.verbose = case (val = env('VERBOSE', kwargs[:verbose]))
+                         when String
+                           env_bool(val, workspace.verbose, strict: true, index: true)
+                         else
+                           val.nil? ? workspace.verbose : val
+                         end
           @output = []
           @ref = []
           @children = []
@@ -138,8 +144,10 @@ module Squared
           data = @workspace.script_find(*@ref, @group)
           if @output[0].nil?
             if (scr = data[:script])
-              @global = true
-              script_set(scr, args: data.fetch(:args, kwargs[:args]), prod: kwargs[:prod])
+              unless kwargs[:script] == false
+                @global = true
+                script_set(scr, args: data.fetch(:args, kwargs[:args]), prod: kwargs[:prod])
+              end
             elsif (run = data[:run])
               @global = true
               run_set run
@@ -162,7 +170,6 @@ module Squared
             @global = true
             run_set data[:run]
           end
-          @global = true
         end
 
         def initialize_events(ref, **)
@@ -279,21 +286,29 @@ module Squared
         end
 
         def exception=(val)
-          @exception = env_bool(val, workspace.exception, strict: true)
+          @exception = case val
+                       when Numeric, TrueClass, FalseClass
+                         val
+                       else
+                         workspace.exception
+                       end
         end
 
         def pipe=(val)
-          @pipe = env_pipe(val, workspace.pipe, strict: true)
+          @pipe = case val
+                  when Numeric, Pathname
+                    val
+                  else
+                    workspace.pipe
+                  end
         end
 
         def verbose=(val)
-          @verbose = case (val = env('VERBOSE', val))
-                     when NilClass
-                       workspace.verbose
-                     when String
-                       env_bool(val, workspace.verbose, strict: true, index: true)
-                     else
+          @verbose = case val
+                     when Numeric, TrueClass, FalseClass
                        val
+                     else
+                       workspace.verbose
                      end
         end
 
@@ -323,13 +338,8 @@ module Squared
                       else
                         out, done = graph(args, out: [])
                         out.map! do |val|
-                          done.each_with_index do |proj, i|
-                            next unless val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/)
-
-                            val += " (#{i.succ})"
-                            break
-                          end
-                          val
+                          n = done.index { |proj| val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/) }
+                          n ? "#{val} (#{n.succ})" : val
                         end
                         emphasize(out, title: path, right: true, border: borderstyle, sub: [
                           { pat: /\A(#{Regexp.escape(path.to_s)})(.*)\z/, styles: theme[:header] },
@@ -385,44 +395,33 @@ module Squared
         end
 
         def add(path, name = nil, **kwargs, &blk)
-          if path.is_a?(String) && (seg = path[%r{\A(.+)[\\/]\*+\z}, 1])
-            return self unless checkdir?(path = basepath(seg))
+          if path.is_a?(String) && path =~ %r{\A(.+)[\\/]\*+\z}
+            return self unless checkdir?(path = basepath($1))
 
             path = path.children.select { |val| checkdir?(val) }
           end
           if path.is_a?(Array)
-            name = @name if name == true
+            name = self.name if name == true
             path.each { |val| add(val, name && task_join(name, File.basename(val)), **kwargs, &blk) }
-            return self
-          elsif !projectpath?(path = basepath(path)) || !checkdir?(path)
-            return self
-          else
+          elsif projectpath?(path = basepath(path)) && checkdir?(path)
+            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
+                   else
+                     path.basename
                    end
+            workspace.add(path, name, **kwargs) do
+              __send__ :parent_set, parent
+              proj = self
+              instance_eval(&blk) if block_given?
+            end
+            @children << proj
           end
-          if @withargs
-            data = @withargs.dup
-            data.merge!(kwargs)
-            kwargs = data
-          end
-          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
-                 else
-                   path.basename
-                 end
-          workspace.add(path, name, **kwargs) do
-            __send__ :parent_set, parent
-            proj = self
-            instance_eval(&blk) if block_given?
-          end
-          @children << proj
           self
         end
 
@@ -432,13 +431,13 @@ module Squared
         end
 
         def inject(obj, *args, **kwargs, &blk)
-          return self unless enabled?
-
-          out = obj.link(self, *args, **kwargs, &blk) if obj.respond_to?(:link)
-          if !out
-            print_error('link not compatible', subject: obj, hint: name)
-          elsif out.respond_to?(:build)
-            out.build
+          if enabled?
+            out = obj.link(self, *args, **kwargs, &blk) if obj.respond_to?(:link)
+            if !out
+              print_error('link not compatible', subject: obj, hint: name)
+            elsif out.respond_to?(:build)
+              out.build
+            end
           end
           self
         end
@@ -522,7 +521,7 @@ module Squared
             next if @@graph[:_].include?(proj)
 
             if (val = ENV["PREREQS_#{proj.instance_variable_get(:@envname)}"] || ENV["PREREQS_#{proj.ref.upcase}"])
-              val.split(/\s*,\s*/).each do |meth|
+              split_escape(val).each do |meth|
                 if proj.respond_to?(meth.to_sym)
                   begin
                     proj.__send__(meth, sync: sync)
@@ -581,7 +580,7 @@ module Squared
             begin
               @clean.each { |cmd, opts| build(cmd.to_s, opts, sync: sync) }
             rescue StandardError => e
-              on_error e, from
+              on_error e, :clean
             end
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
@@ -692,6 +691,8 @@ module Squared
                   ext = 'tgz'
                 when 'application/x-xz'
                   ext = 'txz'
+                when 'application/x-7z-compressed'
+                  ext = '7z'
                 end
               end
               break uri = url if data
@@ -726,7 +727,7 @@ module Squared
             case ext
             when 'zip', 'aar'
               session 'unzip', shell_quote(file), quote_option('d', target)
-            when 'tar', 'tgz', 'tar.gz', 'tar.xz', 'gz', 'xz'
+            when 'tar', 'tgz', 'txz', 'tar.gz', 'tar.xz', 'gz', 'xz'
               flags = +(verbose ? 'v' : '')
               if ext.end_with?('gz')
                 flags += 'z'
@@ -1081,6 +1082,7 @@ module Squared
         def graph_branch(target, data, tasks = nil, out = nil, sync: true, pass: [], done: [], depth: 0,
                          single: false, last: false, context: nil)
           tag = ->(proj) { "#{proj.name}#{SEM_VER.match?(proj.version) ? "@#{proj.version}" : ''}" }
+          script = ->(proj) { workspace.script_get(:graph, group: proj.group, ref: proj.allref)&.fetch(:graph, nil) }
           check = ->(deps) { deps.reject { |val| done.include?(val) } }
           dedupe = lambda do |name|
             next [] unless (ret = data[name])
@@ -1131,10 +1133,7 @@ module Squared
                                                    single: single, last: j == true, context: target)
             end
             if !out
-              if !tasks && (script = workspace.script_get(:graph, group: proj.group, ref: proj.allref))
-                tasks = script[:graph]
-              end
-              (tasks || (dev? ? ['build', 'copy'] : ['depend', 'build'])).each do |meth|
+              (tasks || (subtasks = script.call(proj)) || (dev? ? %w[build copy] : %w[depend build])).each do |meth|
                 next if pass.include?(meth)
 
                 if workspace.task_defined?(cmd = task_join(proj.name, meth))
@@ -1145,7 +1144,7 @@ module Squared
                   end
                   run(cmd, sync: false, banner: false)
                   ENV.delete(key) if key
-                elsif proj.has?(meth, tasks ? nil : workspace.baseref)
+                elsif proj.has?(meth, tasks || subtasks ? nil : workspace.baseref)
                   proj.__send__(meth.to_sym, sync: sync)
                 end
               end
@@ -1331,7 +1330,7 @@ module Squared
             sub&.each { |h| s = sub_style(s, **h) }
             s
           end
-          ret = [sub_style(ARG[:BORDER][1] * n, styles: border), *lines]
+          ret = [sub_style(ARG[:BORDER][1] * n, styles: border)].concat(lines)
           ret.reverse! if reverse
           ret.join("\n")
         end
@@ -1433,7 +1432,7 @@ module Squared
           else
             pat = /\A(\s*\d+\.)(.+)\z/
             unless grep.empty?
-              footer = "#{out.size} found"
+              footer = "#{out.size} found "
               sub << { pat: /\A(\d+)( .+)\z/, styles: theme[:inline] }
             end
           end
@@ -1760,10 +1759,8 @@ module Squared
 
         def semcmp(val, other)
           return 0 if val == other
-
-          a, b = [val, other].map! { |ver| ver.scan(SEM_VER) }
-          return -1 if b.empty?
-          return 1 if a.empty?
+          return -1 if (b = other.scan(SEM_VER)).empty?
+          return 1 if (a = val.scan(SEM_VER)).empty?
 
           a, b = [a.first, b.first].map! do |c|
             begin
@@ -2039,7 +2036,7 @@ module Squared
           if val.directory? && !val.empty?
             true
           else
-            log&.warn "directory \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
+            log&.warn "directory \"#{val}\" (#{val.directory? ? 'empty' : 'not found'})"
             false
           end
         end
@@ -2139,6 +2136,10 @@ module Squared
           Workspace::Support.hashlist
         end
 
+        def hashdup
+          Workspace::Support.hashdup
+        end
+
         def borderstyle
           ((data = workspace.banner_get(*@ref, group: group)) && data[:border]) || theme[:border]
         end

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

@@ -13,7 +13,7 @@ module Squared
           buildx: {
             common: %w[builder=b D|debug],
             build: %w[add-host=q annotation=q attest=q build-arg=qq build-context=qq cache-from=q cache-to=q
-                      cgroup-parent=b ent=q iidfile=p label=q a-file=p network=b no-cache-filter=b o|output=q platform=b
+                      cgroup-parent=b iidfile=p label=q a-file=p network=b no-cache-filter=b o|output=q platform=b
                       q|quiet secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
             bake: %w[print list=q set=q].freeze,
             shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p progress=b provenance=q
@@ -26,8 +26,8 @@ module Squared
                       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,
             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 q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b T|no-TTY=b?
-                    p|publish=e pull=b u|user=e v|volume=q w|workdir=q].freeze,
+                    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,
             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,25 +36,26 @@ module Squared
           }.freeze,
           container: {
             create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
-                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b 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=e dns-option=e dns-search=e domainname=b
-                       entrypoint=q e|env=qq env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b ip6=e
-                       ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b log-driver=b
-                       log-opt=q mac-address=e 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=b
-                       p|publish=e 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,
-            run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
+                       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 io-maxbandwidth=b io-maxiops=b
+                       ip=b ip6=q ipc=b isolation=b kernel-memory=b l|label=q label-file=q link=b link-local-ip=q
+                       log-driver=b log-opt=q mac-address=q 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=b 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,
+            run: %w[d|detach detach-keys=q hostname=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
                      w|workdir=q].freeze,
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
-            inspect: %w[s|size f|format=q].freeze,
+            inspect: %w[s|size f|format=q type=b].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
             stop: %w[s|signal=b t|time=i t|timeout=i].freeze,
             restart: %w[s|signal=b t|time=i t|timeout=i].freeze,
@@ -68,7 +69,7 @@ module Squared
             save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
-            connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=b link=b link-local-ip=b].freeze,
+            connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
             disconnect: %w[f|force].freeze
           }.freeze
         }.freeze
@@ -630,13 +631,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

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

@@ -1549,7 +1549,7 @@ module Squared
             append_value list
             remote = nil
           when :move, :copy
-            s = "-#{flag.to_s[0]}"
+            s = +"-#{flag.to_s[0]}"
             s.upcase! if option('force', 'f')
             cmd << s
             refs.compact.each { |val| cmd << shell_quote(val) }
@@ -1977,7 +1977,7 @@ module Squared
               when 'rebase'
                 op << basic_option($1, $2) if VAL_GIT[:rebase][:value].include?($2)
               when 'shallow-since'
-                op.append?($1) { Date.parse($2)&.strftime('%F %T') }
+                op.append?($1) { Date.parse($2).strftime('%F %T') }
               when 'recurse-submodules'
                 op.append?($1, $2, type: :basic)
               when 'refspec'

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

@@ -129,13 +129,9 @@ module Squared
                 when 'add'
                   format_desc action, nil, 'save?=prod|dev|optional|peer,name+'
                   task action, [:save] do |_, args|
-                    save = param_guard(action, 'save', args: args, key: :save)
-                    if save.start_with?('=')
-                      exact = true
-                      save = save[1..-1]
-                    end
-                    packages = case save
-                               when 'prod', 'dev', 'optional', 'peer'
+                    packages = if args.save =~ /\A(=)?(prod|dev|optional|peer)\z/
+                                 exact = !$1.nil?
+                                 save = $2
                                  args.extras
                                else
                                  save = 'prod'
@@ -426,19 +422,7 @@ module Squared
             workspace.rev_clear(name, sync: sync)
             return update if !flag && env('NODE_UPDATE')
 
-            pnpm = pnpm?
-            yarn = pnpm ? 0 : dependtype(:yarn)
-            if @pm[:__] && !pnpm && yarn == 0
-              case @pm[:__]
-              when 'pnpm'
-                pnpm = true
-              when 'yarn'
-                yarn = 1
-              when 'berry'
-                yarn = 2
-              end
-            end
-            if yarn > 0
+            if (yarn = dependtype(:yarn)) > 0
               cmd = session 'yarn'
               if flag == :add
                 cmd << 'add'
@@ -448,7 +432,7 @@ module Squared
                 cmd << 'install'
                 cmd << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
               end
-            elsif pnpm
+            elsif pnpm?
               cmd = session 'pnpm'
               if flag == :add
                 cmd << 'add' << "--save-#{save}"
@@ -637,7 +621,7 @@ module Squared
               else
                 footer.call(0, found.size)
               end
-              commit(:add, refs: ['package.json'], pass: true)
+              commit(:add, ['package.json'], pass: true)
             end
           elsif !avail.empty?
             col1 = size_col.call(avail, 0) + 4
@@ -884,45 +868,32 @@ module Squared
 
         def yarn?
           (@pm[:yarn] ||= if rootpath('yarn.lock', ascend: dependext).exist?
-                            if (rc = rootpath('.yarnrc.yml', ascend: dependext)).exist?
-                              begin
-                                require 'yaml'
-                                doc = YAML.load_file(rc)
-                                doc.nodeLinker == 'node-modules' ? 2 : 3
-                              rescue StandardError => e
-                                log.debug e
-                                3
-                              end
+                            yarntype
+                          elsif (ver = read_packagemanager || read_install)
+                            if ver =~ /^yarn(?:@(\d)|$)/
+                              $1 && $1.to_i > 1 ? yarntype : 1
                             else
-                              1
+                              0
                             end
-                          elsif (ver = read_packagemanager || read_install)&.start_with?('yarn')
-                            ver == 'yarn' || ver.include?('@1') ? 1 : 3
                           else
-                            0
+                            case @pm[:__]
+                            when 'yarn'
+                              1
+                            when 'berry'
+                              yarntype
+                            else
+                              0
+                            end
                           end) > 0
         end
 
         def pnpm?
           (@pm[:pnpm] ||= if rootpath('pnpm-lock.yaml', ascend: dependext).exist?
-                            begin
-                              require 'yaml'
-                              doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: dependext))
-                              @pm[:_] = doc['packageManager']
-                              case doc['nodeLinker']
-                              when 'hoisted'
-                                1
-                              when 'pnp'
-                                3
-                              else
-                                4
-                              end
-                            rescue StandardError => e
-                              log.debug e
-                              4
-                            end
+                            pnpmtype
+                          elsif (ver = read_packagemanager || read_install)
+                            ver.start_with?('pnpm') ? pnpmtype : 0
                           else
-                            (read_packagemanager || read_install)&.start_with?('pnpm') ? 4 : 0
+                            @pm[:__] == 'pnpm' ? pnpmtype : 0
                           end) > 0
         end
 
@@ -972,14 +943,17 @@ module Squared
         private
 
         def read_packagemanager(key = nil, version: nil, update: false)
-          if @pm[:_].nil? || update
+          if (key ? !@pm.key?(key) : @pm[:_].nil?) || update
             doc = JSON.parse(dependfile.read)
-            @pm[:_] = (val = doc['packageManager']) ? val[0, val.index('+') || val.size] : false
-            @pm[:name] = doc['name']
-            @pm[:scripts] = doc['scripts']
-            @pm[:version] = doc['version']
-            @pm[:private] = doc['private']
-            @pm[:workspaces] = doc['workspaces']
+            if @pm[:_].nil?
+              @pm[:_] = (val = doc['packageManager']) ? val[0, val.index('+') || val.size] : false
+              @pm[:name] = doc['name']
+              @pm[:scripts] = doc['scripts']
+              @pm[:version] = doc['version']
+              @pm[:private] = doc['private']
+              @pm[:workspaces] = doc['workspaces']
+            end
+            @pm[key] = doc[key.to_s] if key
           end
         rescue StandardError => e
           log.debug e
@@ -996,10 +970,67 @@ module Squared
         def read_install
           return unless (ret = env('NODE_INSTALL'))
 
-          @pm[:_] ||= ret if ret.include?('@')
+          if ret.include?(',')
+            catch :found do
+              split_escape(ret).each do |val|
+                case val
+                when /^yarn/
+                  next if yarntype(exist: true) == 0
+                when /^pnpm/
+                  next if pnpmtype(exist: true) == 0
+                when /^npm/
+                  nil
+                else
+                  next
+                end
+                ret = val
+                throw :found
+              end
+              return
+            end
+          end
+          @pm[:_] ||= ret
           ret
         end
 
+        def yarntype(exist: false)
+          if (rc = rootpath('.yarnrc.yml', ascend: dependext)).exist?
+            require 'yaml'
+            doc = YAML.load_file(rc)
+            doc.nodeLinker == 'node-modules' ? 2 : 3
+          elsif exist && !basepath('yarn.lock').exist?
+            0
+          else
+            1
+          end
+        rescue StandardError => e
+          return 0 if exist
+
+          log.debug e
+          3
+        end
+
+        def pnpmtype(exist: false)
+          require 'yaml'
+          doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: dependext))
+          @pm['packageManager'] = doc['packageManager']
+          case doc['nodeLinker']
+          when 'hoisted'
+            1
+          when 'pnp'
+            3
+          else
+            4
+          end
+        rescue StandardError => e
+          if exist
+            %w[pnpm-lock.yaml pnpm-workspace.yaml].any? { |val| basepath(val).exist? } ? 4 : 0
+          else
+            log.debug e
+            4
+          end
+        end
+
         def read_scripts
           ret = read_packagemanager(:scripts)
           ret.is_a?(Hash) ? ret.to_a : []

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

@@ -363,7 +363,7 @@ module Squared
           end
         end
 
-        def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated'))
+        def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = pip_session 'list --outdated'
           append_global
           cmd = session_done cmd

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

@@ -886,7 +886,7 @@ module Squared
             pwd_set(pass: !opt.nil?) do
               out = `#{gem_output(opt, 'list --local -d', gemname)}`
               if out =~ /#{Regexp.escape(gemname)} \(([^)]+)\)/
-                $1.split(/\s*,\s*/)
+                split_escape($1)
                   .unshift(@version)
                   .uniq
                   .each do |val|

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

@@ -247,9 +247,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

data/lib/squared/workspace/project.rb

@@ -7,7 +7,7 @@ module Squared
         attr_accessor :line_width
 
         def max_width(lines)
-          n = [lines.max_by(&:size).size, 80].max
+          n = [lines.empty? ? 0 : lines.max_by(&:size).size, 80].max
           [n, Rake.application.terminal_width].min
         end
       end

data/lib/squared/workspace/repo.rb

@@ -135,7 +135,7 @@ module Squared
             next if (stage = env('REPO_STAGE')) == '1'
 
             @project.select do |_, proj|
-              next unless proj.enabled?(proj.workspace.baseref)
+              next unless proj.enabled?(proj.workspace.baseref) && proj.global
 
               proj.depend(sync: true) if proj.depend?
               next if stage == '2'

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

@@ -11,6 +11,21 @@ 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
+                         pass[val] ||= hashdup(val, pass: pass)
+                       when Proc, Method
+                         val
+                       else
+                         val.dup
+                       end
+          end
+          ret
+        end
       end
     end
   end

metadata

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