squared 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9600e055e98f7c95c616af1a848044cb945f64597d986cad88392523a7ffb737
-  data.tar.gz: 255dc97b2d9738085a37fc336f43a6a835270d1ddcf28e9889712d077bc7f827
+  metadata.gz: 5f2dec97bece08fd8a158d8db320fbcb507e0e35c0d05802763616ed8c66a943
+  data.tar.gz: 5049853f41262335db8d2ff6c86f7c8b583e87ef868f18970f12e239aa40c58e
 SHA512:
-  metadata.gz: 498761f07fcfe36010066c6e0e9c6487aaef3652214420c9d6012a61155980bc13475531416a4584641bd0a2ef909016e0f04d1224c991363050692c224f6798
-  data.tar.gz: 3addf62ff638f20117db50cd40a13149490401f9b97a04f19ef2a6d6e02133eea763595ee1df8239933cc68db7e6725caa29de1cb1356b4fec93a38565ccbf7e
+  metadata.gz: 0aa7c2688ecaec61eb92d696dc4a10cd95de39799fad9a295561b33f933093335a7ddc5109ef56dab7b734a48505ef882c72d17a47e847f78fd312448a3210e0
+  data.tar.gz: 7f174f6e1ac139e4deaf97445660b4c021822d97ec74bc9997ce7932b02f88c6abc2b822f3b0b4f2213144c0aec66e9c6d52d40f0cff2d8ccaf7d36b091cf1e0

data/CHANGELOG.md

@@ -1,5 +1,75 @@
 # 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
+
+- See `0.4.16`.
+
+## [0.4.16] - 2025-07-27
+
+### Added
+
+- Git command blame was implemented.
+- Project property only for task filtering was implemented.
+- Node command copy uses NPM pack to refresh development packages.
+- Docker command bake action check was implemented.
+- Ruby uses gem specification for name and version.
+- Ruby constructor parameter gemspec was implemented.
+
+### Changed
+
+- Project boolean property readers were converted into accessors.
+- Workspace hash singleton methods were relocated under Support.
+- Project property version uses setter method for validation.
+- Node command publish will prompt when tag is not semantic.
+- Gem command push without args uses gemspec to locate archive.
+- Prompts will exit process without raising a generic error.
+
+### Fixed
+
+- Gem command exec did not separate command and arguments.
+- Project warning messages were not displayed for errors.
+- Python command outdated did not load virtual env in Windows.
+- Python virtual env original options are not modified.
+- Node could not compare semantic versions above double digits.
+
 ## [0.5.2] - 2025-07-16
 
 ### Changed
@@ -874,9 +944,13 @@
 
 - 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
 [0.4.13]: https://github.com/anpham6/squared/releases/tag/v0.4.13-ruby

data/README.ruby.md

@@ -66,6 +66,7 @@ require "squared/app"                                # All workspace related mod
 # log       = /workspaces/logger
 # emc       = /workspaces/e-mc
 # pir       = /workspaces/pi-r
+# pir2      = /workspaces/pi-r2
 # squared   = /workspaces/squared
 # cli       = /workspaces/squared/publish/sqd-cli
 # sqd-serve = /workspaces/squared/publish/sqd-serve
@@ -83,11 +84,12 @@ Workspace::Application
   .add("pathname", run: "rake compile", copy: "rake install", test: "rake test", group: "default", env: { # Ruby (with C extensions)
     "CFLAGS" => "-fPIC -O1"
   })
-  .add("optparse", doc: "rake rdoc", group: "default") # Uses bundler/gem_tasks (without C extensions)
+  .add("optparse", doc: "rake rdoc", gemspec: "optparse.gemspec", group: "default") # Uses bundler/gem_tasks (without C extensions)
   .add("logger", copy: { from: "lib", glob: "**/*.rb", into: "~/.rvm/gems/ruby-3.4.0/gems/logger-1.6.1" }, clean: ["tmp/"]) # autodetect: true | "rvm" | "rbenv" | "asdf" | "bundler"
   .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("squared", script: ["build:stage1", "build:stage2"], group: "app") do # Copy target (main)
+  .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", 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" })
@@ -108,7 +110,7 @@ Workspace::Application
     variable_set :depend, false
     variable_set :clean, ["build/sqd/"]
   end
-  .with(:docker, pass: ["unpack"]) do
+  .with(:docker, only: ["build", "compose"]) do
     .add("squared", "docker", file: "Dockerfile", context: ".", tag: "latest", registry: "localhost:5000", username: "squared",
                               args: "--ssh=default",
                               secrets: ["id=github,env=GITHUB_TOKEN"],
@@ -498,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                       |
@@ -510,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.
@@ -623,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
@@ -632,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                                                            |
@@ -648,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                                                           |
@@ -668,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)
@@ -713,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/format.rb

@@ -124,7 +124,7 @@ module Squared
       def check_style(args, empty: true)
         ret = []
         colors = __get__(:colors)
-        as_a(args, flat: true, compact: true).each do |val|
+        Array(args).flatten.compact.each do |val|
           if !val.is_a?(::Numeric)
             val = val.to_sym
             ret << val if colors.key?(val) || TEXT_STYLE.include?(val)
@@ -135,7 +135,9 @@ module Squared
             ret << "-0.#{b}".to_f unless b.to_i > 255
           end
         end
-        ret if empty || !ret.empty?
+        return if ret.empty? && !empty
+
+        ret
       end
 
       def apply_style(data, key, args, empty: true)
@@ -222,7 +224,7 @@ module Squared
         n = 0
         max = ->(v) { n = [n, v.max_by(&:size).size].max }
         set = lambda do |v|
-          ret = as_a(v, :to_s)
+          ret = Array(v).map(&:to_s)
           max.call(ret)
           ret
         end
@@ -246,7 +248,7 @@ module Squared
           ret = sub_style(ret, styles: border) if border
           ret
         end
-        sub = as_a sub
+        sub = sub.is_a?(::Hash) ? [sub] : Array(sub)
         pr = lambda do |line|
           s = line.ljust(n)
           sub.each { |h| s = sub_style(s, **h) }

data/lib/squared/common/prompt.rb

@@ -90,9 +90,9 @@ module Squared
             end
             attempts -= 1
             next if attempts > 0
-            break unless force
 
-            exit 1
+            exit 1 if force
+            break
           end
         rescue Interrupt
           puts
@@ -125,7 +125,7 @@ module Squared
                                end
           ret = (prompt.call || '').strip
           multiline.each { |val| break if ret.delete_suffix!(val) } if multiline.is_a?(::Enumerable)
-          raise_error 'user cancelled' if force && ret.empty?
+          exit 1 if force && ret.empty?
           ret
         else
           prompt.call

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
 
@@ -86,8 +91,7 @@ module Squared
       end
 
       def shell_split(val, join: nil, **kwargs)
-        ret = val.shellsplit
-        ret.map! { |opt| shell_escape(opt, double: true, option: true, **kwargs) }
+        ret = val.shellsplit.map! { |opt| shell_escape(opt, double: true, option: true, **kwargs) }
         return ret unless join
 
         ret.join(join.is_a?(::String) ? join : ' ')

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/common/utils.rb

@@ -93,6 +93,15 @@ module Squared
         Time.now.utc.strftime(s).to_i - Time.parse(val).utc.strftime(s).to_i
       end
 
+      def rand_s(size)
+        if RUBY_VERSION >= '3.1'
+          require 'random/formatter'
+          Random.new.alphanumeric(size)
+        else
+          (0...size).map { rand(97..122).chr }.join
+        end
+      end
+
       def env(key, default = nil, suffix: nil, strict: false, equals: nil, ignore: nil)
         ret = env_value(key, suffix: suffix, strict: strict)
         return ret == equals.to_s unless equals.nil?

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.5.2'
+  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
@@ -92,7 +92,7 @@ module Squared
         @prefix = prefix
         @series = Application.series_wrap(self)
         @project = {}
-        @kind = Workspace.hashlist
+        @kind = Support.hashlist
         @extensions = []
         @envname = env_key(@main).freeze
         @pipe = env_pipe(pipe, (ARG[:OUT] && env(ARG[:OUT])) || 1, root: @home)
@@ -106,20 +106,20 @@ module Squared
         else
           @theme = {}
         end
-        @chain = Workspace.hashlist
+        @chain = Support.hashlist
         @script = {
-          group: Workspace.hashobj,
-          ref: Workspace.hashobj,
+          group: Support.hashobj,
+          ref: Support.hashobj,
           group!: {},
           ref!: {}
         }.freeze
         @events = {
-          group: Workspace.hashobj,
-          ref: Workspace.hashobj
+          group: Support.hashobj,
+          ref: Support.hashobj
         }.freeze
         @pass = {
-          group: Workspace.hashobj,
-          ref: Workspace.hashobj,
+          group: Support.hashobj,
+          ref: Support.hashobj,
           global: {},
           pattern: []
         }.freeze
@@ -625,12 +625,16 @@ module Squared
         Rake::Win32.windows?
       end
 
+      def mri?
+        RUBY_ENGINE == 'ruby'
+      end
+
       def jruby?
         RUBY_ENGINE == 'jruby'
       end
 
-      def jruby_win?
-        jruby? && windows?
+      def truffleruby?
+        RUBY_ENGINE == 'truffleruby'
       end
 
       def docker?
@@ -682,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__(*)