squared 0.4.10 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba613d7ba02a664fb4581573f6ee04d705f6bb2d1cb165c30c49d97eb259cbec
-  data.tar.gz: 764888100c6a6560478e99ed1451f1593a86e120799e25400708d81be934102c
+  metadata.gz: 29f44c24914fda199da7719eed8e90da0b508d0c93cf234ff16581e7bf34d112
+  data.tar.gz: aec5400d8d7abfc44c4abd31bf091de65873f177c57b0782118c081e5875009b
 SHA512:
-  metadata.gz: 1cf6f1f10babf7bfbbe665fe5fc97527cf1df4093a3e6b8b906a4bf8cf87f538c601faee86f40decb79455de340e1d8f510fb45d0acc17694cd97a4051010539
-  data.tar.gz: 2b537c2c6a30a17191f32eb1012b225bc29fff9e9102b663a6dcf3ffd05465f4e8a0790f4cbdd6c63b21bd64c762e85dff1d22b4eb35053702a6692e92c994cc
+  metadata.gz: 48e5e2e436689d44a146562e4d791cebf5e19da9ca012c7cdd1860b2fd370c163933fdf58638bf48d4a1b1111170f5f8ed890269388a965dcf2e9e47619a4ea6
+  data.tar.gz: 816de955802b80b8687c6f8903187dfda9f60720696f4ea80ce1295df7e07a3c3bd38bf4b1da5f6ceb6f7ab0031953ccbab54a13adddc7a41c195adcb9f83912

data/CHANGELOG.md

@@ -1,5 +1,57 @@
 # Changelog
 
+## [0.4.12] - 2025-05-18
+
+### Added
+
+- Git command stash with actions using index are interactive.
+- Project tasks can be pipelined in separate thread groups.
+- Global tasks can be pipelined with project tasks.
+- Python venv module supports initialization options.
+
+### Changed
+
+- Node command run parses recognized options per package manager.
+- Project unpack uses merge with multiple headers.
+- Invalid log directory does not abort program.
+- Project accessor line_width was replaced with Rake equivalent.
+
+### Fixed
+
+- Git pull option multiple was not detected.
+- Git output used undefined method when displaying results.
+- Workspace did not add prefix to duplicate project names.
+
+## [0.3.11] - 2025-05-15
+
+- See `0.2.11`.
+
+## [0.2.11] - 2025-05-15
+
+### Fixed
+
+- Disabled batch and alias tasks were not hidden.
+- Workspace git did not parse multiple download URIs.
+
+## [0.1.8] - 2025-05-15
+
+### Fixed
+
+- Disabled batch and alias tasks were not hidden.
+- Log messages were written to terminal twice when emphasized.
+- Node outdated interactive for major would sometimes deactivate.
+- Node outdated interactive for major was mislabeled as minor.
+
+## [0.4.11] - 2025-05-09
+
+### Added
+
+- Docker command build action bake is interactive.
+
+### Fixed
+
+- Docker build command was not functional.
+
 ## [0.4.10] - 2025-05-08
 
 ### Added
@@ -655,6 +707,8 @@
 
 - Changelog was created.
 
+[0.4.12]: https://github.com/anpham6/squared/releases/tag/v0.4.12-ruby
+[0.4.11]: https://github.com/anpham6/squared/releases/tag/v0.4.11-ruby
 [0.4.10]: https://github.com/anpham6/squared/releases/tag/v0.4.10-ruby
 [0.4.9]: https://github.com/anpham6/squared/releases/tag/v0.4.9-ruby
 [0.4.8]: https://github.com/anpham6/squared/releases/tag/v0.4.8-ruby
@@ -666,6 +720,7 @@
 [0.4.2]: https://github.com/anpham6/squared/releases/tag/v0.4.2-ruby
 [0.4.1]: https://github.com/anpham6/squared/releases/tag/v0.4.1-ruby
 [0.4.0]: https://github.com/anpham6/squared/releases/tag/v0.4.0-ruby
+[0.3.11]: https://github.com/anpham6/squared/releases/tag/v0.3.11-ruby
 [0.3.10]: https://github.com/anpham6/squared/releases/tag/v0.3.10-ruby
 [0.3.9]: https://github.com/anpham6/squared/releases/tag/v0.3.9-ruby
 [0.3.8]: https://github.com/anpham6/squared/releases/tag/v0.3.8-ruby
@@ -677,6 +732,7 @@
 [0.3.2]: https://github.com/anpham6/squared/releases/tag/v0.3.2-ruby
 [0.3.1]: https://github.com/anpham6/squared/releases/tag/v0.3.1-ruby
 [0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[0.2.11]: https://github.com/anpham6/squared/releases/tag/v0.2.11-ruby
 [0.2.10]: https://github.com/anpham6/squared/releases/tag/v0.2.10-ruby
 [0.2.9]: https://github.com/anpham6/squared/releases/tag/v0.2.9-ruby
 [0.2.8]: https://github.com/anpham6/squared/releases/tag/v0.2.8-ruby
@@ -688,6 +744,7 @@
 [0.2.2]: https://github.com/anpham6/squared/releases/tag/v0.2.2-ruby
 [0.2.1]: https://github.com/anpham6/squared/releases/tag/v0.2.1-ruby
 [0.2.0]: https://github.com/anpham6/squared/releases/tag/v0.2.0-ruby
+[0.1.8]: https://github.com/anpham6/squared/releases/tag/v0.1.8-ruby
 [0.1.7]: https://github.com/anpham6/squared/releases/tag/v0.1.7-ruby
 [0.1.6]: https://github.com/anpham6/squared/releases/tag/v0.1.6-ruby
 [0.1.5]: https://github.com/anpham6/squared/releases/tag/v0.1.5-ruby

data/README.md

@@ -140,13 +140,13 @@ rake clone               # node + docs
 # PIPE_FAIL={0,1}
 # PORT=3000
 docker build -t squared --build-arg MANIFEST=prod --build-arg NODE_ENV=production .
-docker build -t node --build-arg NODE_TAG=22 --build-arg NODE_INSTALL=pnpm -f Dockerfile.slim .
+docker build -t node --build-arg NODE_TAG=22 --build-arg NODE_INSTALL=pnpm -f slim.Dockerfile .
 NODE=22 docker buildx bake node
 # OR
-docker build -t ruby --build-arg RUBY_TAG=3.4.0 --build-arg NODE_VERSION=22 --build-arg PIPE_FAIL=0 -f Dockerfile.ruby .
+docker build -t ruby --build-arg RUBY_TAG=3.4.0 --build-arg NODE_VERSION=22 --build-arg PIPE_FAIL=0 -f ruby.Dockerfile .
 RUBY=3.4.0 docker buildx bake ruby
 # OR
-docker build -t nginx --build-arg NGINX_VERSION=1.27 --build-arg PORT=3000 --build-arg NODE_VERSION=20 -f Dockerfile.nginx .
+docker build -t nginx --build-arg NGINX_VERSION=1.27 --build-arg PORT=3000 --build-arg NODE_VERSION=20 -f nginx.Dockerfile .
 NGINX=1.27 docker buildx bake nginx
 
 # Express

data/README.ruby.md

@@ -234,17 +234,74 @@ Workspace::Application
   .build(parallel: ["clone"])                                   # rake clone + rake clone:sync
 ```
 
-### Graph
+### Build
+
+#### Chain
+
+There has to be at least one project which uses the ``step`` attribute. Other placement attributes are ignored.
+
+**NOTE**: Projects can only reference non-global namespaced tasks. (e.g. with ":")
+
+```ruby
+Workspace::Application
+  .new
+  .with(:node) do
+    add("e-mc", "emc") do
+      chain "all", "clean", step: 1                                        # Required
+      chain "all", "build", step: 2
+    end
+    add("pi-r", "pir") do
+      chain "all", "build", after: "emc:build"                             # step: 3
+    end
+    add("pi-r2", "pir2") do
+      chain "all", "build", before: "squared"                              # step: 3
+    end
+    add("squared-express", "express") do
+      chain "all", "clean", with: "emc"                                    # step: 1
+      chain "all", "build", with: "pir"                                    # step: 3
+    end
+    add("squared") do
+      revbuild(include: %w[src/ framework/ types/])                        # Git revision build command (optional)
+      chain "all", "revbuild", after: "express:build"                      # step: 4
+      chain "publish", "bump:patch", "publish:latest", step: 0, sync: true # rake publish -> squared:bump:patch -> squared:publish:latest
+    end
+  end
+  .with(:python) do
+    doc("make html")
+    add("android-docs") do
+      chain "all", "doc", with: "squared", after: "squared"                # step: 4
+    end
+    add("chrome-docs") do
+      chain "all", "doc", with: "squared", before: "squared:revbuild"      # Same
+    end
+  end
+  .chain "all", "status", with: "squared", after: "android-docs"           # Global tasks (e.g. without ":")
+  .build
+```
+
+```sh
+rake all                                                                   # all[1-3-4]
+rake all:print
+```
+
+Threaded is the default when there are two or more tasks. Using ``with`` and either **before** or **after** will create a synchronous group.
+
+* Step 1: emc:clean + express:clean (thread)
+* Step 2: emc:build (sync)
+* Step 3: pir:build + express:build + pir2:build (thread)
+* Step 4: chrome-docs:doc + squared:revbuild + android-docs:doc + status (sync)
+
+#### Graph
 
 ```ruby
 Workspace::Application
   .new(main: "squared")
-  .graph(["depend"], ref: :git) # Optional
+  .graph(["depend"], ref: :git)                                                # Optional
   .with(:python) do
     doc(windows? ? ".\make.bat html" : "make html")                            # rake android-docs:doc | rake doc:python
     add("android-docs", "android", venv: "/home/user/.venv")                   # rake android-docs:depend
-    add("chrome-docs", "chrome", graph: "android", venv: ".venv") do           # /workspaces/chrome-docs/.venv
-      variable_set :dependindex, 2                                             # Use Poetry for dependencies (optional)
+    add("chrome-docs", "chrome", graph: "android", venv: %w[.venv --clear]) do # /workspaces/chrome-docs/.venv
+      variable_set :dependindex, 1                                             # Use Poetry for dependencies (optional)
     end
   end
   .with(:node) do
@@ -344,18 +401,14 @@ rake squared:graph:run[express,pir]  # emc + pir + express + squared
 rake squared:graph:run[node,-emc]    # pir + express + squared
 ```
 
-### Batch
+### Tasks
 
 ```ruby
 Workspace::Series.batch(:ruby, :node, {
   stage: %i[graph test],
   reset: %i[stash pull]
 })
-```
-
-### Rename
 
-```ruby
 Workspace::Series.rename("depend", "install")
 ```
 
@@ -423,6 +476,7 @@ Non-task:
 * active
 * inline
 * subject
+* border
 * warn
 * caution
 * current
@@ -561,7 +615,6 @@ LOG_AUTO                     # year,y,month,m,day,d,1
 # Optional
 LOG_DIR                      # exist?
 LOG_LEVEL                    # See gem "logger"
-LOG_COLUMNS                  # terminal width (default: 80)
 ```
 
 ### Git

data/lib/squared/common/base.rb

@@ -46,6 +46,7 @@ module Squared
           active: [:bold],
           inline: [:bold],
           subject: [:bold],
+          border: nil,
           warn: %i[white red!],
           caution: %i[black yellow!],
           current: nil,

data/lib/squared/common/format.rb

@@ -167,7 +167,7 @@ module Squared
         color ? sub_style(ret, *styles) : ret
       end
 
-      def log_message(level, *args, subject: nil, hint: nil, color: ARG[:COLOR], append: true, pass: false)
+      def log_message(level, *args, subject: nil, hint: nil, append: true, pass: false, color: ARG[:COLOR])
         args = args.map(&:to_s)
         if level.is_a?(::Numeric)
           if append && respond_to?(:log)
@@ -176,10 +176,10 @@ module Squared
           end
           return false if !pass && level < ARG[:LEVEL]
         end
-        if args.size > 1 && !hint
+        if (args.size > 1 && !hint) || hint == false
           title = log_title(level, color: false)
-          sub = { pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)] } if color
-          emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
+          sub = [pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)]] if color
+          emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub, pipe: -1)
         else
           msg = [log_title(level, color: color)]
           msg << (color ? sub_style(subject, styles: (@theme && @theme[:subject]) || :bold) : subject) if subject
@@ -211,7 +211,8 @@ module Squared
         (empty ? args.reject { |val| val.nil? || val.empty? } : args).join(space) + (hint ? " (#{hint})" : '')
       end
 
-      def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, border: nil, pipe: nil)
+      def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, pipe: nil,
+                    border: @theme && @theme[:border])
         n = 0
         max = ->(v) { n = [n, v.max_by(&:size).size].max }
         set = lambda do |v|
@@ -271,6 +272,8 @@ module Squared
           yield out
         elsif pipe
           case pipe
+          when -1
+            return out
           when 0
             pipe = $stdin
           when 2

data/lib/squared/common/utils.rb

@@ -47,9 +47,7 @@ module Squared
 
       def task_invoked?(*args)
         Rake::Task.tasks.any? do |obj|
-          next unless obj.already_invoked
-
-          args.any? { |val| val.is_a?(::Regexp) ? obj.name.match?(val) : val == obj.name }
+          obj.already_invoked && args.any? { |val| val.is_a?(::Regexp) ? obj.name.match?(val) : val == obj.name }
         end
       end
 
@@ -157,15 +155,13 @@ module Squared
         when ::Numeric
           return key if key.between?(0, 2)
         end
+        return default unless default.is_a?(::String)
+
         begin
-          if default.is_a?(::String)
-            default = (root ? Pathname.new(root) + default : Pathname.new(default)).realdirpath
-          end
+          (root ? Pathname.new(root) + default : Pathname.new(default)).realdirpath
         rescue StandardError => e
           warn e
           1
