squared 0.4.34 → 0.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d59b575971efdb7998b924fa5ca7815c4aeaeeaeecb756197fbc79b11433743
-  data.tar.gz: 9cb428fb205f51803c0b7576b71d78165a8987925f90c04462c266bd03ca48b9
+  metadata.gz: 31323c0d6d0f5d2d45c7e4cc882237fb5cc687d6f7f1d3b618b86385f26d6398
+  data.tar.gz: ddb3271ef90874b2a716418bfc344744c58a2b433954bd8034551621de500232
 SHA512:
-  metadata.gz: 5504784e072989e9e4a25ee08aa2f8bc5b9b73d4476aa9ad5d4633b08b2546847b9945de201f964b04a52124b2e75bc2f9341321348f429e2dc9ea0c4bae3fd8
-  data.tar.gz: 73786a35bd4255024f235090cc8b11883b95efa8903e2034b8f5d13353fb7a7756ed8d8d335f42756232d595a00bf10cdafb099c3065906617575e3cd035bebf
+  metadata.gz: 281d00f10b66df75ed5e2269f566b892a768fa493e68701fd9a73de787c77e0d191e10e1165e846dbd7d93d6de8427811e6193e8970564310d56a42085dd7e5b
+  data.tar.gz: 6672b181a9e792ff624dc8876d0b45b954c3b304f8e78abcb6a2ac674e2188aabd347e6f4d86a91c6550c11c2ac6ba842e728562a74dfb8a0740f7214a5200f3

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [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.
+
+### Changed
+
+- Application method with using hide and pass compatibility was implemented.
+
+### Fixed
+
+- Docker task clean does not run in parallel without ENV override.
+- OptionPartition methods with escape parameter were reordered.
+- OptionPartition methods with quote parameter were revised.
+- Project base run command was not covered due to lack of communication.
+
+## [0.4.35] - 2025-12-31
+
+### Changed
+
+- Ruby task copy uses GEM_HOME as fallback for autodetect.
+
+### Fixed
+
+- Git commands [rebase|clone] did not forward sync flag.
+- Pip command install carelessly used an undefined method.
+- Common prompt method readline with multiline did not permit empty lines.
+- Application method with using pass did not ignore exceptions.
+
 ## [0.4.34] - 2025-12-26
 
 ### Added
@@ -1137,7 +1168,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
 
@@ -1158,12 +1189,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.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
 [0.4.32]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.32

data/lib/squared/common/format.rb

@@ -186,7 +186,9 @@ module Squared
         end
         if hint.nil? ? args.size > 1 : !hint
           title = log_title(level, color: false)
-          sub = [pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)]] if color
+          if color
+            sub = [{ pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)] }]
+          end
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub, pipe: -1)
         else
           msg = [log_title(level, color: color)]
@@ -237,6 +239,8 @@ module Squared
           lines = val.to_s.lines(chomp: true)
           lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(::StandardError))
         end
+        return if lines.empty?
+
         n = cols || max.call(lines)
         if $stdout.tty?
           require 'io/console'

data/lib/squared/common/prompt.rb

@@ -94,7 +94,11 @@ module Squared
           elsif block_given?
             Readline.readmultiline(msg, history, &blk)
           else
-            Readline.readmultiline(msg, history) { |line| multiline.any? { |val| line.split.last.end_with?(val.to_s) } }
+            Readline.readmultiline(msg, history) do |line|
+              next if line.strip.empty?
+
+              multiline.any? { |val| line.split.last.end_with?(val.to_s) }
+            end
           end
         end
         case force

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.4.34'
+  VERSION = '0.4.36'
 end

data/lib/squared/workspace/application.rb

@@ -178,8 +178,25 @@ module Squared
         self
       end
 
