squared 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41bec81d0daef581416b2c3c7a6cefc66da439794df530c5b2e9c65f7feba6ae
-  data.tar.gz: 8b74836f62055cc6d173148753420ac2bb621e951f1d339cae60ed35357c6f5f
+  metadata.gz: 76e13effa08fdb2534843e9fddf53139dbed8462375670966f6cc56ad89338ed
+  data.tar.gz: 0b012aabda216eeb70a76cca881512d34dd9be166ef39f702b0f4b71ee31d7a0
 SHA512:
-  metadata.gz: f042541b80121e9ef547066105a6148a21c790cf50ef0931097ee1506f75fd0a154323671585ec4c86fce33ac2c4c3d8d52d380550091d88932992fc79491466
-  data.tar.gz: 3fc67865ab3499416cac65f06652206af9dd762f898c561924b19f7c50c5430f640da0e03249ac1cdc39c0a2de1b0ba4125b8e2813805fa65259e5d285d44f79
+  metadata.gz: 043bc6751cbff73bc30408eecbd089691d712c47db5ebe2cca03bea20c6f500a22cc24f8b9286445bf0336efa9003c9367687c489d7bddefa808f9592e9b9e20
+  data.tar.gz: 927ce35b03ff2ad729ea4b900400657816c4221e7d0372c2f0e7fec69524e2c4d9059fc1d267498ba153e321017876aebe858d966f9028669010d3e924fd2adb

data/CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+## [0.4.4] - 2025-04-08
+
+### Added
+
+- Git command restore was implemented.
+- Python command venv was implemented.
+- Python command run can use separate VIRTUAL_ENV per project.
+- Python command depend can manage virtual environment.
+- Python command pip action freeze was implemented.
+- Ruby bundle command cache was implemented.
+- Python command pip action uninstall was implemented.
+- Docker command network was implemented.
+- Ruby program irb command was implemented.
+- Docker containers can have multiple tags.
+
+### Changed
+
+- Base command unpack action ext accepts generic extensions.
+- Docker images not matching project aliases are not listed.
+- Python dependtype lists poetry.lock (2) before pyproject.toml (3).
+- Rake command can be run with program options.
+
+### Fixed
+
+- Unsafe git commands are prompted before execution.
+- Unrecognized options are appended selectively on context.
+- Hatch root options were not applied correctly.
+
+## [0.3.7] - 2025-04-08
+
+- See `0.2.7`.
+
+## [0.2.7] - 2025-04-08
+
+### Fixed
+
+- Paths that conflict with git options can be quoted.
+- Bundle command update did not append package names.
+- Git result status type was truncated.
+- Log messages were concatenated without separator.
+- Python pip environment options used undefined session.
+- Regexp "o" modifier was not used properly.
+- Rake did not run individual project Rakefile.
+- Ruby commands did not delimit exec arguments.
+
+## [0.4.3] - 2025-04-01
+
+### Added
+
+- Git global command branch shows ahead and behind values.
+- Workspace theme style label warn was created.
+
+### Fixed
+
+- Git and Docker did not order common options first.
+
+### Changed
+
+- Git commit amend uses flag --force-with-lease.
+
 ## [0.4.2] - 2025-03-28
 
 ### Added
@@ -87,6 +147,7 @@
 - Git base class did not check for null Logger instance.
 - Banner border width extended past terminal edge.
 - Task program command options used unrecognized symbol.
+- Python pip environment options used undefined session.
 
 ## [0.3.5] - 2025-03-06
 
@@ -390,9 +451,12 @@
 
 - Changelog was created.
 
+[0.4.4]: https://github.com/anpham6/squared/releases/tag/v0.4.4-ruby
+[0.4.3]: https://github.com/anpham6/squared/releases/tag/v0.4.3-ruby
 [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.7]: https://github.com/anpham6/squared/releases/tag/v0.3.7-ruby
 [0.3.6]: https://github.com/anpham6/squared/releases/tag/v0.3.6-ruby
 [0.3.5]: https://github.com/anpham6/squared/releases/tag/v0.3.5-ruby
 [0.3.4]: https://github.com/anpham6/squared/releases/tag/v0.3.4-ruby
