squared 0.5.10 → 0.5.12

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

@@ -13,7 +13,7 @@ module Squared
           buildx: {
             common: %w[builder=b D|debug],
             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
+                      cgroup-parent=b 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
@@ -26,8 +26,8 @@ module Squared
                       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,
+                    cap-add=b cap-drop=b entrypoint=q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b
+                    T|no-TTY=b? p|publish=q 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
@@ -36,25 +36,26 @@ module Squared
           }.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
-                       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 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,
+                       rm t|tty use-api-socket 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=q dns-option=q dns-search=q domainname=b entrypoint=q e|env=qq
+                       env-file=p expose=q gpus=q group-add=b health-cmd=q health-interval=b health-retries=i
+                       health-start-interval=q health-start-period=q health-timeout=q io-maxbandwidth=b io-maxiops=b
+                       ip=b ip6=q ipc=b isolation=b kernel-memory=b l|label=q label-file=q link=b link-local-ip=q
+                       log-driver=b log-opt=q mac-address=q 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=q 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 hostname=q sig-proxy=b?].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,
+            inspect: %w[s|size f|format=q type=b].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,
@@ -68,7 +69,7 @@ module Squared
             save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
-            connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=b link=b link-local-ip=b].freeze,
+            connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=q link=b link-local-ip=q].freeze,
             disconnect: %w[f|force].freeze
           }.freeze
         }.freeze
@@ -113,7 +114,7 @@ module Squared
           return unless dockerfile(file).exist?
 
           @context = context
-          @tag = tag || tagname("#{@project}:#{@version || 'latest'}")
+          self.tag = tag || tagname("#{@project}:#{@version || 'latest'}")
           @mounts = mounts
           @secrets = secrets
           @registry = tagjoin registry, kwargs[:username]
@@ -206,7 +207,7 @@ module Squared
                         end
                       end
                     else
-                      format_desc(action, flag, 'opts*,id/name', after: flag == :update ? '+' : '*')
+                      format_desc action, flag, "opts*,id/name#{flag == :update ? '+' : '*'}"
                       task flag do |_, args|
                         container flag, args.to_a
                       end
@@ -533,7 +534,7 @@ module Squared
             list_image(flag, docker_output('image ls -a'), from: from) do |val|
               op << val
               if flag == :tag
-                op << tagname("#{@project}:#{op.first}")
+                op << tagname("#{project}:#{op.first}")
                 break
               end
             end
@@ -554,7 +555,7 @@ module Squared
             banner = false
           end
           ret = run(cmd, sync: sync, exception: exception, banner: banner, from: from)
-          print_success if success?(ret) && (flag == :tag || flag == :save)
+          print_success if success?(ret, flag == :tag || flag == :save)
         end
 
         def network(flag, opts = [], target: nil)
@@ -656,13 +657,14 @@ module Squared
             when 2, 4
               return
             when 3
-              return unless COMPOSEFILE.map { |val| basepath(val) }.select(&:exist?).size > 1
+              return unless COMPOSEFILE.select { |val| basepath(val).exist? }.size > 1
             end
           end
           files = Array(@file).map { |val| quote_option('file', basepath(val)) }
           if target.is_a?(Set)
             opts = target.to_a.insert(index, *files)
-            target.clear.merge(opts)
+            target.clear
+                  .merge(opts)
           else
             target.insert(index, *files)
           end
@@ -678,7 +680,7 @@ module Squared
         def append_tag(val, target: @session)
           case val
           when String
-            val.split(',')
+            split_escape val
           when Array
             val
           else
@@ -820,7 +822,7 @@ module Squared
             end
             cmd.merge(Array(out).map! { |val| parse.call(val) })
             cmd << args
-            print_success if success?(run(cmd)) && ctx.start_with?(/(?:network|tag|save)/)
+            print_success if success?(run(cmd), ctx.start_with?(/(?:network|tag|save)/))
           end
         end
 

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

@@ -408,10 +408,11 @@ module Squared
 
                     case flag
                     when :branch
-                      format_desc action, flag, 'path,opts*'
-                      task flag, [:path] do |_, args|
+                      format_desc action, flag, 'path,name?'
+                      task flag, [:path, :name] do |_, args|
                         path = param_guard(action, flag, args: args, key: :path)
-                        submodule(flag, args.extras, path: path)
+                        branch = args.name
+                        submodule(flag, [branch ? 'b' : 'd'], branch: branch, path: path)
                       end
                     when :url
                       format_desc action, flag, 'path,url,opts*'
@@ -498,7 +499,7 @@ module Squared
                           remote = choice_remote
                         end
                         ret = tag(flag, refs: [name], message: message, commit: commit, remote: remote)
-                        print_success if success?(ret) && !remote
+                        print_success if success?(ret, !remote)
                       end
                     end
                   when 'stash'
@@ -640,7 +641,7 @@ module Squared
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
                         unless commit
-                          commit, merge = choice_commit(values: ['Merge? [y|N]'])
+                          commit, merge = choice_commit(values: ['Merge? [y/N]'])
                           merge = merge&.upcase == 'Y'
                         end
                         checkout(flag, commit: commit, merge: merge)
@@ -721,7 +722,7 @@ module Squared
                       task flag, [:name, :commit] do |_, args|
                         branch = param_guard(action, flag, args: args, key: :name)
                         commit = commithead args.commit
-                        commit, track = choice_commit(values: ['Track? [Y|n]'], force: false) if commit == ':'
+                        commit, track = choice_commit(values: ['Track? [Y/n]'], force: false) if commit == ':'
                         switch(flag, branch: branch, commit: commit, track: track)
                       end
                     when :detach
@@ -1476,7 +1477,9 @@ module Squared
           source op
           cached = git_spawn 'diff --cached --name-only --no-color'
           if amend || !cached.empty? || dryrun?
-            puts cached if adding.empty? && !cached.empty? && banner?
+            if adding.empty? && !cached.empty? && banner?
+              puts(cached.lines.map! { |val| "cached #{shell_quote(val.chomp)}" })
+            end
             source co
             source pu
           elsif banner?
@@ -1556,7 +1559,7 @@ module Squared
             append_value list
             remote = nil
           when :move, :copy
-            s = "-#{flag.to_s[0]}"
+            s = +"-#{flag.to_s[0]}"
             s.upcase! if option('force', 'f')
             cmd << s
             refs.compact.each { |val| cmd << shell_quote(val) }
@@ -1642,21 +1645,19 @@ module Squared
           source
         end
 
-        def submodule(flag, opts = [], path: nil, url: nil)
+        def submodule(flag, opts = [], branch: nil, path: nil, url: nil)
           cmd, opts = git_session('submodule', opts: opts)
           op = OptionPartition.new(opts, OPT_GIT[:submodule].fetch(flag, []), cmd, project: self)
           case flag
           when :branch, :url
             op.adjoin("set-#{flag}")
-            op << '--'
-            op.add_path(path) if path
-            op.add_quote(url) if url
+            op.add_quote(branch, '--', path, url)
           else
             op.adjoin(flag)
             op << '--recursive' if option('recursive', 'r')
             op.splice(path: true)
           end
-          source
+          print_success if success?(source, flag == :branch)
         end
 
         def restore(flag, opts = [], commit: nil, files: nil)
@@ -1979,7 +1980,7 @@ module Squared
               when 'rebase'
                 op << basic_option($1, $2) if VAL_GIT[:rebase][:value].include?($2)
               when 'shallow-since'
-                op.append?($1) { Date.parse($2)&.strftime('%F %T') }
+                op.append?($1) { Date.parse($2).strftime('%F %T') }
               when 'recurse-submodules'
                 op.append?($1, $2, type: :basic)
               when 'refspec'

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

@@ -130,10 +130,9 @@ module Squared
                 when 'add'
                   format_desc action, nil, 'save?=prod|dev|optional|peer,name+'
                   task action, [:save] do |_, args|
-                    save = param_guard(action, 'save', args: args, key: :save)
-                    exact = true if save.delete_prefix!('=')
-                    packages = case save
-                               when 'prod', 'dev', 'optional', 'peer'
+                    packages = if args.save =~ /\A(=)?(prod|dev|optional|peer)\z/
+                                 exact = !$1.nil?
+                                 save = $2
                                  args.extras
                                else
                                  save = 'prod'
@@ -147,21 +146,21 @@ module Squared
 
                   format_desc action, nil, "script,opts*|#{indexchar}index+|#,pattern*"
                   task action, [:script] do |_, args|
+                    list = scripts.to_a
                     if args.script == '#'
-                      format_list(scripts.to_a, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
+                      format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: dependfile)
                     else
                       args = param_guard(action, 'script', args: args.to_a)
                       opts = []
                       args.each do |val|
                         if (n, extra = indexitem(val))
                           if (item = list[n - 1])
-                            val = extra ? "#{item.first} #{extra}" : item.first
+                            run compose([item.first, extra].compact.join(' '), script: true)
                           elsif exception
                             indexerror n, list
                           else
                             next log.warn "run script #{n} of #{list.size} (out of range)"
                           end
-                          run compose(val, script: true)
                         else
                           opts << val
                         end
@@ -374,7 +373,7 @@ module Squared
                     target.mkpath
                     subdir << target.to_s
                   end
-                  FileUtils.cp(basepath(s), dest, verbose: verbose.is_a?(Numeric) && verbose > 0)
+                  FileUtils.cp(basepath(s), dest, verbose: verbosetype > 0)
                 rescue StandardError => e
                   print_error e
                   errors += 1
@@ -416,7 +415,7 @@ module Squared
             end
             target.each do |src, to|
               glob.each { |val| log.info "cp #{from + val} #{to}" }
-              copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbose)
+              copy_dir(src, to, glob, create: create, link: link, force: force, pass: pass, verbose: verbosetype > 0)
             rescue StandardError => e
               on_error e, :copy
             end
@@ -431,19 +430,7 @@ module Squared
             workspace.rev_clear(name, sync: sync)
             return update if !flag && env('NODE_UPDATE')
 
-            pnpm = pnpm?
-            yarn = pnpm ? 0 : dependtype(:yarn)
-            if @pm[:__] && !pnpm && yarn == 0
-              case @pm[:__]
-              when 'pnpm'
-                pnpm = true
-              when 'yarn'
-                yarn = 1
-              when 'berry'
-                yarn = 2
-              end
-            end
-            if yarn > 0
+            if (yarn = dependtype(:yarn)) > 0
               cmd = session 'yarn'
               if flag == :add
                 cmd << 'add'
@@ -453,7 +440,7 @@ module Squared
                 cmd << 'install'
                 cmd << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
               end
-            elsif pnpm
+            elsif pnpm?
               cmd = session 'pnpm'
               if flag == :add
                 cmd << 'add' << "--save-#{save}"
@@ -487,7 +474,7 @@ module Squared
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           dryrun = opts.include?('dry-run') || opts.include?('d')
-          if pnpm? && read_packagemanager(version: '7.15', update: true)
+          if pnpm?
             cmd = session 'pnpm', 'outdated'
             dryrun ||= dryrun?('pnpm')
           else
@@ -642,7 +629,7 @@ module Squared
               else
                 footer.call(0, found.size)
               end
-              commit(:add, refs: ['package.json'], pass: true)
+              commit(:add, ['package.json'], pass: true)
             end
           elsif !avail.empty?
             col1 = size_col.call(avail, 0) + 4
@@ -888,45 +875,32 @@ module Squared
 
         def yarn?
           (@pm[:yarn] ||= if rootpath('yarn.lock', ascend: dependext).exist?
-                            if (rc = rootpath('.yarnrc.yml', ascend: dependext)).exist?
-                              begin
-                                require 'yaml'
-                                doc = YAML.load_file(rc)
-                                doc.nodeLinker == 'node-modules' ? 2 : 3
-                              rescue StandardError => e
-                                log.debug e
-                                3
-                              end
+                            yarntype
+                          elsif (ver = read_packagemanager || read_install)
+                            if ver =~ /^yarn(?:@(\d)|$)/
+                              $1 && $1.to_i > 1 ? yarntype : 1
                             else
-                              1
+                              0
                             end
-                          elsif (ver = read_packagemanager || read_install)&.start_with?('yarn')
-                            ver == 'yarn' || ver.include?('@1') ? 1 : 3
                           else
-                            0
+                            case @pm[:__]
+                            when 'yarn'
+                              1
+                            when 'berry'
+                              yarntype
+                            else
+                              0
+                            end
                           end) > 0
         end
 
         def pnpm?
           (@pm[:pnpm] ||= if rootpath('pnpm-lock.yaml', ascend: dependext).exist?
-                            begin
-                              require 'yaml'
-                              doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: dependext))
-                              @pm[:_] = doc['packageManager']
-                              case doc['nodeLinker']
-                              when 'hoisted'
-                                1
-                              when 'pnp'
-                                3
-                              else
-                                4
-                              end
-                            rescue StandardError => e
-                              log.debug e
-                              4
-                            end
+                            pnpmtype
+                          elsif (ver = read_packagemanager || read_install)
+                            ver.start_with?('pnpm') ? pnpmtype : 0
                           else
-                            (read_packagemanager || read_install)&.start_with?('pnpm') ? 4 : 0
+                            @pm[:__] == 'pnpm' ? pnpmtype : 0
                           end) > 0
         end
 
@@ -976,14 +950,17 @@ module Squared
         private
 
         def read_packagemanager(key = nil, version: nil, update: false)
-          if @pm[:_].nil? || update
+          if (key ? !@pm.key?(key) : @pm[:_].nil?) || update
             doc = JSON.parse(dependfile.read)
-            @pm[:_] = (val = doc['packageManager']) ? val[0, val.index('+') || val.size] : false
-            @pm[:name] = doc['name']
-            @pm[:scripts] = doc['scripts']
-            @pm[:version] = doc['version']
-            @pm[:private] = doc['private']
-            @pm[:workspaces] = doc['workspaces']
+            if @pm[:_].nil?
+              @pm[:_] = (val = doc['packageManager']) ? val[0, val.index('+') || val.size] : false
+              @pm[:name] = doc['name']
+              @pm[:scripts] = doc['scripts']
+              @pm[:version] = doc['version']
+              @pm[:private] = doc['private']
+              @pm[:workspaces] = doc['workspaces']
+            end
+            @pm[key] = doc[key.to_s] if key
           end
         rescue StandardError => e
           log.debug e
@@ -1000,10 +977,67 @@ module Squared
         def read_install
           return unless (ret = env('NODE_INSTALL'))
 
-          @pm[:_] ||= ret if ret.include?('@')
+          if ret.include?(',')
+            catch :found do
+              split_escape(ret).each do |val|
+                case val
+                when /^yarn/
+                  next if yarntype(exist: true) == 0
+                when /^pnpm/
+                  next if pnpmtype(exist: true) == 0
+                when /^npm/
+                  nil
+                else
+                  next
+                end
+                ret = val
+                throw :found
+              end
+              return
+            end
+          end
+          @pm[:_] ||= ret
           ret
         end
 
+        def yarntype(exist: false)
+          if (rc = rootpath('.yarnrc.yml', ascend: dependext)).exist?
+            require 'yaml'
+            doc = YAML.load_file(rc)
+            doc.nodeLinker == 'node-modules' ? 2 : 3
+          elsif exist && !basepath('yarn.lock').exist?
+            0
+          else
+            1
+          end
+        rescue StandardError => e
+          return 0 if exist
+
+          log.debug e
+          3
+        end
+
+        def pnpmtype(exist: false)
+          require 'yaml'
+          doc = YAML.load_file(basepath('node_modules/.modules.yaml', ascend: dependext))
+          @pm['packageManager'] = doc['packageManager']
+          case doc['nodeLinker']
+          when 'hoisted'
+            1
+          when 'pnp'
+            3
+          else
+            4
+          end
+        rescue StandardError => e
+          if exist
+            %w[pnpm-lock.yaml pnpm-workspace.yaml].any? { |val| basepath(val).exist? } ? 4 : 0
+          else
+            log.debug e
+            4
+          end
+        end
+
         def append_loglevel(target: @session)
           level = env('NODE_LOGLEVEL')
           silent = !verbose || level == 'silent'

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

@@ -372,7 +372,7 @@ module Squared
           end
         end
 
-        def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated'))
+        def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = pip_session 'list --outdated'
           append_global
           cmd = session_done cmd

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

@@ -279,7 +279,13 @@ module Squared
           elsif outdated?
             workspace.rev_clear(name, sync: sync)
             cmd = bundle_session 'install'
-            cmd << '--without=development' if prod?
+            if prod? && !config_get('without')
+              if RUBY_VERSION > '3'
+                config_set 'without', 'development'
+              else
+                cmd << '--without=development'
+              end
+            end
             if (n = option('jobs')).to_i > 0
               cmd << "-j#{n}"
             end
@@ -312,7 +318,7 @@ module Squared
             c = glob[i] || glob.first
             log.info "cp #{a + c} #{b}"
             begin
-              copy_dir(a, b, c, pass: pass, verbose: verbose)
+              copy_dir(a, b, c, pass: pass, verbose: verbosetype > 0)
             rescue StandardError => e
               on_error e, :copy
             end
@@ -528,7 +534,9 @@ module Squared
                                    if @asdf
                                      cmd = 'asdf'
                                      ver = '.tool-versions'
-                                     `asdf current #{@asdf.first}`[/\A\S+\s+\S+/, 0].sub(/\s+/, ' ')
+                                     opt = [@asdf.first]
+                                     opt.unshift('--no-header') unless @@asdf[1] == 15
+                                     `asdf current #{opt.join(' ')}`[/^\S+\s+\S+/, 0].sub(/\s+/, ' ')
                                    else
                                      ver = nil
                                      `ruby --version`
@@ -916,7 +924,7 @@ module Squared
             pwd_set(pass: !opt.nil?) do
               out = `#{gem_output(opt, 'list --local -d', gemname)}`
               if out =~ /#{Regexp.escape(gemname)} \(([^)]+)\)/
-                $1.split(/\s*,\s*/)
+                split_escape($1)
                   .prepend(version)
                   .uniq
                   .each do |val|
@@ -1023,6 +1031,28 @@ module Squared
           session_output('rake', *cmd, **kwargs)
         end
 
+        def config_get(key)
+          ret = if pwd_set { `#{bundle_output('config get --parseable', key)}` } =~ /\A([^=]+)=(.*)\z/ && $1 == key
+                  $2.chomp
+                end
+          case ret
+          when 'true'
+            true
+          when '', '[]'
+            nil
+          else
+            if ret =~ /\A\[:(.+)\]\z/
+              $1.split(', :').map! { |val| ((val.delete_prefix!('"') && val.delete_suffix!('"')) || val).to_sym }
+            else
+              ret || false
+            end
+          end
+        end
+
+        def config_set(key, *val)
+          run(bundle_output('config set', key, *val), banner: false, series: false)
+        end
+
         def preopts
           verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
         end

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

@@ -10,9 +10,10 @@ module Squared
           include Common::Shell
           extend Forwardable
 
+          OPT_NAME = /\A(?:(--)|-)((?(1)[A-Za-z\d]+|[A-Za-z\d]))\z/
           OPT_VALUE = /\A-{0,2}([^= ]+)(?: *= *| +)(.+)\z/
           OPT_SINGLE = /\A-([A-Za-z\d])(.+)\z/
-          private_constant :OPT_VALUE, :OPT_SINGLE
+          private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
           class << self
             include Common::Format
@@ -70,8 +71,8 @@ module Squared
             def strip(val)
               return [] unless val
 
-              val = shell_split(val) if val.is_a?(String)
-              val.map { |s| s.sub(OPT_SINGLE, '\1=\2').sub(OPT_VALUE, '\1=\2') }.reject(&:empty?)
+              val = shell_split val if val.is_a?(String)
+              val.map { |s| s.sub(OPT_SINGLE, '\1=\2').sub(OPT_VALUE, '\1=\2').sub(OPT_NAME, '\2') }.reject(&:empty?)
             end
 
             def select(list, bare: true, no: true, single: false, double: false)
@@ -247,9 +248,9 @@ module Squared
                     add quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key)
                     if val.match?(/\A(["']).+\1\z/)
-                      add shell_option(key, val, escape: false, merge: merge, sep: sep)
+                      add shell_option(key, val, escape: false, merge: merge)
                     elsif path
-                      add quote_option(key, path + val, merge: merge, sep: sep)
+                      add quote_option(key, path + val, merge: merge)
                     else
                       push opt
                     end
@@ -414,7 +415,7 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
-            merge(args.map! { |val| shell_quote(val, **kwargs) })
+            merge(args.compact.map! { |val| val == '--' ? val : shell_quote(val, **kwargs) })
             self
           end
 

data/lib/squared/workspace/repo.rb

@@ -132,19 +132,20 @@ module Squared
           task 'all' do |_, args|
             stage ||= 'all'
             ns['sync'].invoke(*args.to_a)
-            next if env('REPO_STAGE', equals: '1')
+            next if (stage = env('REPO_STAGE')) == '1'
 
             @project.select do |_, proj|
-              next unless proj.enabled?(proj.workspace.baseref)
+              next unless proj.enabled?(proj.workspace.baseref) && proj.global
 
               proj.depend(sync: true) if proj.depend?
-              next if env('REPO_STAGE', equals: '2')
+              next if stage == '2'
 
               proj.build?
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next unless proj.dev? && proj.copy? && !env('REPO_STAGE', equals: '3')
+              next if stage == '3'
+              next unless proj.copy? && (proj.dev? || stage == '4')
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)