squared 0.6.10 → 0.6.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51fbe5bab2648700b1859c3cf76d5960e1e6d02084281444e5113a02365ecfc6
-  data.tar.gz: f3179ae97b2035233ac01856bd9f775462afb87183da51c3be34eb6357813f61
+  metadata.gz: 05f58e158cd533725a7c9e6eaacead60da71dddbf311e2f63a4f69f2e51ec998
+  data.tar.gz: 4d400ce46ffaf7dd7c2a7a48ea28019bca1e313c46cef7dc666f64be492808e7
 SHA512:
-  metadata.gz: 368045e7cd2f56b56e95e5d5809346d69e87c41fb3a3b8f33af001844d0d18f63fc5f72abca10d166c7b6af51443dd52ddd2fd9ee72aff1fe67f38e9d7a02526
-  data.tar.gz: e750addd94fab922f914ffd75b771c2b5710b64f4375229dc52d7b1129637a5eccd857a7fe39ba51254793f4e3de78c041d73c644accee0a083164abf3132fa4
+  metadata.gz: 0dd82a720a4f3d63a8d342ee09cb582c818299d6a25922dd4a366602392afb47a89b6138a69f8d30875e617b18a0b3e929de554c0a9512a8bfe10b526569c33a
+  data.tar.gz: 0e99a815e0c8e769edc40171d9e3f039f82fcd366b6d66a094ef35425dc0cb44cc83eb67cad605dd8a7bf25dbf6daf15e18ee2605da866b57e2ed1f8a4011849

data/CHANGELOG.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## [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
+
+- Git internal data calls do not write to logs.
+
+## [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
+
+### Added
+
+- Python venv initialization installs setuptools when detected.
+- Node task depend adds prod option flags when NODE_ENV=production.
+
+### Fixed
+
+- OptionPartition methods with escape parameter were reordered.
+- OptionPartition methods with quote parameter were revised.
+
 ## [0.6.10] - 2025-02-23
 
 ### Added
@@ -1586,7 +1637,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
 
@@ -1607,12 +1658,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.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
 [0.6.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.8
@@ -1624,6 +1677,8 @@
 [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
 [0.5.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.19
@@ -1646,6 +1701,8 @@
 [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
 [0.4.33]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.33

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.10'
+  VERSION = '0.6.12'
 end

data/lib/squared/workspace/application.rb

@@ -923,6 +923,7 @@ module Squared
           require_relative rb
           break
         end
+        nil
       end
 
       def root?(path, pass: [])

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

@@ -251,7 +251,7 @@ module Squared
                    print_error e
                  end
           log[:progname] ||= @name
-          env('LOG_LEVEL', ignore: false) { |val| log[:level] = val.start_with?(/\d/) ? log_sym(val.to_i) : val }
+          env('LOG_LEVEL', ignore: false) { |s| log[:level] = s.start_with?(/\d/) ? log_sym(s.to_i) : s }
           log.delete(:file)
           @log = [file, log]
         end
@@ -521,7 +521,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|
@@ -841,7 +841,7 @@ module Squared
           ensure
             if dir
               remove_entry dir
-            elsif delete && file&.exist?
+            elsif delete && file.exist?
               file.unlink
             end
           end
@@ -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.none?(String)
               build(*obj, **kwargs)
             elsif obj
               run_s(*Array(obj), **kwargs)
@@ -1323,17 +1323,17 @@ module Squared
                            s += "#{indent || (last && data[final].last == context) ? ' ' : a}   "
                            k += 1
                          end
-                         s += "#{j ? d : c}#{b * 3} #{tag.call(proj)}"
+                         s + "#{j ? d : c}#{b * 3} #{tag.call(proj)}"
                        end
               end
               if order
                 n = order.size
                 order[name] ||= if proj.parent
-                                  if order[s = proj.parent.name]
-                                    order[s] += 1
+                                  if order[key = proj.parent.name]
+                                    order[key] += 1
                                     n.pred
                                   else
-                                    order[s] = n.succ
+                                    order[key] = n.succ
                                     n
                                   end
                                 else
@@ -2260,7 +2260,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]
@@ -2269,7 +2269,7 @@ module Squared
             else
               ret[0] = false
             end
-            ret[2] = data[:env] unless dise
+            ret[2] = data[:env] unless noenv
             ret
           end
           self.global = global
@@ -2277,7 +2277,7 @@ module Squared
           when Hash
             @output = parse.call(data)
           when Enumerable
-            @output = if cmd.all? { |data| data.is_a?(Hash) }
+            @output = if cmd.all?(Hash)
                         noopt = false
                         noenv = false
                         cmd.map { |data| parse.call(data) }
@@ -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,
@@ -426,7 +426,7 @@ module Squared
                                    end
                           if squash
                             found = false
-                            git_spawn(git_output('log --format=%h'), stdout: false).each do |val|
+                            git_spawn('log --format=%h', stdout: false).each do |val|
                               if found
                                 squash = val.chomp
                                 break
@@ -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
@@ -1888,22 +1889,22 @@ module Squared
           if io && banner == false
             from = nil
             banner = nil
+            args = false
           else
-            if banner
-              banner = nil unless banner? && !multiple
-              args = true
-            end
             if from == false
               from = nil
             elsif !from && cmd.respond_to?(:drop)
               from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) }
               from &&= :"git:#{from}"
             end
-            banner &&= cmd.temp { |val| val.start_with?(/--(?:work-tree|git-dir)/) } if cmd.respond_to?(:temp)
+            if banner
+              banner = cmd.temp { |val| val.start_with?(/--(work-tree|git-dir)/) } if cmd.respond_to?(:temp)
+              args = true
+            end
           end
           cmd = session_done cmd
-          log&.info cmd
-          banner = if banner
+          log&.info cmd unless args == false
+          banner = if banner && banner? && !multiple
                      format_banner(banner.is_a?(String) ? banner : cmd, hint: hint, strip: true)
                    end
           on :first, from
@@ -2122,9 +2123,7 @@ module Squared
 
         def append_message(val = nil, target: @session)
           val = messageopt if val.to_s.empty?
-          return unless val
-
-          target << quote_option('message', val)
+          target << quote_option('message', val) if val
         end
 
         def append_head(val = nil, target: @session)

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
@@ -529,31 +530,36 @@ module Squared
               run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), from: :remove, sync: sync)
             end
             if (yarn = dependtype(:yarn)) > 0
-              cmd = session('yarn', flag || 'install')
-              append_loglevel
-              if yarn == 1
-                cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
-                cmd << '--ignore-scripts' if option('ignore-scripts')
-                cmd << '--force' if option('force')
+              if !flag && yarn > 1 && prod?
+                cmd = session 'yarn', 'workspaces focus --all --production'
               else
-                cmd << '--mode=skip-build' if option('ignore-scripts')
-                cmd << '--check-cache' if !flag && option('force')
-              end
-              if nolockfile?('yarn')
-                cmd << '--no-lockfile'
-              elsif option('ci')
+                cmd = session('yarn', flag || 'install')
                 if yarn == 1
-                  cmd << '--frozen-lockfile'
-                elsif !flag
-                  cmd << '--immutable' << '--refresh-lockfile'
+                  cmd << '--production' if prod?
+                  cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
+                  cmd << '--ignore-scripts' if option('ignore-scripts')
+                  cmd << '--force' if option('force')
+                else
+                  cmd << '--mode=skip-build' if option('ignore-scripts')
+                  cmd << '--check-cache' if !flag && option('force')
+                end
+                if nolockfile?('yarn')
+                  cmd << '--no-lockfile'
+                elsif ci
+                  if yarn == 1
+                    cmd << '--frozen-lockfile'
+                  elsif !flag
+                    cmd << '--immutable' << '--refresh-lockfile'
+                  end
+                end
+                if add
+                  cmd << '-W' if yarn == 1 && !option('w', 'ignore-workspace-root-check', equals: '0')
+                  rm.call(cmd)
+                  om.call(cmd)
+                  cmd << '--exact' if exact
                 end
               end
-              if add
-                cmd << '-W' if yarn == 1 && !option('w', 'ignore-workspace-root-check', equals: '0')
-                rm.call(cmd)
-                om.call(cmd)
-                cmd << '--exact' if exact
-              end
+              append_loglevel
             elsif pnpm?
               cmd = session('pnpm', flag || 'install')
               append_nocolor
@@ -564,6 +570,7 @@ module Squared
                 cmd << '--save-exact' if exact
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
+                cmd << '--prod' if prod?
                 append_platform
               end
               option('public-hoist-pattern') do |val|
@@ -574,20 +581,22 @@ 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
                 cmd << "--omit=#{save || omit}"
                 save = nil
+              elsif !add && prod?
+                cmd << '--include=prod'
               end
               unless ci
                 if add

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
@@ -209,7 +209,7 @@ module Squared
                                      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)
@@ -1074,7 +1076,11 @@ module Squared
                      .clear(pass: false)
                      .arg?(/\A-v+\z/)
           ret = run(op, env, exception: true, banner: banner)
-          pip(:install, 'poetry', banner: false) if poetry?
+          if poetry?
+            pip(:install, 'poetry', banner: false)
+          elsif setuptools?
+            pip(:install, 'setuptools', 'wheel', banner: false)
+          end
           success?(ret, banner, !status) { |out| puts(out && dir.directory? ? "Success: #{dir}" : 'Failed') }
         end
 

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

@@ -812,7 +812,7 @@ module Squared
                                    `rvm current`[/^\S+/, 0]
                                  when 'rbenv'
                                    name = `rbenv version-name`
-                                   name.match?(SEM_VER) ? "ruby #{name}" : name
+                                   (name =~ SEM_VER) == 0 ? "ruby #{name}" : name
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
@@ -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`
@@ -1654,7 +1655,7 @@ module Squared
         def unpack_get(tag, ext)
           return super unless ext == 'gem'
 
-          "https://rubygems.org/downloads/#{File.basename(tag, '.gem')}.gem"
+          "https://rubygems.org/downloads/#{tag.sub_ext('.gem')}"
         end
 
         def preopts

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

@@ -27,7 +27,7 @@ module Squared
           def multiple=(val)
             case val
             when Enumerable
-              @multiple.concat(val.to_a.map { |val| val.is_a?(Regexp) ? val : val.to_s })
+              @multiple.concat(val.to_a.map { |pat| pat.is_a?(Regexp) ? pat : pat.to_s })
             when String, Symbol, Pathname
               @multiple << val.to_s
             when Regexp

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

@@ -48,10 +48,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
@@ -336,7 +336,7 @@ module Squared
                   push opt
                   skip = true if args
                 end
-                skip = true if first&.any? { |s| s.is_a?(Regexp) ? opt.match?(s) : !opt.include?(s) }
+                skip = true if first&.any? { |pat| pat.is_a?(Regexp) ? opt.match?(pat) : !opt.include?(pat) }
               end
             end
             @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})#{sep}(.+)\z/m
@@ -361,7 +361,8 @@ module Squared
             self
           end
 
-          def append_any(*args, escape: false, quote: true, **kwargs)
+          def append_any(*args, escape: false, **kwargs)
+            quote = kwargs.fetch(:quote, true)
             (args.empty? ? extras : args.flatten).each do |val|
               if block_given?
                 temp = val
@@ -369,7 +370,7 @@ module Squared
                 if val.is_a?(Array)
                   found << temp
                   k, v, q = val
-                  add_option(k, v, escape: escape, quote: quote, double: q == '"', merge: q == true, **kwargs)
+                  add_option(k, v, escape: escape, double: q == '"', merge: q == true, **kwargs)
                   next
                 end
               end
@@ -377,10 +378,10 @@ module Squared
 
               if exist?(val)
                 add_path(val, **kwargs)
-              elsif quote
-                add_quote(val, **kwargs)
               elsif escape
                 add shell_escape(val, **kwargs)
+              elsif quote
+                add_quote(val, **kwargs)
               else
                 add val
               end
@@ -494,7 +495,7 @@ module Squared
 
           def add_path(*args, option: nil, force: true, double: false, **kwargs)
             if args.empty?
-              args = select { |val| val.is_a?(String) }
+              args = grep(String)
               found.concat(args)
               args.map! { |val| path + val } if path
               append(args, force: force, **kwargs)
@@ -510,6 +511,7 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
+            kwargs.delete(:quote)
             merge(args.compact
                       .map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
@@ -520,8 +522,8 @@ module Squared
             self
           end
 
-          def add_first(fallback = nil, prefix: nil, path: false, escape: false, quote: false, reverse: false,
-                        expect: false, **kwargs)
+          def add_first(fallback = nil, prefix: nil, path: false, escape: false, reverse: false, expect: false,
+                        **kwargs)
             val = (reverse ? pop : shift) || fallback
             if val
               temp = val
@@ -529,10 +531,10 @@ module Squared
               unless block_given? && !(val = yield val).is_a?(String)
                 if path
                   add_path(val, **kwargs)
-                elsif quote
-                  add_quote(val, **kwargs)
                 elsif escape
                   add shell_escape(val, **kwargs)
+                elsif kwargs[:quote]
+                  add_quote(val, **kwargs)
                 else
                   add val
                 end

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.10
+  version: 0.6.12
 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: []