@@ -400,6 +464,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.7]: https://github.com/anpham6/squared/releases/tag/v0.2.7-ruby
 [0.2.6]: https://github.com/anpham6/squared/releases/tag/v0.2.6-ruby
 [0.2.5]: https://github.com/anpham6/squared/releases/tag/v0.2.5-ruby
 [0.2.4]: https://github.com/anpham6/squared/releases/tag/v0.2.4-ruby

data/README.ruby.md

@@ -1,7 +1,6 @@
 # squared 0.4
 
 * [source](https://github.com/anpham6/squared)
-* [manifest](https://github.com/anpham6/squared-repo)
 * [docs](https://squared.readthedocs.io)
 
 ## Version Compatibility
@@ -24,6 +23,7 @@ gem install squared
 ### Optional
 
 * [Repo](https://source.android.com/docs/setup/reference/repo)
+* https://github.com/anpham6/squared-repo
 * Python 3.6
 * Not compatible with Windows
 
@@ -155,13 +155,13 @@ Workspace::Application
 
 **NOTE**: The use of "**ref**" (class name) is only necessary when initializing an empty directory (e.g. *rake repo:init*).
 
-## Archive
+### Archive
 
 ```ruby
-# HEADERS={"Authorization":"Bearer RANDOM-TOKEN"} (hash/json)
-# ZIP_DEPTH=0               | default=1
-# TAR_DEPTH=0               | TAR_DEPTH_SQUARED
-# UNPACK_FORCE=1            | Remove target directory
+# HEADERS={"Authorization":"Bearer RANDOM-TOKEN"} | hash/json
+# ZIP_DEPTH=0                                     | default=1
+# TAR_DEPTH=0                                     | TAR_DEPTH_SQUARED
+# UNPACK_FORCE=1                                  | Remove target directory
 
 Workspace::Application
   .new(main: "squared")
@@ -171,7 +171,7 @@ Workspace::Application
       uri: "https://github.com/anpham6/chrome-docs/archive/refs/tags/v0.5.0.tar.gz",  # URI.open (required)
       digest: "e3d55d2004d4770dd663254c9272dc3baad0d57a5bd14ca767de6546cdf14680",     # SHA1 | SHA256 | SHA384 | SHA512 | MD5
       digest: "rmd160:47b7790a511eed675fec1a3e742845fef058799b",                      # RMD160
-      ext: "tar.gz",                                                                  # zip | tar | tar.gz | tgz | tar.xz | txz
+      ext: "tar.gz",                                                                  # zip | tar | tar.gz | tgz | tar.xz | txz | 7z
       depth: 1,                                                                       # nested directories (e.g. --strip-components)
       headers: {                                                                      # URI.open
         "Authorization" => "Bearer RANDOM-TOKEN"
@@ -238,8 +238,10 @@ Workspace::Application
   .new(main: "squared")
   .graph(["depend"], ref: :git) # Optional
   .with(:python) do
-    add("android-docs", "android")
-    add("chrome-docs", "chrome", graph: "android")
+    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)
+    end
   end
   .with(:node) do
     graph(["build", "copy"], on: {                                             # Overrides "git"
@@ -409,6 +411,7 @@ Non-task:
 * active
 * inline
 * subject
+* warn
 * caution
 * current
 * extra
@@ -417,6 +420,47 @@ Non-task:
 * yellow
 * green
 
+## Git
+
+Most project classes will inherit from `Git` which enables these tasks:
+
+| Task       | Git              |  Command                                      |
+| :--------- | :--------------- | :-------------------------------------------- |
+| branch     | branch           | create set delete move copy list edit current |
+| checkout   | checkout         | commit branch track detach path               |
+| commit     | commit           | add all amend amend-orig                      |
+| diff       | diff             | head cached branch files between contain      |
+| fetch      | fetch            | origin remote                                 |
+| files      | ls-files         | cached modified deleted others ignored        |
+| git        |                  | clean mv rm                                   |
+| merge      | merge            | commit no-commit send                         |
+| pull       | pull             | origin remote                                 |
+| rebase     | rebase           | branch onto send                              |
+| refs       | ls-remote --refs | heads tags remote                             |
+| reset      | reset            | commit index patch mode                       |
+| restore    | restore          | staged worktree                               |
+| rev        | rev              | commit branch output parseopt                 |
+| show       | show             | format oneline                                |
+| stash      | stash            | push pop apply drop list                      |
+| tag        | tag              | add delete list                               |
+
+You can disable all of them at once using the `exclude` property.
+
+```ruby
+Workspace::Application
+  .new
+  .add("squared", exclude: :git)
+```
+
+You can disable one or more of them using the `pass` property as a *string*.
+
+```ruby
+Workspace::Application
+  .new
+  .add("squared", pass: ["pull"], ref: :node)
+  .pass("pull", ref: :node) { read_packagemanager(:private) }
+```
+
 ## Environment
 
 ### Path
@@ -438,7 +482,7 @@ Common::PATH.merge!({
 
 ### Build
 
-```ruby
+```sh
 Workspace::Application
   .new
   .add("squared", run: "gcc a.c -o a.o", opts: { __debug__: { g: true, O2: true, c: nil }, c: true, j: 4 }) # gcc a.c -o a.o -c -j4
@@ -454,19 +498,23 @@ BUILD_${NAME}_TYPE   # debug
 
 # :env                                       :script   :opts                                  :args
 # NODE_ENV="production" NO_COLOR="1" npm run build:dev --loglevel=error --workspaces=false -- --quiet
-BUILD_${NAME}        # build:dev
-BUILD_${NAME}_OPTS   # --loglevel=error --workspaces=false
-BUILD_${NAME}_ENV    # {"NODE_ENV":"production","NO_COLOR":"1"} (hash/json)
-BUILD_${NAME}_DEV    # pattern,0,1 (:dev)
-BUILD_${NAME}_PROD   # pattern,0,1 (:prod)
-${REF}_${NAME}_OPTS  # --quiet (e.g. NODE_SQUARED_OPTS)
-
-BUILD_${NAME}=0      # skip project
+BUILD_${NAME}               # build:dev
+BUILD_${NAME}_OPTS          # --loglevel=error --workspaces=false
+BUILD_${NAME}_ENV           # {"NODE_ENV":"production","NO_COLOR":"1"} (hash/json)
+BUILD_${NAME}_DEV           # pattern,0,1 (:dev)
+BUILD_${NAME}_PROD          # pattern,0,1 (:prod)
+${REF}_${NAME}_OPTS         # --quiet (e.g. NODE_SQUARED_OPTS)
+
+BUILD_${NAME}=0             # skip project
+BUILD_${NAME}_VERSION=0.1.0 # publish + detection
+
+BANNER=0                    # hide banner
+BANNER_${NAME}=0            #
 ```
 
 ### Graph
 
-```ruby
+```sh
 GRAPH_${NAME}        # depend,build => squared:depend + squared:build
 GRAPH_${NAME}_PASS   # -emc,pir,express => pir + express
 ```
@@ -475,7 +523,7 @@ GRAPH_${NAME}_PASS   # -emc,pir,express => pir + express
 
 These global options also can target the project suffix `${NAME}`. (e.g. LOG_FILE_EMC)
 
-```ruby
+```sh
 LOG_FILE             # %Y-%m-%d.log
 # OR
 LOG_AUTO             # year,y,month,m,day,d,1
@@ -485,11 +533,72 @@ LOG_LEVEL            # See gem "logger"
 LOG_COLUMNS          # terminal width (default: 80)
 ```
 
+### Git
+
+```sh
+GIT_OPTIONS=q,strategy=ort     # all
+GIT_OPTIONS_${NAME}=v,ff-only  # project only
+GIT_AUTOSTASH=1                # rebase (all)
+GIT_AUTOSTASH_${NAME}=0        # rebase (project only)
+```
+
+| Command    | Flag              |  ENV                                                                  |
+| :--------- | :---------------- | :-------------------------------------------------------------------- |
+| pull       | rebase            | AUTOSTASH                                                             |
+| pull       | remote            | REFSPEC=s                                                             |
+| pull       | *                 | REBASE=0,1 FORCE RECURSE_SUBMODULES=0,1,s                             |
+| rebase     | branch            | HEAD=s                                                                |
+| rebase     | onto              | INTERACTIVE I HEAD=s                                                  |
+| fetch      | -remote           | ALL                                                                   |
+| fetch      | remote            | REFSPEC=s                                                             |
+| fetch      | *                 | FORCE RECURSE_SUBMODULES=0,1,s                                        |
+| clone      | *                 | DEPTH=n ORIGIN=s BRANCH=s LOCAL=0,1                                   |
+| stash      | push              | PATHSPEC=s                                                            |
+| stash      | global            | ALL=0,1 KEEP_INDEX=0,1 INCLUDE_UNTRACKED=0,1 STAGED=0,1 MESSAGE=s M=s |
+| status     | global            | LONG IGNORE_SUBMODULES=s,0-3 PATHSPEC=s                               |
+| revbuild   | global            | UNTRACKED_FILES=s IGNORE_SUBMODULES=s IGNORED=s (status)              |
+| reset      | mode (mixed)      | N REFRESH=0                                                           |
+| reset      | index             | PATHSPEC=s                                                            |
+| reset      | -commit           | HEAD=s                                                                |
+| checkout   | branch            | DETACH TRACK=s                                                        |
+| checkout   | global path       | HEAD=s PATHSPEC=s                                                     |
+| checkout   | *                 | FORCE MERGE                                                           |
+| tag        | add               | SIGN HEAD=s                                                           |
+| log        | *                 | PATHSPEC=s                                                            |
+| diff       | -between -contain | MERGE_BASE                                                            |
+| diff       | head branch       | INDEX=n                                                               |
+| diff       | *                 | PATHSPEC=s                                                            |
+| commit     | *                 | MESSAGE=s M=s REPOSITORY=s DRY_RUN EDIT=0                             |
+| branch     | create            | TRACK=0,1,s FORCE                                                     |
+| branch     | move copy         | FORCE                                                                 |
+| branch     | global            | SYNC                                                                  |
+| restore    | *                 | PATHSPEC=s                                                            |
+| show       | -online           | ABBREV=n                                                              |
+| rev        | commit branch     | HEAD=s                                                                |
+| git        | rm                | PATHSPEC=s                                                            |
+
+### Docker
+
+```sh
+DOCKER_OPTIONS=q,no-cache                # all
+DOCKER_OPTIONS_${NAME}=v,no-cache=false  # project only (override)
+DOCKER_TAG=latest                        # all
+DOCKER_TAG_${NAME}=v0.1.0                # project only (override)
+```
+
+| 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      | push              | TAG=s REGISTRY=s                                |
+
 ### Repo
 
 These global options also can target the application main suffix `${NAME}`. (e.g. REPO_ROOT_SQUARED)
 
-```ruby
+```sh
 REPO_ROOT            # parent dir
 REPO_HOME            # project dir (main)
 REPO_BUILD           # run,script
@@ -499,51 +608,12 @@ REPO_DEV             # pattern,0,1
 REPO_PROD            # pattern,0,1
 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_TIMEOUT         # confirm dialog (seconds)
 ```
 
-## Git
-
-Most project classes will inherit from `Git` which enables these tasks:
-
-| Task       | Git              |  Command                                      |
-| :--------- | :--------------- | :-------------------------------------------- |
-| branch     | branch           | create set delete move copy list edit current |
-| checkout   | checkout         | commit branch track detach path               |
-| commit     | commit           | add all amend amend-orig                      |
-| diff       | diff             | head cached branch files between contain      |
-| fetch      | fetch            | origin remote                                 |
-| files      | ls-files         | cached modified deleted others ignored        |
-| git        |                  | clean mv restore rm                           |
-| merge      | merge            | commit no-commit send                         |
-| pull       | pull             | origin remote                                 |
-| rebase     | rebase           | branch onto send                              |
-| refs       | ls-remote --refs | heads tags remote                             |
-| reset      | reset            | commit index patch mode                       |
-| rev        | rev              | commit branch output parseopt                 |
-| show       | show             | format oneline                                |
-| stash      | stash            | push pop apply drop list                      |
-| tag        | tag              | add delete list                               |
-
-You can disable all of them at once using the `exclude` property.
-
-```ruby
-Workspace::Application
-  .new
-  .add("squared", exclude: :git)
-```
-
-You can disable one or more of them using the `pass` property as a *string*.
-
-```ruby
-Workspace::Application
-  .new
-  .add("squared", pass: ["pull"], ref: :node)
-  .pass("pull", ref: :node) { read_packagemanager(:private) }
-```
-
 ## LICENSE
 
 BSD 3-Clause

data/lib/squared/common/base.rb

@@ -45,7 +45,8 @@ module Squared
           active: [:bold],
           inline: [:bold],
           subject: [:bold],
-          caution: [:red],
+          warn: %i[white red!],
+          caution: %i[black yellow!],
           current: nil,
           extra: nil,
           major: [:bold]

data/lib/squared/common/format.rb

@@ -185,12 +185,8 @@ module Squared
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
         else
           msg = [log_title(level, color: color)]
-          if subject
-            msg << (color ? sub_style(subject, styles: (@theme && @theme[:subject]) || :bold) : subject)
-          else
-            msg += args
-            args.clear
-          end
+          msg << (color ? sub_style(subject, styles: (@theme && @theme[:subject]) || :bold) : subject) if subject
+          msg << args.shift if msg.size == 1
           message(msg.join(' '), *args, hint: hint)
         end
       end

data/lib/squared/common/shell.rb

@@ -35,7 +35,8 @@ module Squared
 
       def shell_quote(val, option: true, force: true, double: false, override: false)
         val = val.to_s
-        return val if (!force && !val.include?(' ')) || (option && val.match?(/(?:^|\S=|[^=]\s+)(["']).+\1\z/m))
+        return val if !force && !val.include?(' ')
+        return val if option && val.match?(/(?:^|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m)
 
         if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
           "\"#{val.gsub(/(?<!\\)"/, '\\"')}\""

data/lib/squared/common/utils.rb

@@ -9,7 +9,7 @@ module Squared
       module_function
 
       def split_escape(val, char: ',')
-        val.split(/\s*(?<!\\)#{char}\s*/o)
+        val.split(/\s*(?<!\\)#{char}\s*/)
       end
 
       def split_option(val)
@@ -105,12 +105,12 @@ module Squared
         ret = env_value(key, suffix: suffix, strict: strict)
         return ret == equals.to_s unless equals.nil?
 
-        ret.empty? || (ignore && as_a(ignore).any? { |val| ret == val.to_s }) ? default : ret
+        ret.empty? || (ignore && as_a(ignore).any? { |val| val.to_s == ret }) ? default : ret
       end
 
       def env_value(key, default = '', suffix: nil, strict: false)
         if suffix
-          if (ret = ENV["#{key}#{@envname ? "_#{@envname}" : ''}_#{suffix}"])
+          if (ret = ENV["#{key + (@envname ? "_#{@envname}" : '')}_#{suffix}"])
             return ret
           elsif strict
             return default
@@ -124,7 +124,10 @@ module Squared
       end
 
       def env_bool(key, default = false, suffix: nil, strict: false, index: false)
-        if key.is_a?(::String)
+        case key
+        when nil
+          default
+        when ::String
           case (val = env_value(key, suffix: suffix, strict: strict))
           when ''
             default
@@ -134,7 +137,7 @@ module Squared
             index && val.to_i > 0 ? val.to_i : true
           end
         else
-          key.nil? ? default : key
+          key
         end
       end
 

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -404,7 +404,7 @@ module Squared
       end
 
       def task_localname(val)
-        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/o, '') : val.to_s
+        prefix && val.is_a?(String) ? val.sub(/\A#{Regexp.escape(prefix)}:/, '') : val.to_s
       end
 
       def task_desc(*args, **kwargs)
@@ -590,6 +590,15 @@ module Squared
         File.exist?('/.dockerenv')
       end
 
+      def powershell?
+        case ENV['TERM_PROGRAM']
+        when 'powershell.exe', 'vscode'
+          true
+        else
+          !ENV['PSModulePath'].nil? || !ENV['POWERSHELL_DISTRIBUTION_CHANNEL'].nil?
+        end
+      end
+
       def rootpath(*args)
         root.join(*args)
       end