squared 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54118de98db0adf55417ad35cbc3c118bba709c8bbb98b9d74acccaf7a30621e
-  data.tar.gz: 13f6ac344ecdc68f724c10a967f0eba1de6cd0332157abe0c9079db9dba1b9d0
+  metadata.gz: 5f2dec97bece08fd8a158d8db320fbcb507e0e35c0d05802763616ed8c66a943
+  data.tar.gz: 5049853f41262335db8d2ff6c86f7c8b583e87ef868f18970f12e239aa40c58e
 SHA512:
-  metadata.gz: cfbfbd1b2a5fcd376fceafe53fa77789726704d6cdf7f3d919c6381e04f89e2fc3888adfb38e819bbeba7bb51cd7f7f0c08e4fe797d16ee688752dddb9ad6b68
-  data.tar.gz: 4ffd9c7e92c7d357c6e877fa78ca850b202585721001a2c58dbc5851eac292abad59ab67f12fc8eab5ef7706bf3cd1d8db7aaf4ee9b169f0cebf38dfe1016b99
+  metadata.gz: 0aa7c2688ecaec61eb92d696dc4a10cd95de39799fad9a295561b33f933093335a7ddc5109ef56dab7b734a48505ef882c72d17a47e847f78fd312448a3210e0
+  data.tar.gz: 7f174f6e1ac139e4deaf97445660b4c021822d97ec74bc9997ce7932b02f88c6abc2b822f3b0b4f2213144c0aec66e9c6d52d40f0cff2d8ccaf7d36b091cf1e0

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # Changelog
 
+## [0.5.4] - 2025-08-09
+
+### Changed
+
+- Shellwords gem is no longer globally required.
+
+## [0.4.17] - 2025-08-09
+
+### Added
+
+- Node repos can be initialized with specific package manager.
+- Docker Engine options were updated to 28.0.
+- Git commands pull and fetch action all was implemented.
+- Git command reset action undo was implemented.
+- Python command pip action upgrade was implemented.
+- Git commands refs and files can use both pathspec and pattern.
+- Git command submodule was implemented.
+- Git command status was implemented.
+- Git command switch action branch was implemented.
+
+### Changed
+
+- Project task events can be assigned to a single proc.
+- Ruby task copy uses require paths from gem specification.
+- Docker task build:bake was renamed bake:build.
+- Project global tasks can be hidden and still expose subtasks.
+- Repo command line options can be overriden with class method.
+- Repo task all variable REPO_DRYRUN was replaced with REPO_STAGE.
+- Repo command sync option no-fail was renamed fail.
+
+### Fixed
+
+- Gem command outdated did not work outside main project folder.
+- Node command bump did not reset major and minor trailing digits.
+- Docker image status message was displayed backwards.
+
 ## [0.5.3] - 2025-07-27
 
 ### Fixed
@@ -908,10 +944,12 @@
 
 - Changelog was created.
 
+[0.5.4]: https://github.com/anpham6/squared/releases/tag/v0.5.4-ruby
 [0.5.3]: https://github.com/anpham6/squared/releases/tag/v0.5.3-ruby
 [0.5.2]: https://github.com/anpham6/squared/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared/releases/tag/v0.5.0-ruby
+[0.4.17]: https://github.com/anpham6/squared/releases/tag/v0.4.17-ruby
 [0.4.16]: https://github.com/anpham6/squared/releases/tag/v0.4.16-ruby
 [0.4.15]: https://github.com/anpham6/squared/releases/tag/v0.4.15-ruby
 [0.4.14]: https://github.com/anpham6/squared/releases/tag/v0.4.14-ruby

data/README.ruby.md

@@ -89,7 +89,7 @@ Workspace::Application
   .add("e-mc", "emc", copy: { from: "publish", scope: "@e-mc", also: [:pir, "squared-express/"] }, ref: :node) # Node
   .add("pi-r", "pir", copy: { from: "publish", scope: "@pi-r" }, clean: ["publish/**/*.js", "tmp/"]) # Trailing slash required for directories
   .add("pi-r2", "pir2", copy: { from: :npm, also: %i[squared express], files: ["LICENSE", ["README.md.ruby", "README.md"]] }) # Uses dist files from NPM package spec
