squared 0.7.9 → 0.8.0

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

@@ -56,15 +56,15 @@ module Squared
             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,
             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,
@@ -114,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
         })
@@ -166,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]
@@ -227,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
@@ -247,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'
@@ -277,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
@@ -288,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
@@ -297,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*'
@@ -440,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
@@ -477,14 +473,14 @@ 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)
@@ -508,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
@@ -524,7 +520,8 @@ module Squared
                       out << k
                       next
                     when 'source', 'src', 'destination', 'dst', 'target', 'volume-subpath', 'image-path'
-                      raise_error ArgumentError, "#{k}: no path value", hint: flag unless v
+                      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
@@ -533,18 +530,20 @@ module Squared
                     log_message('unrecognized option', subject: from, hint: k)
                   end
                 end
-                raise_error TypeError, 'none specified', hint: flag unless type
+                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
             cmd << id << latest
-            raise_error ArgumentError, "unrecognized args: #{op.join(', ')}", hint: flag unless op.empty?
+            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
@@ -565,7 +564,9 @@ module Squared
             if op.empty?
               ps, status, no = filter_ps flag, from
               cmd << '--no-stream' if flag == :stats
-              list_image(flag, ps, no: no, hint: status, from: from) { |img| run(cmd.temp(img), from: from) }
+              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: /^:/)
@@ -626,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
@@ -642,7 +643,8 @@ module Squared
             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
@@ -652,9 +654,6 @@ module Squared
             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
@@ -748,7 +747,7 @@ module Squared
               target << basic_option('name', dnsname("#{name}_%s" % rand_s(6)))
             end
           when :exec
-            raise_error ArgumentError, 'nothing to execute', hint: flag if list.empty?
+            raise ArgumentError, message('nothing to execute', hint: flag) if list.empty?
           end
           target << val << list.shift
           target << list.join(' && ') unless list.empty?
@@ -802,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
@@ -818,7 +817,8 @@ 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')
@@ -829,8 +829,8 @@ module Squared
                   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)
@@ -877,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
@@ -1010,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)