-        else
-          default
         end
       end
 

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -106,6 +106,7 @@ module Squared
         else
           @theme = {}
         end
+        @chain = {}
         @script = {
           group: {},
           ref: {},
@@ -132,8 +133,9 @@ module Squared
       def initialize_session
         return unless @pipe.is_a?(Pathname)
 
-        bord = '#' * Project.line_width
-        puts bord, format('Session started on %s by %s', Time.now.to_s, @main), bord
+        msg = "Session started on #{Time.now} by #{@main}"
+        bord = '#' * s.size
+        puts bord, msg, bord
       end
 
       def build(parallel: [], pass: nil, **kwargs)
@@ -165,6 +167,8 @@ module Squared
         __build__(**kwargs)
 
         yield self if block_given?
+
+        __chain__(**kwargs)
         @closed = true
         self
       end
@@ -197,6 +201,34 @@ module Squared
         script_command :run, script, group, ref, on, &blk
       end
 
+      def chain(task, *action, project: nil, step: 0, with: nil, before: nil, after: nil, sync: false,
+                group: @group, ref: @ref)
+        keys = if project
+                 action.map! { |val| task_join(project.name, val) }
+                 nil
+               elsif (target = group || ref)
+                 action.map! { |val| task_name(task_join(val, target)) }
+                 nil
+               else
+                 action.map! { |val| task_name(val) }
+                 prefix ? nil : @project.keys
+               end
+        ns = lambda do |val|
+          next if (ret = as_a(val, :to_s, flat: true)).empty?
+
+          ret.map! do |arg|
+            if arg.include?(':') || (keys && !keys.include?(arg))
+              task_name(arg)
+            else
+              /\A#{Regexp.escape(task_name(arg))}:/
+            end
+          end
+        end
+        data = Support::ChainData.new(action, step, ns.call(with), ns.call(before), ns.call(after), sync)
+        (@chain[task_name(task.to_s)] ||= []) << data
+        self
+      end
+
       def script(script, group: @group, ref: @ref, on: nil)
         script_command :script, script, group, ref, on
       end
@@ -305,7 +337,7 @@ module Squared
         index = 0
         while @project[name]
           index += 1
-          name = "#{project}-#{index}"
+          name = task_name "#{project}-#{index}"
         end
         proj = ((if !ref.is_a?(Class)
                    Application.find(ref, path: path)
@@ -506,7 +538,7 @@ module Squared
       def format_desc(val, opts = nil, arg: 'opts*', before: nil, after: nil, out: false)
         return unless TASK_METADATA || out
 
-        val = val.to_s.split(':') if val.is_a?(String)
+        val = val.split(':') if val.is_a?(String)
         if before || after || opts
           pos = []
           pos << (before.is_a?(Array) ? before.join(',') : before) if before
@@ -602,6 +634,7 @@ module Squared
       end
 
       def powershell?
+        return true if ENV['SHELL']&.end_with?(File.join('', 'pwsh'))
         return false unless windows?
 
         case ENV['TERM_PROGRAM']
@@ -650,13 +683,129 @@ module Squared
         task Rake.application.default_task_name => out
       end
 
+      def __chain__(*)
+        @chain.each do |key, group|
+          level = []
+          sync = []
+          failed = []
+          i = 0
+          pass = nil
+          until (i > 0 && !group.compact! && !pass) || group.empty?
+            group.each_with_index do |data, j|
+              if i == 0
+                action, reject = data.action.partition { |val| task_defined?(val) }
+                failed.concat(reject)
+                next group[j] = nil if action.empty?
+
+                step = data.step
+                data.action = action
+              else
+                step = 0
+                catch :found do
+                  has = ->(c, d) { c.any? { |e| e.is_a?(Regexp) ? d.match?(e) : d == e } }
+                  w = data.with
+                  a = data.after
+                  b = data.before
+                  level.each_with_index do |tasks, k|
+                    with = lambda do |n|
+                      tasks.insert(n, *data.action)
+                      sync << tasks
+                      data.action.clear
+                    end
+                    tasks&.each_with_index do |v1, l|
+                      index = k if w && has.call(w, v1)
+                      if a && has.call(a, v1)
+                        if index
+                          with.call(l + 1)
+                          throw :found
+                        else
+                          index = k + 1
+                        end
+                      elsif b && has.call(b, v1)
+                        if index
+                          with.call(l)
+                          throw :found
+                        else
+                          index = k - 1
+                        end
+                      elsif index
+                        if a || b
+                          tasks.each_with_index do |v2, m|
+                            if a && has.call(a, v2)
+                              with.call(m + 1)
+                              throw :found
+                            elsif b && has.call(b, v2)
+                              with.call(m)
+                              throw :found
+                            end
+                          end
+                          if !pass
+                            pass = [i, data]
+                          elsif pass.include?(data)
+                            if i == pass.first + 1
+                              pass.delete(data)
+                              pass = nil if pass.size == 1
+                            end
+                          else
+                            pass << data
+                          end
+                          next
+                        end
+                      else
+                        next
+                      end
+                      step = index == -1 ? -1 : index + 1
+                      throw :found
+                    end
+                  end
+                end
+              end
+              if step == -1
+                level.unshift(data.action)
+                step = 0
+              elsif step > 0
+                (level[step -= 1] ||= []).concat(data.action)
+              elsif !data.action.empty?
+                next
+              end
+              sync << level[step] if data.sync
+              group[j] = nil
+              pass = nil
+            end
+            i += 1
+          end
+          level.compact!
+          sync.uniq!
+          series.chain(key, level, sync: sync)
+          next if task_defined?(key = task_join(key, 'print'))
+
+          format_desc key
+          task key do
+            unless failed.empty? && group.empty?
+              puts log_message(Logger::ERROR, *(failed + group.map { |val| val.action }.flatten),
+                               subject: 'failed placement', hint: false, pass: true)
+            end
+            cols = level.flatten(1).map(&:size).max
+            level.each_with_index do |grp, n|
+              title = "Step #{n.succ}#{if !sync.include?(grp) || (grp.size == 1 && series.parallel.include?(grp.first))
+                                         ''
+                                       else
+                                         ' (sync)'
+                                       end}"
+              emphasize(grp, title: title, cols: [cols, title.size].max, border: theme[:border],
+                             sub: [pat: /\A(Step \d+)(.*)\z/, styles: theme[:header]])
+            end
+          end
+        end
+      end
+
       def puts(*args)
         puts_oe(*args, pipe: pipe)
       end
 
       def script_command(task, val, group, ref, on, &blk)
         if block_given?
-          val = Struct.new(:run, :block).new(val, blk)
+          val = Support::RunData.new(val, blk)
         elsif !val
           return self
         end