squared 0.4.36 → 0.4.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31323c0d6d0f5d2d45c7e4cc882237fb5cc687d6f7f1d3b618b86385f26d6398
-  data.tar.gz: ddb3271ef90874b2a716418bfc344744c58a2b433954bd8034551621de500232
+  metadata.gz: dc06fd43c026c03e1a4ef6b082967f726f0a6a75dd3ab2ecca128198f8f51985
+  data.tar.gz: 6547492956431f6272a7f1165b2cb3a24f0e8b20787969837dabf13560c11815
 SHA512:
-  metadata.gz: 281d00f10b66df75ed5e2269f566b892a768fa493e68701fd9a73de787c77e0d191e10e1165e846dbd7d93d6de8427811e6193e8970564310d56a42085dd7e5b
-  data.tar.gz: 6672b181a9e792ff624dc8876d0b45b954c3b304f8e78abcb6a2ac674e2188aabd347e6f4d86a91c6550c11c2ac6ba842e728562a74dfb8a0740f7214a5200f3
+  metadata.gz: 8982c15e41b7de8e786b7d10515ff44b23e15c8e3e0b403f82db79067b792119b1df6a2b62756314f065fc21f7322c8c27e68edc5f1530fa098747272a703abb
+  data.tar.gz: eb886ff5f4d5d15afb15c84f1f739d410a53b7fd5aa22ac5b15112e3e5438b2ed7f590d2fd2b3601579212309565be9c51f65c1978b49cf1f78dc11ffeb0ed2c

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.4.38] - 2026-06-14
+
+### Added
+
+- Application project commands can be defined without a reference.
+- Git command branch action all was implemented.
+
+### Changed
+
+- Override alias methods were created for suffix "!" to "\_".
+- Project banners do not display boolean attributes.
+- OptionPartition method append strips single quotes when quoting strings.
+
+### Fixed
+
+- Application methods log and exclude were non-functional.
+- Docker command bake action build does not support changing context.
+- Project base method semver did not include prerelease delimiter.
+- Project session cleanup did not compare by reference.
+
+## [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
@@ -1195,6 +1229,8 @@
 
 - Changelog was created.
 
+[0.4.38]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.38
+[0.4.37]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.37
 [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

data/lib/squared/common/shell.rb

@@ -46,24 +46,31 @@ 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?
+        return val if option && val.match?(/\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m)
 
-        if option
-          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)
-
-          base = $2 unless preserve
+          if pass == '"' || pass == "'"
+            return val if pass == $1
+          elsif pass || ($1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o))
+            return val
+          end
+          case preserve
+          when false
+            base = $2
+          when '"'
+            base = $2 if $1 == "'"
+          when "'"
+            base = $2 if $1 == '"'
+          end
         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.36'
+  VERSION = '0.4.38'
 end

data/lib/squared/workspace/application.rb

@@ -837,7 +837,7 @@ module Squared
         log_console(*args, pipe: kwargs[:pipe] || pipe)
       end
 
-      def script_command(task, val, group, ref, on, &blk)
+      def script_command(task, val, group, ref, on = nil, &blk)
         if block_given?
           val = Struct::RunData.new(val, blk)
         elsif !val
@@ -848,7 +848,7 @@ module Squared
           items = as_a(group, :to_sym)
         else
           label = :ref
-          items = as_a(ref, :to_sym)
+          items = as_a(ref || :_, :to_sym)
         end
         items.each do |name|
           @script[label][name][task] = val
@@ -881,6 +881,8 @@ module Squared
           nil
         elsif ref && target[:ref].key?(ref)
           target[:ref][ref]
+        else
+          target[:ref][:_]
         end
       end
 

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

@@ -20,7 +20,7 @@ module Squared
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
                      pass only exclude].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?[-.]?(\S+)?\b/.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?(?:([-.])?(\S+))?\b/.freeze
         URI_SCHEME = %r{\A([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
         TASK_METADATA = Rake::TaskManager.record_task_metadata
         private_constant :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
@@ -816,9 +816,9 @@ 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)
+            print_error('no command session started', subject: project, hint: from, pass: true)
             return
           end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
@@ -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
@@ -1268,7 +1268,7 @@ module Squared
           return cmd unless cmd.respond_to?(:done)
 
           raise_error('no args added', hint: cmd.first) unless cmd.size > 1
-          @session = nil if cmd == @session
+          @session = nil if cmd.equal?(@session)
           cmd.done
         end
 
@@ -1409,7 +1409,7 @@ module Squared
                     __send__(meth)
                   end
                 end
-                val = val.compact.join(s)
+                val = val.reject { |item| !item || item == true }.join(s)
                 next unless found && !val.empty?
               elsif (val = __send__(val)).nil?
                 next
@@ -1790,9 +1790,9 @@ module Squared
 
           a, b = [a.first, b.first].map! do |c|
             begin
-              d = Integer(c[5]).to_s
+              d = Integer(c[6]).to_s
             rescue StandardError
-              d = c[5] ? '-1' : '0'
+              d = c[6] ? '-1' : '0'
             end
             [c[0], c[2], c[4] || '0', d]
           end
@@ -2012,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)
@@ -2066,7 +2077,7 @@ module Squared
         end
 
         def semmajor?(cur, want)
-          (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[5]
+          (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[6]
         end
 
         def printfirst?

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,
@@ -330,19 +330,8 @@ module Squared
             append_tag(tag || option('tag', ignore: false) || self.tag)
             append_context context
           when :bake
-            unless op.empty?
-              args = op.dup
-              op.reset
-              if Dir.exist?(args.last)
-                if projectpath?(val = args.pop)
-                  context = val
-                else
-                  op.push(val)
-                end
-              end
-              op.append(args, escape: true, strip: /^:/)
-              contextdir context if context
-            end
+            op.append(escape: true, strip: /^:/, clear: true)
+            op.push(context) if context
           end
           op.clear(pass: false)
           run(from: :"buildx:#{flag}")
@@ -362,6 +351,7 @@ module Squared
           end
           run(from: :"compose:#{flag}")
         end
+        alias compose_ compose!
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)

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

@@ -339,7 +339,7 @@ module Squared
         end
 
         subtasks({
-          'branch' => %i[create track delete move copy list current].freeze,
+          'branch' => %i[create track delete move copy list all current].freeze,
           'checkout' => %i[commit branch track detach path].freeze,
           'commit' => %i[add all amend amend-orig fixup].freeze,
           'diff' => %i[head branch files view between contain].freeze,
@@ -697,12 +697,7 @@ module Squared
                       task flag do |_, args|
                         branch flag, args.to_a
                       end
-                    when :current
-                      format_desc action, flag
-                      task flag do
-                        branch flag
-                      end
-                    else
+                    when :move, :copy
                       format_desc action, flag, 'branch,oldbranch?'
                       task flag, [:branch, :oldbranch] do |_, args|
                         if (branch = args.branch)
@@ -713,6 +708,11 @@ module Squared
                         end
                         branch(flag, refs: [oldbranch, branch])
                       end
+                    else
+                      format_desc action, flag
+                      task flag do
+                        branch flag
+                      end
                     end
                   when 'switch'
                     case flag
@@ -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
@@ -1361,6 +1357,7 @@ module Squared
           append_pathspec op.extras
           source(exception: false)
         end
+        alias log_ log!
 
         def diff(flag, opts = [], refs: [], branch: nil, range: [], index: [])
           cmd, opts = git_session('diff', opts: opts)
@@ -1804,6 +1801,10 @@ module Squared
 
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
                    multiple: false, hint: nil, from: nil, send: :system, **kwargs)
+          unless cmd
+            print_error('no git session started', subject: project, hint: from, pass: true)
+            return
+          end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           if io && banner == false
             from = nil
@@ -1990,7 +1991,7 @@ module Squared
           end
           op << '--verbose' if (flag || from == :fetch) && stdout? && !op.arg?('quiet')
           if remote
-            op.append(remote, delim: true)
+            op.append(remote)
             if (val = option('refspec', target: target, strict: true))
               op.append(*split_escape(val))
             else

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

@@ -552,7 +552,7 @@ module Squared
               when :patch
                 upgrade = a == c && b == d && f[4] != w[4]
               end
-              if upgrade && !w[5]
+              if upgrade && !w[6]
                 next if file == want
 
                 found << [key, file, want, if a != c

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
@@ -176,11 +176,11 @@ module Squared
                       end
                       break
                     end
-                    unless found.anybits?(1)
-                      puts log_message(found == 0 ? Logger::INFO : Logger.WARN,
-                                       "no scripts #{found == 0 ? 'found' : 'executed'}",
-                                       subject: name, hint: pyprojectfile)
-                    end
+                    next if found.anybits?(1)
+
+                    puts log_message(found == 0 ? Logger::INFO : Logger::WARN,
+                                     "no scripts #{found == 0 ? 'found' : 'executed'}",
+                                     subject: name, hint: pyprojectfile)
                   end
                 when 'exec'
                   format_desc action, nil, 'command|:,args*'
@@ -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
@@ -516,6 +516,7 @@ module Squared
           op.clear
           run(from: :"#{flag}:build")
         end
+        alias build_ build!
 
         def publish(flag, opts = [])
           case flag

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

@@ -7,7 +7,7 @@ module Squared
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb gems.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
-          ruby: %w[0=im? a c C=pm e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit verbose
+          ruby: %w[a c l n p s S w 0=im? C=pm e=q E=bm F=qm i=bm? I=pm r=bm W=bm? x=pm? d|debug jit rjit verbose
                    y|yydebug backtrace-limit=i crash-report=q disable=q dump=q enable=q encoding=b external-encoding=b
                    internal-encoding=b parser=b].freeze,
           rake: %w[A|all B|build-all comments n|dry-run m|multitask P|prereqs q|quiet X|no-deprecation-warnings
@@ -496,7 +496,7 @@ module Squared
               ].each do |val|
                 next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
 
-                trim = ->(s) { s[/\A\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/\A([a-z]+)-/i, '\1 ') }
+                trim = ->(s) { s =~ /^\D+\d+\.\d+(?:\.\S+)?/ ? $&.sub(/^([a-z]+)-/i, '\1 ') : s }
                 ver = '.ruby-version'
                 out << trim.call(case (cmd = File.basename(val))
                                  when 'rvm'
@@ -509,7 +509,8 @@ module Squared
                                    `#{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`

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

@@ -21,7 +21,7 @@ module Squared
             include Prompt
 
             def append(target, *args, delim: false, escape: false, quote: true, strip: nil, force: true, double: false,
-                       **)
+                       preserve: true, **)
               return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
@@ -35,7 +35,7 @@ module Squared
                 if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
                 elsif quote || pa
-                  shell_quote(val, force: force, double: double)
+                  shell_quote(val, force: force, double: double, preserve: preserve)
                 else
                   val
                 end
@@ -294,9 +294,9 @@ module Squared
             self
           end
 
-          def append(*args, **kwargs)
-            args = extras if args.empty?
-            OptionPartition.append(target, *args, **kwargs)
+          def append(*args, clear: false, preserve: '"', **kwargs)
+            args = clear ? extras.dup.tap { extras.clear } : extras if args.empty?
+            OptionPartition.append(target, *args, preserve: preserve, **kwargs)
             self
           end
 

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.36
+  version: 0.4.38
 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.10
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []