squared 0.8.8 → 0.9.0.pre1

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

@@ -128,6 +128,7 @@ module Squared
           'image' => %i[ls rm pull push tag save inspect history].freeze,
           'container' => %i[attach commit create diff exec inspect kill logs pause restart rm run start stats stop top
                             unpause update].freeze,
+          'run' => %i[rmi rmd mount volume entrypoint].freeze,
           'network' => %i[connect disconnect create rm].freeze,
           'ls' => nil
         })
@@ -181,7 +182,7 @@ module Squared
               if flags.nil?
                 case action
                 when 'ls'
-                  format_desc(action, nil, 'a/ll?,s/tandard?,range*', before: VAL_DOCKER[:ls])
+                  format_desc(action, nil, VAL_DOCKER[:ls].keys, after: 'a/ll?,s/tandard?,range*', arg: nil)
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
@@ -303,13 +304,22 @@ module Squared
                           end
                         end
                       else
-                        format_desc action, flag, "opts*,id/name#{case flag
-                                                                  when :stats then '*'
-                                                                  when :logs, :diff, :attach, :top then nil
-                                                                  else '+'
-                                                                  end}"
+                        single = %i[logs diff attach top].freeze
+                        format_desc action, flag, "opts*,id/name#{if flag == :stats
+                                                                    '*'
+                                                                  elsif !single.include?(flag)
+                                                                    '+'
+                                                                  end}|:"
                         task flag do |_, args|
-                          container flag, args.to_a
+                          args = args.to_a
+                          if choice!(args, first: false)
+                            args.concat(Array(choice_command(:container, multiple: !single.include?(flag))))
+                            if flag == :rm
+                              stop = filter_ps(:stop, column: 'ID').select { |id| args.include?(id) }
+                              container :stop, stop if !stop.empty? && confirm_basic('Stop?', stop.join(', '))
+                            end
+                          end
+                          container flag, args
                         end
                       end
                     when 'image'
@@ -358,18 +368,47 @@ module Squared
                           end
                         end
                       end
+                    when 'run'
+                      format_desc action, flag, 'id|:,opts*'
+                      task flag, [:id] do |_, args|
+                        id = if args.id == ':'
+                               choice_command(:image, multiple: false)
+                             else
+                               param_guard(action, flag, args: args, key: :id)
+                             end
+                        args = case flag
+                               when :mount
+                                 mount = []
+                                 loop do
+                                   s = readline("Enter mount ##{mount.size.succ}", force: false)
+                                   break if s.empty?
+
+                                   mount << (s.include?('type=') ? s : "type=bind,#{s}")
+                                 end
+                                 mount.map { |val| quote_option('mount', val, double: true) }
+                               when :volume
+                                 choice_command(:volume, multiple: true, series: true).map do |val|
+                                   basic_option 'volume', val
+                                 end
+                               when :entrypoint
+                                 ["entrypoint=#{shell_quote(readline('Entrypoint', force: true), double: true)}"]
+                               when :rmi
+                                 %w[rm i t]
+                               when :rmd
+                                 %w[rm d]
+                               end + args.extras
+                        container(:run, args.uniq, id: id)
+                      end
                     when 'network'
                       format_desc action, flag, 'name,opts*'
                       task flag, [:name] do |_, args|
-                        name = if flag == :create || flag == :rm
-                                 param_guard(action, flag, args: args, key: :name)
-                               else
-                                 args.name
-                               end
+                        name = flag == :create ? param_guard(action, flag, args: args, key: :name) : args.name
                         if name
                           network(flag, args.extras, name: name)
+                        elsif flag == :rm
+                          choice_command :'network:rm'
                         else
-                          choice_command flag
+                          choice_command(flag, id: choice_command(:container, force: false), series: true)
                         end
                       end
                     end
@@ -501,7 +540,7 @@ module Squared
             if flag == :publish
               id ||= option('tag', ignore: false) || op.shift || tagmain
               registry ||= option('registry') || op.shift || @oci
-              emptyargs op, flag
+              op.clear(strict: true)
               op << shell_quote(tagjoin(registry, id))
               return unless confirm_command(op.to_s, title: from, target: id)
             else
@@ -516,10 +555,10 @@ module Squared
               if multiple
                 op.concat(service) if service
                 op.append(delim: true, escape: true, strip: ':')
-              else
-                raise ArgumentError, message('no service was selected', hint: flag) unless service
-
+              elsif service
                 append_command(flag, service, op.extras, prompt: '::')
+              else
+                raise ArgumentError, message('no service was selected', hint: flag)
               end
             end
           end
@@ -668,7 +707,7 @@ module Squared
                 args = if name
                          index += 1
                          opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
-                       elsif choice!(opts, only: true)
+                       elsif choice!(opts, empty: true, only: true)
                          OptionPartition.strip(readline('Enter arguments', force: false))
                        else
                          opts
@@ -720,9 +759,9 @@ module Squared
           when :push
             id ||= option('tag', ignore: false) || op.shift || tagmain
             registry ||= option('registry') || op.shift || self.registry
-            emptyargs op, flag
             raise ArgumentError, message('username/registry not specified', hint: flag) unless registry
 
+            op.clear(strict: true)
             uri = shell_quote tagjoin(registry, id)
             op << uri
             img = docker_output 'image tag', id, uri
@@ -745,7 +784,7 @@ module Squared
           success?(run(sync: sync, exception: exception, banner: banner, from: from), status)
         end
 
-        def network(flag, opts = [], target: nil, name: target)
+        def network(flag, opts = [], name: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, **dockerinit)
                               .clear
@@ -891,7 +930,7 @@ module Squared
           target
         end
 
-        def filter_ps(flag, meth = nil, column: nil, from: meth || :'container:ps')
+        def filter_ps(flag, column: nil, from: :'container:ps')
           no = false
           status = case flag.to_sym
                    when :start
@@ -927,7 +966,7 @@ module Squared
           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)
@@ -974,7 +1013,7 @@ module Squared
                        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 + ARG[:TAB] + ee.size
+                w = 9 + flag.to_s.size + 4 + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), theme[:inline])
                 index += 1
                 next unless confirm("#{h + b}?", no ? 'N' : 'Y')
@@ -1009,18 +1048,22 @@ module Squared
           confirm "#{s} #{sub_style(target, theme[:subject])}#{" as #{sub_style(as, theme[:inline])}" if as}?", 'N'
         end
 
-        def choice_command(flag, *action)
+        def choice_command(flag, *action, id: nil, multiple: nil, series: false, force: true)
           msg, cmd = case flag
-                     when :exec
+                     when :exec, :container
                        ['Choose a container', 'ps -a']
                      when :bake
                        ['Choose a target', 'buildx bake --list=type=targets']
-                     when :connect, :disconnect
+                     when :connect, :disconnect, :'network:rm'
                        ['Choose a network', 'network ls']
                      when :service
                        ['Choose a service',
                         'compose ps -a ' \
                         '--format="table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}"']
+                     when :volume
+                       ['Choose a volume',
+                        'volume ls ' \
+                        '--format="table {{.Name}}\t{{.Driver}}\t{{.Mountpoint}}"']
                      else
                        ['Choose an image',
                         'images -a ' \
@@ -1031,28 +1074,40 @@ module Squared
             puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0, 2].join(' ')}")
             return
           end
-          puts " #  #{lines.shift}"
-          multiple = false
+          parse = lambda do |list|
+            ret = Array(list).map { |val| val.split(/\s+/, 2).first }.reject(&:empty?)
+            return ret.first if multiple == false
+
+            ret unless ret.empty?
+          end
+          puts "#{"\n" if id && !printfirst?} #  #{lines.shift}"
           ctx = flag.to_s
           case flag
           when :run, :exec
             values = [['Options', flag == :run], ['Arguments', flag == :exec]]
           when :rm, :bake
             values = ['Options']
-            multiple = true
+            multiple = true if multiple.nil?
             ctx = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
           when :save
             values = [['Output', true], 'Platform']
-            multiple = true
+            multiple = true if multiple.nil?
           when :service
-            values = []
-            multiple = true
+            values = ['Options']
+            multiple = true if multiple.nil?
             ctx = 'compose'
           when :connect, :disconnect
-            values = ['Options', ['Container', true]]
+            values = id ? ['Options'] : ['Options', ['Container', true]]
             ctx = "network #{flag}"
+          when :'network:rm'
+            values = ['Options']
+            multiple = true if multiple.nil?
+            ctx = 'network rm'
+          when :container, :image, :volume
+            return parse.call(choice_index(msg, lines, multiple: multiple, series: series, force: force,
+                                                       attempts: force ? 3 : 1))
           end
-          out, opts, args = choice_index(msg, lines, multiple: multiple, values: values)
+          out, opts, args = choice_index(msg, lines, values: values, multiple: multiple, series: series)
           cmd = docker_output(ctx, *action)
           case flag
           when :tag
@@ -1067,8 +1122,10 @@ module Squared
           else
             cmd << opts << '--'
           end
-          cmd.merge(Array(out).map { |val| val.split(/\s+/, 2).first })
-          success?(run(cmd << args, { 'NO_COLOR' => 'true' }), ctx.start_with?('network', 'tag', 'save'))
+          cmd.merge(parse.call(out))
+          cmd << args
+          cmd.merge(Array(id)) if id
+          success?(run(cmd, { 'NO_COLOR' => 'true' }), ctx.start_with?('network', 'tag', 'save'))
         end
 
         def filetype(val = dockerfile)
@@ -1108,14 +1165,14 @@ module Squared
             s = val.join(':')
             return s unless s.size > max
           end
-          ret[0...max]
+          ret[...max]
         end
 
         def dnsname(val, max: 63, char: nil)
           ret = val.sub(/^[^a-z]+/i, '')
                    .sub(/[^a-z\d]+$/i, '')
                    .gsub(/[^a-z\d#{char}]+/i, '-')
-                   .gsub(/-{2,}/, '-')[0...max]
+                   .gsub(/-{2,}/, '-')[...max]
           char ? ret : ret.downcase
         end
 
@@ -1123,10 +1180,6 @@ module Squared
           dnsname(val, max: 128, char: '.').gsub(/\.{2,}/, '.')
         end
 
-        def charname(val)
-          val.gsub(/[^\w.-]+/, '_')
-        end
-
         def tagmain
           tag.is_a?(Array) ? tag.first : tag
         end
@@ -1135,10 +1188,6 @@ module Squared
           { project: self, strict: strict?, explicit: '=', bool: %w[1 0 true false] }
         end
 
-        def emptyargs(list, hint = nil)
-          raise ArgumentError, message('unrecognized args', list.join(', '), hint: hint) unless list.empty?
-        end
-
         def anypath?(*args)
           args.any? { |val| basepath!(val) }
         end