squared 0.4.14 → 0.5.0

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

@@ -21,8 +21,7 @@ module Squared
           compose: {
             common: %w[all-resources compatibility dry-run ansi|b env-file=p f|file=p parallel=b profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
-            build: %w[check no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
-                      ssh=qq].freeze,
+            build: %w[no-cache pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b ssh=qq].freeze,
             exec: %w[dry-run privileged d|detach e|env=qq index=i T|no-TTY=b? user=e w|workdir=q].freeze,
             run: %w[build dry-run no-deps quiet-pull remove-orphans rm P|service-ports use-aliases cap-add=b cap-drop=b
                     d|detach entrypoint=q e|env=qq i|interactive=b? l|label=q name=b T|no-TTY=b? p|publish=e pull=b
@@ -112,6 +111,7 @@ module Squared
           @mounts = mounts
           @secrets = secrets
           @registry = tagjoin registry, kwargs[:username]
+          @file = nil
           initialize_ref Docker.ref
           initialize_logger(**kwargs)
           initialize_env(**kwargs)
@@ -160,7 +160,7 @@ module Squared
                         compose! flag, args.to_a
                       end
                     when :exec, :run
-                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'}|:,args*,opts*"
+                      format_desc action, flag, "service,command#{flag == :exec ? '' : '?'},args*,opts*"
                       task flag, [:service] do |_, args|
                         service = param_guard(action, flag, args: args, key: :service)
                         compose!(flag, args.extras, service: service)
@@ -198,8 +198,8 @@ module Squared
                     when :push
                       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.extras, id: tag)
+                        id = param_guard(action, flag, args: args, key: :tag)
+                        image(flag, args.extras, id: id)
                       end
                     else
                       format_desc(action, flag, case flag
@@ -267,10 +267,8 @@ module Squared
           end
 
           [args, flags].each_with_index do |target, index|
-            if target.is_a?(String)
-              ret << target
-            elsif (target = append_any(target, target: []))
-              ret.merge(target.map { |arg| index == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
+            if (data = append_any(target, target: []))
+              ret.merge(data.map { |arg| index == 0 ? fill_option(arg) : quote_option('build-arg', arg) })
             end
           end
           case from
@@ -280,12 +278,12 @@ module Squared
               ret << quote_option('secret', @secrets, double: true)
             when Hash
               append = lambda do |type|
-                Array(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
+                as_a(@secrets[type]).each { |arg| ret << quote_option('secret', "type=#{type},#{arg}", double: true) }
               end
               append.call(:file)
               append.call(:env)
             else
-              Array(@secrets).each { |arg| ret << quote_option('secret', arg) }
+              as_a(@secrets).each { |arg| ret << quote_option('secret', arg) }
             end
             if (val = option('tag', ignore: false))
               append_tag val
@@ -294,8 +292,8 @@ module Squared
             end
             append_context
           when :bake, :compose
-            if (val = option(from == :bake ? 'target' : 'service', ignore: false))
-              ret.merge(split_escape(val).map! { |s| shell_escape(s) })
+            option(from == :bake ? 'target' : 'service', ignore: false) do |a|
+              ret.merge(split_escape(a).map! { |b| shell_escape(b) })
             end
           end
           ret
@@ -313,7 +311,7 @@ module Squared
           when :bake
             unless op.empty?
               args = op.dup
-              op.reset
+              op.extras.clear
               if Dir.exist?(args.last)
                 if projectpath?(val = args.pop)
                   context = val
@@ -360,11 +358,11 @@ module Squared
               both = run[:bind] + run[:tmpfs]
               diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
               delim = Regexp.new(",\\s*(?=#{both.join('|')})")
-              Array(@mounts).each do |val|
+              as_a(@mounts).each do |val|
                 args = []
                 tmpfs = true
                 val.split(delim).each do |opt|
-                  k, v, q = split_option(opt)
+                  k, v, q = split_option opt
                   next unless both.include?(k)
 
                   if k == 'type'
@@ -504,7 +502,7 @@ module Squared
             raise_error(id ? "unknown args: #{op.join(', ')}" : 'no id/tag given', hint: from) unless id && op.empty?
             raise_error('username/registry not provided', hint: from) unless registry
             registry.chomp!('/')
-            uri = shell_quote("#{registry}/#{id}")
+            uri = shell_quote "#{registry}/#{id}"
             op << uri
             img = docker_output 'image', 'tag', id, uri
             return unless confirm_command(img.to_s, cmd.to_s, target: id, as: registry, title: from)
@@ -566,9 +564,7 @@ module Squared
         end
 
         def append_command(flag, val, list, target: @session, from: nil)
-          if list.delete(':')
-            list << readline('Enter command [args]', force: true)
-          elsif (args = env('DOCKER_ARGS'))
+          if (args = env('DOCKER_ARGS'))
             list << args
           end
           case flag
@@ -591,7 +587,7 @@ module Squared
         def append_file(type, target: @session)
           return unless type == 2 || type == 4 || @file.is_a?(Array)
 
-          files = Array(@file).map { |val| quote_option('file', path + val) }
+          files = as_a(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
             target.merge(files)
           else
@@ -607,18 +603,20 @@ module Squared
         end
 
         def append_tag(val, target: @session)
-          ver = option('version', target: target, 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))
+          case val
+          when String
+            val.split(',')
+          when Array
+            val
+          else
+            []
+          end.yield_self do |list|
+            ver = option('version', target: target, ignore: false)
+            list.each do |s|
+              s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
+              target << basic_option('tag', tagname(s))
+            end
+            target
           end
         end
 
@@ -665,7 +663,7 @@ module Squared
                 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?
+                  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])
@@ -758,7 +756,7 @@ module Squared
                         [parse.call(out)]
                       end)
             cmd << args
-            print_success if success?(run(cmd)) && ctx.match?(/\A(?:network|tag|save)/)
+            print_success if success?(run(cmd)) && ctx.start_with?(/(?:network|tag|save)/)
           end
         end
 
@@ -788,9 +786,10 @@ module Squared
 
         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]
+          val.join(':').yield_self do |s|
+            s = val.first if val.size > 1 && s.size > 128
+            s[0..127]
+          end
         end
 
         def dnsname(val)