-      def with(*val, pass: false, group: nil, **kwargs, &blk)
-        return self if pass == true || (pass && Array(pass).map(&:to_s).any? { |s| respond_to?(s) && __send__(s) })
+      def with(*val, hide: nil, group: nil, **kwargs, &blk)
+        if hide.nil? && kwargs.key?(:pass)
+          pass = kwargs[:pass]
+          case pass
+          when true, false
+            hide = pass
+            kwargs.delete(:pass)
+          else
+            hide, pass = Array(pass).partition { |s| respond_to?(s) || s.to_s.end_with?('?') }
+            if pass.empty?
+              kwargs.delete(:pass)
+            elsif hide.empty?
+              hide = nil
+            else
+              kwargs[:pass] = pass
+            end
+          end
+        end
+        return self if hide == true || (hide && Array(hide).any? { |s| respond_to?(s) && __send__(s) rescue nil })
 
         @group = nil
         @ref = nil
@@ -810,7 +827,7 @@ module Squared
                                          ' (sync)'
                                        end}"
               emphasize(grp, title: title, cols: [cols, title.size].max, border: theme[:border],
-                             sub: [pat: /\A(Step \d+)(.*)\z/, styles: theme[:header]])
+                             sub: [{ pat: /\A(Step \d+)(.*)\z/, styles: theme[:header] }])
             end
           end
         end

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

@@ -456,7 +456,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|
@@ -1065,8 +1065,7 @@ module Squared
           begin
             cmd.flatten.each { |val| run(val, env, sync: sync, banner: banner, **kwargs) }
           rescue StandardError => e
-            ret = on :error, from, e
-            raise unless ret == true
+            on_error(e, from, exception: kwargs.fetch(:exception, exception))
           end
           on :last, from
         end
@@ -1114,6 +1113,8 @@ module Squared
           else
             items = check.call(data[start])
           end
+          return done if items.empty?
+
           if out
             a, b, c, d, e = ARG[:GRAPH]
             f = tag.call(target)
@@ -1911,7 +1912,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]
@@ -1920,12 +1921,12 @@ module Squared
             else
               ret[0] = false
             end
-            ret[2] = data[:env] unless dise
+            ret[2] = data[:env] unless noenv
             ret
           end
           case cmd
           when Array
-            @output = if cmd.all? { |data| data.is_a?(Hash) }
+            @output = if cmd.all?(Hash)
                         noopt = false
                         noenv = false
                         cmd.map { |data| parse.call(data) }

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

@@ -254,8 +254,8 @@ module Squared
         def clean(*, sync: invoked_sync?('clean'), **)
           if runnable?(@clean)
             super
-          else
-            image(:rm, sync: sync)
+          elsif sync || option('y', prefix: 'docker')
+            image :rm
           end
         end
 
@@ -665,8 +665,8 @@ module Squared
           end
         end
 
-        def list_image(flag, cmd, hint: nil, from: nil, no: true)
-          pwd_set do
+        def list_image(flag, cmd, hint: nil, no: true, from: nil)
+          pwd_set(from: from) do
             found = false
             index = 0
             all = option('all', prefix: 'docker')

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

@@ -1049,7 +1049,7 @@ module Squared
 
             cmd << "--#{command}"
           end
-          source
+          source(sync: sync)
         end
 
         def autostash(*, sync: invoked_sync?('autostash'), **)
@@ -1090,7 +1090,7 @@ module Squared
           append_hash opts
           cmd << '--quiet' unless verbose
           append_value(data[0], path, delim: true)
-          source(banner: sync && !quiet?, multiple: !sync || quiet?)
+          source(sync: sync, banner: sync && !quiet?, multiple: !sync || quiet?)
         end
 
         def stash(flag = nil, opts = [], sync: invoked_sync?('stash', flag))
@@ -1181,7 +1181,7 @@ module Squared
                       { pat: /^(## )(.+?)(\.{3})(.+)$/, styles: [nil, g, nil, r], index: -1 }
                     ]
                   else
-                    [pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2]
+                    [{ pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2 }]
                   end
           end
           out, banner, from = source(io: true)
@@ -1905,7 +1905,7 @@ module Squared
             styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
             puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
-                              sub: [pat: /^(\d+)(.+)$/, styles: styles])
+                              sub: [{ pat: /^(\d+)(.+)$/, styles: styles }])
           end
           on :last, from
         end

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
+          common: %w[dry-run=!? force=!? loglevel=b include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
           install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
           install_base: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
                            package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
@@ -427,13 +427,18 @@ module Squared
 
             if (yarn = dependtype(:yarn)) > 0
               cmd = session 'yarn'
-              if flag == :add
+              if !flag && yarn > 1 && prod?
+                cmd << 'workspaces focus --all --production'
+              elsif flag == :add
                 cmd << 'add'
                 cmd << "--#{save}" unless save == 'prod'
                 cmd << '--exact' if exact
               else
                 cmd << 'install'
-                cmd << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
+                if yarn == 1
+                  cmd << '--production' if prod?
+                  cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
+                end
               end
             elsif pnpm?
               cmd = session 'pnpm'
@@ -443,6 +448,7 @@ module Squared
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
                 cmd << 'install'
+                cmd << '--prod' if prod?
                 append_platform
               end
               if (val = option('public-hoist-pattern'))
@@ -457,6 +463,7 @@ module Squared
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
               else
+                cmd << '--include=prod' if prod?
                 append_platform
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
@@ -678,15 +685,16 @@ module Squared
             log.info cmd.to_s
           end
           if sync
-            run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
+            run(sync: sync, from: from, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
             require 'open3'
             on :first, from
             pwd_set(from: from, dryrun: dryrun) do
               cmd = session_done cmd
               Open3.popen2e(cmd) do |_, out|
-                write_lines(out, banner: format_banner(cmd),
-                                 sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:bright_blue), index: 2])
+                write_lines(out,
+                            banner: format_banner(cmd),
+                            sub: npmnotice + [{ pat: /^(.+)(Tarball .+)$/, styles: color(:bright_blue), index: 2 }])
               end
             end
             on :last, from
@@ -801,7 +809,7 @@ module Squared
               raise_error('version not found', hint: dependfile)
             end
           rescue StandardError => e
-            on_error e, :bump
+            on_error(e, :bump, dryrun: dryrun?)
           end
         end
 

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

@@ -228,7 +228,7 @@ module Squared
                             if args.empty?
                               args = readline('Enter command', force: true).split(' ', 2)
                             elsif args.size == 1 && !option('interactive', prefix: 'venv', equals: '0')
-                              args << readline('Enter arguments', force: false)
+                              args << readline('Enter arguments', force: false) unless args.first.include?(' ')
                             end
                             venv_init
                             run args.join(' ')
@@ -875,10 +875,22 @@ module Squared
             .clear(pass: false)
           status = op.arg?(/\A-v+\z/)
           run(op, env, exception: true, banner: banner)
-          install(:upgrade, ['poetry']) if poetry?
+          if poetry?
+            install(:upgrade, ['poetry'])
+          elsif setuptools?
+            install(:upgrade, ['setuptools', 'wheel'])
+          end
           puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
         end
 
+        def installable?
+          setuptools? || !!pyprojectfile
+        end
+
+        def setuptools?
+          dependtype == 2 || dependtype == 4
+        end
+
         def poetry?
           dependtype == 1
         end

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

@@ -503,7 +503,7 @@ module Squared
                                    `rvm current`[/^\S+/, 0]
                                  when 'rbenv'
                                    name = `rbenv version-name`
-                                   name =~ SEM_VER ? "ruby #{name}" : name
+                                   (name =~ SEM_VER) == 0 ? "ruby #{name}" : name
                                  when 'chruby.sh'
                                    chruby = session_output 'source', val
                                    `#{chruby.with('ruby --version')}`
@@ -768,7 +768,7 @@ module Squared
               else
                 op.clear
               end
-            elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
+            elsif (n = op.index { |val| val.match?(/(\A|[\w.-])@\d/) })
               name = op.delete_at(n)
               pre, ver = if (n = name.index('@')) == 0
                            [gemname, name[1..-1]]
@@ -855,7 +855,16 @@ module Squared
         def copy?
           return true if @copy.is_a?(Hash) ? copy[:into] : super
           return gemdir? if gemdir
+          return false unless @autodetect
+
+          set = lambda do |val, path|
+            base = Pathname.new(path.strip)
+            return false unless base.join(gempath(val, 'specifications')).exist?
 
+            log.warn "using version #{val} (given #{version})" if version && version != val
+            self.version = val
+            self.gemdir = base + gempath
+          end
           if version
             begin
               case @autodetect
@@ -866,33 +875,20 @@ module Squared
                   self.gemdir = File.join($1, 'lib/ruby/gems', "#{$2}.0")
                 end
               when 'asdf'
-                val = pwd_set { `asdf where ruby` }
+                val = pwd_set { `asdf where ruby`.chomp }
                 self.gemdir = File.join(val, 'lib/ruby/gems', "#{$1}.0") if val =~ /(\d\.\d)\.[^.]+$/
-              when 'env'
-                ENV['GEM_HOME'] || ENV['GEM_ROOT']
               when /bundler?/
                 path = pwd_set { `bundle env` }[/^\s+Gem Path\s+(.+)$/, 1]
                 self.gemdir = path.split(File::PATH_SEPARATOR).find { |val| Dir.exist?(val) }
+              else
+                self.gemdir = ENV['GEM_HOME'] || ENV['GEM_ROOT']
               end
+              return true if gemdir?
             rescue StandardError => e
               log.debug e
             end
-            return true if gemdir?
-          end
-          return false unless @autodetect
-
-          set = lambda do |val, path|
-            base = Pathname.new(path.strip)
-            return false unless base.join(gempath(val, 'specification')).exist?
-
-            log.warn "using version #{val} (given #{version})" if version && version != val
-            self.version = val
-            self.gemdir = base + gempath
-          end
-          if version
-            opt = gempwd
-            pwd_set(pass: !opt.nil?) do
-              out = `#{gem_output(opt, 'list --local -d', gemname)}`
+            pwd_set(pass: !gempwd.nil?) do
+              out = `#{gem_output(gempwd, 'list --local -d', gemname)}`
               if out =~ /#{Regexp.escape(gemname)}\s+\((.+)\)$/
                 split_escape($1)
                   .unshift(@version)

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

@@ -32,10 +32,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
@@ -300,10 +300,13 @@ module Squared
             self
           end
 
-          def append_any(*args, quote: true, **kwargs)
+          def append_any(*args, escape: false, **kwargs)
+            quote = kwargs.fetch(:quote, true)
             (args.empty? ? extras : args.flatten).each do |val|
               if exist?(val)
                 add_path(val, **kwargs)
+              elsif escape
+                add shell_escape(val, **kwargs)
               elsif quote
                 add_quote(val, **kwargs)
               else
@@ -395,6 +398,7 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
+            kwargs.delete(:quote)
             args.compact!
             merge(args.map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
@@ -411,10 +415,12 @@ module Squared
                           elsif exclude.first.is_a?(Symbol)
                             partition(&exclude.first)
                           else
+                            exclude.map! { |pat| Regexp.new(pat) }
                             partition do |val|
-                              next false if pattern && OptionPartition.pattern?(val)
+                              val = val.to_s
+                              next if pattern && OptionPartition.pattern?(val)
 
-                              exclude.none? { |pat| val.match?(Regexp.new(pat)) }
+                              exclude.none? { |pat| val.match?(pat) }
                             end
                           end
             unless temp.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.34
+  version: 0.4.36
 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: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []