squared 0.4.2 → 0.4.4

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

@@ -63,6 +63,10 @@ module Squared
             list: %w[a|all digests no-trunc f|filter=q format=q].freeze,
             push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
             rm: %w[f|force no-prune].freeze
+          }.freeze,
+          network: {
+            connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=b link=b link-local-ip=b].freeze,
+            disconnect: %w[f|force].freeze
           }.freeze
         }.freeze
         VAL_DOCKER = {
@@ -85,13 +89,14 @@ module Squared
           end
         end
 
-        @@tasks[ref] = {
+        subtasks({
           'build' => %i[tag context bake].freeze,
           'compose' => %i[build run exec up].freeze,
           'image' => %i[list rm push].freeze,
           'container' => %i[run exec update commit inspect diff start stop restart pause unpause top stats kill
-                            rm].freeze
-        }.freeze
+                            rm].freeze,
+          'network' => %i[connect disconnect].freeze
+        })
 
         attr_reader :context
         attr_accessor :tag
@@ -101,7 +106,7 @@ module Squared
           return unless dockerfile(file).exist?
 
           @context = context
-          @tag = tag || "#{@project}:latest"
+          @tag = tag || tagname("#{@project}:#{@version || 'latest'}")
           @mounts = mounts
           @secrets = secrets
           @registry = [registry, kwargs[:username]].compact.join('/')
@@ -132,7 +137,7 @@ module Squared
                       format_desc(action, flag, 'opts*', before: flag == :tag ? 'name' : 'dir')
                       task flag, [flag] do |_, args|
                         param = param_guard(action, flag, args: args, key: flag)
-                        buildx(:build, args.to_a.drop(1), "#{flag}": param)
+                        buildx(:build, args.extras, "#{flag}": param)
                       end
                     when :bake
                       format_desc action, flag, 'opts*,target*,context?'
@@ -152,7 +157,7 @@ module Squared
                       format_desc action, flag, "service,command#{flag == :exec ? '' : '?'},args*,opts*"
                       task flag, [:service] do |_, args|
                         service = param_guard(action, flag, args: args, key: :service)
-                        composex(flag, args.to_a.drop(1), service: service)
+                        composex(flag, args.extras, service: service)
                       end
                     end
                   when 'container'
@@ -161,13 +166,13 @@ module Squared
                       format_desc(action, flag, 'id/name,opts*', after: flag == :exec ? 'args+' : 'tag?')
                       task flag, [:id] do |_, args|
                         id = param_guard(action, flag, args: args, key: :id)
-                        container(flag, args.to_a.drop(1), id: id)
+                        container(flag, args.extras, id: id)
                       end
                     when :run
                       format_desc action, flag, 'image,opts*,args*'
                       task flag, [:image] do |_, args|
                         image = param_guard(action, flag, args: args, key: :image)
-                        container(flag, args.to_a.drop(1), id: image)
+                        container(flag, args.extras, id: image)
                       end
                     else
                       format_desc(action, flag, 'opts*', after: "id/name#{flag == :update ? '+' : '*'}")
@@ -181,7 +186,7 @@ module Squared
                       format_desc action, flag, 'tag,registry/username?,opts*'
                       task flag, [:tag] do |_, args|
                         tag = param_guard(action, flag, args: args, key: :tag)
-                        image(flag, args.to_a.drop(1), id: tag)
+                        image(flag, args.extras, id: tag)
                       end
                     else
                       format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
@@ -189,6 +194,12 @@ module Squared
                         image flag, args.to_a
                       end
                     end
+                  when 'network'
+                    format_desc action, flag, 'target,opts*'
+                    task flag, [:target] do |_, args|
+                      target = param_guard(action, flag, args: args, key: :target)
+                      network(flag, args.extras, target: target)
+                    end
                   end
                 end
               end
@@ -251,9 +262,10 @@ module Squared
               as_a(@secrets).each { |arg| ret << quote_option('secret', arg) }
             end
             if (val = option('tag', ignore: false))
-              ret << quote_option('tag', val)
+              append_tag val
+              ret << basic_option('tag', tagname(val))
             elsif !session_arg?('t', 'tag')
-              ret << quote_option('tag', tag)
+              append_tag tag
             end
             append_context
           when :bake, :compose
@@ -268,10 +280,11 @@ module Squared
           cmd, opts = docker_session('buildx', opts: opts)
           opts = option_sanitize(opts, OPT_DOCKER[:buildx][:common]).first
           cmd << flag
-          out = option_sanitize(opts, OPT_DOCKER[:buildx][flag] + OPT_DOCKER[:buildx][:shared]).first
+          list = OPT_DOCKER[:buildx][flag == :bake ? :bake : :build] + OPT_DOCKER[:buildx][:shared]
+          out = option_sanitize(opts, list).first
           case flag
-          when :build
-            cmd.merge(as_a(tag).map { |val| quote_option('tag', val) })
+          when :build, :context
+            append_tag(tag || option('tag', ignore: false) || @tag)
             append_context context
           when :bake
             unless out.empty?
@@ -288,7 +301,7 @@ module Squared
               contextdir(context) if context
             end
           end
-          option_clear out
+          option_clear(out, pass: false)
           run(from: :"buildx:#{flag}")
         end
 
@@ -297,7 +310,7 @@ module Squared
           opts = option_sanitize(opts, OPT_DOCKER[:compose][:common]).first
           append_file filetype unless session_arg?('f', 'file')
           cmd << flag
-          out = option_sanitize(opts, OPT_DOCKER[:compose][flag] + OPT_DOCKER[:common]).first
+          out = option_sanitize(opts, OPT_DOCKER[:compose][flag]).first
           from = :"compose:#{flag}"
           case flag
           when :build, :up
@@ -312,7 +325,7 @@ module Squared
           cmd, opts = docker_session('container', flag, opts: opts)
           list = OPT_DOCKER[:container].fetch(flag, [])
           list += OPT_DOCKER[:container][:update] if flag == :run
-          out = option_sanitize(opts, list, first: flag == :exec).first
+          out = option_sanitize(opts, list, args: flag == :run || flag == :exec).first
           from = :"container:#{flag}"
           case flag
           when :run, :exec
@@ -348,12 +361,12 @@ module Squared
                 cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
               end
             end
-            append_command(flag, id.to_s.empty? ? tag : id, out, target: cmd, from: from)
+            append_command(flag, id.to_s.empty? ? tagmain : id, out, from: from)
           when :update
             raise_error('missing container', hint: from) if out.empty?
             append_value(out, escape: true)
           when :commit
-            latest = out.shift || tag
+            latest = out.shift || tagmain
             cmd << id << latest
             raise_error("unknown args: #{out.join(', ')}", hint: from) unless out.empty?
             return unless confirm_command(cmd.to_s, title: from, target: id, as: latest)
@@ -364,17 +377,16 @@ module Squared
 
             opts = []
             append_option('platform', target: opts, equals: true)
-            case option('disable-content-trust', ignore: false)
-            when 'true', '1'
-              opts << 'disable-content-trust'
-            when 'false', '0'
-              opts << 'disable-content-trust=false'
-            end
+            opts << case option('disable-content-trust', ignore: false)
+                    when 'false', '0'
+                      '--disable-content-trust=false'
+                    else
+                      '--disable-content-trust'
+                    end
             opts << '--quiet' unless verbose
             return image(:push, opts, id: latest, registry: registry)
           else
             if out.empty?
-              ps = docker_output 'ps', '-a'
               status = []
               no = true
               case flag
@@ -399,7 +411,7 @@ module Squared
               when :rm
                 status = %w[created exited dead]
               end
-              ps.merge(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
@@ -412,7 +424,7 @@ module Squared
         end
 
         def image(flag, opts = [], sync: true, id: nil, registry: nil)
-          cmd, opts = docker_session('image', flag == :exec ? :list : flag, opts: opts)
+          cmd, opts = docker_session('image', flag, opts: opts)
           out = option_sanitize(opts, OPT_DOCKER[:image][flag]).first
           from = :"image:#{flag}"
           case flag
@@ -420,13 +432,8 @@ module Squared
             if opts.size == out.size
               index = 0
               name = nil
-              opts.each do |opt|
-                if (name = opt[/^name=["']?(.+)["']?$/, 1])
-                  opts.delete(opt)
-                  break
-                end
-              end
-              list_image(flag, cmd << '-a', from: from) do |val|
+              opts.reverse_each { |opt| break opts.delete(opt) if (name = opt[/^name=["']?(.+?)["']?$/, 1]) }
+              list_image(:run, cmd << '-a', from: from) do |val|
                 container(:run, if name
                                   opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
                                 else
@@ -451,8 +458,8 @@ module Squared
               return
             end
           when :push
-            id ||= tag
-            registry ||= out.shift || @registry
+            id ||= option('tag', ignore: false) || tagmain
+            registry ||= out.shift || option('registry') || @registry
             raise_error(id ? "unknown args: #{out.join(', ')}" : 'no id/tag given', hint: from) unless id && out.empty?
             raise_error('username/registry not provided', hint: from) unless registry
             registry.chomp!('/')
@@ -466,6 +473,15 @@ module Squared
           run(sync: sync, from: from)
         end
 
+        def network(flag, opts = [], target: nil)
+          cmd, opts = docker_session('network', flag, opts: opts)
+          option_sanitize(opts, OPT_DOCKER[:network][flag]).first
+          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?
+          end
+        end
+
         def build?
           @output[0] != false && dockerfile.exist?
         end
@@ -494,9 +510,10 @@ module Squared
         def docker_session(*cmd, opts: nil)
           return session('docker', *cmd) unless opts
 
-          ret = session 'docker'
-          opts = option_sanitize(opts, OPT_DOCKER[:common]).first
-          [ret.merge(cmd), opts]
+          out = []
+          opts = option_sanitize(opts, OPT_DOCKER[:common], target: out).first
+          ret = session('docker', *out, *cmd)
+          [ret, opts]
         end
 
         def docker_output(*cmd, **kwargs)
@@ -504,7 +521,15 @@ module Squared
         end
 
         def append_command(flag, val, list, target: @session, from: nil)
-          raise_error('no command args', hint: from) if flag == :exec && list.empty?
+          case flag
+          when :run
+            unless session_arg?('name')
+              require 'random/formatter'
+              target << basic_option('name', dnsname("#{name}_#{Random.new.alphanumeric(6)}"))
+            end
+          when :exec
+            raise_error('no command args', hint: from) if list.empty?
+          end
           target << val << list.shift
           target << shell_quote(list.join(' && '), double: true, option: false) unless list.empty?
         end
@@ -522,25 +547,43 @@ module Squared
           target << contextdir(ctx || context)
         end
 
+        def append_tag(val, target: @session)
+          ver = option('version', ignore: false)
+          list = case val
+                 when String
+                   val.split(',')
+                 when Array
+                   val
+                 else
+                   []
+                 end
+          list.each do |s|
+            s = "#{s.sub(/:latest$/, '')}:#{ver}" if ver && (!s.include?(':') || s.end_with?(':latest'))
+            target << basic_option('tag', tagname(s))
+          end
+        end
+
         def list_image(flag, cmd, hint: nil, from: nil, no: true, &blk)
           pwd_set do
             found = false
-            IO.popen(session_done(cmd << '--format=json')).each_with_index do |line, index|
+            index = 0
+            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':').first})(?:[_.,:-]|$)/
+            IO.popen(session_done(cmd << '--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']
               rt = [data['Repository'], data['Tag']].reject { |val| val == '<none>' }.join(':')
               rt = nil if rt.empty?
-              aa = if data['Names']
-                     as_a(data['Names']).join(', ')
-                   elsif rt
-                     dd = true
-                     data['Repository']
-                   else
-                     id
-                   end
+              aa = data['Names'] || (if rt && data['Repository']
+                                       dd = true
+                                       data['Repository']
+                                     else
+                                       id
+                                     end)
+              ee = data['Image'] || rt || aa
+              next unless ee.match?(pat) || aa.match?(pat)
+
               bb = index.succ.to_s
               cc = bb.size + 1
-              ee = data['Image'] || rt || aa
               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']
@@ -550,14 +593,22 @@ module Squared
               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)"
-              %w[Tag Status Ports Size].each do |key|
+              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 + aa.size
+              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
@@ -608,6 +659,25 @@ module Squared
           val && projectpath?(val) ? shell_quote(basepath(val)) : '.'
         end
 
+        def tagname(val)
+          val = val.split(':').map { |s| charname(s.sub(/^\W+/, '')) }
+          ret = val.join(':')
+          ret = val.first if val.size > 1 && ret.size > 128
+          ret[0..127]
+        end
+
+        def dnsname(val)
+          charname(val[/^[^a-z\d]*(.*?)[^a-z\d]*$/i, 1].gsub(/-{2,}/, '-'))[0..62].downcase
+        end
+
+        def charname(val)
+          val.gsub(/[^\w.-]+/, '_')
+        end
+
+        def tagmain
+          tag.is_a?(Array) ? tag.first : tag
+        end
+
         def compose?(file)
           COMPOSEFILE.include?(File.basename(file))
         end