squared 0.4.8 → 0.4.10

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

@@ -4,8 +4,6 @@ module Squared
   module Workspace
     module Project
       class Docker < Base
-        include Prompt
-
         COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml compose.yml 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
@@ -37,15 +35,15 @@ module Squared
             run: %w[d|detach init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet
                     read-only rm runtime t|tty add-host=q annotation=q a|attach=b blkio-weight-device=i cap-add=b
                     cap-drop=b cgroup-parent=b cgroupns=b cidfile=p detach-keys=q 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 io-maxbandwidth=b
-                    io-maxiops=b 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 memory-swappiness=b mount=qq name=b network=b
-                    network-alias=b oom-score-adj=b pid=b platform=b p|publish=e pull=b restart=b runtime=b
-                    security-opt=q shm-size=b sig-proxy=b? stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q
-                    ulimit=q user=e userns=b uts=b v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
+                    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 io-maxbandwidth=b io-maxiops=b 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 memory-swappiness=b mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b
+                    platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b sig-proxy=b?
+                    stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q user=e userns=b uts=b
+                    v|volume=q volume-driver=b volumes-from=b w|workdir=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,
             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
@@ -163,7 +161,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
@@ -173,7 +171,7 @@ module Squared
                         end
                       end
                     when :run
-                      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)
@@ -198,14 +196,19 @@ module Squared
                     when :list, :rm
                       format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
                       task flag do |_, args|
-                        image flag, args.to_a
+                        args = args.to_a
+                        if flag == :rm && args.empty?
+                          choice_command :rm
+                        else
+                          image flag, args
+                        end
                       end
                     end
                   when 'network'
                     format_desc action, flag, 'target,opts*'
                     task flag, [:target] do |_, args|
-                      if (target = args.target)
-                        network(flag, args.extras, target: target)
+                      if args.target
+                        network(flag, args.extras, target: args.target)
                       else
                         choice_command flag
                       end
@@ -273,7 +276,6 @@ module Squared
             end
             if (val = option('tag', ignore: false))
               append_tag val
-              ret << basic_option('tag', tagname(val))
             elsif !session_arg?('t', 'tag')
               append_tag tag
             end
@@ -307,7 +309,7 @@ module Squared
                 end
               end
               op.append(args, escape: true)
-              contextdir(context) if context
+              contextdir context if context
             end
           end
           op.clear(pass: false)
@@ -333,7 +335,7 @@ module Squared
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
           list = OPT_DOCKER[:container].fetch(flag, [])
-          list.concat(OPT_DOCKER[:container][:update]) if flag == :run
+          list += OPT_DOCKER[:container][:update] if flag == :run
           op = OptionPartition.new(opts, list, cmd, project: self, args: flag == :run || flag == :exec)
           from = :"container:#{flag}"
           case flag
@@ -361,7 +363,7 @@ module Squared
                     args << k
                     next
                   when 'source', 'src', 'destination', 'dst', 'target'
-                    v = basepath(v)
+                    v = path + v
                     v = shell_quote(v, option: false, force: false) if q == ''
                     tmpfs = false if k[0] == 's'
                   end
@@ -420,7 +422,7 @@ module Squared
               when :rm
                 status = %w[created exited dead]
               end
-              ps = docker_output('ps -a', *status.map { |s| "--filter='status=#{s}'" })
+              ps = docker_output('ps -a', *status.map { |s| "--filter=\"status=#{s}\"" })
               list_image(flag, ps, no: no, hint: "status: #{status.join(', ')}", from: from) do |img|
                 run(cmd.temp(img), from: from)
               end
@@ -435,6 +437,8 @@ module Squared
         def image(flag, opts = [], sync: true, id: nil, registry: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:image][flag], cmd, project: self)
+          exception = @exception
+          banner = true
           from = :"image:#{flag}"
           case flag
           when :list
@@ -457,6 +461,10 @@ module Squared
           when :rm
             if id
               op << id
+              if option('y')
+                exception = false
+                banner = false
+              end
             else
               if op.empty?
                 list_image(flag, docker_output('image ls -a'), from: from) do |val|
@@ -478,9 +486,12 @@ module Squared
             img = docker_output 'image', 'tag', id, uri
             return unless confirm_command(img.to_s, cmd.to_s, target: id, as: registry, title: from)
 
-            run(img, exception: true, sync: false, banner: false)
+            cmd = img
+            sync = false
+            exception = true
+            banner = false
           end
-          run(sync: sync, from: from)
+          run(cmd, sync: sync, exception: exception, banner: banner, from: from)
         end
 
         def network(flag, opts = [], target: nil)
@@ -489,7 +500,7 @@ module Squared
           op.clear
           from = :"network:#{flag}"
           list_image(flag, docker_output('ps -a'), from: from) do |img|
-            puts 'Success' if run(cmd.temp(target, img), from: from) == true && stdout? && banner?
+            print_success if success?(run(cmd.temp(target, img), from: from))
           end
         end
 
@@ -537,8 +548,12 @@ module Squared
           case flag
           when :run
             unless session_arg?('name', target: target)
-              require 'random/formatter'
-              target << basic_option('name', dnsname("#{name}_#{Random.new.alphanumeric(6)}"))
+              target << basic_option('name', dnsname("#{name}_%s" % if RUBY_VERSION >= '3.1'
+                                                                      require 'random/formatter'
+                                                                      Random.new.alphanumeric(6)
+                                                                    else
+                                                                      (0...6).map { rand(97..122).chr }.join
+                                                                    end))
             end
           when :exec
             raise_error('no command args', hint: from) if list.empty?
@@ -550,7 +565,7 @@ module Squared
         def append_file(type, target: @session)
           return unless type == 2 || type == 4 || @file.is_a?(Array)
 
-          files = as_a(@file).map { |val| quote_option('file', basepath(val)) }
+          files = as_a(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
             target.merge(files)
           else
@@ -585,7 +600,9 @@ module Squared
           pwd_set do
             found = false
             index = 0
-            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':').first})(?:[_.,:-]|$)/
+            all = option('all', prefix: 'docker')
+            y = from == :'image:rm' && option('y', prefix: 'docker')
+            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})(?:[_.,:-]|$)/
             IO.popen(session_done(cmd << '--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']
@@ -598,41 +615,43 @@ module Squared
                                        id
                                      end)
               ee = data['Image'] || rt || aa
-              next unless option('all') || ee.match?(pat) || aa.match?(pat)
-
-              bb = index.succ.to_s
-              cc = bb.size + 1
-              a = sub_style(ee, styles: theme[:inline])
-              b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a}#{ee == id ? '' : " (#{id})"}"
-              c, d = no ? ['y/N', 'N'] : ['Y/n', 'Y']
-              e = time_format(time_since(data['CreatedAt']), pass: ['ms'])
-              f = sub_style(ARG[:BORDER][0], styles: theme[:inline])
-              g = ' ' * (cc + 1)
-              h = "#{sub_style(bb.rjust(cc), styles: theme[:current])} #{f} "
-              puts unless index == 0
-              puts "#{h + sub_style(aa, styles: theme[:subject])} (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')
+              next unless all || ee.match?(pat) || aa.match?(pat)
+
+              unless y
+                bb = index.succ.to_s
+                cc = bb.size + 1
+                a = sub_style(ee, styles: theme[:inline])
+                b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a}#{ee == id ? '' : " (#{id})"}"
+                c, d = no ? ['y/N', 'N'] : ['Y/n', 'Y']
+                e = time_format(time_since(data['CreatedAt']), pass: ['ms'])
+                f = sub_style(ARG[:BORDER][0], styles: theme[:inline])
+                g = ' ' * (cc + 1)
+                h = "#{sub_style(bb.rjust(cc), styles: theme[:current])} #{f} "
+                puts unless index == 0
+                puts "#{h + sub_style(aa, styles: theme[:subject])} (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}: #{as_a(data[key]).join(', ')}" unless data[key].to_s.empty?
-              end
-              w = 9 + flag.to_s.size + 4 + ee.size
-              puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), styles: theme[:inline])
-              found = true
-              index += 1
-              next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
+                  puts "#{g + f} #{key}: #{as_a(data[key]).join(', ')}" unless data[key].to_s.empty?
+                end
+                w = 9 + flag.to_s.size + 4 + ee.size
+                puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), styles: theme[:inline])
+                found = true
+                index += 1
+                next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
 
-              puts if @@print_order == 0
+                puts if @@print_order == 0
+              end
               yield id
             end
-            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found
+            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found || y
           end
         rescue StandardError => e
           log.error e
@@ -660,7 +679,7 @@ module Squared
 
         def choice_command(flag)
           msg, cmd, index = case flag
-                            when :run
+                            when :run, :rm
                               ['Choose an image', 'images -a', 2]
                             when :exec
                               ['Choose a container', 'ps -a', 0]
@@ -673,17 +692,27 @@ module Squared
             puts log_message(Logger::INFO, 'none found', subject: name, hint: "docker #{cmd}")
           else
             puts " #  #{header}"
+            multiple = false
+            parse = ->(val) { val.split(/\s+/)[index] }
             case flag
             when :run, :exec
-              values = [['Options', flag == :run], ['Command arguments', flag == :exec]]
+              values = [['Options', flag == :run], ['Arguments', flag == :exec]]
               cmd = flag.to_s
+            when :rm
+              values = ['Options']
+              multiple = true
+              cmd = "image #{flag}"
             else
-              values = [['Options', false], ['Container', true]]
+              values = ['Options', ['Container', true]]
               cmd = "network #{flag}"
             end
-            out, opts, args = choice_index(msg, lines, values: values)
-            ret = run docker_output(cmd, opts, '--', out.split(/\s+/)[index], args)
-            puts 'Success' if ret && cmd.start_with?('network')
+            out, opts, args = choice_index(msg, lines, multiple: multiple, values: values)
+            ret = run docker_output(cmd, opts, '--', *(if out.is_a?(Array)
+                                                         out.map! { |val| parse.call(val) }
+                                                       else
+                                                         [parse.call(out)]
+                                                       end), args)
+            print_success if success?(ret && cmd.start_with?('network'))
           end
         end
 
@@ -703,7 +732,7 @@ module Squared
         end
 
         def contextdir(val = nil)
-          val && projectpath?(val) ? shell_quote(basepath(val)) : '.'
+          val && projectpath?(val) ? shell_quote(path + val) : '.'
         end
 
         def tagname(val)