squared 0.5.22 → 0.5.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06381e5c59519169c2d591b16869b5d8cf241dbf5b0dc8a84ba697da432e9aa3'
-  data.tar.gz: 0f4f6b05caa95e9ac59540505c1eb56825817cd1bff9ff46abe3fd11b1a53918
+  metadata.gz: 45a01f6cbe5a1aac8bb8569a17d8e1367e2b31bb4cd38ed3be1a406462983f48
+  data.tar.gz: 5380204c9a5c8e411448b437b67f037d89ac30a6835158dfbaad3e704bef9739
 SHA512:
-  metadata.gz: e1f1afdae59763ad88da3466a07c8f1acbea78d3738173bc9ba13606b0977a2bddec6b31ce49eb5e2b7ce5b1e952da53573da51ba3e693b2dcefbce3f90f9f46
-  data.tar.gz: 8a6eef1e7cd3f666091714cdce7e171efc36d9e662e1f14e77e983bb9d017b6bfef8ae5cf4e34f4c55ea1852ef4e7fc65a7b050f1841ba8633771456e4caba7d
+  metadata.gz: 168617a435a76d164f939965060d5e75fe7d3e4195fc09b6dce3870397df137c0760d2a99c599bcb05df65a1d78f184d9bb8e1df6de761a70f9a344c7950ba31
+  data.tar.gz: 3c825837cb557a12c4df649833340d26add03f391ebbd382afee1dcbf7d2971f538588af7c08b39494d6b76e2c7202d1e7a974339ba68b4fa4f4720ebab64b79

data/CHANGELOG.md

@@ -1,7 +1,29 @@
 # Changelog
 
+## [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.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
@@ -1372,6 +1394,7 @@
 
 - Changelog was created.
 
+[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
@@ -1395,6 +1418,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

@@ -48,7 +48,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?
 
@@ -56,16 +56,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.5.22'
+  VERSION = '0.5.23'
 end

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

@@ -886,7 +886,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, series: true, **)
+                interactive: nil, hint: nil, series: true, send: :system, **)
           unless cmd
             print_error('no command session started', subject: project, hint: from, pass: true)
             return
@@ -923,7 +923,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)
@@ -982,7 +982,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
@@ -1080,7 +1080,7 @@ module Squared
         end
 
         def dependtype(*)
-          @dependindex ? @dependindex.succ : 0
+          dependindex&.succ || 0
         end
 
         def log
@@ -2059,10 +2059,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,
@@ -335,7 +335,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

@@ -984,12 +984,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

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

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

@@ -548,7 +548,8 @@ module Squared
                                      ver = '.tool-versions'
                                      opt = [@asdf.first]
                                      opt.unshift('--no-header') unless @@asdf[1] == 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

@@ -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.5.22
+  version: 0.5.23
 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.6
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []