squared 0.4.36 → 0.4.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31323c0d6d0f5d2d45c7e4cc882237fb5cc687d6f7f1d3b618b86385f26d6398
-  data.tar.gz: ddb3271ef90874b2a716418bfc344744c58a2b433954bd8034551621de500232
+  metadata.gz: 3717cf9c708b4a265d919790f7713bc6c35187c7229d956411d2dcf80ab7dfab
+  data.tar.gz: 1659d367915ab16c72c148ddc3ea95312664afe5c92a7b77e31158318f0d1f3b
 SHA512:
-  metadata.gz: 281d00f10b66df75ed5e2269f566b892a768fa493e68701fd9a73de787c77e0d191e10e1165e846dbd7d93d6de8427811e6193e8970564310d56a42085dd7e5b
-  data.tar.gz: 6672b181a9e792ff624dc8876d0b45b954c3b304f8e78abcb6a2ac674e2188aabd347e6f4d86a91c6550c11c2ac6ba842e728562a74dfb8a0740f7214a5200f3
+  metadata.gz: 330278fdc20d09076437c13530569ab1b09174ba7133558f7f5decdf8da25bff8ee22e0c9054c564f15c80f3a0dae79c859099d875aad2613bd14a244519ebf0
+  data.tar.gz: f83310b3557945985db8a70b2f283bd2376b44e50fba64f5a1dc267c3f753bee4aab328906a66b9b888f042a533e75ec74a3c8c3a8147ad444a2e215549a87a2

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # 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
@@ -1195,6 +1209,7 @@
 
 - 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

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.36'
+  VERSION = '0.4.37'
 end

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

@@ -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
@@ -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)

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,
@@ -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

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

@@ -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/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.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: []