-  .add("squared", script: ["build:stage1", "build:stage2"], group: "app") do # Copy target (main)
+  .add("squared", init: 'pnpm', script: ["build:stage1", "build:stage2"], group: "app") do # Use pnpm/yarn/berry for depend + Copy target (main)
     # Repo (global)
     as(:run, "build:dev", "dev")                                             # npm run build:dev -> npm run dev
     as(:run, { "build:dev": "dev", "build:prod": "prod" })
@@ -500,11 +500,11 @@ Most project classes will inherit from `Git` which enables these tasks:
 | checkout   | checkout         | commit branch track detach path               |
 | commit     | commit           | add all amend amend-orig fixup                |
 | diff       | diff             | head cached branch files between contain      |
-| fetch      | fetch            | origin remote                                 |
+| fetch      | fetch            | origin remote all                             |
 | files      | ls-files         | cached modified deleted others                |
-| git        |                  | add clean mv rm revert                        |
+| git        |                  | add blame clean mv rm revert                  |
 | merge      | merge            | commit no-commit send                         |
-| pull       | pull             | origin remote                                 |
+| pull       | pull             | origin remote all                             |
 | rebase     | rebase           | branch onto send                              |
 | refs       | ls-remote --refs | heads tags remote                             |
 | reset      | reset            | commit index patch mode                       |
@@ -512,7 +512,7 @@ Most project classes will inherit from `Git` which enables these tasks:
 | rev        | rev              | commit output                                 |
 | show       | show             | format oneline                                |
 | stash      | stash            | push pop apply branch drop clear list         |
-| switch     | switch           | create detach merge                           |
+| switch     | switch           | branch create detach                          |
 | tag        | tag              | add sign delete list                          |
 
 You can disable all of them at once using the `exclude` property.
@@ -625,6 +625,8 @@ LOG_LEVEL                    # See gem "logger"
 
 ### Git
 
+* Version: 2.50
+
 ```sh
 GIT_OPTIONS=q,strategy=ort  # all
 GIT_OPTIONS_${NAME}=v,ff    # project only
@@ -634,15 +636,15 @@ GIT_AUTOSTASH_${NAME}=0     # rebase (project only)
 
 | Command    | Flag              |  ENV                                                                  |
 | :--------- | :---------------- | :-------------------------------------------------------------------- |
-| branch     | create            | TRACK=0,1,s FORCE                                                     |
-| branch     | move copy         | FORCE                                                                 |
+| branch     | create            | TRACK=0,1,s F|FORCE                                                   |
+| branch     | move copy         | F|FORCE                                                               |
 | branch     | set delete        | COUNT=n                                                               |
 | branch     | global            | SYNC                                                                  |
 | checkout   | branch            | DETACH TRACK=s COUNT=n                                                |
 | checkout   | detach            | REFLOG=1                                                              |
 | checkout   | track             | COUNT=n                                                               |
 | checkout   | global path       | HEAD=s PATHSPEC=s                                                     |
-| checkout   | *                 | FORCE MERGE                                                           |
+| checkout   | *                 | F|FORCE MERGE                                                         |
 | clone      | *                 | DEPTH=n ORIGIN=s BRANCH=s REVISION=s LOCAL=0,1                        |
 | commit     | *                 | UPSTREAM=s DRY_RUN EDIT=0 M|MESSAGE=s                                 |
 | diff       | -between -contain | MERGE_BASE                                                            |
@@ -650,13 +652,13 @@ GIT_AUTOSTASH_${NAME}=0     # rebase (project only)
 | diff       | *                 | PATHSPEC=s                                                            |
 | fetch      | -remote           | ALL                                                                   |
 | fetch      | remote            | REFSPEC=s                                                             |
-| fetch      | *                 | FORCE RECURSE_SUBMODULES=0,1,s                                        |
+| fetch      | *                 | F|FORCE RECURSE_SUBMODULES=0,1,s                                      |
 | git        | rm                | PATHSPEC=s                                                            |
 | log        | *                 | PATHSPEC=s                                                            |
 | pull       | rebase            | AUTOSTASH                                                             |
 | pull       | remote            | REFSPEC=s                                                             |
 | pull       | -remote           | ALL                                                                   |
-| pull       | *                 | REBASE=0,1 FORCE RECURSE_SUBMODULES=0,1,s                             |
+| pull       | *                 | REBASE=0,1 F|FORCE RECURSE_SUBMODULES=0,1,s                           |
 | rebase     | branch            | HEAD=s                                                                |
 | rebase     | onto              | INTERACTIVE I HEAD=s                                                  |
 | reset      | mode (mixed)      | N REFRESH=0                                                           |
@@ -670,14 +672,16 @@ GIT_AUTOSTASH_${NAME}=0     # rebase (project only)
 | status     | global            | BRANCH LONG IGNORE_SUBMODULES=s,0-3 PATHSPEC=s                        |
 | switch     | detach            | REFLOG=1                                                              |
 | switch     | -detach           | HEAD=s                                                                |
-| switch     | *                 | FORCE                                                                 |
+| switch     | *                 | F|FORCE                                                               |
 | tag        | add               | SIGN FORCE HEAD=s M|MESSAGE=s                                         |
-| tag        | sign              | FORCE HEAD=s M|MESSAGE=s                                              |
+| tag        | sign              | F|FORCE HEAD=s M|MESSAGE=s                                            |
 | tag        | delete            | COUNT=n                                                               |
 | rev        | commit branch     | HEAD=s                                                                |
 
 ### Docker
 
+* Version: 28.3
+
 ```sh
 DOCKER_OPTIONS=q,no-cache                # all
 DOCKER_OPTIONS_${NAME}=v,no-cache=false  # project only (override)
@@ -715,7 +719,7 @@ REPO_WARN            # 0,1
 REPO_SYNC            # 0,1
 REPO_URL             # manifest repository
 REPO_MANIFEST        # e.g. latest,nightly,prod
-REPO_DRYRUN          # 0,1,2
+REPO_STAGE           # 0,1,2,3
 REPO_TIMEOUT         # confirm dialog (seconds)
 ```
 

data/lib/squared/common/shell.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'shellwords'
 require 'rake'
 
 module Squared
@@ -31,13 +30,19 @@ module Squared
 
           "#{$1}=%s" % if $2.include?(' ')
                          shell_quote($2, option: false)
+                       elsif Rake::Win32.windows?
+                         $2
                        else
-                         Rake::Win32.windows? ? $2 : Shellwords.escape($2)
+                         require 'shellwords'
+                         Shellwords.escape($2)
                        end
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, double: double, force: force) : val
+        elsif val.empty?
+          ''
         else
-          val.empty? ? '' : Shellwords.escape(val)
+          require 'shellwords'
+          Shellwords.escape(val)
         end
       end
 

data/lib/squared/common/system.rb

@@ -12,9 +12,9 @@ module Squared
         if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
           e = kwargs[:exception]
           if (dir = kwargs[:chdir]) && ((pwd = Dir.pwd) != dir)
-            Dir.chdir(dir)
+            Dir.chdir dir
             ret = Kernel.send(name, *args)
-            Dir.chdir(pwd)
+            Dir.chdir pwd
           else
             ret = Kernel.send(name, *args)
           end
@@ -59,7 +59,7 @@ module Squared
         soft = 0
         subdir.each do |dir, files|
           if link
-            files.dup.yield_self do |items|
+            files.dup.tap do |items|
               files.clear
               items.each do |file|
                 if file.exist?

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -26,7 +26,7 @@ module Squared
             next unless base || obj < impl_project
 
             if base
-              @impl_project = obj
+              self.impl_project = obj
               impl_series.base_set(obj)
             else
               kind_project.prepend(obj)
@@ -39,7 +39,7 @@ module Squared
               impl_series.alias(*args)
             end
             if (args = obj.bannerargs)
-              @attr_banner.merge(args)
+              attr_banner.merge(args)
             end
           end
         end
@@ -83,7 +83,7 @@ module Squared
         basename = @home.basename.to_s
         if main
           @main = main.to_s.freeze
-          @home += @main unless @main == basename || (windows? && @main.downcase == basename.downcase)
+          @home += @main unless @main == basename || (windows? && @main.casecmp?(basename))
         else
           @main = basename.freeze
         end
@@ -686,9 +686,14 @@ module Squared
       private
 
       def __build__(default: nil, **)
-        return unless default && task_defined?(out = task_name(default))
-
-        task Rake.application.default_task_name => out
+        unless task_defined?('squared:version')
+          task 'squared:version' do
+            puts Squared::VERSION
+          end
+        end
+        if default && task_defined?(out = task_name(default))
+          task Rake.application.default_task_name => out
+        end
       end
 
       def __chain__(*)

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

@@ -21,8 +21,8 @@ module Squared
         VAR_SET = %i[parent global script index envname desc dependfile dependindex theme archive env dev prod graph
                      pass only exclude].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
-        URI_SCHEME = %r{^([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?-?(\S+)?\b/.freeze
+        URI_SCHEME = %r{\A([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
         TASK_METADATA = Rake::TaskManager.record_task_metadata
         private_constant :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
 
@@ -213,7 +213,7 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          if @output[2] != false && (val = env('BUILD', suffix: 'ENV'))
+          unless @output[2] == false || !(val = env('BUILD', suffix: 'ENV'))
             @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
           end
           unless @output[0] == false || @output[0].is_a?(Array)
@@ -658,7 +658,7 @@ module Squared
                    when 128, 'sha512'
                      Digest::SHA512
                    else
-                     raise_error("invalid checksum: #{digest}", hint: name)
+                     raise_error "invalid checksum: #{digest}"
                    end
           end
           if (val = env('HEADERS')) && (val = parse_json(val, hint: "HEADERS_#{@envname}"))
@@ -991,7 +991,7 @@ module Squared
         end
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, from: nil, banner: true, chdir: path,
-                interactive: nil, **)
+                interactive: nil, hint: nil, **)
           unless cmd
             warn log_message(Logger::WARN, 'no command given', subject: project, hint: from || 'unknown', pass: true)
             return
@@ -1017,7 +1017,7 @@ module Squared
               log&.warn "ENV discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
-              print_item format_banner(cmd, banner: banner) if sync
+              print_item format_banner(hint ? "#{cmd} (#{hint})" : cmd, banner: banner) if sync
               if var != false && (pre = runenv)
                 case pre
                 when Hash
@@ -1256,7 +1256,7 @@ module Squared
         def session_done(cmd)
           return cmd unless cmd.respond_to?(:done)
 
-          raise_error('no args added', hint: cmd.first || name) unless cmd.size > 1
+          raise_error('no args added', hint: cmd.first) unless cmd.size > 1
           @session = nil if cmd == @session
           cmd.done
         end
@@ -1410,7 +1410,7 @@ module Squared
           unless items.empty?
             pad = items.size.to_s.size
             items.each_with_index do |val, i|
-              next unless reg.empty? || reg.any? { |pat| val[0].match?(pat) }
+              next unless matchany?(val[0], reg)
 
               out << ('%*d. %s' % [pad, i.succ, each ? each.call(val) : val[0]])
             end
@@ -1513,11 +1513,11 @@ module Squared
           list.flatten.each do |opt|
             next unless (val = option(opt, **kwargs))
 
-            return target << (if flag
-                                shell_option(opt, equals ? val : nil, quote: quote, escape: escape, force: force)
-                              else
-                                shell_quote val
-                              end)
+            return target << if flag
+                               shell_option(opt, equals ? val : nil, quote: quote, escape: escape, force: force)
+                             else
+                               shell_quote val
+                             end
           end
           nil
         end
@@ -1726,6 +1726,17 @@ module Squared
           files.map { |val| val == '.' ? '.' : shell_quote(path + val) }
         end
 
+        def matchmap(list, prefix = nil)
+          list.map do |val|
+            if val.is_a?(Regexp)
+              val
+            else
+              val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
+              Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
+            end
+          end
+        end
+
         def semver(val)
           return val if val[3]
 
@@ -1743,12 +1754,13 @@ module Squared
         end
 
         def semcmp(val, other)
-          a, b = [val, other].map! { |ver| ver.match(SEM_VER) }
-          return 1 unless a
-          return -1 unless b
-          return 0 if a[0] == b[0]
+          return 0 if val == other
+
+          a, b = [val, other].map! { |ver| ver.scan(SEM_VER) }
+          return -1 if b.empty?
+          return 1 if a.empty?
 
-          a, b = [a, b].map! { |c| [c[1], c[3], c[5] || '0'] }
+          a, b = [a.first, b.first].map! { |c| [c[0], c[2], c[4] || '0', c[5] ? '-1' : '0'] }
           a.each_with_index do |c, index|
             next if c == (d = b[index])
 
@@ -1757,6 +1769,10 @@ module Squared
           0
         end
 
+        def semgte?(val, other)
+          semcmp(val, other) != 1
+        end
+
         def indexitem(val)
           [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
@@ -1800,7 +1816,7 @@ module Squared
         def on(event, from, *args, **kwargs)
           return unless from && @events.key?(event)
 
-          @events[event][from]&.each do |obj|
+          Array(@events[event][from]).each do |obj|
             target, opts = if obj.is_a?(Array) && obj[1].is_a?(Hash)
                              [obj[0], kwargs.empty? ? obj[1] : obj[1].merge(kwargs)]
                            else
@@ -1826,25 +1842,22 @@ module Squared
           print_error(err, pass: pass) unless ret
         end
 
-        def pwd_set(pass: false, from: nil)
-          pass = semscan(pass).join <= RUBY_VERSION if pass.is_a?(String)
+        def pwd_set(pass: false, dryrun: false, from: nil)
           pwd = Dir.pwd
-          if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
-            ret = yield
-          else
-            Dir.chdir(path)
-            ret = yield
-            Dir.chdir(pwd)
-          end
+          return yield if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+
+          Dir.chdir path
+          ret = yield
+          Dir.chdir pwd
         rescue StandardError => e
-          on_error e, from
+          on_error(e, from, dryrun: dryrun)
         else
           ret
         end
 
         def run_set(cmd, val = nil, opts: nil, **)
-          diso = @output[1] == false && !@output[0].nil?
-          dise = @output[2] == false
+          noopt = @output[1] == false && !@output[0].nil?
+          noenv = @output[2] == false
           parse = lambda do |data|
             ret = []
             if data[:command]
@@ -1864,8 +1877,8 @@ module Squared
           case cmd
           when Array
             @output = if cmd.all? { |data| data.is_a?(Hash) }
-                        diso = false
-                        dise = false
+                        noopt = false
+                        noenv = false
                         cmd.map { |data| parse.call(data) }
                       else
                         cmd.dup
@@ -1876,14 +1889,14 @@ module Squared
           else
             @output[0] = cmd
           end
-          unless diso
+          unless noopt
             if opts == false
               @output[1] = false
             elsif opts && opts != true
               @output[1] = opts
             end
           end
-          return if dise
+          return if noenv
 
           if val.is_a?(Hash)
             @output[2] = val
@@ -1986,6 +1999,10 @@ module Squared
           @only ? !@only.include?(key) : @pass.include?(key)
         end
 
+        def matchany?(val, list, empty: true)
+          list.empty? ? empty : list.any? { |pat| val.match?(pat) }
+        end
+
         def projectpath?(val)
           Pathname.new(val).cleanpath.yield_self do |file|
             file.absolute? ? file.to_s.start_with?(File.join(path, '')) : !file.to_s.start_with?(File.join('..', ''))