squared 0.4.18 → 0.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e8fe45c2b6a9cc6fa2b274de07af33c74afde0e6a203ca2c5c3dfd0c13267ed
-  data.tar.gz: ca5bdcf32da9e2383c63bd20966eaf524b2400d88f4b0045947f6403315ac961
+  metadata.gz: f1b0859a60110d19550ba8436a184dbf5475d9103cc844d4bcab7850f2065dc5
+  data.tar.gz: 887a31b94a66e59b0981f6dcbe64544e1f721b07cb5d82d9a71b8bbbc209820e
 SHA512:
-  metadata.gz: a7a419bf6297c047a0b062e85b6c0f397919bb65c2ef426c89c765e177e3c55f0c461c4529e7cde9fa32161b5be33bfd8e0217b23d514dd4646eb4c7ec99cc34
-  data.tar.gz: fc5e91cafb09e0963287ffa1dad25e57992d07a5e2942a3cddc3740f760079268aab1bb2d6d9f8d6a50169f5826d66b584fe388727fa725a8012930857f6f292
+  metadata.gz: 5936f90594961c71af2f1420607ed9c739bd0f182a440aff4c2d474a8bcc9bbb3e0db1c2bfa6ba27052823414d2f6db981f4251a32c09769595b89a561ecfc84
+  data.tar.gz: 19cc6e69dda54b8d0a3f2cb43606bfb23e25f1f20c071b8e47421156af30d5763162f4a5b14df5f8787a465e53bbabf18b0a9943e7a3c809c31a9825e885e32a

data/CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [0.4.20] - 2025-09-14
+
+### Changed
+
+- Project banners when requested return consistent arguments.
+
+### Fixed
+
+- Workspace global as command alias used undefined parameter.
+- Python did not separate dependency manager and build backend.
+- Gem command build did not validate gemspec was located.
+- Project class Ruby used glob methods not available in Ruby 2.4.
+- Shell options support using boolean as values.
+- Git command merge action commit failed when using interactive menu.
+- NPM command line options did not support boolean flags.
+
+## [0.4.19] - 2025-08-30
+
+### Added
+
+- Docker command options were updated to 28.3.
+- Docker command compose action down was implemented.
+- Docker containers conflicting with options can be prefixed with colon.
+- Git command stash action push option message is interactive.
+- Repo commands init and sync inherit any positional options.
+
+### Fixed
+
+- Docker did not ignore pre-defined file with COMPOSE_FILE.
+- Docker did not support multiple config files.
+- Repo did not transfer arguments to supplement tasks.
+- Node public method version caused a recursive loop.
+- Node command bump action minor without major was revised.
+
 ## [0.4.18] - 2025-08-23
 
 ### Added
@@ -14,7 +48,7 @@
 - Workspace pipe and verbose interprets $DEBUG AND $VERBOSE modes.
 - Git response status did not check for STDIN stream.
 - Common format method puts_oe was renamed log_console.
-- Global task git:all is disabled for single project workspaces. 
+- Global task git:all is disabled for single project workspaces.
 
 ## [0.3.14] - 2025-08-23
 
@@ -928,6 +962,8 @@
 
 - Changelog was created.
 
+[0.4.20]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.20
+[0.4.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.19
 [0.4.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.18
 [0.4.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.17-ruby
 [0.4.16]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.16-ruby

data/lib/squared/common/format.rb

@@ -157,7 +157,8 @@ module Squared
           when Logger::WARN then :warn
           when Logger::ERROR then :error
           when Logger::FATAL then :fatal
-          else :unknown end
+          else :unknown
+          end
         else
           level.to_s.downcase.to_sym
         end

data/lib/squared/common/shell.rb

@@ -74,7 +74,7 @@ module Squared
           a = '--'
           b = '='
         end
-        "#{a}#{flag}#{if val
+        "#{a}#{flag}#{unless val.nil?
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote, double: double, override: override)
                                elsif quote
@@ -94,8 +94,8 @@ module Squared
 
       def shell_bin(name, env: true)
         key = name.upcase
-        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,
-                    option: false, force: false)
+        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name, option: false, force: false,
+                                                                                          double: true)
       end
 
       def fill_option(val, **kwargs)

data/lib/squared/common/system.rb

@@ -61,10 +61,9 @@ module Squared
               files.clear
               items.each do |file|
                 if file.exist?
-                  if file.symlink?
-                    next unless force
-                  else
+                  if !file.symlink?
                     files << file
+                  elsif !force
                     next
                   end
                 end

data/lib/squared/version.rb

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

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

@@ -98,6 +98,7 @@ module Squared
           @ref = []
           @children = []
           @events = hashobj.update({ first: first, last: last, error: error })
+          @as = hashobj
           @envname = env_key(@name).freeze
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
@@ -262,9 +263,9 @@ module Squared
             -1
           elsif h.any? { |val| e.include?(val) }
             1
-          elsif e.any? { |val| f.include?(val) }
+          elsif e.any? { |val| f.include?(val) } # rubocop:disable Lint/DuplicateBranch
             -1
-          elsif f.any? { |val| e.include?(val) }
+          elsif f.any? { |val| e.include?(val) } # rubocop:disable Lint/DuplicateBranch
             1
           elsif @index >= 0 && (i = other.instance_variable_get(:@index)) >= 0
             @index <=> i
@@ -476,7 +477,7 @@ module Squared
               else
                 next unless respond_to?(:compose)
 
-                cmd << a if (a = compose(as_get(b), d, script: true, args: e, from: from))
+                cmd << a if (a = compose(as_get(b, from), d, script: true, args: e, from: from))
               end
               var.merge!(c) if c.is_a?(Hash)
             end
@@ -485,7 +486,7 @@ module Squared
             cmd, opts, var, flags, extra = args
           end
           if cmd
-            cmd = as_get cmd
+            cmd = as_get(cmd, from)
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
             flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
             case opts
@@ -502,7 +503,7 @@ module Squared
           else
             return unless (opts || extra) && respond_to?(:compose)
 
-            cmd = compose(as_get(opts), flags, script: true, args: extra, from: from)
+            cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
             from = :script if from == :run && script?
           end
           run(cmd, var, sync: sync, from: from, banner: banner)
@@ -788,9 +789,8 @@ module Squared
         end
 
         def as(cmd, script, to = nil)
-          script = { "#{script}": to } if to
-          data = (@as ||= {})[cmd.to_sym] ||= {}
-          script.each { |key, val| data[key.to_s] = val }
+          data = @as[cmd.to_sym]
+          (to ? [[script, to]] : script).each { |key, val| data[key.to_s] = val }
           self
         end
 
@@ -2010,10 +2010,8 @@ module Squared
           end
         end
 
-        def as_get(val)
-          return unless val
-
-          @global && (ret = @as && @as[from] && @as[from][val]) ? ret : val
+        def as_get(val, from)
+          (@global && @as[from][val]) || val
         end
 
         def task_build(keys)
@@ -2103,8 +2101,8 @@ module Squared
           val != action && invoked_sync?(val)
         end
 
-        def success?(ret)
-          ret == true && stdout? && banner?
+        def success?(ret, display = true)
+          ret == true && display && stdout? && banner?
         end
 
         def banner?

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Docker < Base
-        COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml compose.yml docker-compose.yml].freeze
+        COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml docker-compose.yml].freeze
         BAKEFILE = %w[docker-bake.json docker-bake.hcl docker-bake.override.json docker-bake.override.hcl].freeze
         DIR_DOCKER = (COMPOSEFILE + BAKEFILE).freeze
         OPT_DOCKER = {
@@ -12,56 +12,57 @@ module Squared
                      tlskey=p].freeze,
           buildx: {
             common: %w[builder=b D|debug],
-            build: %w[load pull push add-host=q annotation=q attest=q build-arg=qq ent=q iidfile=p label=q a-file=p
-                      network=b no-cache-filter=b o|output=q platform=b q|quiet secret=qq shm-size=b ssh=qq t|tag=b
-                      target=b ulimit=q].freeze,
-            bake: %w[load print pull push list=q metadata-file=p set=q].freeze,
-            shared: %w[check no-cache allow=q call=b? f|file=p progress=b provenance=q sbom=q].freeze
+            build: %w[add-host=q annotation=q attest=q build-arg=qq build-context=qq cache-from=q cache-to=q
+                      cgroup-parent=b ent=q iidfile=p label=q a-file=p network=b no-cache-filter=b o|output=q platform=b
+                      q|quiet secret=qq shm-size=b ssh=qq t|tag=b target=b ulimit=q].freeze,
+            bake: %w[print list=q set=q].freeze,
+            shared: %w[check load no-cache pull push allow=q call=b? f|file=p metadata-file=p progress=b provenance=q
+                       sbom=q].freeze
           }.freeze,
           compose: {
-            common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=b profile=b progress=b
+            common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=n profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
-            build: %w[check no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
-                      ssh=qq].freeze,
-            exec: %w[dry-run privileged d|detach e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
-            run: %w[build dry-run no-deps quiet-pull remove-orphans rm P|service-ports use-aliases cap-add=b cap-drop=b
-                    d|detach entrypoint=q e|env=qq i|interactive=b? l|label=q name=b T|no-TTY=b? p|publish=e pull=b
-                    u|user=e v|volume=q w|workdir=q].freeze,
-            up: %w[y abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
-                   d|detach dry-run force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start
-                   quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch attach=b exit-code-from=b
-                   no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze
+            build: %w[check no-cache print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
+                      provenance=q sbom=q ssh=qq].freeze,
+            exec: %w[d|detach privileged e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
+            run: %w[build d|detach no-deps q|quiet quiet-build quiet-pull remove-orphans rm P|service-ports use-aliases
+                    cap-add=b cap-drop=b q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b T|no-TTY=b?
+                    p|publish=e pull=b u|user=e v|volume=q w|workdir=q].freeze,
+            up: %w[abort-on-container-exit abort-on-container-failure always-recreate-deps attach-dependencies build
+                   d|detach force-recreate menu no-build no-color no-deps no-log-prefix no-recreate no-start quiet-build
+                   quiet-pull remove-orphans V|renew-anon-volumes timestamps wait w|watch y|yes attach=b
+                   exit-code-from=b no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze,
+            down: %w[remove-orphans v|volumes rmi=b t|timeout=i].freeze
           }.freeze,
           container: {
             create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
-                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b add-host=q annotation=q
-                       a|attach=b blkio-weight=i blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b
-                       cidfile=p device=q device-cgroup-rule=q device-read-bps=q device-read-iops=q device-write-bps=q
+                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b add-host=q annotation=q a|attach=b
+                       blkio-weight=i blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b cidfile=p
+                       device=q device-cgroup-rule=q device-read-bps=q device-read-iops=q device-write-bps=q
                        device-write-iops=q disable-content-trust=b? dns=e dns-option=e dns-search=e domainname=b
-                       entrypoint=q e|env=qq env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b
-                       health-retries=i health-start-interval=b health-start-period=b health-timeout=b h|hostname=e ip=b
-                       ip6=e ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b
-                       log-driver=b log-opt=q mac-address=e m|memory=b memory-reservation=b memory-swap=n
-                       memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n
-                       platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b
-                       stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q
-                       volume-driver=b volumes-from=b w|workdir=q].freeze,
+                       entrypoint=q e|env=qq env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b ip6=e
+                       ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b link-local-ip=b log-driver=b
+                       log-opt=q mac-address=e m|memory=b memory-reservation=b memory-swap=n memory-swappiness=n
+                       mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n platform=b
+                       p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b stop-timeout=i
+                       storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q volume-driver=b
+                       volumes-from=b w|workdir=q].freeze,
             run: %w[d|detach detach-keys=q sig-proxy=b?].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
-                     w|workdir=q].freeze,
             update: %w[blkio-weight=i cpu-period=i cpu-quota=i cpu-rt-period=i cpu-rt-runtime=i c|cpu-shares=i cpus=f
                        cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
                        restart=q].freeze,
+            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p user=e
+                     w|workdir=q].freeze,
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q].freeze,
             start: %w[a|attach i|interactive detach-keys=q].freeze,
             stop: %w[s|signal=b t|time=i t|timeout=i].freeze,
             restart: %w[s|signal=b t|time=i t|timeout=i].freeze,
             kill: %w[s|signal=b].freeze,
-            stats: %w[no-trunc format|q].freeze
+            stats: %w[a|all no-stream no-trunc format|q].freeze
           }.freeze,
           image: {
-            list: %w[a|all digests no-trunc f|filter=q format=q].freeze,
+            list: %w[a|all q|quiet digests no-trunc tree f|filter=q format=q].freeze,
             push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
             rm: %w[f|force no-prune platform=b].freeze,
             save: %w[o|output=p platform=b].freeze
@@ -96,7 +97,7 @@ module Squared
 
         subtasks({
           'build' => %i[tag context].freeze,
-          'compose' => %i[build run exec up].freeze,
+          'compose' => %i[build run exec up down].freeze,
           'bake' => %i[build check].freeze,
           'image' => %i[list rm push tag save].freeze,
           'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
@@ -151,7 +152,7 @@ module Squared
 
                     case flag
                     when :build
-                      format_desc action, flag, ':?,opts*,target*,context?'
+                      format_desc action, flag, 'opts*,target*,context?|:'
                       task flag do |_, args|
                         args = args.to_a
                         if args.first == ':'
@@ -171,7 +172,7 @@ module Squared
                     break unless compose?
 
                     case flag
-                    when :build, :up
+                    when :build, :up, :down
                       format_desc action, flag, 'opts*,service*'
                       task flag do |_, args|
                         compose! flag, args.to_a
@@ -222,7 +223,8 @@ module Squared
                       format_desc(action, flag, case flag
                                                 when :rm, :save then 'id*,opts*'
                                                 when :tag then 'version?'
-                                                else 'opts*,args*' end)
+                                                else 'opts*,args*'
+                                                end)
                       task flag do |_, args|
                         args = args.to_a
                         if args.empty? && flag != :list
@@ -259,12 +261,11 @@ module Squared
 
           ret = docker_session
           if from == :run
-            case (n = filetype)
-            when 1, 2
+            if bake?(n = filetype)
               ret << 'buildx' << 'bake'
               append_file n
               from = :bake
-            when 3, 4
+            elsif compose?(n)
               ret << 'compose' << 'build'
               append_file n
               from = :compose
@@ -337,7 +338,7 @@ module Squared
                   op.push(val)
                 end
               end
-              op.append(args, escape: true)
+              op.append(args, escape: true, strip: /^:/)
               contextdir context if context
             end
           end
@@ -350,15 +351,14 @@ module Squared
           op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self)
           append_file filetype unless op.arg?('f', 'file')
           op << flag
-          op.parse(OPT_DOCKER[:compose][flag])
-          from = :"compose:#{flag}"
+          op.parse(OPT_DOCKER[:compose].fetch(flag, []))
           case flag
-          when :build, :up
-            op.append(escape: true)
+          when :build, :up, :down
+            op.append(escape: true, strip: /^:/)
           when :exec, :run
             append_command flag, service, op.extras
           end
-          run(from: from)
+          run(from: :"compose:#{flag}")
         end
 
         def container(flag, opts = [], id: nil)
@@ -390,10 +390,10 @@ module Squared
                   elsif all.include?(k)
                     unless type
                       run.each_pair do |key, val|
-                        if val.include?(k)
-                          type = key.to_s unless key == :common
-                          break
-                        end
+                        next unless val.include?(k)
+
+                        type = key.to_s unless key == :common
+                        break
                       end
                     end
                     case k
@@ -416,7 +416,7 @@ module Squared
             append_command(flag, id || tagmain, op.extras)
           when :update
             raise_error('missing container', hint: flag) if op.empty?
-            op.append(escape: true)
+            op.append(escape: true, strip: /^:/)
           when :commit
             latest = op.shift || tagmain
             cmd << id << latest
@@ -469,7 +469,7 @@ module Squared
               end
               return
             else
-              op.append(escape: true)
+              op.append(escape: true, strip: /^:/)
             end
           end
           run(from: from)
@@ -520,7 +520,7 @@ module Squared
             list_image(flag, docker_output('image ls -a'), from: from) do |val|
               op << val
               if flag == :tag
-                op << tagname("#{@project}:#{op.extras.first}")
+                op << tagname("#{@project}:#{op.first}")
                 break
               end
             end
@@ -546,7 +546,7 @@ module Squared
 
         def network(flag, opts = [], target: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:network][flag], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self)
           op.clear
           from = :"network:#{flag}"
           list_image(flag, docker_output('ps -a'), from: from) do |img|
@@ -563,10 +563,14 @@ module Squared
         end
 
         def compose?(file = dockerfile)
+          return file == 3 || file == 4 if file.is_a?(Numeric)
+
           COMPOSEFILE.include?(File.basename(file))
         end
 
         def bake?(file = dockerfile)
+          return file == 1 || file == 2 if file.is_a?(Numeric)
+
           BAKEFILE.include?(File.basename(file))
         end
 
@@ -618,13 +622,22 @@ module Squared
         end
 
         def append_file(type, target: @session)
-          return unless type == 2 || type == 4 || @file.is_a?(Array)
+          return if ENV['COMPOSE_FILE'] && compose?(type)
 
+          unless @file.is_a?(Array)
+            case type
+            when 2, 4
+              return
+            when 3
+              return unless COMPOSEFILE.map { |val| path + val }.select(&:exist?).size > 1
+            end
+          end
           files = Array(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
-            target.merge(files)
+            opts = target.to_a.insert(2, *files)
+            target.clear.merge(opts)
           else
-            target.concat(files)
+            target.insert(2, *files)
           end
         end
 
@@ -789,7 +802,7 @@ module Squared
             bake?(val) ? 1 : 2
           when '.yml', '.yaml'
             if compose?(val)
-              path.children.any? { |file| bake?(file) } ? 1 : 3
+              @only&.include?('compose') || path.children.none? { |file| bake?(file) } ? 3 : 1
             else
               4
             end

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

@@ -500,10 +500,11 @@ module Squared
                     end
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
-                                                              when :push then 'pathspec*'
+                                                              when :push then 'pathspec*,:'
                                                               when :branch then 'name,stash?|:'
                                                               when :clear, :list then nil
-                                                              else 'stash?|:' end)
+                                                              else 'stash?|:'
+                                                              end)
                     task flag do |_, args|
                       stash flag, args.to_a
                     end
@@ -541,7 +542,7 @@ module Squared
                           commit1 = commithead args.commit1
                           if commit1
                             commit2 = commithead param_guard(action, flag, args: args, key: :commit2)
-                            args = args.extras.to_a
+                            args = args.extras
                             range = [commit1, commit2]
                           else
                             range, opts, refs = choice_commit(multiple: view ? true : 2, values: %w[Options Pathspec])
@@ -751,11 +752,12 @@ module Squared
                           args = args.extras
                         else
                           commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
-                          args = args.extras.to_a.concat(case mode&.downcase
-                                                         when 'h', 'hard' then ['hard']
-                                                         when 's', 'soft' then ['soft']
-                                                         when 'n', 'N' then ['mixed', 'N']
-                                                         else ['mixed'] end)
+                          args = args.extras.concat(case mode&.downcase
+                                                    when 'h', 'hard' then ['hard']
+                                                    when 's', 'soft' then ['soft']
+                                                    when 'n', 'N' then ['mixed', 'N']
+                                                    else ['mixed']
+                                                    end)
                         end
                         print_success if success?(reset(flag, args, commit: commit))
                       end
@@ -921,7 +923,8 @@ module Squared
                     before = case flag
                              when :blame then 'file'
                              when :mv then 'source+,destination'
-                             when :revert then 'commit+' end
+                             when :revert then 'commit+'
+                             end
                     format_desc(action, flag, 'opts*', before: before, after: case flag
                                                                               when :add
                                                                                 'pathspec*,pattern*'
@@ -975,6 +978,7 @@ module Squared
                 elsif !(force = confirm('Force checkout? [y/N] ', 'N'))
                   return
                 end
+                printsucc
               end
               op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, no: OPT_GIT[:no][:pull])
               reg = if op.empty?
@@ -1024,7 +1028,7 @@ module Squared
             return unless upstream
 
             op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, no: OPT_GIT[:no][:rebase])
-            cmd << upstream
+            op << upstream
             append_head op.shift
             op.clear(pass: false)
           when :onto
@@ -1098,6 +1102,7 @@ module Squared
             op = OptionPartition.new(opts, list, cmd, project: self, no: no, first: flag == :push ? matchpathspec : nil)
             case flag
             when :push
+              op.append?('message', readline('Enter message', force: true), force: true) if op.remove(':')
               append_pathspec op.extras
             when :pop, :apply, :drop, :branch
               if op.remove(':')
@@ -1105,7 +1110,7 @@ module Squared
                   if op.empty?
                     values = [['Branch name', true]]
                   else
-                    op << op.pop
+                    op << op.shift
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
@@ -1116,7 +1121,7 @@ module Squared
                   op << out
                 end
               elsif !op.empty?
-                op << op.pop
+                op << op.shift
               elsif flag == :branch
                 raise_error 'no branch name'
               end
@@ -1260,7 +1265,6 @@ module Squared
             end
           when :patch
             cmd << '--patch'
-            append_pathspec(refs, pass: false)
           when :undo
             cmd << '--hard HEAD@{1}'
             ref = false
@@ -1477,15 +1481,16 @@ module Squared
 
         def merge(flag, opts = [], command: nil, branch: nil)
           cmd, opts = git_session('merge', opts: opts)
+          display = false
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            raise_error 'no branch/commit' if op.empty?
             op << "--#{flag}" << '--'
             if branch
               op << branch
               op.clear(pass: false)
             else
+              raise_error 'no branch/commit' if op.empty?
               append_commit(*op.extras)
             end
           else
@@ -1496,8 +1501,9 @@ module Squared
             return unless VAL_GIT[:merge][:send].include?(command)
 
             cmd << "--#{command}"
+            display = command == 'abort'
           end
-          source
+          print_success if success?(source, display)
         end
 
         def branch(flag = nil, opts = [], refs: [], ref: nil, target: nil, remote: nil)
@@ -1737,7 +1743,8 @@ module Squared
                                    project: self, no: OPT_GIT[:no][flag], first: case flag
                                                                                  when :blame, :revert
                                                                                    nil
-                                                                                 else matchpathspec end)
+                                                                                 else matchpathspec
+                                                                                 end)
           case flag
           when :blame
             raise_error 'no file found' unless (n = op.index { |s| (path + s).file? })
@@ -1772,8 +1779,7 @@ module Squared
             end
             return source(git_session('status -s'), banner: false) unless append_pathspec(op.extras)
 
-            verbose = flag == :add && !op.arg?('verbose')
-            print_success if success?(source) && verbose
+            print_success if success?(source, flag == :add && !op.arg?('verbose'))
             return
           when :mv
             refs = projectmap op.extras
@@ -1806,9 +1812,12 @@ module Squared
             from = nil
             banner = nil
           else
-            banner = nil if banner && (multiple || !banner?)
+            if banner
+              banner = nil unless banner? && !multiple
+              args = true
+            end
             if cmd.respond_to?(:done)
-              if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z\-]*\z/) })
+              if from.nil? && (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') }
@@ -1819,17 +1828,14 @@ module Squared
           log&.info cmd
           banner = if banner
                      banner = (banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), '')
-                     format_banner(hint ? "#{banner} (#{hint})" : banner, banner: true)
+                     format_banner(hint ? "#{banner} (#{hint})" : banner)
                    end
           on :first, from
           begin
             if io
-              ret = if stdout
-                      `#{cmd}`
-                    else
-                      banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
-                    end
-              return ret
+              return `#{cmd}` if stdout
+
+              return args ? [IO.popen(cmd), banner || '', from] : IO.popen(cmd)
             elsif stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`

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

@@ -5,15 +5,17 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=v].freeze,
-          install: %w[prefer-dedupe package-lock-only cpu=b libc=b os=b].freeze,
-          install_base: %w[ignore-scripts install-links strict-peer-deps include=b omit=b install-strategy=b].freeze,
+          common: %w[dry-run=!? include-workspace-root=!? workspaces=!? w|workspace=v].freeze,
+          install: %w[prefer-dedupe=!? package-lock-only=!? audit=! bin-links=! cpu=b fund=! libc=b os=b
+                      package-lock=!].freeze,
+          install_base: %w[ignore-scripts=!? install-links=!? strict-peer-deps=!? include=b omit=b
+                           install-strategy=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
-          install_as: %w[foreground-scripts g|global no-save save save-bundle save-dev E|save-exact save-optional
-                         save-peer S|save-prod].freeze,
-          run: %w[foreground-scripts if-present ignore-scripts script-shell=p].freeze,
+          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod foreground-scripts=!?
+                         g|global=!? S|save=!? E|save-exact=!?].freeze,
+          run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
-          pack: %w[json ignore-scripts pack-destination=p].freeze
+          pack: %w[json=!? pack-destination=p].freeze
         }.freeze
         OPT_PNPM = {
           common: %w[aggregate-output color no-color stream use-stderr C|dir=p loglevel=b w|workspace-root].freeze,
@@ -670,13 +672,13 @@ module Squared
           if sync
             run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
+            require 'open3'
             on :first, from
             pwd_set(from: from, dryrun: dryrun) do
-              require 'open3'
-              banner = format_banner cmd.to_s
-              Open3.popen2e(cmd.done) do |_, out|
-                write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
-                                 banner: banner)
+              cmd = session_done cmd
+              Open3.popen2e(cmd) do |_, out|
+                write_lines(out, banner: format_banner(cmd),
+                                 sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:bright_blue), index: 2])
               end
             end
             on :last, from
@@ -758,8 +760,8 @@ module Squared
                 seg[4] &&= seg[4].succ
               else
                 seg[2] = seg[2].succ
+                seg[4] &&= '0'
               end
-              seg[4] = '0'
             when :patch
               seg[4] &&= seg[4].succ
             end
@@ -928,7 +930,7 @@ module Squared
         end
 
         def version
-          self.version ||= read_packagemanager(:version)
+          @version ||= read_packagemanager(:version)
         end
 
         def packagename
@@ -1025,9 +1027,9 @@ module Squared
 
         def npmnotice
           [
-            { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:cyan), index: 2 },
-            { pat: /^(npm )(error)(.*)$/, styles: color(:red), index: 2 },
-            { pat: /^(npm )(notice)(.*)$/, styles: color(:cyan), index: 2 },
+            { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:bright_cyan), index: 2 },
+            { pat: /^(npm )(error)(.*)$/, styles: color(:bright_red), index: 2 },
+            { pat: /^(npm )(notice)(.*)$/, styles: color(:bright_cyan), index: 2 },
             { pat: /^(npm )(.+)$/, styles: :bold }
           ]
         end

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

@@ -37,8 +37,8 @@ module Squared
           common: %w[I|ignore-python no-cache n|non-interactive].freeze,
           build: %w[C=bm no-clean no-isolation no-sdist no-wheel quiet verbose config-setting=q d|dest=p p|project=p
                     k|skip=b].freeze,
-          publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p identity=b
-                      p|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
+          publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p
+                      i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
         }.freeze
         OPT_HATCH = {
           common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=b
@@ -303,7 +303,7 @@ module Squared
                     when 'build'
                       case flag
                       when :poetry
-                        next unless poetry?
+                        next unless build_backend == 'poetry.core.masonry.api'
                       when :pdm
                         next unless build_backend == 'pdm.backend'
                       when :hatch
@@ -888,7 +888,7 @@ module Squared
         end
 
         def poetry?
-          build_backend ? build_backend == 'poetry.core.masonry.api' : dependtype == 1
+          dependtype == 1
         end
 
         def requirements?

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

@@ -183,7 +183,8 @@ module Squared
                 else
                   format_desc(action, nil, 'opts*', before: case action
                                                             when 'cache', 'check' then nil
-                                                            else 'command+' end)
+                                                            else 'command+'
+                                                            end)
                   task action do |_, args|
                     bundle(action, *args.to_a)
                   end
@@ -448,7 +449,7 @@ module Squared
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
           append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
-                        append: flag == :all ? nil : /\A\w+=/)
+                        append: flag == :all ? nil : /\A[a-z-]+=/)
           run_rb(from: :update)
         end
 
@@ -701,6 +702,7 @@ module Squared
             return
           when :build
             if op.empty?
+              raise_error('gemspec not found', hint: project) unless gemfile
               op.add_path(gemfile)
             else
               op.add_path(op.shift)
@@ -711,7 +713,8 @@ module Squared
               file = path + (if (spec = gemspec)
                                "#{spec.name}-#{spec.version}.gem"
                              else
-                               choice_index('Select a file', Dir.glob('*.gem', base: path), force: true)
+                               gems = Dir.glob(path.join('*.gem')).map { |val| File.basename(val) }
+                               choice_index('Select a file', gems, force: true)
                              end)
             else
               file = path + op.shift
@@ -753,9 +756,8 @@ module Squared
                 else
                   op.clear
                 end
-              elsif (n = op.extras.find_index { |val| val.match?(/(\A|[a-z])@\d/) })
-                items = op.extras.to_a
-                name = items.delete_at(n)
+              elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
+                name = op.delete_at(n)
                 if (n = name.index('@')) == 0
                   pre = gemname
                   ver = name[1..-1]
@@ -764,8 +766,7 @@ module Squared
                   ver = name[(n + 1)..-1]
                 end
                 op.adjoin(pre, shell_option('version', ver))
-                  .clear(items)
-                  .reset
+                  .clear
               elsif flag != :install
                 op.adjoin
               end
@@ -830,8 +831,8 @@ module Squared
         def gemspec
           return @gemspec unless @gemspec.nil?
 
-          @gemspec = if (file = gemfile)
-                       Gem::Specification.load(file.to_s) rescue false
+          @gemspec = if gemfile
+                       Gem::Specification.load(gemfile.to_s) rescue false
                      else
                        false
                      end
@@ -1036,7 +1037,7 @@ module Squared
           return @gemfile unless @gemfile.nil?
 
           @gemfile = [project, name].map! { |val| path + "#{val}.gemspec" }
-                                    .concat(path.glob('*.gemspec'))
+                                    .concat(Dir.glob(path.join('*.gemspec')))
                                     .find { |file| File.exist?(file) } || false
         end
 

data/lib/squared/workspace/project/support/class.rb

@@ -18,10 +18,14 @@ module Squared
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true, **)
+            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, **)
               return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
+              if strip
+                pat, s = Array(strip)
+                ret.map! { |val| val.gsub(pat, s || '') }
+              end
               ret.map! { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) } if escape || quote
               if target.is_a?(Set)
                 target.merge(ret)
@@ -34,7 +38,7 @@ module Squared
             def clear(target, opts, pass: true, styles: nil, **kwargs)
               return if opts.empty?
 
-              kwargs[:subject] ||= stripext(target.first)
+              kwargs[:subject] ||= stripext target.first
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
@@ -60,10 +64,10 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
-                s.map! { |val| Regexp.escape(shell_option(val)) }
+                s.map! { |val| Regexp.escape(val.start_with?('-') ? val : shell_option(val)) }
                 r << /\A(?:#{s.join('|')})#{value ? '[ =].' : '(?: |=|\z)'}/
               end
-              target.any? { |opt| r.any? { |val| opt&.match?(val) } }
+              Array(target).compact.any? { |val| r.any? { |pat| pat.match?(val.to_s) } }
             end
 
             def pattern?(val)
@@ -76,13 +80,14 @@ module Squared
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
                          :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
-                         :pop, :push, :concat, :index, :delete_at, :join, :map, :map!, :select, :reject, :size
+                         :pop, :push, :concat, :index, :delete_at, :join, :map, :map!, :select, :select!, :reject, :size
 
           def_delegator :@extras, :delete, :remove
+          def_delegator :@extras, :delete_at, :remove_at
           def_delegator :@extras, :delete_if, :remove_if
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
-            @target = target.is_a?(Set) ? target : Set.new(target)
+            @target = target.is_a?(Set) ? target : target.to_set
             @project = project
             @path = path || project&.path
             @errors = []
@@ -103,6 +108,7 @@ module Squared
             i = []
             f = []
             si = []
+            bl = []
             list.flat_map do |val|
               x, y = val.split('|', 2)
               if y
@@ -137,6 +143,8 @@ module Squared
                   si << flag
                 when 'v'
                   @values << Regexp.escape(flag)
+                when '!'
+                  bl << flag
                 else
                   next
                 end
@@ -176,7 +184,7 @@ module Squared
                     add quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key) && path
                     add quote_option(key, path + val, merge: merge)
-                  elsif b.include?(key) || numcheck.call(key, val)
+                  elsif b.include?(key) || (bl.include?(key) && %w[true false].include?(val)) || numcheck.call(key, val)
                     add basic_option(key, val, merge: merge)
                   elsif merge
                     add basic_option(key, val, merge: true)
@@ -303,30 +311,30 @@ module Squared
             self
           end
 
-          def append?(key, val = nil, type: nil, **kwargs)
-            return false if arg?(key)
+          def reset(errors: false)
+            extras.clear
+            clear(errors: true) if errors
+            self
+          end
+
+          def append?(key, val = nil, type: nil, force: false, **kwargs)
+            return false unless force || !arg?(key)
 
             val = yield self if block_given?
             return false unless val
 
             type ||= :quote if kwargs.empty?
-            op << case type
-                  when :quote
-                    quote_option(key, val)
-                  when :basic
-                    basic_option(key, val)
-                  else
-                    shell_option(key, val, **kwargs)
-                  end
+            add case type
+                when :quote
+                  quote_option(key, val)
+                when :basic
+                  basic_option(key, val)
+                else
+                  shell_option(key, val, **kwargs)
+                end
             true
           end
 
-          def reset(errors: false)
-            extras.clear
-            clear(errors: true) if errors
-            self
-          end
-
           def arg?(*args, **kwargs)
             OptionPartition.arg?(target, *args, **kwargs)
           end

data/lib/squared/workspace/repo.rb

@@ -117,10 +117,8 @@ module Squared
           path = ns.scope.path
           branch = env('REPO_MANIFEST') || Repo.read_manifest(root)
           target = branch || manifest
-          cmd = nil
           stage = nil
           opts = %w[force rebase detach submodules fail no-update gc]
-          newline = ARGV.index { |val| val.start_with?('repo:') }.to_i > 0
           desc = lambda do |val, alt = nil|
             if (ver = branch || alt)
               val = val.sub('{0}', "opts*=#{opts.join(',')}")
@@ -132,9 +130,8 @@ module Squared
 
           desc.call('all[{0}]')
           task 'all' do |_, args|
-            cmd ||= repo_opts args
             stage ||= 'all'
-            ns['sync'].invoke
+            ns['sync'].invoke(*args.to_a)
             next if env('REPO_STAGE', equals: '1')
 
             @project.select do |_, proj|
@@ -162,39 +159,53 @@ module Squared
             args = args.to_a
             u = env('REPO_URL') || manifest_url
             m = args.first && !opts.include?(args.first) ? args.shift : target
-            g = case (g = env('REPO_GROUPS'))
+            g = args.first && !opts.include?(args.first) ? args.shift : nil
+            g = case (val = env('REPO_GROUPS'))
+                when '', NilClass
+                  g
                 when '0', 'false'
                   nil
                 else
-                  g || (args.first && !opts.include?(args.first) ? args.shift : nil)
-                end
-            cmd = repo_opts args
-            s = case (s = env('REPO_SUBMODULES'))
-                when '0', 'false'
-                  false
-                else
-                  s ? true : cmd.include?('--fetch-submodules')
+                  val
                 end
             stage = 'init'
-            puts if newline
-            args = ["-u #{u}", "-m #{m}.xml"]
-            args << "-g #{g}" if g
-            args << '--submodules' if s
-            Common::System.shell("#{repo_bin} init #{args.join(' ')}", chdir: root)
+            opts = repo_opts "-u #{u}", "-m #{m}.xml"
+            opts << "-g #{g}" if g
+            opts << '--submodules' if repo_submodules?(args.include?('submodules'))
+            repo_run "#{repo_bin} init #{opts.uniq.join(' ')}"
             next if env('REPO_STAGE', equals: '0')
 
-            ns['all'].invoke
+            ns['all'].invoke(*args)
           end
 
           desc.call('sync[{0}]')
           task 'sync' do |t, args|
-            raise_error 'repo not initialized' unless branch || stage == 'init'
-            cmd ||= repo_opts args
-            cmd << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}"
-            puts unless !newline || stage == 'init'
+            opts = if stage == 'init'
+                     []
+                   else
+                     raise_error 'repo not initialized' unless branch
+                     repo_opts
+                   end
+            args.to_a.each do |val|
+              case val
+              when 'force'
+                opts << '--force-checkout'
+              when 'rebase', 'detach'
+                opts << "--#{val}"
+              when 'submodules'
+                opts << '--fetch-submodules' if repo_submodules?(true)
+              when 'fail'
+                opts << '--fail-fast'
+              when 'no-update'
+                opts << '--no-manifest-update'
+              when 'gc'
+                opts << '--auto-gc'
+              end
+            end
+            opts << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}" unless opts.grep(/^--?j(?:obs)?/).empty?
+            opts << '--fetch-submodules' if repo_submodules?
             begin
-              Common::System.shell("#{repo_bin} sync #{cmd.join(' ')}", chdir: root,
-                                                                        exception: cmd.include?('--fail-fast'))
+              repo_run("#{repo_bin} sync #{opts.uniq.join(' ')}", exception: opts.include?('--fail-fast'))
             rescue Errno::ENOENT => e
               emphasize(e, title: root)
               raise
@@ -223,35 +234,34 @@ module Squared
         )
       end
 
-      def repo_opts(args)
-        ret = []
-        args.to_a.each do |val|
-          case val
-          when 'force'
-            ret << '--force-checkout'
-          when 'rebase', 'detach'
-            ret << "--#{val}"
-          when 'submodules'
-            ret << '--fetch-submodules'
-          when 'fail'
-            ret << '--fail-fast'
-          when 'no-update'
-            ret << '--no-manifest-update'
-          when 'gc'
-            ret << '--auto-gc'
-          end
-        end
-        ret
+      def repo_run(cmd, exception: false)
+        puts log_message(Logger::INFO, cmd, subject: main, hint: root) if verbose
+        Common::System.shell(cmd, chdir: root, exception: exception)
       end
 
       def repo_bin
         Common::Shell.shell_bin('repo')
       end
 
+      def repo_opts(*args)
+        return args unless (n = ARGV.index('--'))
+
+        ARGV[(n + 1)..-1].concat(args)
+      end
+
       def repo?
         !manifest_url.nil? && (repo_install? || @repo_override == true)
       end
 
+      def repo_submodules?(val = false)
+        case (s = env('REPO_SUBMODULES'))
+        when '0', 'false'
+          false
+        else
+          s ? true : val
+        end
+      end
+
       def repo_install?(dir = root, parent: false)
         return true if root?(dir, pass: ['.repo']) || dir.join('.repo').directory?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.20
 platform: ruby
 authors:
 - An Pham