squared 0.6.1 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a3b6e4109938a7ee4ddc9d778c798ad412cd2941a6b887cc62f9bd39779b4ad
-  data.tar.gz: 6912a295b0e64223d3130d8793bce44e954c0903fd74b65eb0f420726a41f82d
+  metadata.gz: ac2411d2abc2d5caca8296cd25de89f28ede8458dd42809216e9ecb60dbc12e3
+  data.tar.gz: 2574d5d757f7405c47d792c47f83520325a633514801885706404efc3a10fa8b
 SHA512:
-  metadata.gz: 137851028240806e553b125ec638df63cb20c25b6f73328a1c08f7af7603d666a1b61ff04dde1da27995a13d0bf2a6c28e644d20b6e8beb6e26fba061191d908
-  data.tar.gz: 21c7fce48d7638aa90b9c0ef40282b30557205065f6117e0602248771cee9e628910f90125295dac4a831615adda43296112809b437f31b4db0aa9d3f03de437
+  metadata.gz: 6623132213ca2b9510f867ffd711ce8541ef3d707290a51ae40eeca20dbe8ec027c4b47630d67ba96527faa9630a71b9befd89020bbba2ac329fc76925200c61
+  data.tar.gz: 909a95ac73cd5261d4d2bf184fb90ae6069d92fc30ba850d574da048f73938090ddea6ea7693fc6d0353df8a63213d964b2a964f44e3afa9f8f4188c47f8f5aa

data/CHANGELOG.md

@@ -1,5 +1,84 @@
 # Changelog
 
+## [0.6.3] - 2025-11-14
+
+### Added
+
+- Node command package action rebuild was implemented.
+- Node command add can remove packages using "-" prefix.
+- Git command log action grep was implemented.
+- Node command package action add was implemented.
+
+### Changed
+
+- Application class extended Enumerable collection class.
+- OptionPartition class is lazily loaded using autoload.
+- Requiring individual project classes in Rakefile is optional.
+- Application class uses static method register instead of series_wrap.
+- Project support modules are required inside Base class module.
+- Project graph print did not display parent and last child consequetively.
+- Project outdated interactive prompts use exact column alignments.
+
+## [0.5.16] - 2025-11-14
+
+### Fixed
+
+- See `0.4.30`.
+
+## [0.4.30] - 2025-11-14
+
+### Added
+
+- Config viewer can read items by index in an Array.
+
+### Fixed
+
+- Node command add uses event name "add" and not "depend".
+- Node command add did not include packages with Yarn and PNPM.
+- Git method revbuild did not splat build arguments.
+
+## [0.6.2] - 2025-11-08
+
+### Added
+
+- JoinSet methods [add|merge] were aliased to [push|concat].
+- JoinSet supports values that can be used multiple times.
+
+### Changed
+
+- Ruby command rake can multiple indexed tasks with separate options.
+
+### Fixed
+
+- Session global program options were untested and worthless upon draft.
+
+## [0.5.15] - 2025-11-08
+
+### Fixed
+
+- See `0.4.29`.
+
+## [0.4.29] - 2025-11-08
+
+### Fixed
+
+- OptionPartition was created by mistake and is unreliable in every way.
+
+## [0.5.14] - 2025-11-08
+
+### Fixed
+
+- See `0.4.28`.
+
+## [0.4.28] - 2025-11-08
+
+### Fixed
+
+- Project base method build as arrays parsed unrelated arguments.
+- OptionPartition method arg? does not check after "--" delimiter.
+- OptionPartition did not support duplicate values after "--" delimiter.
+- OptionPartition method opt? did not type check for String.
+
 ## [0.6.1] - 2025-11-05
 
 ### Added
@@ -12,6 +91,7 @@
 
 - Project base method run argument series was backwards.
 - Project base choice range did not detect empty list result.
+- Project base method build as arrays parsed unrelated arguments.
 
 ## [0.5.13] - 2025-11-05
 
@@ -1308,8 +1388,13 @@
 
 - Changelog was created.
 
+[0.6.3]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.3
+[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.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.16
+[0.5.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.15
+[0.5.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.14
 [0.5.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.13
 [0.5.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.12
 [0.5.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.11
@@ -1324,6 +1409,9 @@
 [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.30]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.30
+[0.4.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29
+[0.4.28]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.28
 [0.4.27]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.27
 [0.4.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.26
 [0.4.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.25

data/README.md

@@ -75,6 +75,10 @@ require "squared/app"                                # All workspace related mod
 # sqd-serve = /workspaces/squared/publish/sqd-serve
 # sqd       = /workspaces/squared/sqd
 
+# Load external Project classes (optional)
+Workspace::Application.load_ref('/home/user/.gem/ruby/3.4.0/gems/squared-0.6.0/lib/squared/workspace/project') # ref = :node => node.rb (absolute)
+Workspace::Application.load_ref('lib/squared/workspace/project', gem: 'squared')                               # bundle env (relative)
+
 Workspace::Application
   .new(Dir.pwd, main: "squared") # Dir.pwd? (main? is implicitly basename)
   .banner("group", "project", styles: ["yellow", "black"], border: "bold") # name | project | path | ref | group? | parent? | version?
@@ -150,13 +154,13 @@ Node = Workspace::Project::Node                                      # tsc
 Node.options("build:dev", "target=es2022", project: "tsconfig.json") # :node (ref)
 Node.options("build:dev", "outDir=tmp", :squared)                    # squared (project name)
 
-Ruby = Workspace::Project::Ruby                                      # ruby | gem | rake | bundle | irb
+Ruby = Workspace::Project::Ruby                                      # ruby | gem | rake | bundle | irb | rbs
 Ruby.options("lint", "rubocop", opts: ["gemfile=Gemfile"])           # :ruby
 Ruby.options("lint", "--parallel", :squared)
 
-Python = Workspace::Project::Python                                   # pip
-Python.options("build", opts: ["r=requirements.txt"])                 # :python
-Python.options(:build, "build:dev", opts: ["no-deps"])
+Python = Workspace::Project::Python                                  # pip
+Python.options("build", opts: ["r=requirements.txt"])                # :python
+Python.options(:build, "build:dev", opts: ["no-deps"])               # inherits "build" as "build:dev"
 
 Workspace::Application
   .new(ENV["SQUARED_HOME"], prefix: "rb", common: false)             # Local styles
@@ -692,7 +696,8 @@ GIT_AUTOSTASH_${NAME}=0     # rebase (project only)
 | checkout   | track             | COUNT=n                                                               |
 | checkout   | global path       | HEAD=s PATHSPEC=s                                                     |
 | checkout   | *                 | F|FORCE MERGE                                                         |
-| clone      | *                 | DEPTH=n ORIGIN=s BRANCH=s REVISION=s LOCAL=0,1                        |
+| clone      | *                 | DEPTH=n ORIGIN=s BRANCH=s REVISION=s BARE=1 LOCAL=0,1                 |
+|            |                   | SINGLE_BRANCH=0,1 NO_CHECKOUT=1 NO_TAGS=1 QUIET=1                     |
 | commit     | *                 | UPSTREAM=s DRY_RUN EDIT=0 M|MESSAGE=s                                 |
 | diff       | -between -contain | MERGE_BASE                                                            |
 | diff       | head branch       | INDEX=n                                                               |
@@ -742,14 +747,19 @@ BUILD_SQUARED_OPTS="NODE_TAG=24 RUBY_VERSION=3.4.0" DOCKER_SQUARED_OPTS="--no-ca
 docker build --no-cache --label=v1 --build-arg='NODE_TAG=24' --build-arg='RUBY_VERSION=3.4.0' .
 ```
 
-| Command    | Flag              | ENV                                             |
-| :--------- | :---------------- | :---------------------------------------------- |
-| buildx     | build             | TAG=s                                           |
-| buildx     | bake              | SERVICE=s                                       |
-| compose    | build             | TARGET=s                                        |
-| container  | commit            | REGISTRY=s PLATFORM=s DISABLE_CONTENT_TRUST=0,1 |
-| image      | rm                | Y=0,1                                           |
-| image      | push              | TAG=s REGISTRY=s                                |
+| Command    | Flag               | ENV                                             |
+| :--------- | :----------------- | :---------------------------------------------- |
+| buildx     | build context      | TAG=s                                           |
+| buildx     | bake               | SERVICE=s                                       |
+| compose    | build              | TARGET=s                                        |
+| compose    | run                | VERSION=s                                       |
+| container  | commit             | REGISTRY=s PLATFORM=s DISABLE_CONTENT_TRUST=0,1 |
+| container  | -run -create -exec | ALL=1                                           |
+|            | -update -commit    |                                                 |
+| image      | rm                 | Y=1                                             |
+| image      | push               | TAG=s REGISTRY=s                                |
+| image      | -push              | ALL=1                                           |
+| network    | *                  | ALL=1                                           |
 
 ### asdf
 

data/lib/squared/common/base.rb

@@ -14,8 +14,8 @@ module Squared
       CHOICE: 25,
       QUOTE: "'",
       SPACE: ' => ',
-      GRAPH: ['|', '-', '|', '\\', '-'].freeze,
-      BORDER: ['|', '-', '-', '-', '-', '-', '|', '|', '-', '-'].freeze,
+      GRAPH: %w[| - | \\ -].freeze,
+      BORDER: %w[| - - - - - | | - -].freeze,
       VIEW: 'view',
       BACKTRACE: $DEBUG || !$VERBOSE.nil?,
       LEVEL: ENV.fetch('LOG_LEVEL', 0).to_i,

data/lib/squared/common/format.rb

@@ -28,8 +28,8 @@ module Squared
         bright_cyan!: '106',
         bright_white!: '107'
       }.freeze
-      BOX_GRAPH = ['│', '─', '├', '└', '┬'].freeze
-      BOX_BORDER = ['│', '─', '┌', '┐', '┘', '└', '├', '┤', '┬', '┴'].tap do |val|
+      BOX_GRAPH = %w[│ ─ ├ └ ┬].freeze
+      BOX_BORDER = %w[│ ─ ┌ ┐ ┘ └ ├ ┤ ┬ ┴].tap do |val|
         if ENV['TERM']&.end_with?('256color')
           val.slice!(2, 4)
           val.insert(2, '╭', '╮', '╯', '╰')
@@ -61,25 +61,25 @@ module Squared
       def sub_style(val, *args, styles: nil, pat: nil, index: 1)
         return val unless ARG[:COLOR]
 
-        if pat && index != 0
-          return val unless (data = pat.match(val))
+        ret = if pat && index != 0
+                return val unless (data = pat.match(val))
 
-          ret = index == -1 ? data.to_a.drop(1) : data[index]
-        else
-          ret = val
-          index = 0
-        end
+                index == -1 ? data.to_a.drop(1) : data[index]
+              else
+                index = 0
+                val
+              end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
+        args.clear if args.size == 1 && args.first.nil?
         args.concat(Array(styles)).flatten.each_with_index do |type, i|
           next unless type
 
-          if index == -1
-            s = ret[i]
-            next ret[i] = '' if s.nil?
-          else
-            s = ret
-          end
+          s = if index == -1
+                ret[i] || (next ret[i] = '')
+              else
+                ret
+              end
           if type.is_a?(::Numeric)
             f, b = type.to_s.split('.')
             s = wrap.call(s, ['38', '5', f]) if f[0] != '-' && f.to_i <= 255
@@ -125,6 +125,10 @@ module Squared
         out
       end
 
+      def sub_style!(val, *args, **kwargs)
+        val.replace(sub_style(val, *args, **kwargs))
+      end
+
       def check_style(args, empty: true)
         ret = []
         colors = __get__(:colors)
@@ -192,9 +196,9 @@ module Squared
               ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
             end
           end
-          return false if !pass && level < ARG[:LEVEL]
+          return false unless pass || level >= ARG[:LEVEL]
         end
-        if (args.size > 1 && !hint) || hint == false
+        if hint.nil? ? args.size > 1 : !hint
           title = log_title(level, color: false)
           emphasize(args,
                     title: title + (subject ? " #{subject}" : ''),
@@ -204,7 +208,9 @@ module Squared
                          end)
         else
           msg = [log_title(level, color: color)]
-          msg << (color ? sub_style(subject.to_s, styles: (@theme && @theme[:subject]) || :bold) : subject) if subject
+          if subject
+            msg << (color ? sub_style(subject.to_s, (@theme.is_a?(::Hash) && @theme[:subject]) || :bold) : subject)
+          end
           msg << args.shift if msg.size == 1
           message(msg.join(' '), *args, hint: hint)
         end
@@ -236,7 +242,7 @@ module Squared
       end
 
       def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, pipe: nil,
-                    border: @theme && @theme[:border])
+                    border: @theme.is_a?(::Hash) && @theme[:border])
         n = 0
         max = ->(a) { n = [n, a.max_by(&:size).size].max }
         set = ->(s) { Array(s).map(&:to_s).tap { |a| max.call(a) } }
@@ -257,17 +263,19 @@ module Squared
         out = []
         draw = lambda do |a, b|
           ret = a + (b1 * (n + 2)) + b
-          ret = sub_style(ret, styles: border) if border
-          ret
+          next ret unless border
+
+          sub_style ret, border
         end
         sub = sub.is_a?(::Hash) ? [sub] : Array(sub)
         pr = lambda do |line|
           s = line.ljust(n)
-          sub.each { |h| s = sub_style(s, **h) }
+          sub.each { |h| sub_style!(s, **h) }
           s = "#{b0} #{s} #{b0}"
           if border
-            s = sub_style(s, **opt_style(border, /\A(#{Regexp.escape(b0)})(.+)\z/m))
-            s = sub_style(s, **opt_style(border, /\A(.+)(#{Regexp.escape(b0)})\z/m, 2))
+            [[/\A(#{Regexp.escape(b0)})(.+)\z/om], [/\A(.+)(#{Regexp.escape(b0)})\z/om, 2]].each do |args|
+              sub_style!(s, **opt_style(border, *args))
+            end
           end
           s
         end
@@ -282,7 +290,7 @@ module Squared
           unless sub.empty? && !right
             footer.map! do |s|
               s = s.rjust(n + 4) if right
-              sub.each { |h| s = sub_style(s, **h) }
+              sub.each { |h| sub_style!(s, **h) }
               s
             end
           end
@@ -291,17 +299,16 @@ module Squared
         if block_given?
           yield out
         elsif pipe
+          return out if pipe == -1
+
           case pipe
-          when -1
-            return out
           when 0
-            pipe = $stdin
+            $stdin
           when 2
-            pipe = $stderr
+            $stderr
           else
-            pipe = $stdout unless pipe.respond_to?(:puts)
-          end
-          pipe.puts out
+            pipe.respond_to?(:puts) ? pipe : $stdout
+          end.puts(out)
         else
           err ? warn(out) : puts(out)
         end

data/lib/squared/common/prompt.rb

@@ -19,7 +19,7 @@ module Squared
     module Prompt
       module_function
 
-      def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 3, timeout: 60)
+      def confirm(msg, default = nil, agree: 'Y', cancel: 'N', force: false, attempts: 3, timeout: 60)
         require 'timeout'
         if agree == 'Y' && cancel == 'N' && !msg.match?(%r{\[(?:Yn|nY|Y/n|y/N)\]})
           case default
@@ -38,6 +38,7 @@ module Squared
             when agree
               return true
             when cancel
+              exit 1 if force
               return false
             end
             attempts -= 1
@@ -47,6 +48,7 @@ module Squared
           puts
           exit 0
         else
+          exit 1 if force
           false
         end
       end
@@ -129,7 +131,7 @@ module Squared
         multiline = if multiline && Readline.respond_to?(:readmultiline)
                       multiline.is_a?(::Enumerable) || block_given? ? multiline : [multiline.to_s]
                     end
-        prompt = lambda do
+        read = lambda do
           if !multiline
             Readline.readline(msg, history)
           elsif block_given?
@@ -145,12 +147,12 @@ module Squared
                                 else
                                   [force ? ':' : '?', '']
                                 end
-          ret = (prompt.call || '').strip
+          ret = (read.call || '').strip
           multiline.each { |val| break if ret.delete_suffix!(val.to_s) } if multiline.is_a?(::Enumerable)
           exit 1 if force && ret.empty?
           ret
         else
-          prompt.call
+          read.call
         end
       end
     end

data/lib/squared/common/shell.rb

@@ -13,7 +13,7 @@ module Squared
 
       module_function
 
-      def shell_escape(val, quote: false, force: false, double: false, option: false, override: false)
+      def shell_escape(val, quote: false, option: false, force: false, double: false, override: false)
         if (r = /\A(--?)([^=\s]+)((=|\s+)(["'])?(?(5)(.*)\5|(.*)))?\z/m.match(val = val.to_s))
           if (data = r[2].match(QUOTE_VALUE))
             double = data[1] == '"'
@@ -31,7 +31,7 @@ module Squared
                   r[7]
                 end
           r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, force: force, double: double, override: override)
-        elsif option && val =~ /\A(-{0,2}[^\[\]=\s-][^\[\]=\s]*)=(.+)\z/m
+        elsif option && val =~ /\A(-{0,2}[^=\s-][^=\s]*)=(.+)\z/m
           return val if $2.match?(QUOTE_VALUE)
 
           "#{$1}=%s" % if $2.include?(' ')
@@ -55,7 +55,7 @@ module Squared
         return val if (!force && !val.include?(' ')) || val.empty?
 
         if option
-          pat = /\A(?:-[^\[\]=\s-](?:=|\s+)?|(--)?[^\[\]=\s-][^\[\]=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
+          pat = /\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
           return val if val.match?(pat)
         end
         q = ->(s) { s.gsub("'\\\\''", "'") }
@@ -103,7 +103,7 @@ module Squared
       end
 
       def shell_split(val, join: nil, **kwargs)
-        ret = val.shellsplit.map! { |opt| shell_escape(opt, double: true, option: true, **kwargs) }
+        ret = val.shellsplit.map! { |opt| shell_escape(opt, option: true, double: true, **kwargs) }
         return ret unless join
 
         ret.join(join.is_a?(::String) ? join : ' ')
@@ -156,6 +156,7 @@ module Squared
       end
 
       def fill_option(val, **kwargs)
+        return val unless val.is_a?(::String)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
         shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)

data/lib/squared/config.rb

@@ -12,15 +12,14 @@ module Squared
       include Rake::DSL
 
       class << self
-        def parse(gem, namespace, ext = [pkg])
+        def parse(gem, namespace, ext = [gem])
           require gem
-          obj = eval namespace
-          Array(ext).each { |val| @@mime_obj[val] = [obj, ext] }
+          [eval(namespace), Array(ext)].tap do |data|
+            data.last.each { |key| @@mime_obj[key] = data }
+          end
         rescue LoadError, NameError => e
           warn e
           nil
-        else
-          @@mime_obj[ext.first]
         end
 
         def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
@@ -245,7 +244,7 @@ module Squared
                                                 opt_style(theme[:key], /\A((?~ : ))( : (?!undefined).+)\z/m),
                                                 opt_style(theme[:number], /\A((?~: ): )(-?[\d.]+)(\s*)\z/m, 2),
                                                 opt_style(theme[:string], /\A((?~: ): ")(.+)("\s*)\z/m, 2),
-                                                opt_style(theme[:hash], /\A((?~: ): \{)(.+)(\}\s*)\z/m, 2),
+                                                opt_style(theme[:hash], /\A((?~: ): \{)(.+)(}\s*)\z/m, 2),
                                                 opt_style(theme[:array], /\A((?~: ): \[)(.+)(\]\s*)\z/m, 2),
                                                 opt_style(theme[:boolean], /\A((?~: ): )(true|false)(\s*)\z/m, 2),
                                                 opt_style(theme[:value], /\A((?~: ): (?!undefined))([^"\[{].*)\z/m, 2)
@@ -259,7 +258,7 @@ module Squared
         symbolize = opts[:symbolize_names]
         keys.each do |key|
           begin
-            items = key.split('.')
+            items = key.split('.').flat_map { |name| name =~ /^(.+)\[(\d+)\]$/ ? [$1, $2.to_i] : name }
             items = items.map(&:to_sym) if symbolize
             val = data.dig(*items)
             if val.nil?
@@ -271,7 +270,7 @@ module Squared
               end
             end
           rescue StandardError
-            log&.warn "#{Viewer}(#{type}) => #{file && "#{file} "}{#{key}: undefined}"
+            log&.warn "#{Viewer}(#{type}) => #{"#{file} " if file}{#{key}: undefined}"
             val = Regexp.escape($!.message)
             key = key.sub(/(#{val})\.|\.(#{val})|(#{val})/) do
               s = "<#{$3 || $2 || $1}>"

data/lib/squared/version.rb

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