squared 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2f535f6c08d8ee1abce8aeefe9f0bd9ead9af0c6ef8cf3925561b1235606017
-  data.tar.gz: 2517079e95af88ddcb835c564b7c4e0d429823ca1bde22a403afa54e2cba56fd
+  metadata.gz: 40b39041151c559d38910aa11e68b6aa9cc28d1bb67176559193da4005cdda15
+  data.tar.gz: cc6753a83f0390110e723cf92830cbb4c441d0e0c794d837fe5c20956cab713a
 SHA512:
-  metadata.gz: 07da4a2cb18fdf2a2aef060a60e03a1dba007937ae4300abb29aee8708b9be5d16472f09a6e9762aead5ad99de66ef1724c8be3842a4039b94ed73eacfa1ada4
-  data.tar.gz: 86c0b904ce9aa176a3aa1a7950e44a5b4e178adac6387a3aa25773ed680c07d567249ed593b4389376598aca05800e5bfce304d02b1c7ff858e4abb8733d5320
+  metadata.gz: 36c3de2c6763c0d66b28a353cf36fca2de5eb5fe90de5eee457bf1802d23b18db8ac4a2e78d01799a993cf370cb96b068f2d4acda4cc049c1e70f2f5cbcfb004
+  data.tar.gz: 0e8d0aee698b441c8c4b3eec2a79cb52cf6e22e0a4aad88567defd0d8587dc16f678fdde318048220edb33ef5aa80ff7f2b253ede61fa3a03aac71849ba8179e

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.5.6] - 2025-08-30
+
+### Added
+
+- Docker command compose parameter services is interactive.
+- Workspace with public method has conditional pass parameter.
+
+## [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.5.5] - 2025-08-23
 
 ### Added
@@ -33,7 +58,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
 
@@ -1000,6 +1025,7 @@
 
 - Changelog was created.
 
+[0.5.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.6
 [0.5.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.5
 [0.5.4]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.4-ruby
 [0.5.3]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.3-ruby

data/lib/squared/common/format.rb

@@ -159,7 +159,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/version.rb

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

data/lib/squared/workspace/application.rb

@@ -179,7 +179,9 @@ module Squared
         self
       end
 
-      def with(*val, group: nil, **kwargs, &blk)
+      def with(*val, pass: false, group: nil, **kwargs, &blk)
+        return self if pass == true || (pass && Array(pass).map(&:to_s).any? { |s| respond_to?(s) && __send__(s) })
+
         @group = nil
         @ref = nil
         @withargs = kwargs.empty? ? nil : kwargs

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

@@ -274,9 +274,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
@@ -336,10 +336,10 @@ module Squared
                         out, done = graph(args, out: [])
                         out.map! do |val|
                           done.each_with_index do |proj, i|
-                            if val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/)
-                              val += " (#{i.succ})"
-                              break
-                            end
+                            next unless val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/)
+
+                            val += " (#{i.succ})"
+                            break
                           end
                           val
                         end
@@ -387,7 +387,9 @@ module Squared
                                  args.extras
                                else
                                  version, opts = choice_index('Select a version',
-                                                              @asdf[1].children.map(&:basename).push('latest'),
+                                                              @asdf[1].children
+                                                                      .map(&:basename)
+                                                                      .append('latest', 'system'),
                                                               force: true, accept: [['Confirm?', false, true]],
                                                               values: ['Options'])
                                  OptionPartition.strip(opts)
@@ -2136,8 +2138,8 @@ module Squared
           workspace.series.name_get(action).yield_self { |name| name != action && invoked_sync?(name) }
         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,13 +172,13 @@ module Squared
                     break unless compose?
 
                     case flag
-                    when :build, :up
-                      format_desc action, flag, 'opts*,service*'
+                    when :build, :up, :down
+                      format_desc action, flag, 'opts*,service*|:'
                       task flag do |_, args|
                         compose! flag, args.to_a
                       end
                     when :exec, :run
-                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'}|:,args*,opts*"
+                      format_desc action, flag, "service|:,command#{flag == :exec ? '' : '?'}|::,args*,opts*"
                       task flag, [:service] do |_, args|
                         service = param_guard(action, flag, args: args, key: :service)
                         compose!(flag, args.extras, service: service)
@@ -186,7 +187,7 @@ module Squared
                   when 'container'
                     case flag
                     when :exec, :commit
-                      format_desc(action, flag, flag == :exec ? 'id/name,opts*,args+' : 'id/name,tag?,opts*')
+                      format_desc(action, flag, flag == :exec ? 'id/name,opts*,args+|:' : 'id/name,tag?,opts*')
                       task flag, [:id] do |_, args|
                         if flag == :exec && !args.id
                           choice_command flag
@@ -196,7 +197,7 @@ module Squared
                         end
                       end
                     when :run, :create
-                      format_desc action, flag, 'image,opts*,args*'
+                      format_desc action, flag, 'image,opts*,args*|:'
                       task flag, [:image] do |_, args|
                         if args.image
                           container(flag, args.extras, id: args.image)
@@ -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
@@ -335,7 +336,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
@@ -348,15 +349,27 @@ 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}"
-          case flag
-          when :build, :up
-            op.append(escape: true)
-          when :exec, :run
-            append_command flag, service, op.extras
+          op.parse(OPT_DOCKER[:compose].fetch(flag, []))
+          multiple = case flag
+                     when :build, :up, :down then true
+                     else false
+                     end
+          if op.remove(':') || service == ':'
+            keys = Set.new
+            read_composefile('services', target: op.values_of('f', 'file')) { |data| keys.merge(data.keys) }
+            service = unless keys.empty?
+                        choice_index('Add services', keys, multiple: multiple, force: !multiple,
+                                                           attempts: multiple ? 1 : 5)
+                      end
           end
-          run(from: from)
+          if multiple
+            op.concat(service) if service
+            op.append(delim: true, escape: true, strip: /^:/)
+          else
+            raise_error('no services were found', hint: flag) unless service
+            append_command(flag, service, op.extras, prompt: '::')
+          end
+          run(from: :"compose:#{flag}")
         end
 
         def container(flag, opts = [], id: nil)
@@ -388,10 +401,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
@@ -414,7 +427,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
@@ -467,7 +480,7 @@ module Squared
               end
               return
             else
-              op.append(escape: true)
+              op.append(escape: true, strip: /^:/)
             end
           end
           run(from: from)
@@ -544,7 +557,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|
@@ -561,10 +574,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
 
@@ -585,6 +602,21 @@ module Squared
 
         private
 
+        def read_composefile(*keys, target: nil)
+          require 'yaml'
+          target = ENV['COMPOSE_FILE']&.split(workspace.windows? ? ';' : ':') if !target || target.empty?
+          Array(target || dockerfile).each do |val|
+            doc = YAML.load_file(path + val)
+            if keys.empty?
+              yield doc
+            elsif (data = doc.dig(*keys))
+              yield data
+            end
+          rescue StandardError => e
+            log.debug e
+          end
+        end
+
         def docker_session(*cmd, opts: nil)
           return session('docker', *cmd) unless opts
 
@@ -597,9 +629,9 @@ module Squared
           session('docker', *cmd, main: false, options: false, **kwargs)
         end
 
-        def append_command(flag, val, list, target: @session)
-          if list.delete(':')
-            list << readline('Enter command [args]', force: true)
+        def append_command(flag, val, list, target: @session, prompt: ':')
+          if list.delete(prompt)
+            list << readline('Enter command [args]', force: flag == :exec)
           elsif (args = env('DOCKER_ARGS'))
             list << args
           end
@@ -616,13 +648,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
 
@@ -788,7 +829,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

@@ -503,10 +503,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, :all then nil
-                                                              else 'stash?|:' end)
+                                                              else 'stash?|:'
+                                                              end)
                     task flag do |_, args|
                       stash flag, args.to_a
                     end
@@ -755,7 +756,8 @@ module Squared
                                                          when 'h', 'hard' then ['hard']
                                                          when 's', 'soft' then ['soft']
                                                          when 'n', 'N' then ['mixed', 'N']
-                                                         else ['mixed'] end)
+                                                         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?', 'N'))
                   return
                 end
+                printsucc
               end
               op = OptionPartition.new(opts, OPT_GIT[:pull], cmd, project: self, no: OPT_GIT[:no][:pull])
               reg = if op.empty?
@@ -1105,6 +1109,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(':')
@@ -1481,6 +1486,7 @@ 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])
@@ -1500,8 +1506,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)
@@ -1736,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? })
@@ -1771,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
@@ -1807,7 +1814,7 @@ module Squared
           else
             banner = nil if banner && (multiple || !banner?)
             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|git-dir)/) }

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

@@ -767,8 +767,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
@@ -936,7 +936,7 @@ module Squared
         end
 
         def version
-          self.version ||= read_packagemanager(:version)
+          @version ||= read_packagemanager(:version)
         end
 
         def packagename

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[a-z\-]+=/)
+                        append: flag == :all ? nil : /\A[a-z-]+=/)
           run_rb(from: :update)
         end
 
@@ -502,7 +503,7 @@ module Squared
                   c < d ? -1 : 1
                 end
               end
-              .push('')
+              .append('')
               .each do |val|
                 next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
 

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)
@@ -77,7 +81,7 @@ 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_if, :remove_if
@@ -212,6 +216,36 @@ module Squared
             self
           end
 
+          def values_of(*args, strict: true, first: false, last: false)
+            eq, s = strict ? ['=', '[^ ]+'] : ['(?:=| +)', '[^-][^ ]*']
+            grp = ["\"((?:[^\"]|(?<=\\\\)\"(?!$#{Rake::Win32.windows? ? '| ' : ''}))*)\""]
+            grp << "'((?:[^']|'\\\\'')*)'" unless Rake::Win32.windows?
+            grp << "(#{s})"
+            args.map! do |opt|
+              if opt.size == 1
+                /(?:\A| )-#{opt} ?([^ ]+)/
+              else
+                /(?:\A| )--#{opt + eq}(?:#{grp.join('|')})/
+              end
+            end
+            ret = []
+            target.each do |opt|
+              args.each do |pat|
+                next unless opt =~ pat
+
+                ret << ($1 || $2 || $3)
+                break
+              end
+            end
+            return ret unless first || last
+
+            if last
+              last.is_a?(Numeric) ? ret.last(last) : ret.last
+            else
+              first.is_a?(Numeric) ? ret.first(first) : ret.first
+            end
+          end
+
           def uniq(list)
             items = map { |val| nameonly(val) }
             list.reject do |val|
@@ -304,30 +338,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,7 +117,6 @@ 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.any?(/^repo:/)
@@ -132,9 +131,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 +160,55 @@ 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)}"
+            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.any?(/^--?j(?:obs)?/)
+            opts << '--fetch-submodules' if repo_submodules?
             puts unless !newline || stage == 'init'
             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 +237,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::System.shell_bin('repo')
+        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.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - An Pham