squared 0.4.35 → 0.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87083dafc757443f6f6afb994664bbb3089d4c57af8f32e06e2a9b76a21f520d
-  data.tar.gz: 8025828b76fce4826e3572e2546977ee7d998027aed144d9b119d84ba0a6e05d
+  metadata.gz: 3717cf9c708b4a265d919790f7713bc6c35187c7229d956411d2dcf80ab7dfab
+  data.tar.gz: 1659d367915ab16c72c148ddc3ea95312664afe5c92a7b77e31158318f0d1f3b
 SHA512:
-  metadata.gz: 868a4f6d3fbbd406eab3ce1d2c87850f7a59fe2161314b001e8a20b540f9c98bd71a8f4250699d463220337be7124e7d437d34178e5f6036f40087c188e4ab98
-  data.tar.gz: 60e6625462ad8f9d6efbf4b9029629f6eceee0316647be5bf19098c9c951a7de42b6411395135b1664c76f598ac63a40656541f3e669775cfefa6f9261d356cc
+  metadata.gz: 330278fdc20d09076437c13530569ab1b09174ba7133558f7f5decdf8da25bff8ee22e0c9054c564f15c80f3a0dae79c859099d875aad2613bd14a244519ebf0
+  data.tar.gz: f83310b3557945985db8a70b2f283bd2376b44e50fba64f5a1dc267c3f753bee4aab328906a66b9b888f042a533e75ec74a3c8c3a8147ad444a2e215549a87a2

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [0.4.37] - 2026-04-29
+
+### Changed
+
+- Project base method dependindex replaces private instance variable.
+
+### Fixed
+
+- Ruby command version did not abort asdf "Not installed" error.
+- Git command pull action all did not pass option flags to branches.
+- Python command exec did not activate virtual environment.
+- Docker command bake did not reinsert failed check for context directory.
+- Common method shell_quote argument preserve did not bypass requoting.
+
+## [0.4.36] - 2026-03-11
+
+### Added
+
+- Python venv initialization installs setuptools when detected.
+- Node task depend adds prod option flags when NODE_ENV=production.
+
+### Changed
+
+- Application method with using hide and pass compatibility was implemented.
+
+### Fixed
+
+- Docker task clean does not run in parallel without ENV override.
+- OptionPartition methods with escape parameter were reordered.
+- OptionPartition methods with quote parameter were revised.
+- Project base run command was not covered due to lack of communication.
+
 ## [0.4.35] - 2025-12-31
 
 ### Changed
@@ -1150,7 +1182,7 @@
 - Rake did not set original rakefile when calling itself.
 - Extended tasks were not associated to their supporting class method.
 
-## [0.1.0] - 2024-12-7
+## [0.1.0] - 2024-12-07
 
 ### Added
 
@@ -1171,12 +1203,14 @@
 - Git pull did not display colors for diff bar chart.
 - Git commit did not fetch latest refs before submitting.
 
-## [0.0.12] - 2024-12-1
+## [0.0.12] - 2024-12-01
 
 ### Added
 
 - Changelog was created.
 
+[0.4.37]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.37
+[0.4.36]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.36
 [0.4.35]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.35
 [0.4.34]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.34
 [0.4.33]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.33

data/lib/squared/common/format.rb

@@ -186,7 +186,9 @@ module Squared
         end
         if hint.nil? ? args.size > 1 : !hint
           title = log_title(level, color: false)
-          sub = [pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)]] if color
+          if color
+            sub = [{ pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)] }]
+          end
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub, pipe: -1)
         else
           msg = [log_title(level, color: color)]
@@ -237,6 +239,8 @@ module Squared
           lines = val.to_s.lines(chomp: true)
           lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(::StandardError))
         end
+        return if lines.empty?
+
         n = cols || max.call(lines)
         if $stdout.tty?
           require 'io/console'

data/lib/squared/common/shell.rb

@@ -46,7 +46,7 @@ module Squared
         end
       end
 
-      def shell_quote(val, option: true, force: true, double: false, preserve: true, override: false)
+      def shell_quote(val, option: true, force: true, double: false, preserve: true, pass: false, override: false)
         val = val.to_s
         return val if (!force && !val.include?(' ')) || val.empty?
 
@@ -54,16 +54,16 @@ module Squared
           pat = /\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
           return val if val.match?(pat)
         end
-        q = ->(s) { s.gsub("'\\\\''", "'") }
         if val =~ QUOTE_VALUE
-          return val if $1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o)
+          return val if pass || ($1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o))
 
           base = $2 unless preserve
         end
+        q = -> { (base || val).gsub("'\\\\''", "'") }
         if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
-          "\"#{q.call(base || val).gsub(/(?<!\\)"/, '\\"')}\""
+          "\"#{q.call.gsub(/(?<!\\)"/, '\\"')}\""
         else
-          base ? val : "'#{q.call(val).gsub("'", "'\\\\''")}'"
+          "'#{q.call.gsub("'", "'\\\\''")}'"
         end
       end
 

data/lib/squared/common/system.rb

@@ -9,6 +9,7 @@ module Squared
       module_function
 
       def shell(*args, name: :system, **kwargs)
+        kwargs.delete(:exception) unless name == :system
         if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
           e = kwargs[:exception]
           if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
@@ -24,7 +25,7 @@ module Squared
         else
           return Kernel.send(name, *args, **kwargs)
         end
-        return ret unless e && !ret && name == :system
+        return ret unless e && !ret
 
         raise $?.to_s
       end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -178,8 +178,25 @@ module Squared
         self
       end
 
-      def with(*val, pass: false, group: nil, **kwargs, &blk)
-        return self if pass == true || (pass && as_a(pass, :to_s).any? { |s| respond_to?(s) && __send__(s) rescue nil })
+      def with(*val, hide: nil, group: nil, **kwargs, &blk)
+        if hide.nil? && kwargs.key?(:pass)
+          pass = kwargs[:pass]
+          case pass
+          when true, false
+            hide = pass
+            kwargs.delete(:pass)
+          else
+            hide, pass = Array(pass).partition { |s| respond_to?(s) || s.to_s.end_with?('?') }
+            if pass.empty?
+              kwargs.delete(:pass)
+            elsif hide.empty?
+              hide = nil
+            else
+              kwargs[:pass] = pass
+            end
+          end
+        end
+        return self if hide == true || (hide && Array(hide).any? { |s| respond_to?(s) && __send__(s) rescue nil })
 
         @group = nil
         @ref = nil
@@ -810,7 +827,7 @@ module Squared
                                          ' (sync)'
                                        end}"
               emphasize(grp, title: title, cols: [cols, title.size].max, border: theme[:border],
-                             sub: [pat: /\A(Step \d+)(.*)\z/, styles: theme[:header]])
+                             sub: [{ pat: /\A(Step \d+)(.*)\z/, styles: theme[:header] }])
             end
           end
         end

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

@@ -456,7 +456,7 @@ module Squared
             args[0] = instance_eval(&blk) || f
             return unless args.first
           end
-          if args.all? { |val| val.is_a?(Array) }
+          if args.all?(Array)
             cmd = []
             var = {}
             args.each do |val|
@@ -816,7 +816,7 @@ module Squared
         end
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, from: nil, banner: true, chdir: path,
-                interactive: nil, hint: nil, **)
+                interactive: nil, hint: nil, send: :system, **)
           unless cmd
             print_error('no command session started', subject: project, hint: from || 'unknown', pass: true)
             return
@@ -854,7 +854,7 @@ module Squared
                 end
               end
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
-              ret = shell(*args, chdir: chdir, exception: exception)
+              ret = shell(*args, name: send, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
             on_error(e, from, exception: true)
@@ -904,7 +904,7 @@ module Squared
               run_set(output[0], *args, **kwargs)
             when :dependfile
               @dependindex = nil
-              @dependfile = val.nil? ? nil : basepath(*args)
+              @dependfile = (basepath(*args) if val)
             else
               if block_given?
                 if blocks.include?(key)
@@ -1009,7 +1009,7 @@ module Squared
         end
 
         def dependtype(*)
-          @dependindex ? @dependindex.succ : 0
+          dependindex&.succ || 0
         end
 
         def log
@@ -1113,6 +1113,8 @@ module Squared
           else
             items = check.call(data[start])
           end
+          return done if items.empty?
+
           if out
             a, b, c, d, e = ARG[:GRAPH]
             f = tag.call(target)
@@ -1910,7 +1912,7 @@ module Squared
             ret = []
             if data[:command]
               ret[0] = data[:command]
-              ret[1] = data[:opts] unless diso
+              ret[1] = data[:opts] unless noopt
               ret[3] = data[:args]
             elsif data[:script]
               ret[1] = data[:script]
@@ -1919,12 +1921,12 @@ module Squared
             else
               ret[0] = false
             end
-            ret[2] = data[:env] unless dise
+            ret[2] = data[:env] unless noenv
             ret
           end
           case cmd
           when Array
-            @output = if cmd.all? { |data| data.is_a?(Hash) }
+            @output = if cmd.all?(Hash)
                         noopt = false
                         noenv = false
                         cmd.map { |data| parse.call(data) }
@@ -2010,10 +2012,21 @@ module Squared
                    end
         end
 
-        def dependfile_set(list)
-          @dependindex = list.index { |file| basepath(file).exist? }.tap do |index|
-            @dependfile = basepath(list[index || 0])
-          end
+        def dependfile_set(list, default: 0)
+          @dependindex = if @dependname
+                           @dependfile = basepath @dependname
+                           list.index(@dependname)
+                         else
+                           list.index { |file| basepath(file).exist? }.tap do |i|
+                             @dependfile = basepath(list[i || default])
+                           end
+                         end || (list unless enabled?)
+        end
+
+        def dependindex
+          dependfile_set @dependindex if @dependindex.is_a?(Array)
+
+          @dependindex unless @dependindex.is_a?(Array)
         end
 
         def as_get(val, from)

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

@@ -20,7 +20,7 @@ module Squared
                        sbom=q].freeze
           }.freeze,
           compose: {
-            common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=n profile=b progress=b
+            common: %w[all-resources compatibility dry-run ansi=b env-file=p f|file=p parallel=n profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
             build: %w[check no-cache print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
                       provenance=q sbom=q ssh=qq].freeze,
@@ -254,8 +254,8 @@ module Squared
         def clean(*, sync: invoked_sync?('clean'), **)
           if runnable?(@clean)
             super
-          else
-            image(:rm, sync: sync)
+          elsif sync || option('y', prefix: 'docker')
+            image :rm
           end
         end
 
@@ -337,7 +337,7 @@ module Squared
                 if projectpath?(val = args.pop)
                   context = val
                 else
-                  op.push(val)
+                  args << val
                 end
               end
               op.append(args, escape: true, strip: /^:/)

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

@@ -983,12 +983,8 @@ module Squared
                 printsucc
               end
               op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, no: OPT_GIT[:no][:pull])
-              reg = if op.empty?
-                      []
-                    else
-                      opts = op.uniq(opts)
-                      matchmap op
-                    end
+              opts -= op.extras
+              reg = matchmap op
               session_done op.target
               heads = []
               cur = nil
@@ -1181,7 +1177,7 @@ module Squared
                       { pat: /^(## )(.+?)(\.{3})(.+)$/, styles: [nil, g, nil, r], index: -1 }
                     ]
                   else
-                    [pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2]
+                    [{ pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2 }]
                   end
           end
           out, banner, from = source(io: true)
@@ -1905,7 +1901,7 @@ module Squared
             styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
             puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
-                              sub: [pat: /^(\d+)(.+)$/, styles: styles])
+                              sub: [{ pat: /^(\d+)(.+)$/, styles: styles }])
           end
           on :last, from
         end

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
+          common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
           install_base: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
                            package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
@@ -427,13 +427,18 @@ module Squared
 
             if (yarn = dependtype(:yarn)) > 0
               cmd = session 'yarn'
-              if flag == :add
+              if !flag && yarn > 1 && prod?
+                cmd << 'workspaces focus --all --production'
+              elsif flag == :add
                 cmd << 'add'
                 cmd << "--#{save}" unless save == 'prod'
                 cmd << '--exact' if exact
               else
                 cmd << 'install'
-                cmd << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
+                if yarn == 1
+                  cmd << '--production' if prod?
+                  cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
+                end
               end
             elsif pnpm?
               cmd = session 'pnpm'
@@ -443,6 +448,7 @@ module Squared
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
                 cmd << 'install'
+                cmd << '--prod' if prod?
                 append_platform
               end
               if (val = option('public-hoist-pattern'))
@@ -457,6 +463,7 @@ module Squared
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
               else
+                cmd << '--include=prod' if prod?
                 append_platform
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
@@ -685,8 +692,9 @@ module Squared
             pwd_set(from: from, dryrun: dryrun) do
               cmd = session_done cmd
               Open3.popen2e(cmd) do |_, out|
-                write_lines(out, banner: format_banner(cmd),
-                                 sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:bright_blue), index: 2])
+                write_lines(out,
+                            banner: format_banner(cmd),
+                            sub: npmnotice + [{ pat: /^(.+)(Tarball .+)$/, styles: color(:bright_blue), index: 2 }])
               end
             end
             on :last, from

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

@@ -87,7 +87,7 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          dependfile_set DEP_PYTHON
+          dependfile_set(DEP_PYTHON, default: 2)
           editable_set editable
           venv_set kwargs[:venv]
         end
@@ -196,7 +196,7 @@ module Squared
                             end
                             args.join(' ')
                           end
-                    shell(cmd, name: :exec, chdir: path)
+                    run(cmd, send: :exec, banner: false)
                   end
                 end
               else
@@ -228,7 +228,7 @@ module Squared
                             if args.empty?
                               args = readline('Enter command', force: true).split(' ', 2)
                             elsif args.size == 1 && !option('interactive', prefix: 'venv', equals: '0')
-                              args << readline('Enter arguments', force: false)
+                              args << readline('Enter arguments', force: false) unless args.first.include?(' ')
                             end
                             venv_init
                             run args.join(' ')
@@ -875,7 +875,11 @@ module Squared
             .clear(pass: false)
           status = op.arg?(/\A-v+\z/)
           run(op, env, exception: true, banner: banner)
-          install(:upgrade, ['poetry']) if poetry?
+          if poetry?
+            install(:upgrade, ['poetry'])
+          elsif setuptools?
+            install(:upgrade, ['setuptools', 'wheel'])
+          end
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end
 

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

@@ -503,13 +503,14 @@ module Squared
                                    `rvm current`[/^\S+/, 0]
                                  when 'rbenv'
                                    name = `rbenv version-name`
-                                   name =~ SEM_VER ? "ruby #{name}" : name
+                                   (name =~ SEM_VER) == 0 ? "ruby #{name}" : name
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
                                  when 'install'
                                    ver = '.tool-versions'
-                                   `asdf current ruby`[/ruby\s+\S+/, 0].sub(/\s+/, ' ')
+                                   exit 1 unless (cur = `asdf current ruby`[/ruby\s+\S+/, 0])
+                                   cur.sub(/\s+/, ' ')
                                  else
                                    ver = nil
                                    `ruby --version`
@@ -768,7 +769,7 @@ module Squared
               else
                 op.clear
               end
-            elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
+            elsif (n = op.index { |val| val.match?(/(\A|[\w.-])@\d/) })
               name = op.delete_at(n)
               pre, ver = if (n = name.index('@')) == 0
                            [gemname, name[1..-1]]

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

@@ -32,10 +32,10 @@ module Squared
               ret.map! do |val|
                 next val if opt?(val)
 
-                if quote || val.is_a?(Pathname)
-                  shell_quote(val, force: force, double: double)
-                elsif escape
+                if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
+                elsif quote || pa
+                  shell_quote(val, force: force, double: double)
                 else
                   val
                 end
@@ -300,10 +300,13 @@ module Squared
             self
           end
 
-          def append_any(*args, quote: true, **kwargs)
+          def append_any(*args, escape: false, **kwargs)
+            quote = kwargs.fetch(:quote, true)
             (args.empty? ? extras : args.flatten).each do |val|
               if exist?(val)
                 add_path(val, **kwargs)
+              elsif escape
+                add shell_escape(val, **kwargs)
               elsif quote
                 add_quote(val, **kwargs)
               else
@@ -395,6 +398,7 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
+            kwargs.delete(:quote)
             args.compact!
             merge(args.map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
@@ -411,10 +415,12 @@ module Squared
                           elsif exclude.first.is_a?(Symbol)
                             partition(&exclude.first)
                           else
+                            exclude.map! { |pat| Regexp.new(pat) }
                             partition do |val|
-                              next false if pattern && OptionPartition.pattern?(val)
+                              val = val.to_s
+                              next if pattern && OptionPartition.pattern?(val)
 
-                              exclude.none? { |pat| val.match?(Regexp.new(pat)) }
+                              exclude.none? { |pat| val.match?(pat) }
                             end
                           end
             unless temp.empty?

data/lib/squared/workspace/repo.rb

@@ -16,7 +16,7 @@ module Squared
       attr_reader :manifest_url, :manifest
 
       def repo(url, manifest = 'latest', run: nil, script: nil, args: nil, dev: nil, prod: nil,
-               ref: @ref, group: @group)
+               ref: @ref, group: @group, **)
         @home = if (val = env('REPO_HOME'))
                   path = Pathname.new(val)
                   if main == path.basename.to_s

metadata

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