squared 0.8.3 → 0.8.4

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

@@ -21,14 +21,14 @@ module Squared
           }.freeze,
           compose: {
             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,
+                       project-directory=p p|project-name=b].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=b? user=e w|workdir=q].freeze,
+            exec: %w[d|detach privileged e|env=qq index=i T|no-tty user=b 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=b? p|publish=q pull=b u|user=e v|volume=q w|workdir=q].freeze,
+                    T|no-tty p|publish=q pull=b u|user=b v|volume=qq 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
@@ -39,9 +39,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
@@ -49,13 +49,14 @@ 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=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+                       ulimit=q u|user=b userns=b uts=b v|volume=qq 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=e
+            exec: %w[d|detach i|interactive privileged t|tty detach-keys=q e|env=qq env-file=p u|user=b
                      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].freeze,
             logs: %w[details f|follow t|timestamps since=q n|tail=b until=q].freeze,
             inspect: %w[s|size f|format=q].freeze,
@@ -64,12 +65,12 @@ module Squared
             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,
-            attach: %w[no-stdin detach-keys=q sig-proxy=!?].freeze
+            attach: %w[no-stdin detach-keys=q sig-proxy].freeze
           }.freeze,
           image: {
             common: %w[platform=q].freeze,
             inspect: %w[f|format].freeze,
-            history: %w[f|format no-trunc q|quiet H|human=!?].freeze,
+            history: %w[f|format no-trunc q|quiet H|human].freeze,
             ls: %w[a|all digests no-trunc q|quiet tree f|filter=q format=q].freeze,
             pull: %w[a|all-tags q|quiet].freeze,
             push: %w[a|all-tags q|quiet].freeze,
@@ -108,6 +109,10 @@ module Squared
             [].freeze
           end
 
+          def bannerargs
+            %i[context registry tag].freeze
+          end
+
           def config?(val)
             return false unless (val = as_path(val))
 
@@ -120,43 +125,40 @@ module Squared
           'compose' => %i[build create publish run exec up down logs service].freeze,
           'bake' => %i[build compose check].freeze,
           'image' => %i[ls rm pull push tag save inspect history].freeze,
-          'container' => %i[attach commit create diff exec logs top inspect kill pause restart rm run start stats stop
+          'container' => %i[attach commit create diff exec inspect kill logs pause restart rm run start stats stop top
                             unpause update].freeze,
           'network' => %i[connect disconnect create].freeze,
           'ls' => nil
         })
 
         attr_reader :context
-        attr_accessor :tag
+        attr_accessor :registry, :tag
 
-        def initialize(*, client: nil, mounts: [], **kwargs)
+        def initialize(*, **kwargs)
           super
           self.global = nil
           return unless dockerfile(kwargs[:file]).exist?
 
-          @tag = kwargs[:tag] || tagname("#{@project}:#{@version || 'latest'}")
+          @tag = env('TAG', strict: true,
+                            ignore: false) || kwargs[:tag] || tagname(@project, @version || 'latest')
           @context = kwargs[:context]
-          @client = if client
-                      opts = []
-                      client.each do |key, val|
-                        val = case (key = key.to_s)
-                              when 'config'
-                                basepath!(val, type: 'd')
-                              when 'tlscacert', 'tlscert', 'tlskey'
-                                basepath!(val, type: 'f')
-                              when 'context', 'host', 'log-level'
-                                quote_option(key, val)
-                              when 'debug', 'tls', 'tlsverify'
-                                opts << key
-                                next
-                              end
-                        opts << quote_option(key, val) if val
-                      end
-                      opts unless opts.empty?
-                    end
-          @mounts = mounts
+          @client = kwargs[:client]&.each_with_object([]) do |(key, val), out|
+            val = case (key = key.to_s)
+                  when 'config'
+                    basepath!(val, type: 'd')
+                  when 'tlscacert', 'tlscert', 'tlskey'
+                    basepath!(val, type: 'f')
+                  when 'context', 'host', 'log-level'
+                    quote_option(key, val)
+                  when 'debug', 'tls', 'tlsverify'
+                    out << key
+                    next
+                  end
+            out << quote_option(key, val) if val
+          end
+          @mounts = Array(kwargs[:mounts])
           @secrets = kwargs[:secrets]
-          @registry = tagjoin kwargs[:registry], kwargs[:username]
+          self.registry = tagjoin kwargs[:registry], kwargs[:username]
           @oci = tagjoin kwargs[:oci], kwargs[:username]
           initialize_ref Docker.ref
           initialize_logger kwargs[:log]
@@ -229,7 +231,7 @@ module Squared
                         format_desc action, flag, 'opts*,target*,context?|:'
                         task flag do |_, args|
                           args = args.to_a
-                          if args.first == ':'
+                          if choice!(args)
                             choice_command :bake
                           else
                             buildx(:bake, args, from: (:'buildx:bake' if flag == :compose))
@@ -253,14 +255,14 @@ module Squared
                           compose_(flag, args.extras, service: service)
                         end
                       when :service
-                        cmds = %w[down kill pause restart rm start stop top unpause watch].freeze
+                        cmds = %w[down kill logs pause restart rm start stop top unpause watch].freeze
                         format_desc(action, flag, cmds, arg: nil, after: 'name+|:')
                         task flag, [:command] do |_, args|
                           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 == ':'
+                          if choice!(service)
                             choice_command flag, cmd
                           else
                             compose_(flag, [cmd], service: service.empty? || service)
@@ -313,11 +315,13 @@ module Squared
                     when 'image'
                       case flag
                       when :push
-                        next unless @registry
-
-                        format_desc action, flag, 'tag?,registry/username?,opts*'
+                        format_desc action, flag, 'tag?,registry/username?|:,opts*'
                         task flag do |_, args|
-                          image flag, args.to_a
+                          args = args.to_a
+                          if choice!(args, first: false) || !self.registry
+                            registry = readline('Enter registry/username', force: true)
+                          end
+                          image(flag, args, id: id, registry: registry)
                         end
                       when :pull
                         format_desc action, flag, 'tag,registry/username?,opts*'
@@ -423,11 +427,7 @@ module Squared
             else
               ret.merge(Array(@secrets).map { |arg| quote_option('secret', arg) })
             end
-            if (val = option('tag', ignore: false))
-              append_tag val
-            elsif !session_arg?('t', 'tag')
-              append_tag tag
-            end
+            append_tag option('tag', ignore: false) or session_arg?('t', 'tag') ? nil : tag
             append_context
           when :bake, :compose
             option(from == :bake ? 'target' : 'service', ignore: false) { |val| ret.merge(split_escape(val).quote!) }
@@ -436,15 +436,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 = data[:shared].dup.push('f|file=q')
+            shared = bx[:shared].dup.push('f|file=q')
             shared.delete('f|file=p')
           end
           cmd, opts = docker_session('buildx', opts: opts)
-          data = OPT_DOCKER[:buildx]
-          op = OptionPartition.new(opts, data[:common], cmd, project: self, strict: strict?)
+          op = OptionPartition.new(opts, bx[:common], cmd, **dockerinit)
           op.append(flag, quote: false)
-            .parse(data[flag == :bake ? :bake : :build] + (shared || data[:shared]))
+            .parse(bx[flag == :bake ? :bake : :build] + (shared || bx[:shared]))
           case flag
           when :build, :context
             append_tag tag || option('tag', ignore: false) || self.tag
@@ -455,6 +455,10 @@ 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)}"/
@@ -476,7 +480,7 @@ module Squared
           if flag == :service
             command = opts.first
             if service == true
-              cmd, status = filter_ps command, from
+              cmd, status = filter_ps(command, from: from)
               lines = IO.popen(cmd.temp('--services')).map(&:strip).reject(&:empty?)
               return list_empty(hint: status) if lines.empty?
 
@@ -485,10 +489,11 @@ module Squared
             docker_session('compose', command, '--', *service)
           else
             cmd, opts = docker_session('compose', opts: opts)
-            op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self, strict: strict?)
+            cp = OPT_DOCKER[:compose]
+            op = OptionPartition.new(opts, cp[:common], cmd, **dockerinit)
             append_file(filetype, force: flag == :publish) unless op.arg?('f', 'file')
             op << flag
-            op.parse(OPT_DOCKER[:compose].fetch(flag, []))
+            op.parse(cp.fetch(flag, []))
             if flag == :publish
               id ||= option('tag', ignore: false) || op.shift || tagmain
               registry ||= option('registry') || op.shift || @oci
@@ -519,18 +524,19 @@ module Squared
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
-          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)
+          rc = flag == :run
+          ct = OPT_DOCKER[:container]
+          list = ct.fetch(flag, [])
+          list += ct[:create] if rc
+          list += ct[:update] if rc ||= flag == :create
+          op = OptionPartition.new(opts, list, cmd, args: rc || flag == :exec, **dockerinit)
           from = symjoin 'container', flag
           case flag
           when :run, :create, :exec
             if rc && !op.arg?('mount')
               all = collect_hash VAL_DOCKER[:run]
               delim = Regexp.new(",\\s*(?=#{all.join('|')})")
-              Array(@mounts).each do |val|
+              @mounts.each do |val|
                 type = nil
                 args = val.split(delim).each_with_object([]) do |opt, out|
                   k, v, q = OptionPartition.parse_option(opt)
@@ -581,7 +587,7 @@ module Squared
             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
+            registry = option('registry') || self.registry
             run(from: from, exception: registry.nil? ? exception? : true)
             return unless registry
 
@@ -597,7 +603,7 @@ module Squared
             return image(:push, opts, id: latest, registry: registry)
           else
             if op.empty?
-              ps, status, no = filter_ps flag, from
+              ps, status, no = filter_ps(flag, 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)
@@ -621,9 +627,10 @@ module Squared
 
         def image(flag, opts = [], sync: true, id: nil, registry: nil, filter: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
-          list = OPT_DOCKER[:image].fetch(flag, [])
-          list += OPT_DOCKER[:image][:common] unless flag == :ls || flag == :tag
-          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?)
+          im = OPT_DOCKER[:image]
+          list = im.fetch(flag, [])
+          list += im[:common] unless flag == :ls || flag == :tag
+          op = OptionPartition.new(opts, list, cmd, **dockerinit)
           exception = exception?
           banner = true
           from = symjoin 'image', flag
@@ -640,11 +647,18 @@ module Squared
                 break
               end
               list_image(:run, filter: filter, from: from) do |val|
-                container(:run, if name
-                                  opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
-                                else
-                                  opts
-                                end, id: val)
+                args = if name
+                         opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
+                       elsif choice!(opts, only: true)
+                         OptionPartition.strip(readline('Enter arguments', force: false))
+                       else
+                         opts
+                       end
+                if args.none?(/^d(etach)?$/)
+                  Thread.new(args.dup, val) { |a, id| container(:run, a, id: id) }.join
+                  break
+                end
+                container(:run, args, id: val)
                 index += 1
               end
               return
@@ -670,7 +684,7 @@ module Squared
               op << val
               found = true
               if flag == :tag
-                op << tagname("#{project}:#{op.first}")
+                op << tagname(project, op.first)
                 break
               end
             end
@@ -679,27 +693,27 @@ module Squared
             if !id
               id = tagmain
             elsif !op.arg?('a', 'all-tags') && !id.include?(':')
-              id = "#{project}:#{id}"
+              id = tagname project, id
             end
             unless registry
               registry = op.shift
-              registry ||= option('registry') || @registry unless id.include?('/')
+              registry ||= option('registry') || self.registry unless id.include?('/')
             end
             cmd << shell_quote(tagjoin(registry, id))
           when :push
             id ||= option('tag', ignore: false) || op.shift || tagmain
-            registry ||= option('registry') || op.shift || @registry
+            registry ||= option('registry') || op.shift || self.registry
             emptyargs op, flag
             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
+            exception = true
             banner = false
           when :inspect, :history
             raise ArgumentError, message('missing image', hint: flag) if op.empty?
@@ -716,7 +730,7 @@ module Squared
 
         def network(flag, opts = [], target: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self, strict: strict?)
+          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, **dockerinit)
                               .clear
           from = symjoin 'network', flag
           if flag == :create
@@ -767,7 +781,7 @@ module Squared
 
         def read_composefile(*keys, target: nil)
           require 'yaml'
-          target = ENV['COMPOSE_FILE']&.split(workspace.windows? ? ';' : ':') unless target && !target.empty?
+          target = ENV['COMPOSE_FILE']&.split(windows? ? ';' : ':') unless target && !target.empty?
           Array(target || dockerfile).each do |val|
             doc = YAML.load_file(basepath(val))
             if keys.empty?
@@ -784,7 +798,7 @@ module Squared
           opts = OptionPartition.union(Array(opts), @client) if @client
           return session('docker', *cmd) unless opts
 
-          op = OptionPartition.new(opts, OPT_DOCKER[:common], project: self, strict: strict?)
+          op = OptionPartition.new(opts, OPT_DOCKER[:common], **dockerinit)
           [session('docker', *op.to_a, *cmd), op.extras]
         end
 
@@ -792,12 +806,12 @@ module Squared
           session('docker', *cmd, main: false, options: false, **kwargs)
         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
+        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
           case flag
           when :run
             unless session_arg?('name', target: target)
@@ -806,8 +820,22 @@ module Squared
           when :exec
             raise ArgumentError, message('nothing to execute', hint: flag) if list.empty?
           end
-          target << val << list.shift
-          target << list.join(' && ') unless list.empty?
+          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
+          end
         end
 
         def append_file(type, target: @session, index: 2, force: false)
@@ -839,13 +867,13 @@ module Squared
           else
             Array(val)
           end.each do |s|
-            s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
+            s = tagname s, ver if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
             target << basic_option('tag', tagname(s))
           end
           target
         end
 
-        def filter_ps(flag, from = :'container:ps')
+        def filter_ps(flag, meth = nil, from: meth || :'container:ps')
           no = false
           status = case flag.to_sym
                    when :start
@@ -879,7 +907,7 @@ module Squared
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
-            y = from == :'image:rm' && option('y', prefix: 'docker')
+            y = from.to_s.end_with?(':rm') && option('y', prefix: 'docker')
             filter = env('DOCKER_FILTER', filter).to_s
             pat = if OptionPartition.pattern?(filter)
                     Regexp.new(filter)
@@ -915,17 +943,17 @@ module Squared
                 puts unless index == 1
                 puts (h + sub_style(aa, theme[:subject])).subhint("created #{e} ago")
                 cols = %w[Tag Status Ports]
-                cols << case flag
-                        when :connect, :disconnect
-                          'Networks'
-                        else
-                          'Size'
-                        end
-                cols.each do |key|
-                  next if (key == 'Tag' && !dd) || (key == 'Size' && data[key] == '0B')
-
-                  puts "#{g + f} #{key}: #{Array(data[key]).join(', ')}" unless data[key].to_s.empty?
-                end
+                       .push(case flag
+                             when :connect, :disconnect
+                               'Networks'
+                             else
+                               'Size'
+                             end)
+                       .reject do |key|
+                         (key == 'Tag' && !dd) || (key == 'Size' && data[key] == '0B') || data[key].to_s.empty?
+                       end
+                pad = cols.map(&:size).max
+                cols.each { |key| puts "#{g + f} #{key.rjust(pad)}: #{Array(data[key]).join(', ')}" }
                 w = 9 + flag.to_s.size + 4 + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), theme[:inline])
                 index += 1
@@ -1008,7 +1036,7 @@ module Squared
           cmd = docker_output(ctx, *action)
           case flag
           when :tag
-            args = tagjoin @registry, tag
+            args = tagjoin registry, tag
           when :save
             opts = opts.sub_ext('.tar')
             cmd << quote_option('output', File.expand_path(opts))
@@ -1020,8 +1048,7 @@ module Squared
             cmd << opts << '--'
           end
           cmd.merge(Array(out).map { |val| val.split(/\s+/, 2).first })
-          cmd << args
-          success?(run(cmd), ctx.start_with?('network', 'tag', 'save'))
+          success?(run(cmd << args, { 'NO_COLOR' => 'true' }), ctx.start_with?('network', 'tag', 'save'))
         end
 
         def filetype(val = dockerfile)
@@ -1048,11 +1075,20 @@ module Squared
           args.map { |val| val.chomp(char) }.join(char) unless args.empty?
         end
 
-        def tagname(val)
-          val = val.split(':').map { |s| charname(s.sub(/^\W+/, '')) }
+        def tagname(*val, max: 128)
+          val = val.compact
+                   .join(':')
+                   .split(':')
+                   .map { |s| charname(s.sub(/^\W+/, '')) }
           ret = val.join(':')
-          ret = val.first if val.size > 1 && ret.size > 128
-          ret[0..127]
+          return ret unless ret.size > max
+
+          while val.size > 1
+            val.pop
+            s = val.join(':')
+            return s unless s.size > max
+          end
+          ret[0...max]
         end
 
         def dnsname(val)
@@ -1067,6 +1103,10 @@ module Squared
           tag.is_a?(Array) ? tag.first : tag
         end
 
+        def dockerinit
+          { project: self, strict: strict?, explicit: '=', bool: %w[true false 1 0] }
+        end
+
         def emptyargs(list, hint = nil)
           raise ArgumentError, message('unrecognized args', list.join(', '), hint: hint) unless list.empty?
         end