squared 0.6.11 → 0.6.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9559cf340c4a95816cc2853417bfb3c43053cf59cdd4e4b38fac0c074f41264
-  data.tar.gz: 60d6c5b20aa58e9606402745283948393253363ed38d5f15322be5d7cbfde7d5
+  metadata.gz: 94097556aa9d578868291a94e79b77bb4c647f25a732c18168af747ef159d176
+  data.tar.gz: c5546efd99a127548fe59d3c43b19fe44c0328470b89549ad6c094898ca60599
 SHA512:
-  metadata.gz: 0b34a0a55c607060040c027b19bc16b5ad93ba1403d753c45a75edadb3086f179b1e533b4d5058787b544012e0eda60d5e1b70ed9ff26c5fda65d55fd74b5513
-  data.tar.gz: 65478734cb5d093f3abb96022479ba3aec90b7b08741f0f924c348b06466dedb0a8db9d19e7d78e2d0f7cd26c874f7ff56d387323b943baa969097f2c97f37c5
+  metadata.gz: 03f8156021daa593832a7366a4cca5e3c62451bbdba1c4c2138cde0549c3fa9f4f584fc6ab7a89f3dd0abb5fb618b0e87a8f01bbab44202b320e17062379deb4
+  data.tar.gz: eab421c80afe78291ec52442e26fd9e99467ee934d76afa9d04843e5670cd9e67720e5e63247f625a17889fb2ef0fffa1699ae4d733b28ef12b694960bd8c6f4

data/CHANGELOG.md

@@ -1,5 +1,43 @@
 # Changelog
 
+## [0.6.13] - 2026-05-04
+
+### Added
+
+- Application project commands can be defined without a reference.
+
+### Fixed
+
+- Application methods log and exclude were non-functional.
+- Project base tasks did not detect build scripts using Arrays.
+
+## [0.6.12] - 2026-04-29
+
+### Fixed
+
+- Application dynamic Project loader assumed class would be found.
+- Git command grep did not add patterns with "--" pathspec separator.
+
+## [0.5.23] - 2026-04-29
+
+### Fixed
+
+- See `0.4.37`.
+
+## [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.6.11] - 2026-03-11
 
 ### Changed
@@ -8,6 +46,8 @@
 
 ## [0.5.22] - 2026-03-11
 
+### Fixed
+
 - Project base run command was not covered due to lack of type checking.
 
 ## [0.4.36] - 2026-03-11
@@ -1635,6 +1675,8 @@
 
 - Changelog was created.
 
+[0.6.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.13
+[0.6.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.12
 [0.6.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.11
 [0.6.10]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.10
 [0.6.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.9
@@ -1647,6 +1689,7 @@
 [0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2
 [0.6.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.1
 [0.6.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.0
+[0.5.23]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.23
 [0.5.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.22
 [0.5.21]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.21
 [0.5.20]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.20
@@ -1670,6 +1713,7 @@
 [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.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

@@ -51,7 +51,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?
 
@@ -59,16 +59,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

@@ -28,6 +28,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)
@@ -43,7 +44,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.6.11'
+  VERSION = '0.6.13'
 end

data/lib/squared/workspace/application.rb

@@ -867,7 +867,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
@@ -878,7 +878,7 @@ module Squared
           as_a group, :to_sym
         else
           label = :ref
-          as_a ref, :to_sym
+          as_a(ref || :_, :to_sym)
         end.each do |name|
           @script[label][name][task] = val
           @events[label][name][task] = on if on.is_a?(Hash)
@@ -910,6 +910,8 @@ module Squared
           nil
         elsif ref && target[:ref].key?(ref)
           target[:ref][ref]
+        else
+          target[:ref][:_]
         end
       end
 
@@ -923,6 +925,7 @@ module Squared
           require_relative rb
           break
         end
+        nil
       end
 
       def root?(path, pass: [])

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

@@ -918,7 +918,7 @@ module Squared
         end
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, banner: true, from: nil, chdir: path,
-                interactive: nil, hint: nil, series: false, **)
+                interactive: nil, hint: nil, series: false, send: :system, **)
           unless cmd
             print_error('no command session started', subject: project, hint: from, pass: true)
             return
@@ -956,7 +956,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)
@@ -1008,7 +1008,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
               instance_variable_set(:"@#{key}", val)
             end
@@ -1116,7 +1116,7 @@ module Squared
         end
 
         def dependtype(*)
-          @dependindex ? @dependindex.succ : 0
+          dependindex&.succ || 0
         end
 
         def dependname
@@ -1249,7 +1249,7 @@ module Squared
           else
             if series?(obj)
               obj.each(&:call)
-            elsif obj.is_a?(Array) && obj.any? { |val| !val.is_a?(String) }
+            elsif obj.is_a?(Array) && obj.any? { |val| val.nil? || !val.is_a?(String) }
               build(*obj, **kwargs)
             elsif obj
               run_s(*Array(obj), **kwargs)
@@ -2369,13 +2369,19 @@ module Squared
                    end
         end
 
-        def dependfile_set(list)
+        def dependfile_set(list, default: 0)
           @dependindex = if @dependname
                            @dependfile = basepath @dependname
                            list.index(@dependname)
                          else
-                           list.index { |file| exist?(file) }.tap { |i: 0| @dependfile = basepath(list[i]) }
-                         end
+                           list.index { |file| exist?(file) }.tap { |i| @dependfile = basepath(list[i || default]) }
+                         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 ansi|b compatibility dry-run env-file=p f|file=p parallel=n profile=b progress=b
+            common: %w[all-resources ansi=b compatibility dry-run 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,
@@ -400,7 +400,7 @@ module Squared
                 if projectpath?(val = args.pop)
                   context = val
                 else
-                  op.push(val)
+                  args << val
                 end
               end
               op.append(args, escape: true, strip: /^:/)
@@ -875,11 +875,11 @@ module Squared
                      when :service
                        ['Choose a service',
                         'compose ps -a ' \
-                        "--format='table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}'"]
+                        '--format="table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}"']
                      else
                        ['Choose an image',
                         'images -a ' \
-                        "--format='table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}'"]
+                        '--format="table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}"']
                      end
           lines = `#{docker_output(cmd)}`.lines
           if lines.size <= 1

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

@@ -169,22 +169,22 @@ module Squared
           }.freeze,
           fetch: {
             base: %w[multiple porcelain progress P|prune-tags refetch stdin u|update-head-ok
-                     recurse-submodules-default=b].freeze,
+                     recurse-submodules-default=b?].freeze,
             pull: %w[4 6 n t a|append atomic dry-run f|force k|keep negotiate-only prefetch p|prune q|quiet set-upstream
                      unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q recurse-submodules=v
                      refmap=q o|server-option=q shallow-exclude=b shallow-since=v upload-pack=q].freeze
           }.freeze,
           git: {
-            add: %w[N|intent-to-add refresh].freeze,
+            add: %w[N|intent-to-add].freeze,
             blame: %w[b c l s t w C=im? L=q M=im? S=p color-by-age color-lines first-parent incremental line-porcelain
                       p|porcelain root score-debug f|show-name e|show-email n|show-number show-stats abbrev=i contents=p
-                      date=q encoding=b ignore-rev=b ignore-revs-file=p reverse=q].freeze,
+                      date=q diff-algorithm=b encoding=b ignore-rev=b ignore-revs-file=p reverse=q].freeze,
             clean: %w[d x X f|force n|dry-run i|interactive q|quiet e|exclude=q].freeze,
             grep: %w[e f=p h H I O=bm r all-match and G|basic-regexp break cached column c|count E|extended-regexp
                      l|files-with-matches L|files-without-match F|fixed-strings full-name W|function-context heading
                      i|ignore-case v|invert-match n|line-number name-only no-index not z|null o|only-matching or
                      P|perl-regexp q|quiet recurse-submodules p|show-function a|text untracked w|word-regexp
-                     A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=i
+                     A|after-context=i B|before-context=i color=b C|context=i m|max-count=n max-depth=n
                      open-files-in-pager=b threads=n].freeze,
             mv: %w[k f|force n|dry-run v|verbose].freeze,
             revert: %w[e S=bm? n|no-commit reference cleanup=b gpg-sign=b? m|mainline=i s|signoff strategy=b
@@ -254,7 +254,7 @@ module Squared
           submodule: {
             status: %w[cached recursive].freeze,
             update: %w[checkout f|force init merge N|no-fetch no-recommend-shallow no-single-branch recommend-shallow
-                       rebase recursive remote single-branch depth=i filter=q jobs=i reference=b ref-format=q].freeze,
+                       rebase recursive remote single-branch depth=i filter=q jobs=i reference=q ref-format=q].freeze,
             branch: %w[b|branch d|default].freeze,
             sync: %w[recursive].freeze
           }.freeze,
@@ -1009,12 +1009,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
@@ -1849,10 +1845,15 @@ module Squared
           when :rm, :clean
             append_pathspec(op.extras, expect: flag == :rm)
           when :grep
+            delim = false
             op.each do |val|
-              if op.include?('--')
+              if val == '--'
+                delim = true
+                op.delim
+              elsif delim
                 op.add_path(val)
               elsif op.exist?(val, glob: true)
+                delim = true
                 op.delim
                   .add_path(val)
               else

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

@@ -508,6 +508,7 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
+            ci = option('ci')
             om = lambda do |cmd|
               if omit
                 save = case save
@@ -544,7 +545,7 @@ module Squared
                 end
                 if nolockfile?('yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci')
+                elsif ci
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -580,15 +581,15 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif option('ci')
+                     elsif ci
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session 'npm'
-              cmd << (ci = option('ci') ? 'ci' : 'install')
+              cmd = session('npm', ci ? 'ci' : 'install')
               cmd << '--workspaces=false' if ws
+              cmd << '--force' if option('force')
               append_nocolor
               append_loglevel
               if omit
@@ -856,13 +857,18 @@ module Squared
           package(:update, from: :update)
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
+        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil,
+                    workspace: false)
           if read_package('private')
+            return if workspace
+
             ws = children.select { |proj| proj.ref?(Node.ref) }
             if ws.empty?
               print_error('nothing to publish', subject: name, hint: 'private')
             elsif confirm_basic('Publish workspace?', ws.map(&:name).join(', '), 'N')
-              ws.each { |proj| proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun) }
+              ws.each do |proj|
+                proj.publish(flag, sync: sync, otp: otp, tag: tag, access: access, dryrun: dryrun, workspace: true)
+              end
             end
             return
           end

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

@@ -113,7 +113,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
@@ -204,12 +204,12 @@ module Squared
                     end
                     next if found.anybits?(1)
 
-                    puts log_message(found == 0 ? Logger::INFO : Logger.WARN,
+                    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*'
+                  format_desc action, nil, 'command|:,args*'
                   task action do |_, args|
                     args = args.to_a
                     cmd = if (i = args.delete(':')) && !workspace.windows?
@@ -219,7 +219,7 @@ module Squared
                           else
                             (args << command_args(args, min: 1, prefix: 'python')).compact.join(' ')
                           end
-                    shell(cmd, name: :exec, chdir: path)
+                    run(cmd, send: :exec, banner: false)
                   end
                 end
               else
@@ -710,7 +710,9 @@ module Squared
           when :freeze
             venv_init
             op << '>'
-            op.add_quote(ret = basepath(op.detect { |val| op.exist?(val) } || DEP_PYTHON[4]))
+            file = op.detect { |val| op.exist?(val) }
+            op.remove(file) if file
+            op.add_quote(ret = basepath(file || DEP_PYTHON[4]))
               .clear
           when :cache
             op.concat(args)

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

@@ -822,7 +822,8 @@ module Squared
                                      ver = '.tool-versions'
                                      opt = [@asdf.first]
                                      opt.unshift('--no-header') unless @@asdf.version == 15
-                                     `asdf current #{opt.join(' ')}`[/^\S+\s+\S+/, 0].sub(/\s+/, ' ')
+                                     exit 1 unless (cur = `asdf current #{opt.join(' ')}`[/^\S+\s+\S+/, 0])
+                                     cur.sub(/\s+/, ' ')
                                    else
                                      ver = nil
                                      `ruby --version`

data/lib/squared/workspace/repo.rb

@@ -9,7 +9,7 @@ module Squared
       attr_reader :manifest_url, :manifest
 
       def repo(url, manifest = 'latest', install: nil, 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.6.11
+  version: 0.6.13
 platform: ruby
 authors:
 - An Pham
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.11
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []