squared 0.7.13 → 0.8.0

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

@@ -16,19 +16,19 @@ module Squared
                       cgroup-parent=b iidfile=p label=q network=b no-cache-filter=b o|output=q platform=q
                       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=qq call=b? f|file=p metadata-file=p progress=b provenance=b?
-                       sbom=b?].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[1 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=b].freeze,
+            common: %w[all-resources ansi=b compatibility dry-run 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 print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
                       provenance=q sbom=q ssh=qq].freeze,
             create: %w[build force-recreate no-build no-recreate quiet-pull remove-orphans y|yes pull=b scale=i].freeze,
-            exec: %w[d|detach privileged e|env=qq index=i T|no-tty=!? user=b w|workdir=q].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 entrypoint=q e|env=qq env-from-file=p i|interactive=b? l|label=q name=b
-                    T|no-tty=!? p|publish=q pull=b u|user=b v|volume=qq w|workdir=q].freeze,
+                    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
@@ -38,9 +38,9 @@ module Squared
           }.freeze,
           container: {
             create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
-                       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
+                       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
                        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 hostname=q io-maxbandwidth=b io-maxiops=b ip=b ip6=q ipc=b
@@ -48,24 +48,23 @@ module Squared
                        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=q 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=qq volume-driver=b volumes-from=b w|workdir=q].freeze,
+                       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,
             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=n pids-limit=n
                        restart=q].freeze,
-            exec: %w[d|detach i|interactive privileged t|tty=!? detach-keys=q e|env=qq env-file=p u|user=b
+            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p u|user=e
                      w|workdir=q].freeze,
-            rm: %w[f|force l|link v|volumes].freeze,
             commit: %w[no-pause 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|timeout=i].freeze,
             restart: %w[s|signal=b t|timeout=i].freeze,
             kill: %w[s|signal=b].freeze,
-            stats: %w[a|all no-stream no-trunc format|q].freeze
+            stats: %w[a|all no-stream no-trunc format|q].freeze,
+            attach: %w[no-stdin detach-keys=q sig-proxy=!?].freeze
           }.freeze,
           image: {
-            inspect: %w[f|format platform=q].freeze,
             ls: %w[a|all digests no-trunc q|quiet tree f|filter=q format=q].freeze,
             pull: %w[a|all-tags platform=q q|quiet].freeze,
             push: %w[a|all-tags platform=q q|quiet].freeze,
@@ -82,10 +81,10 @@ module Squared
         VAL_DOCKER = {
           run: {
             common: %w[source src destination dst target readonly ro].freeze,
-            bind: %w[bind-create-src bind-propagation].freeze,
+            bind: %w[bind-propagation].freeze,
             volume: %w[volume-subpath volume-nocopy volume-opt].freeze,
             tmpfs: %w[tmpfs-size tmpfs-mode].freeze,
-            image: %w[image-subpath].freeze
+            image: %w[image-path].freeze
           }.freeze,
           ls: {
             compose: %w[Name Image Command Service RunningFor Status Ports CreatedAt ExitCode Health ID Labels
@@ -115,9 +114,9 @@ module Squared
           'build' => %i[tag context].freeze,
           'compose' => %i[build create publish run exec up down service].freeze,
           'bake' => %i[build compose check].freeze,
-          'image' => %i[ls rm pull push tag save inspect].freeze,
-          'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
-                            rm].freeze,
+          'image' => %i[ls rm pull push tag save].freeze,
+          'container' => %i[attach commit create diff exec inspect kill pause restart rm run start stats stop top
+                            unpause update].freeze,
           'network' => %i[connect disconnect create].freeze,
           'ls' => nil
         })
@@ -167,7 +166,7 @@ module Squared
                                                  when 'compose'
                                                    'ps'
                                                  else
-                                                   raise_error ArgumentError, 'unrecognized command', hint: command
+                                                   raise ArgumentError, message('unrecognized command', hint: command)
                                                  end
                     cmd << '-a' if has_value!(args, 'a', 'all') && command != 'network'
                     data = VAL_DOCKER[:ls][command.to_sym]
@@ -228,19 +227,20 @@ module Squared
                         format_desc action, flag, "service/:,command#{'?' unless flag == :exec}/::,args*,opts*"
                         task flag, [:service] do |_, args|
                           service = param_guard(action, flag, args: args, key: :service)
-                          compose!(flag, args.extras, service: service)
+                          compose_(flag, args.extras, service: service)
                         end
                       when :service
                         cmds = %w[down kill pause restart rm start stop top unpause watch].freeze
                         format_desc(action, flag, cmds, arg: nil, after: 'name+|:')
                         task flag, [:command] do |_, args|
-                          command = param_guard(action, flag, args: args, key: :command)
-                          raise_error ArgumentError, 'unrecognized command', hint: command unless cmds.include?(command)
+                          cmd = param_guard(action, flag, args: args, key: :command)
+                          raise ArgumentError, message('unrecognized command', hint: cmd) unless cmds.include?(cmd)
+
                           service = args.extras
                           if service.first == ':'
-                            choice_command flag, command
+                            choice_command flag, cmd
                           else
-                            compose!(flag, [command], service: service.empty? || service)
+                            compose_(flag, [cmd], service: service.empty? || service)
                           end
                         end
                       when :publish
@@ -248,12 +248,12 @@ module Squared
 
                         format_desc action, flag, 'tag?,repository?,opts*'
                         task flag, [:tag] do |_, args|
-                          compose! flag, args.to_a
+                          compose_ flag, args.to_a
                         end
                       else
                         format_desc action, flag, 'opts*,service*|:'
                         task flag do |_, args|
-                          compose!(flag, args.to_a, multiple: true)
+                          compose_(flag, args.to_a, multiple: true)
                         end
                       end
                     when 'container'
@@ -278,7 +278,7 @@ module Squared
                           end
                         end
                       else
-                        format_desc action, flag, "opts*,id/name#{flag == :update || flag == :inspect ? '+' : '*'}"
+                        format_desc action, flag, "opts*,id/name#{flag == :update ? '+' : '*'}"
                         task flag do |_, args|
                           container flag, args.to_a
                         end
@@ -289,7 +289,7 @@ module Squared
                         next unless @registry
 
                         format_desc action, flag, 'tag?,registry/username?,opts*'
-                        task flag do |_, args|
+                        task flag, [:tag] do |_, args|
                           image flag, args.to_a
                         end
                       when :pull
@@ -298,11 +298,6 @@ module Squared
                           id = param_guard(action, flag, args: args, key: :tag)
                           image(flag, args.extras, id: id)
                         end
-                      when :inspect
-                        format_desc action, flag, 'opts*,id+'
-                        task flag do |_, args|
-                          image flag, args.to_a
-                        end
                       else
                         format_desc(action, flag, case flag
                                                   when :rm, :save then 'id,opts*'
@@ -406,15 +401,15 @@ module Squared
         end
 
         def buildx(flag, opts = [], tag: nil, context: nil, from: nil)
-          bx = OPT_DOCKER[:buildx]
           if flag == :bake && context&.match?(%r{^["']?(https?|git)://}i)
-            shared = bx[:shared].dup.push('f|file=q')
+            shared = data[:shared].dup.push('f|file=q')
             shared.delete('f|file=p')
           end
           cmd, opts = docker_session('buildx', opts: opts)
-          op = OptionPartition.new(opts, bx[:common], cmd, project: self, strict: strict?)
+          data = OPT_DOCKER[:buildx]
+          op = OptionPartition.new(opts, data[:common], cmd, project: self, strict: strict?)
           op.append(flag, quote: false)
-            .parse(bx[flag == :bake ? :bake : :build] + (shared || bx[:shared]))
+            .parse(data[flag == :bake ? :bake : :build] + (shared || data[:shared]))
           case flag
           when :build, :context
             append_tag(tag || option('tag', ignore: false) || self.tag)
@@ -425,10 +420,6 @@ module Squared
             end
           when :bake
             append_file(0, index: 3) unless from || op.arg?('f', 'file') || !anypath?(*COMPOSEFILE)
-            if op.first == '-'
-              op.shift
-              op << @output[4] if @output[4]
-            end
             unless op.empty?
               if !context && op.size > 1 && exist?(op.last, type: 'd')
                 pat = /\btarget\s+"#{Regexp.escape(op.last)}"/
@@ -445,7 +436,7 @@ module Squared
           run(from: from || symjoin('buildx', flag))
         end
 
-        def compose!(flag, opts = [], id: nil, service: nil, multiple: false)
+        def compose_(flag, opts = [], id: nil, service: nil, multiple: false)
           from = symjoin 'compose', flag
           if flag == :service
             command = opts.first
@@ -459,11 +450,10 @@ module Squared
             docker_session('compose', command, '--', *service)
           else
             cmd, opts = docker_session('compose', opts: opts)
-            cp = OPT_DOCKER[:compose]
-            op = OptionPartition.new(opts, cp[:common], cmd, project: self, strict: strict?)
+            op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self, strict: strict?)
             append_file(filetype, force: flag == :publish) unless op.arg?('f', 'file')
             op << flag
-            op.parse(cp.fetch(flag, []))
+            op.parse(OPT_DOCKER[:compose].fetch(flag, []))
             if flag == :publish
               id ||= option('tag', ignore: false) || op.shift || tagmain
               registry ||= option('registry') || op.shift || @oci
@@ -483,22 +473,21 @@ module Squared
                 op.concat(service) if service
                 op.append(delim: true, escape: true, strip: /^:/)
               else
-                raise_error ArgumentError, 'no service was selected', hint: flag unless service
+                raise ArgumentError, message('no service was selected', hint: flag) unless service
+
                 append_command(flag, service, op.extras, prompt: '::')
               end
             end
           end
           run(from: from)
         end
-        alias compose_ compose!
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
-          rc = flag == :run
-          ct = OPT_DOCKER[:container]
-          list = ct.fetch(flag, [])
-          list += ct[:create] if rc
-          list += ct[:update] if rc ||= flag == :create
+          data = OPT_DOCKER[:container]
+          list = data.fetch(flag, [])
+          list += data[:create] if (rc = flag == :run)
+          list += data[:update] if rc ||= flag == :create
           op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, args: rc || flag == :exec)
           from = symjoin 'container', flag
           case flag
@@ -515,7 +504,7 @@ module Squared
                     when 'bind', 'volume', 'image', 'tmpfs'
                       type = v
                     else
-                      raise_error TypeError, "unknown: #{v || "''"}", hint: flag
+                      raise TypeError, message('unknown', v || "''", hint: flag)
                     end
                   elsif all.include?(k)
                     unless type
@@ -527,43 +516,34 @@ module Squared
                       end
                     end
                     case k
-                    when 'readonly', 'ro', 'volume-nocopy', 'bind-create-src'
-                      out << k if %w[bind volume].include?(type)
+                    when 'readonly', 'ro'
+                      out << k
                       next
-                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-subpath'
-                      raise_error ArgumentError, "no path value: #{k}", hint: flag unless v
-                      case k
-                      when 'source', 'src'
-                        if type == 'bind'
-                          v = basepath v
-                        elsif type == 'tmpfs'
-                          next
-                        end
-                      when 'destination', 'dst', 'target'
-                        unless v.start_with?('/')
-                          print_error(Logger::ERROR, "path is not absolute: #{v}", subject: from, hint: k)
-                          next
-                        end
-                      end
+                    when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
+                      raise ArgumentError, message('no path value', k, hint: flag) unless v
+
+                      v = basepath v
                       v = shell_quote(v, option: false, force: false) if q == ''
                     end
                     out << "#{k}=#{q}#{v}#{q}"
                   elsif !silent?
-                    puts log_message('unrecognized option', subject: from, hint: k)
+                    log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
-                raise_error TypeError, 'none specified', hint: flag unless type
-                op << "--mount type=#{type},#{args.join(',')}"
+                raise TypeError, message('none specified', hint: flag) unless type
+
+                cmd << "--mount type=#{type},#{args.join(',')}"
               end
             end
             append_command(flag, id || tagmain, op.extras)
           when :update
-            raise_error ArgumentError, 'missing container', hint: flag if op.empty?
+            raise ArgumentError, message('missing container', hint: flag) if op.empty?
+
             op.append(escape: true, strip: /^:/)
           when :commit
             latest = op.shift || tagmain
-            op << id << latest
-            raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag unless op.empty?
+            cmd << id << latest
+            raise ArgumentError, message('unrecognized args', op.join(', '), hint: flag) unless op.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
 
             registry = option('registry') || @registry
@@ -583,8 +563,10 @@ module Squared
           else
             if op.empty?
               ps, status, no = filter_ps flag, from
-              op << '--no-stream' if flag == :stats
-              list_image(flag, ps, no: no, hint: status, from: from) { |img| run(cmd.temp(img), from: from) }
+              cmd << '--no-stream' if flag == :stats
+              list_image(flag, ps, no: no, hint: status, multiple: flag != :attach, from: from) do |img|
+                run(cmd.temp(img), from: from)
+              end
               return
             end
             op.append(escape: true, strip: /^:/)
@@ -645,7 +627,7 @@ module Squared
                 break
               end
             end
-            raise_error ArgumentError, 'target not specified', hint: flag unless found
+            raise ArgumentError, message('target not specified', hint: flag) unless found
           when :pull
             if !id
               id = tagmain
@@ -656,24 +638,22 @@ module Squared
               registry = op.shift
               registry ||= option('registry') || @registry unless id.include?('/')
             end
-            op << shell_quote(tagjoin(registry, id))
+            cmd << shell_quote(tagjoin(registry, id))
           when :push
             id ||= option('tag', ignore: false) || op.shift || tagmain
             registry ||= option('registry') || op.shift || @registry
             emptyargs op, flag
-            raise_error ArgumentError, 'username/registry not specified', hint: flag unless registry
+            raise ArgumentError, message('username/registry not specified', hint: flag) unless registry
+
             uri = shell_quote tagjoin(registry, id)
             op << uri
-            img = docker_output 'image tag', id, uri
+            img = docker_output 'image', 'tag', id, uri
             return unless confirm_command(img.to_s, cmd.to_s, target: id, as: registry, title: from)
 
             @session = img
             sync = false
             exception ||= true
             banner = false
-          when :inspect
-            raise_error ArgumentError, 'missing image', hint: flag if op.empty?
-            op.append(escape: true, strip: /^:/)
           end
           success?(run(sync: sync, exception: exception, banner: banner, from: from), flag == :tag || flag == :save)
         end
@@ -755,36 +735,22 @@ module Squared
           session('docker', *cmd, main: false, options: false, **kwargs)
         end
 
-        def append_command(flag, id, list, target: @session, prompt: ':')
-          if list.delete(prompt)
-            list << readline('Enter command [args]', force: flag == :exec)
-          elsif (val = env('DOCKER_ARGS'))
-            list << val
-          end
+        def append_command(flag, val, list, target: @session, prompt: ':')
+          list << if list.delete(prompt)
+                    readline('Enter command [args]', force: flag == :exec)
+                  else
+                    env('DOCKER_ARGS')
+                  end
           case flag
           when :run
             unless session_arg?('name', target: target)
               target << basic_option('name', dnsname("#{name}_%s" % rand_s(6)))
             end
           when :exec
-            raise_error ArgumentError, 'nothing to execute', hint: flag if list.empty?
-          end
-          target << id
-          case list.first
-          when '--'
-            target.merge(list.drop(1))
-          when /\A(--|&&)(\s|\z)/
-            target.merge(list)
-          else
-            target << list.shift
-            unless list.empty?
-              if list.first.start_with?('-')
-                target.merge(list)
-              else
-                target << list.join(' && ')
-              end
-            end
+            raise ArgumentError, message('nothing to execute', hint: flag) if list.empty?
           end
+          target << val << list.shift
+          target << list.join(' && ') unless list.empty?
         end
 
         def append_file(type, target: @session, index: 2, force: false)
@@ -835,7 +801,7 @@ module Squared
                      %w[running paused exited]
                    when :unpause
                      %w[paused]
-                   when :top, :stats, :watch
+                   when :top, :stats, :watch, :attach
                      %w[running]
                    when :kill
                      no = true
@@ -851,19 +817,20 @@ module Squared
           [cmd, status, no]
         end
 
-        def list_image(flag, cmd = docker_output('image ls -a'), filter: nil, hint: nil, no: true, from: nil)
+        def list_image(flag, cmd = docker_output('image ls -a'), filter: nil, hint: nil, no: true, multiple: true,
+                       from: nil)
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
-            y = from.to_s.end_with?(':rm') && option('y', prefix: 'docker')
+            y = from == :'image:rm' && option('y', prefix: 'docker')
             filter = env('DOCKER_FILTER', filter).to_s
             pat = if OptionPartition.pattern?(filter)
                     Regexp.new(filter)
                   elsif filter.match?(/[:_-]$/)
                     /\b#{Regexp.escape(filter)}/
                   else
-                    filter = filter.empty? ? '(?:[:_-]|$)' : "[:_-]#{filter}"
-                    /\b(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})#{filter}/
+                    filter = filter.empty? ? '([:_-]|$)' : "[:_-]#{filter}"
+                    /\b(#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})#{filter}/
                   end
             IO.popen(cmd.temp('--format=json')).each do |line|
               data = JSON.parse(line)
@@ -910,6 +877,7 @@ module Squared
                 puts if printfirst?
               end
               yield id
+              break unless multiple
             end
             list_empty(hint: hint || from) if index == 1 && !y
           end
@@ -996,7 +964,7 @@ module Squared
           end
           cmd.merge(Array(out).map { |val| val.split(/\s+/, 2).first })
           cmd << args
-          success?(run(cmd, { 'NO_COLOR' => 'true' }), ctx.start_with?('network', 'tag', 'save'))
+          success?(run(cmd), ctx.start_with?('network', 'tag', 'save'))
         end
 
         def filetype(val = dockerfile)
@@ -1043,7 +1011,7 @@ module Squared
         end
 
         def emptyargs(list, hint = nil)
-          raise_error ArgumentError, "unrecognized args: #{list.join(', ')}", hint: hint unless list.empty?
+          raise ArgumentError, message('unrecognized args', list.join(', '), hint: hint) unless list.empty?
         end
 
         def anypath?(*args)