squared 0.4.9 → 0.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81e1fa9c773a59c8cb351dec47eb27b4c858c6266c83bd14be02c621cf68ad57
-  data.tar.gz: 23ccad44a3f5fbc1ade8d5950692fd401566f862b0131debebdd9d5d1a4d6dab
+  metadata.gz: ba613d7ba02a664fb4581573f6ee04d705f6bb2d1cb165c30c49d97eb259cbec
+  data.tar.gz: 764888100c6a6560478e99ed1451f1593a86e120799e25400708d81be934102c
 SHA512:
-  metadata.gz: '00945ddcf48ae0482bdb40f143117ae464a03491fadf6c33b2e34c9f50b4d628c4b72b43c1a388e2c8c175067f62970c7ac60721330c1340a48103c4b972b560'
-  data.tar.gz: d3846c85547ee3acb6d040703d21b7a61630f502c17da71f8d0ddf9032c67930819b933b3c3896a0e2b23c2664bfc2ed5454d95313849a9885c429d0cfacb5f1
+  metadata.gz: 1cf6f1f10babf7bfbbe665fe5fc97527cf1df4093a3e6b8b906a4bf8cf87f538c601faee86f40decb79455de340e1d8f510fb45d0acc17694cd97a4051010539
+  data.tar.gz: 2b537c2c6a30a17191f32eb1012b225bc29fff9e9102b663a6dcf3ffd05465f4e8a0790f4cbdd6c63b21bd64c762e85dff1d22b4eb35053702a6692e92c994cc

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 # Changelog
 
+## [0.4.10] - 2025-05-08
+
+### Added
+
+- Git command pull and fetch action remote is interactive.
+- Ruby command script uses multiline input when available.
+- Ruby command file is interactive.
+- Node command publish can accept access option levels.
+- Docker command image action rm when called empty is interactive.
+
+### Fixed
+
+- Disabled batch and alias tasks were not hidden.
+- Docker tags from ENV were appended twice.
+- Git events were not always registered.
+- Git revbuild did not write lock data file with parallel tasks.
+
+### Changed
+
+- Choice selection default was set to no timeout.
+- Git command add can accept a file search pattern.
+
 ## [0.4.9] - 2025-04-27
 
 ### Added
@@ -633,6 +655,7 @@
 
 - Changelog was created.
 
+[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
 [0.4.7]: https://github.com/anpham6/squared/releases/tag/v0.4.7-ruby

data/README.md

@@ -1,4 +1,4 @@
-# squared 5.4
+# squared 5.5
 
 ## Documentation
 
@@ -15,10 +15,11 @@
 * [squared-express](https://github.com/anpham6/squared-express#readme)
 * [E-mc](https://github.com/anpham6/e-mc#readme)
 * [Pi-r](https://github.com/anpham6/pi-r#readme)
+* [Pi-r2](https://github.com/anpham6/pi-r2#readme)
 
 ## Installation
 
-* NodeJS 16 LTS
+* NodeJS 18
 
 ### NPX
 
@@ -131,26 +132,22 @@ rake clone               # node + docs
 
 ```sh
 # NODE_TAG=latest
-# RUBY_VERSION=2.4.0-3.3.0
-# MANIFEST=nightly,staging,prod,android
+# RUBY_VERSION=2.4.0-3.4.0
+# MANIFEST=nightly,prod,latest,android
 # BUILD={dev,prod}
 # DEV={0,1,local}
 # DOCS=any
 # PIPE_FAIL={0,1}
 # PORT=3000
-docker build -t squared --build-arg MANIFEST=prod --build-arg SQUARED=prod .
-docker build -t node --build-arg NODE_TAG=20 --build-arg NODE_INSTALL=pnpm -f Dockerfile.slim . # no docs
-docker buildx bake node
+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 .
+NODE=22 docker buildx bake node
 # OR
-# RUBY_TAG=latest
-# NODE_VERSION=22.x
-docker build -t ruby --build-arg RUBY_TAG=3.0.0 --build-arg NODE_VERSION=20.x --build-arg PIPE_FAIL=0 -f Dockerfile.ruby .
-docker buildx bake ruby
+docker build -t ruby --build-arg RUBY_TAG=3.4.0 --build-arg NODE_VERSION=22 --build-arg PIPE_FAIL=0 -f Dockerfile.ruby .
+RUBY=3.4.0 docker buildx bake ruby
 # OR
-# NGINX_VERSION=1.27
-# NGINX_VARIANT=bookworm
-docker build -t nginx --build-arg NGINX_VERSION=1.27 --build-arg PORT=3000 --build-arg NODE_VERSION=18.x -f Dockerfile.nginx .
-docker buildx bake nginx
+docker build -t nginx --build-arg NGINX_VERSION=1.27 --build-arg PORT=3000 --build-arg NODE_VERSION=20 -f Dockerfile.nginx .
+NGINX=1.27 docker buildx bake nginx
 
 # Express
 docker run -it --name express --rm -p 3000:3000 \
@@ -521,6 +518,7 @@ squared.settings = {
     ],
     compressImages: false, // TinyPNG API Key <https://tinypng.com/developers>
     compressImages: "****************", // API key
+    compressImages: [{ plugin: "imagemin-pngquant", format: "png", options: { quality: [0.6, 0.8] } }], // v5.5
     convertImages: "", // png | jpeg | webp | gif | bmp
     showAttributes: true,
     showAttributes: {
@@ -541,7 +539,7 @@ squared.settings = {
     showErrorMessages: false,
     convertPixels: "dp", // "sp" | "pt" | "in" | "mm"
     convertLineHeight: "sp", // "dp" | "pt" | "in" | "mm"
-    convertEntities: ["numeric"], // v5.4
+    convertEntities: ["numeric"],
     convertEntities: ["codepoints", {/* JSON (last) */}], // https://html.spec.whatwg.org/entities.json
     insertSpaces: 4,
     outputDocumentHandler: "android",
@@ -1361,4 +1359,4 @@ NOTE: Defining an element "**id**" will prevent it from being removed during the
 
 ## LICENSE
 
-BSD 3-Clause
+BSD 3-Clause

data/README.ruby.md

@@ -98,6 +98,9 @@ Workspace::Application
     with(exclude: [:base]) { add("publish/*", "packages") }                  # rake packages:sqd-serve:build
     # OR
     add(["publish/sqd-cli", "publish/sqd-serve"], true, exclude: [:base])    # rake squared:sqd-serve:build
+
+    # Git
+    revbuild(include: %w[src/ framework/ types/])                            # Synchronous is recommended
   end
   .add("squared/sqd", exclude: :git, pass: [:node, "checkout", "bump"]) do   # Skip initialize(:node) + squared:checkout:* + squared:bump:*
     variable_set :script, "build:sqd"                                        # Override detection
@@ -116,9 +119,9 @@ Workspace::Application
       end
     end
   end
-  .pass("pull", group: "default") { test? || doc? } # pathname:pull | optparse:pull
+  .pass("pull", group: "default") { test? || doc? } # rake pathname:pull | rake optparse:pull
   .style("banner", 255.255) # 256 colors (fg | fg.bg | -0.bg)
-  .build(default: "build", parallel: ["pull", "fetch", "rebase", "archive", "copy", "clean", /^outdated:/], pass: ["publish"]) do |workspace|
+  .build(default: "build", parallel: ["pull", "fetch", "rebase", "archive", "clean", /^outdated:/], pass: ["publish"]) do |workspace|
     workspace
       .enable_aixterm
       .style({
@@ -194,9 +197,9 @@ Workspace::Application
     "pir": {                                                    # rake pir:clone
       uri: "https://github.com/anpham6/pi-r",                   #
       options: {                                                #
-        "origin": "github",                                     # --origin='github'
+        "origin": "github",                                     # --origin=github
         "recurse-submodules": false,                            # --no-recurse-submodules
-        "shallow-exclude": ["v0.0.1", "v0.0.2"]                 # --shallow-exclude='v0.0.1' --shallow-exclude='v0.0.2'
+        "shallow-exclude": ["v0.0.1", "v0.0.2"]                 # --shallow-exclude=v0.0.1 --shallow-exclude=v0.0.2
       }
     }
   )
@@ -238,7 +241,7 @@ Workspace::Application
   .new(main: "squared")
   .graph(["depend"], ref: :git) # Optional
   .with(:python) do
-    doc(windows? ? '.\make.bat html' : 'make html')
+    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)
@@ -490,7 +493,7 @@ rake squared:log:view[H1,HEAD^5,all,lib,./H12345]  # git log --all @~1 @^5 -- 'l
 All project binary programs can have their executable path set to a non-global alias.
 
 ```ruby
-Common::PATH.merge!({
+Common::PATH.update({
   GIT: "/usr/bin/git",                         # PATH_GIT=/usr/bin/git
   TAR: "/opt/archivers/tar",                   # PATH_TAR=/opt/archivers/tar
   UNZIP: "/opt/archivers/unzip",
@@ -593,6 +596,7 @@ GIT_AUTOSTASH_${NAME}=0     # rebase (project only)
 | log        | *                 | PATHSPEC=s                                                            |
 | pull       | rebase            | AUTOSTASH                                                             |
 | pull       | remote            | REFSPEC=s                                                             |
+| pull       | -remote           | ALL                                                                   |
 | pull       | *                 | REBASE=0,1 FORCE RECURSE_SUBMODULES=0,1,s                             |
 | rebase     | branch            | HEAD=s                                                                |
 | rebase     | onto              | INTERACTIVE I HEAD=s                                                  |
@@ -621,6 +625,7 @@ DOCKER_OPTIONS_${NAME}=v,no-cache=false  # project only (override)
 DOCKER_TAG=latest                        # all
 DOCKER_TAG_${NAME}=v0.1.0                # project only (override)
 DOCKER_ALL=1                             # list every image/container
+DOCKER_Y=1                               # confirm all
 ```
 
 | Command    | Flag              |  ENV                                            |
@@ -629,6 +634,7 @@ DOCKER_ALL=1                             # list every image/container
 | 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                                |
 
 ### Repo

data/lib/squared/common/prompt.rb

@@ -8,8 +8,8 @@ module Squared
       def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 30)
         require 'readline'
         require 'timeout'
-        agree = /^#{agree}$/i if agree.is_a?(::String)
-        cancel = /^#{cancel}$/i if cancel.is_a?(::String)
+        agree = /^#{Regexp.escape(agree)}$/i if agree.is_a?(::String)
+        cancel = /^#{Regexp.escape(cancel)}$/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
           begin
             while (ch = Readline.readline(msg))
@@ -32,24 +32,28 @@ module Squared
         end
       end
 
-      def choice(msg, list = nil, min: 1, max: 1, multiple: false, auto: true, force: true, attempts: 5, timeout: 60)
+      def choice(msg, list = nil, min: 1, max: 1, multiple: false, force: true, grep: nil, auto: true,
+                 attempts: 5, timeout: 0)
         require 'readline'
         require 'timeout'
         if list
+          grep &&= (grep.is_a?(::Enumerable) ? grep : [grep]).map { |val| Regexp.new(val) }
           items = []
-          list.each_with_index do |val, index|
-            puts "#{index.succ.to_s.rjust(2)}. #{val}"
+          list.each do |val|
+            next if grep&.none? { |pat| pat.match?(line) }
+
             items << val.chomp
+            puts "#{items.size.to_s.rjust(2)}. #{val}"
           end
           max = items.size
+          raise_error 'empty selection list' if max == 0
+          min = [min, max].min
           if auto
             msg = "#{msg}: [1-#{max}#{if multiple
                                         "|,#{multiple.is_a?(Numeric) ? "{#{multiple}}" : ''}"
                                       end}] "
           end
         end
-        return unless max >= min
-
         valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
         Timeout.timeout(timeout) do
           begin
@@ -82,16 +86,33 @@ module Squared
         end
       end
 
-      def readline(msg, history = false, force: nil)
+      def readline(msg, history = false, force: nil, multiline: nil, &blk)
         require 'readline'
+        multiline = if multiline && Readline.respond_to?(:readmultiline)
+                      multiline.is_a?(::Enumerable) || block_given? ? multiline : [multiline.to_s]
+                    end
+        prompt = lambda do
+          if !multiline
+            Readline.readline(msg, history)
+          elsif block_given?
+            Readline.readmultiline(msg, history, &blk)
+          else
+            Readline.readmultiline(msg, history) { |line| multiline.any? { |val| line.split.last.end_with?(val) } }
+          end
+        end
         case force
         when ::TrueClass, ::FalseClass
-          msg = "#{msg} (#{force ? 'required' : 'optional'}): "
-          ret = Readline.readline(msg, history)&.strip || ''
+          msg = "#{msg} %s " % if multiline
+                                 multiline.is_a?(::Enumerable) ? "{#{multiline.join('|')}}" : multiline
+                               else
+                                 "(#{force ? 'required' : 'optional'}):"
+                               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?
           ret
         else
-          Readline.readline(msg, history)
+          prompt.call
         end
       end
     end

data/lib/squared/common/system.rb

@@ -29,10 +29,10 @@ module Squared
         dest.mkpath if create
         if pass
           exclude = []
-          pass = [pass] unless pass.is_a?(::Array)
+          pass = [pass] unless pass.is_a?(::Enumerable)
           pass.each { |val| exclude.concat(Dir.glob(src + val)) }
         end
-        (glob.is_a?(::Array) ? glob : [glob]).each do |val|
+        (glob.is_a?(::Enumerable) ? glob : [glob]).each do |val|
           Dir.glob(src + val) do |path|
             next if exclude&.include?(path) || (path = Pathname.new(path)).directory?
 
@@ -79,7 +79,7 @@ module Squared
       def copy_guard(src, dest, link: nil, force: false, verbose: true)
         unless force
           if (path = Pathname.new(dest)).directory?
-            src = [src] unless src.is_a?(::Array)
+            src = [src] unless src.is_a?(::Enumerable)
             src = src.reject { |val| path.join(File.basename(val)).exist? }
             return if src.empty?
           elsif path.exist?
@@ -89,7 +89,7 @@ module Squared
         case link
         when 'hard', 1
           FileUtils.ln(src, dest, force: force, verbose: verbose)
-        when TrueClass, 'soft', 0
+        when ::TrueClass, 'soft', 0
           FileUtils.ln_s(src, dest, force: force, verbose: verbose)
         else
           FileUtils.cp(src, dest, verbose: verbose)

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -463,7 +463,7 @@ module Squared
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
           obj.allref.each do |ref|
-            next unless (data = batch[ref])
+            next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
               if (items = task_resolve(obj, val)).empty?
@@ -482,7 +482,7 @@ module Squared
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
           obj.allref.each do |ref|
-            next unless (alt = data[ref])
+            next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve(obj, alt)
             break unless ret.empty?

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

@@ -1505,11 +1505,11 @@ module Squared
           confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d)
         end
 
-        def choice_index(msg, list, values: nil, multiple: false, accept: nil, series: false, trim: nil, column: nil,
-                         attempts: 5, force: true)
+        def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil,
+                         multiple: false, force: true, **kwargs)
           puts if !series && @@print_order > 0
           msg = "#{msg} (optional)" unless force
-          unless (ret = choice(msg, list, multiple: multiple, force: force, attempts: attempts)) || !force
+          unless (ret = choice(msg, list, multiple: multiple, force: force, **kwargs)) || !force
             raise_error 'user cancelled'
           end
           if ret.nil? || ret.empty?
@@ -1855,14 +1855,14 @@ module Squared
         end
 
         def has_value?(data, val)
-          return data.value?(val) if data.is_a?(::Hash)
-          return data.is_a?(::Enumerable) && data.to_a.include?(val) if !val.is_a?(::Enumerable) || val.is_a?(::Hash)
+          return data.value?(val) if data.is_a?(Hash)
+          return data.is_a?(Enumerable) && data.to_a.include?(val) if !val.is_a?(Enumerable) || val.is_a?(Hash)
 
           val.to_a.any? do |obj|
             case data
-            when ::Hash
+            when Hash
               data.value?(obj)
-            when ::Enumerable
+            when Enumerable
               data.to_a.include?(obj)
             end
           end

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

@@ -196,7 +196,12 @@ module Squared
                     when :list, :rm
                       format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
                       task flag do |_, args|
-                        image flag, args.to_a
+                        args = args.to_a
+                        if flag == :rm && args.empty?
+                          choice_command :rm
+                        else
+                          image flag, args
+                        end
                       end
                     end
                   when 'network'
@@ -271,7 +276,6 @@ module Squared
             end
             if (val = option('tag', ignore: false))
               append_tag val
-              ret << basic_option('tag', tagname(val))
             elsif !session_arg?('t', 'tag')
               append_tag tag
             end
@@ -331,7 +335,7 @@ module Squared
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
           list = OPT_DOCKER[:container].fetch(flag, [])
-          list.concat(OPT_DOCKER[:container][:update]) if flag == :run
+          list += OPT_DOCKER[:container][:update] if flag == :run
           op = OptionPartition.new(opts, list, cmd, project: self, args: flag == :run || flag == :exec)
           from = :"container:#{flag}"
           case flag
@@ -433,6 +437,8 @@ module Squared
         def image(flag, opts = [], sync: true, id: nil, registry: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:image][flag], cmd, project: self)
+          exception = @exception
+          banner = true
           from = :"image:#{flag}"
           case flag
           when :list
@@ -455,6 +461,10 @@ module Squared
           when :rm
             if id
               op << id
+              if option('y')
+                exception = false
+                banner = false
+              end
             else
               if op.empty?
                 list_image(flag, docker_output('image ls -a'), from: from) do |val|
@@ -476,9 +486,12 @@ module Squared
             img = docker_output 'image', 'tag', id, uri
             return unless confirm_command(img.to_s, cmd.to_s, target: id, as: registry, title: from)
 
-            run(img, exception: true, sync: false, banner: false)
+            cmd = img
+            sync = false
+            exception = true
+            banner = false
           end
-          run(sync: sync, from: from)
+          run(cmd, sync: sync, exception: exception, banner: banner, from: from)
         end
 
         def network(flag, opts = [], target: nil)
@@ -535,8 +548,12 @@ module Squared
           case flag
           when :run
             unless session_arg?('name', target: target)
-              require 'random/formatter'
-              target << basic_option('name', dnsname("#{name}_#{Random.new.alphanumeric(6)}"))
+              target << basic_option('name', dnsname("#{name}_%s" % if RUBY_VERSION >= '3.1'
+                                                                      require 'random/formatter'
+                                                                      Random.new.alphanumeric(6)
+                                                                    else
+                                                                      (0...6).map { rand(97..122).chr }.join
+                                                                    end))
             end
           when :exec
             raise_error('no command args', hint: from) if list.empty?
@@ -583,6 +600,8 @@ module Squared
           pwd_set do
             found = false
             index = 0
+            all = option('all', prefix: 'docker')
+            y = from == :'image:rm' && option('y', prefix: 'docker')
             pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})(?:[_.,:-]|$)/
             IO.popen(session_done(cmd << '--format=json')).each do |line|
               data = JSON.parse(line)
@@ -596,41 +615,43 @@ module Squared
                                        id
                                      end)
               ee = data['Image'] || rt || aa
-              next unless option('all') || ee.match?(pat) || aa.match?(pat)
-
-              bb = index.succ.to_s
-              cc = bb.size + 1
-              a = sub_style(ee, styles: theme[:inline])
-              b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a}#{ee == id ? '' : " (#{id})"}"
-              c, d = no ? ['y/N', 'N'] : ['Y/n', 'Y']
-              e = time_format(time_since(data['CreatedAt']), pass: ['ms'])
-              f = sub_style(ARG[:BORDER][0], styles: theme[:inline])
-              g = ' ' * (cc + 1)
-              h = "#{sub_style(bb.rjust(cc), styles: theme[:current])} #{f} "
-              puts unless index == 0
-              puts "#{h + sub_style(aa, styles: theme[:subject])} (created #{e} ago)"
-              cols = %w[Tag Status Ports]
-              cols << case flag
-                      when :connect, :disconnect
-                        'Networks'
-                      else
-                        'Size'
-                      end
-              cols.each do |key|
-                next if (key == 'Tag' && !dd) || (key == 'Size' && data[key] == '0B')
+              next unless all || ee.match?(pat) || aa.match?(pat)
+
+              unless y
+                bb = index.succ.to_s
+                cc = bb.size + 1
+                a = sub_style(ee, styles: theme[:inline])
+                b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a}#{ee == id ? '' : " (#{id})"}"
+                c, d = no ? ['y/N', 'N'] : ['Y/n', 'Y']
+                e = time_format(time_since(data['CreatedAt']), pass: ['ms'])
+                f = sub_style(ARG[:BORDER][0], styles: theme[:inline])
+                g = ' ' * (cc + 1)
+                h = "#{sub_style(bb.rjust(cc), styles: theme[:current])} #{f} "
+                puts unless index == 0
+                puts "#{h + sub_style(aa, styles: theme[:subject])} (created #{e} ago)"
+                cols = %w[Tag Status Ports]
+                cols << case flag
+                        when :connect, :disconnect
+                          'Networks'
+                        else
+                          'Size'
+                        end
+                cols.each do |key|
+                  next if (key == 'Tag' && !dd) || (key == 'Size' && data[key] == '0B')
 
-                puts "#{g + f} #{key}: #{as_a(data[key]).join(', ')}" unless data[key].to_s.empty?
-              end
-              w = 9 + flag.to_s.size + 4 + ee.size
-              puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), styles: theme[:inline])
-              found = true
-              index += 1
-              next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
+                  puts "#{g + f} #{key}: #{as_a(data[key]).join(', ')}" unless data[key].to_s.empty?
+                end
+                w = 9 + flag.to_s.size + 4 + ee.size
+                puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), styles: theme[:inline])
+                found = true
+                index += 1
+                next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
 
-              puts if @@print_order == 0
+                puts if @@print_order == 0
+              end
               yield id
             end
-            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found
+            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found || y
           end
         rescue StandardError => e
           log.error e
@@ -658,7 +679,7 @@ module Squared
 
         def choice_command(flag)
           msg, cmd, index = case flag
-                            when :run
+                            when :run, :rm
                               ['Choose an image', 'images -a', 2]
                             when :exec
                               ['Choose a container', 'ps -a', 0]
@@ -671,16 +692,26 @@ module Squared
             puts log_message(Logger::INFO, 'none found', subject: name, hint: "docker #{cmd}")
           else
             puts " #  #{header}"
+            multiple = false
+            parse = ->(val) { val.split(/\s+/)[index] }
             case flag
             when :run, :exec
               values = [['Options', flag == :run], ['Arguments', flag == :exec]]
               cmd = flag.to_s
+            when :rm
+              values = ['Options']
+              multiple = true
+              cmd = "image #{flag}"
             else
-              values = [['Options', false], ['Container', true]]
+              values = ['Options', ['Container', true]]
               cmd = "network #{flag}"
             end
-            out, opts, args = choice_index(msg, lines, values: values)
-            ret = run docker_output(cmd, opts, '--', out.split(/\s+/)[index], args)
+            out, opts, args = choice_index(msg, lines, multiple: multiple, values: values)
+            ret = run docker_output(cmd, opts, '--', *(if out.is_a?(Array)
+                                                         out.map! { |val| parse.call(val) }
+                                                       else
+                                                         [parse.call(out)]
+                                                       end), args)
             print_success if success?(ret && cmd.start_with?('network'))
           end
         end

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

@@ -111,21 +111,30 @@ module Squared
         time_format(epoch, clock: clock)
       end
 
-      def rev_clear(name)
+      def rev_clear(name, sync: true)
         if Dir.exist?(name) && (proj = find(name))
           name = proj.name
         end
-        rev_write if rev_entry(name, 'revision', val: '', create: false)
+        rev_write(sync: sync) if rev_entry(name, 'revision', val: '', create: false)
       end
 
-      def rev_write(name = nil, data = nil, utc: nil)
+      def rev_write(name = nil, data = nil, sync: true, utc: nil)
         return unless @revfile
 
         if name
           data&.each { |key, val| rev_entry(name, key, val: val) }
           rev_timeutc(name, utc) if utc
         end
-        File.write(@revfile, JSON.pretty_generate(@revdoc))
+        sleep 0 while !sync && @revlock
+        begin
+          @revlock = true
+          File.write(@revfile, JSON.pretty_generate(@revdoc))
+        rescue StandardError => e
+          log&.debug e
+          warn log_message(Logger::WARN, e, pass: true) if warning?
+        ensure
+          @revlock = false
+        end
       end
 
       def git_clone?(path, name = nil)
@@ -355,8 +364,13 @@ module Squared
                     if flag == :remote
                       format_desc action, flag, 'remote,opts*'
                       task flag, [:remote] do |_, args|
-                        remote = param_guard(action, flag, args: args, key: :remote)
-                        __send__(action, flag, args.extras, remote: remote)
+                        if (remote = args.remote)
+                          args = args.extras
+                        else
+                          remote = choice_remote
+                          args = args.to_a.drop(1)
+                        end
+                        __send__(action, flag, args, remote: remote)
                       end
                     else
                       format_desc action, flag, 'opts*'
@@ -845,12 +859,10 @@ module Squared
                         args = args.to_a
                         if args.empty? || args.last == ':'
                           files = []
-                          git_spawn('status -s --porcelain', stdout: false).each do |line|
-                            next unless line =~ /^(.)(.)\s+(.+)$/
-
-                            case (flag == :staged ? $1 : $2)
-                            when 'A', 'M'
-                              files << $3
+                          status_data.each do |line|
+                            case (flag == :staged ? line[2] : line[1])
+                            when /[AMDRTC]/
+                              files << line[0]
                             end
                           end
                           unless files.empty?
@@ -867,12 +879,11 @@ module Squared
                     end
                   when 'git'
                     before = case flag
-                             when :rm then 'source+,destination'
+                             when :mv then 'source+,destination'
                              when :revert then 'commit+' end
                     format_desc(action, flag, 'opts*', before: before, after: case flag
-                                                                              when :add, :clean, :mv
-                                                                                'pathspec*'
-                                                                              end)
+                                                                              when :add then 'pathspec*|:pattern:*'
+                                                                              when :clean, :rm then 'pathspec*' end)
                     task flag do |_, args|
                       git flag, args.to_a
                     end
@@ -888,13 +899,13 @@ module Squared
           super
         end
 
-        def depend(*, **)
-          workspace.rev_clear(name)
+        def depend(*, sync: invoked_sync?('depend'), **)
+          workspace.rev_clear(name, sync: sync)
           super
         end
 
-        def clean(*, **)
-          workspace.rev_clear(name)
+        def clean(*, sync: invoked_sync?('clean'), **)
+          workspace.rev_clear(name, sync: sync)
           super
         end
 
@@ -915,7 +926,7 @@ module Squared
             end
           end
           append_pull(opts, OPT_GIT[:pull] + OPT_GIT[:fetch][:pull],
-                      no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull], remote: remote, flag: flag)
+                      no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull], remote: remote, flag: flag, from: :pull)
           source(sync: sync, sub: if verbose
                                     [
                                       { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: color(:red), index: 4 },
@@ -957,11 +968,9 @@ module Squared
         end
 
         def fetch(flag = nil, opts = [], sync: invoked_sync?('fetch', flag), remote: nil)
-          cmd, opts = git_session('fetch', opts: opts)
-          append_pull(opts, collect_hash(OPT_GIT[:fetch]), no: collect_hash(OPT_GIT[:no][:fetch]), remote: remote,
-                                                           flag: flag)
-          cmd << '--all' if !remote && !session_arg?('multiple') && option('all')
-          cmd << '--verbose' if verbose && !session_arg?('quiet')
+          opts = git_session('fetch', opts: opts).last
+          append_pull(opts, collect_hash(OPT_GIT[:fetch]), no: collect_hash(OPT_GIT[:no][:fetch]),
+                                                           remote: remote, flag: flag, from: :fetch)
           source(sync: sync, **threadargs)
         end
 
@@ -980,7 +989,7 @@ module Squared
           opts[:origin] = val if (val = option('origin', ignore: false))
           opts[:branch] = val if (val = option('branch', strict: true))
           opts[:local] = val != '0' if (val = option('local', strict: true))
-          opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(:clone)
+          opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(from: :clone)
           append_hash opts
           cmd << '--quiet' unless verbose
           append_value(data[0], path, delim: true)
@@ -1112,7 +1121,8 @@ module Squared
             msg = sub_style('completed', styles: theme[:active])
             puts log_message(Logger::INFO, name, msg, subject: 'revbuild', hint: time_format(epochtime - start))
           end
-          workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) }, utc: 'build')
+          workspace.rev_write(name, { 'revision' => sha, 'files' => status_digest(*args, **kwargs) },
+                              sync: sync, utc: 'build')
         end
 
         def reset(flag, opts = [], refs: nil, ref: nil, mode: nil, commit: nil)
@@ -1600,17 +1610,25 @@ module Squared
               append_commit(*op.extras)
             end
           when :add, :clean
-            if flag == :add && op.empty? && !op.arg?('pathspec-from-file')
-              files = []
-              red = color(:red)
-              git_spawn('status -s --porcelain -uall', stdout: false).each do |line|
-                next unless line =~ /^.(.) (.+)$/
-
-                files << "#{sub_style($1, styles: red)} #{$2}"
+            if flag == :add && !op.arg?('pathspec-from-file')
+              grep, list = op.extras.partition { |val| val.start_with?(':') && val.end_with?(':') }
+              if list.empty? || !grep.empty?
+                red = color(:red)
+                grep.map! { |val| Regexp.new(val[1..-2]) }
+                files = status_data.map! do |a, b|
+                  next unless grep.empty? || grep.any? { |pat| pat.match?(a) }
+
+                  "#{sub_style(b, styles: red)} #{a}"
+                end
+                .compact
+                unless files.empty?
+                  files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
+                                                              accept: 'Add?')
+                end
+                op.swap(list + files)
               end
-              files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/, accept: 'Add?')
             end
-            append_pathspec(files || op.extras)
+            append_pathspec(op.extras)
             verbose = flag == :add && !op.arg?('verbose')
             print_success if success?(source) && verbose
             return
@@ -1619,7 +1637,7 @@ module Squared
             raise_error 'no source/destination' unless refs.size > 1
             op.merge(refs)
           when :rm
-            append_pathspec(op.extras, expect: !op.arg?('pathspec-from-file'))
+            append_pathspec(op.extras, expect: true)
           end
           source(sync: false, stderr: true)
         end
@@ -1639,13 +1657,13 @@ module Squared
         private
 
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
-                   multiple: false, sub: nil)
+                   multiple: false, **kwargs)
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           banner = nil if multiple && banner
           if cmd.respond_to?(:done)
             if io && banner == false
               from = nil
-            elsif !from && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z][a-z\-]{2,}\z/) })
+            elsif !from && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z\-]*\z/) })
               from = :"git:#{from}"
             end
             banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
@@ -1677,7 +1695,7 @@ module Squared
               require 'open3'
               if stderr
                 Open3.popen3(cmd) do |_, out, err|
-                  n = write_lines(out, banner: banner, sub: sub, pass: true)
+                  n = write_lines(out, banner: banner, pass: true, **kwargs)
                   if n == 0
                     n = write_lines(err, banner: banner)
                     print_success if success?(n == 0 && !banner.nil?)
@@ -1686,7 +1704,7 @@ module Squared
                   end
                 end
               else
-                Open3.popen2e(cmd) { |_, out| write_lines(out, banner: banner) }
+                Open3.popen2e(cmd) { |_, out| write_lines(out, banner: banner, **kwargs) }
               end
             end
           rescue StandardError => e
@@ -1703,13 +1721,8 @@ module Squared
         end
 
         def write_lines(data, banner: nil, loglevel: nil, grep: nil, sub: nil, pass: false, first: false)
-          grep = as_a(grep).map do |val|
-            next val if val.is_a?(Regexp)
-
-            Regexp.new(val == '*' ? '.+' : val.to_s)
-          end
-          grep = nil if grep.empty?
-          sub = nil if stdin?
+          grep &&= as_a(grep).yield_self { |a| a.empty? || a.include?('*') ? nil : a.map { |val| Regexp.new(val) } }
+          sub &&= stdin? ? nil : as_a(sub)
           ret = 0
           out = []
           data.each do |line|
@@ -1739,7 +1752,7 @@ module Squared
               styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
               styles << :bold if styles.size <= 1
               puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
-                                sub: { pat: /\A(\d+)(.+)\z/m, styles: styles })
+                                sub: { pat: /^(\d+)(.+)$/, styles: styles })
             else
               puts empty_status("No #{type} were #{action}", 'grep', grep.is_a?(Array) ? case grep.size
                                                                                          when 0
@@ -1786,8 +1799,8 @@ module Squared
           glob = kwargs.fetch(:include, [])
           pass = kwargs.fetch(:exclude, [])
           ret = {}
-          git_spawn('status -s --porcelain', *args, stdout: false).each do |line|
-            next unless (file = line[/^[A-Z ?!]{3}"?(.+?)"?$/, 1])
+          status_data(*args).each do |line|
+            file = line.first
             next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
             next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
 
@@ -1796,9 +1809,19 @@ module Squared
           ret
         end
 
-        def append_pull(opts, list, target: @session, flag: nil, no: nil, remote: nil)
+        def status_data(*args)
+          ret = []
+          git_spawn('status -z -uall', *args).split("\x0").each do |line|
+            next unless line =~ /^(.)(.) (.+)$/
+
+            ret << [$3, $2, $1]
+          end
+          ret
+        end
+
+        def append_pull(opts, list, target: @session, flag: nil, no: nil, remote: nil, from: nil)
           target << '--force' if option('force', target: target)
-          append_submodules(target: target)
+          append_submodules(target: target, from: from)
           return if !remote && opts.empty?
 
           refspec = []
@@ -1823,6 +1846,7 @@ module Squared
               op.errors << opt
             end
           end
+          op << '--verbose' if (flag || from == :fetch) && verbose && !op.arg?('quiet')
           if remote
             op.append(remote, delim: true)
             if (val = option('refspec', target: target, strict: true))
@@ -1834,6 +1858,8 @@ module Squared
           elsif op.arg?('--multiple')
             op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
             return
+          elsif option('all')
+            cmd << '--all'
           end
           op.clear(errors: true, subject: flag.to_s) if flag
         end
@@ -1874,7 +1900,7 @@ module Squared
           append_first('head', 'tree-ish', 'object', target: target, flag: false, ignore: false)
         end
 
-        def append_submodules(from = nil, target: @session)
+        def append_submodules(target: @session, from: nil)
           return unless (val = option('recurse-submodules', target: target, ignore: false))
 
           if from == :clone
@@ -1928,7 +1954,7 @@ module Squared
           target.include?('--dry-run') || !option('dry-run', target: target).nil?
         end
 
-        def quiet?(target: @session)
+        def quiet?(*, target: @session, **)
           return false unless target
 
           target.include?('--quiet') || (target.include?('-q') && stripext(target.first) == 'git')

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

@@ -191,22 +191,21 @@ module Squared
                         end
                       end
                     when 'publish'
-                      format_desc(action, flag, 'otp?,dry-run?=true', before: flag == :tag ? 'tag' : nil)
+                      format_desc(action, flag, 'otp?,dry-run?,public|restricted?', before: flag == :tag ? 'tag' : nil)
                       task flag do |_, args|
-                        if flag == :latest
-                          otp, dryrun = args.to_a
-                        else
-                          args = param_guard(action, flag, args: args.to_a)
-                          tag, otp, dryrun = args
+                        args = args.to_a
+                        dryrun = true if args.delete('dry-run') || args.delete('true') || args.delete('d')
+                        if args.delete('public') || args.delete('p')
+                          access = 'public'
+                        elsif args.delete('restricted') || args.delete('r')
+                          access = 'restricted'
                         end
-                        check = ->(val) { val == 'dry-run' || val == 'true' }
-                        if check.call(otp)
-                          dryrun = true
-                          otp = nil
+                        if flag == :latest
+                          otp = args.first
                         else
-                          dryrun &&= check.call(dryrun)
+                          tag, otp = param_guard(action, flag, args: args)
                         end
-                        publish(flag, otp: otp, tag: tag, dryrun: dryrun)
+                        publish(flag, otp: otp, tag: tag, dryrun: dryrun, access: access)
                       end
                     end
                   end
@@ -217,7 +216,7 @@ module Squared
         end
 
         def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, workspace: false,
-                 link: false, force: false, override: false, **kwargs)
+                 link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -239,7 +238,7 @@ module Squared
           items = []
           if build? && path != @workspace.home && @workspace.home?
             items << @workspace.home
-            @workspace.rev_clear(@workspace.find(@workspace.home).name)
+            @workspace.rev_clear(@workspace.find(@workspace.home).name, sync: sync)
           end
           items.concat(as_a(also)) if also
           return if items.empty?
@@ -250,13 +249,13 @@ module Squared
             case dir
             when Pathname
               dest = dir
-              @workspace.rev_clear(dest)
+              @workspace.rev_clear(dest, sync: sync)
             when String
               dest = @workspace.root + dir
-              @workspace.rev_clear(dest)
+              @workspace.rev_clear(dest, sync: sync)
             when Symbol
               if (proj = @workspace.find(name: dir))
-                @workspace.rev_clear(proj.name)
+                @workspace.rev_clear(proj.name, sync: sync)
                 dest = proj.path
               else
                 log.warn message("copy project :#{dir}", hint: 'not found')
@@ -274,10 +273,10 @@ module Squared
               glob = dir[:include]
               pass = dir[:exclude]
               dest = items.first unless dest && dest != true
-              @workspace.rev_clear(dest) unless dest == true
+              @workspace.rev_clear(dest, sync: sync) unless dest == true
             when Project::Base
               dest = dir.path
-              @workspace.rev_clear(dir.name)
+              @workspace.rev_clear(dir.name, sync: sync)
             else
               raise_error "copy: given #{dir}"
             end
@@ -329,7 +328,7 @@ module Squared
           if @depend && !flag
             super
           elsif outdated?
-            workspace.rev_clear(name)
+            workspace.rev_clear(name, sync: sync)
             return update if !flag && env('NODE_UPDATE')
 
             if (yarn = dependtype(:yarn)) > 0
@@ -548,7 +547,7 @@ module Squared
           package 'update'
         end
 
-        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, **)
+        def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, dryrun: nil, access: nil)
           if read_packagemanager(:private)
             if warning?
               warn log_message(Logger::WARN, 'invalid task "publish"', subject: name, hint: 'private', pass: true)
@@ -558,11 +557,10 @@ module Squared
           return unless version
 
           cmd = session 'npm', 'publish'
-          otp = option('otp') if otp.nil?
-          tag = option('tag') if tag.nil?
           dryrun = dryrun?('npm') if dryrun.nil?
-          cmd << basic_option('otp', otp) if otp
-          cmd << shell_option('tag', tag) if tag
+          cmd << basic_option('otp', otp) if otp ||= option('otp')
+          cmd << basic_option('tag', tag) if tag ||= option('tag')
+          cmd << basic_option('access', access) if access ||= option('access')
           if verbose
             if dryrun
               cmd << '--dry-run'
@@ -760,6 +758,10 @@ module Squared
           outdated?
         end
 
+        def refresh?
+          !Node.prod?
+        end
+
         def yarn?
           (@pm[:yarn] ||= if rootpath('yarn.lock', ascend: dependext).exist?
                             if (rc = rootpath('.yarnrc.yml', ascend: dependext)).exist?

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

@@ -229,7 +229,7 @@ module Squared
             super
           elsif outdated?
             venv_init
-            workspace.rev_clear(name)
+            workspace.rev_clear(name, sync: sync)
             if !flag && dependtype == 1
               cmd = poetry_session 'install', '-n'
               cmd << '--no-root' if option('no-root')

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

@@ -219,13 +219,20 @@ module Squared
                       when :file
                         format_desc action, flag, 'path,opts*,args*'
                         task flag, [:rb] do |_, args|
-                          file = param_guard(action, flag, args: args, key: :rb)
-                          ruby(flag, args.to_a.drop(1), file: file)
+                          if (file = args.rb)
+                            args = args.to_a.drop(1)
+                          else
+                            file, opts, extra = choice_index('Select a file', Dir.glob('*.rb', base: path),
+                                                             values: %w[Options Arguments], force: true, series: true)
+                            args = OptionPartition.strip(opts)
+                            ENV['RUBY_ARGS'] = extra if extra
+                          end
+                          ruby(flag, args, file: file)
                         end
                       when :script
-                        format_desc action, flag, 'RUBY_E?,opts*,args*'
+                        format_desc action, flag, 'opts*,args*'
                         task flag do |_, args|
-                          command = ENV['RUBY_E'] || readline('Enter script', force: true)
+                          command = ENV['RUBY_E'] || readline('Enter script', force: true, multiline: ['##', ';'])
                           ruby(flag, args.to_a, command: command)
                         end
                       when :version
@@ -246,7 +253,7 @@ module Squared
           if @depend
             super
           elsif outdated?
-            workspace.rev_clear(name)
+            workspace.rev_clear(name, sync: sync)
             cmd = bundle_session 'install'
             cmd << '--without=development' if prod?
             if (n = option('jobs')).to_i > 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.4.10
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-04-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []