squared 0.4.11 → 0.4.13

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

@@ -32,22 +32,24 @@ module Squared
                    no-attach=b pull=b scale=i t|timeout=i wait-timeout=i].freeze
           }.freeze,
           container: {
-            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,
+            create: %w[init i|interactive no-healthcheck oom-kill-disable privileged P|publish-all q|quiet read-only
+                       rm runtime t|tty use-api-socket io-maxbandwidth=b io-maxiops=b add-host=q annotation=q
+                       a|attach=b blkio-weight=i blkio-weight-device=i cap-add=b cap-drop=b cgroup-parent=b cgroupns=b
+                       cidfile=p 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 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 m|memory=b memory-reservation=b memory-swap=n
+                       memory-swappiness=n mount=qq name=b network=b network-alias=b oom-score-adj=b pid=b pids-limit=n
+                       platform=b p|publish=e pull=b restart=b runtime=b security-opt=q shm-size=b stop-signal=b
+                       stop-timeout=i storage-opt=q sysctl=q tmpfs=q ulimit=q u|user=b userns=b uts=b v|volume=q
+                       volume-driver=b volumes-from=b w|workdir=q].freeze,
+            run: %w[d|detach detach-keys=q sig-proxy=b?].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
-                       cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=b
+                       cpuset-cpus=b cpuset-mems=b m|memory=b memory-reservation=b memory-swap=b pids-limit=n
                        restart=q].freeze,
             commit: %w[a|author=q c|change=q m|message=q pause=b?].freeze,
             inspect: %w[s|size f|format=q].freeze,
@@ -60,7 +62,8 @@ module Squared
           image: {
             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
+            rm: %w[f|force no-prune].freeze,
+            save: %w[o|output=p platform=b].freeze
           }.freeze,
           network: {
             connect: %w[alias=b driver-opt=q gw-priority=n ip=b ip6=b link=b link-local-ip=b].freeze,
@@ -90,8 +93,8 @@ module Squared
         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
+          'image' => %i[list rm push tag save].freeze,
+          'container' => %i[run create exec update commit inspect diff start stop restart pause unpause top stats kill
                             rm].freeze,
           'network' => %i[connect disconnect].freeze
         })
@@ -107,7 +110,7 @@ module Squared
           @tag = tag || tagname("#{@project}:#{@version || 'latest'}")
           @mounts = mounts
           @secrets = secrets
-          @registry = [registry, kwargs[:username]].compact.join('/')
+          @registry = tagjoin registry, kwargs[:username]
           initialize_ref Docker.ref
           initialize_logger(**kwargs)
           initialize_env(**kwargs)
@@ -174,7 +177,7 @@ module Squared
                           container(flag, args.extras, id: id)
                         end
                       end
-                    when :run
+                    when :run, :create
                       format_desc action, flag, 'image,opts*,args*'
                       task flag, [:image] do |_, args|
                         if args.image
@@ -197,12 +200,15 @@ module Squared
                         tag = param_guard(action, flag, args: args, key: :tag)
                         image(flag, args.extras, id: tag)
                       end
-                    when :list, :rm
-                      format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
+                    else
+                      format_desc(action, flag, case flag
+                                                when :rm, :save then 'id*,opts*'
+                                                when :tag then 'version?'
+                                                else 'opts*,args*' end)
                       task flag do |_, args|
                         args = args.to_a
-                        if flag == :rm && args.empty?
-                          choice_command :rm
+                        if args.empty? && flag != :list
+                          choice_command flag
                         else
                           image flag, args
                         end
@@ -340,13 +346,15 @@ module Squared
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)
+          rc = flag == :run || flag == :create
           list = OPT_DOCKER[:container].fetch(flag, [])
-          list += OPT_DOCKER[:container][:update] if flag == :run
-          op = OptionPartition.new(opts, list, cmd, project: self, args: flag == :run || flag == :exec)
+          list += OPT_DOCKER[:container][:create] if flag == :run
+          list += OPT_DOCKER[:container][:update] if rc
+          op = OptionPartition.new(opts, list, cmd, project: self, args: rc || flag == :exec)
           from = :"container:#{flag}"
           case flag
-          when :run, :exec
-            if flag == :run && !op.arg?('mount')
+          when :run, :create, :exec
+            if rc && !op.arg?('mount')
               run = VAL_DOCKER[:run]
               both = run[:bind] + run[:tmpfs]
               diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
@@ -378,7 +386,7 @@ module Squared
                 cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
               end
             end
-            append_command(flag, id.to_s.empty? ? tagmain : id, op.extras, from: from)
+            append_command(flag, id || tagmain, op.extras, from: from)
           when :update
             raise_error('missing container', hint: from) if op.empty?
             op.append(escape: true)
@@ -442,7 +450,7 @@ 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)
+          op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self)
           exception = @exception
           banner = true
           from = :"image:#{flag}"
@@ -473,7 +481,7 @@ module Squared
               end
             else
               if op.empty?
-                list_image(flag, docker_output('image ls -a'), from: from) do |val|
+                list_image(:rm, docker_output('image ls -a'), from: from) do |val|
                   image(:rm, opts, sync: sync, id: val)
                 end
               else
@@ -481,6 +489,14 @@ module Squared
               end
               return
             end
+          when :tag, :save
+            list_image(flag, docker_output('image ls -a'), from: from) do |val|
+              op << val
+              if flag == :tag
+                op << tagname("#{@project}:#{op.extras.first}")
+                break
+              end
+            end
           when :push
             id ||= option('tag', ignore: false) || tagmain
             registry ||= op.shift || option('registry') || @registry
@@ -497,7 +513,8 @@ module Squared
             exception = true
             banner = false
           end
-          run(cmd, sync: sync, exception: exception, banner: banner, from: from)
+          ret = run(cmd, sync: sync, exception: exception, banner: banner, from: from)
+          print_success if success?(ret) && (flag == :tag || flag == :save)
         end
 
         def network(flag, opts = [], target: nil)
@@ -653,11 +670,11 @@ module Squared
                 index += 1
                 next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
 
-                puts if @@print_order == 0
+                puts if printfirst?
               end
               yield id
             end
-            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found || y
+            puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) if found || y
           end
         rescue StandardError => e
           log.error e
@@ -670,13 +687,13 @@ module Squared
         def confirm_command(*args, title: nil, target: nil, as: nil)
           return false unless title && target
 
-          puts unless @@print_order == 0
+          puts unless printfirst?
           t = title.to_s.split(':')
           emphasize(args, title: message(t.first.upcase, *t.drop(1)), border: borderstyle, sub: [
             { pat: /\A(\w+(?: => \w+)+)(.*)\z/, styles: theme[:header] },
             { pat: /\A(.+)\z/, styles: theme[:caution] }
           ])
-          @@print_order += 1
+          printsucc
           a = t.last.capitalize
           b = sub_style(target, styles: theme[:subject])
           c = as && sub_style(as, styles: theme[:inline])
@@ -685,14 +702,14 @@ module Squared
 
         def choice_command(flag)
           msg, cmd, index = case flag
-                            when :run, :rm
-                              ['Choose an image', 'images -a', 2]
                             when :exec
                               ['Choose a container', 'ps -a', 0]
                             when :bake
                               ['Choose a target', 'buildx bake --list=type=targets', 0]
-                            else
+                            when :connect, :disconnect
                               ['Choose a network', 'network ls', 0]
+                            else
+                              ['Choose an image', 'images -a', 2]
                             end
           lines = `#{docker_output(cmd)}`.lines
           header = lines.shift
@@ -702,25 +719,43 @@ module Squared
             puts " #  #{header}"
             multiple = false
             parse = ->(val) { val.split(/\s+/)[index] }
+            ctx = flag.to_s
             case flag
             when :run, :exec
               values = [['Options', flag == :run], ['Arguments', flag == :exec]]
-              cmd = flag.to_s
             when :rm, :bake
               values = ['Options']
               multiple = true
-              cmd = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
-            else
+              ctx = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
+            when :save
+              values = [['Output', true], 'Platform']
+              multiple = true
+            when :connect, :disconnect
               values = ['Options', ['Container', true]]
-              cmd = "network #{flag}"
+              ctx = "network #{flag}"
             end
             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'))
+            cmd = docker_output ctx
+            case flag
+            when :tag
+              args = tagjoin @registry, @tag
+            when :save
+              opts = "#{opts}.tar" unless opts.end_with?('.tar')
+              cmd << quote_option('output', File.expand_path(opts))
+              if args
+                cmd << basic_option('platform', args)
+                args = nil
+              end
+            else
+              cmd << opts << '--'
+            end
+            cmd.merge(if out.is_a?(Array)
+                        out.map! { |val| parse.call(val) }
+                      else
+                        [parse.call(out)]
+                      end)
+            cmd << args
+            print_success if success?(run(cmd)) && ctx.match?(/\A(?:network|tag|save)/)
           end
         end
 
@@ -743,6 +778,11 @@ module Squared
           val && projectpath?(val) ? shell_quote(path + val) : '.'
         end
 
+        def tagjoin(*args, char: '/')
+          args.compact!
+          args.join(char) unless args.empty?
+        end
+
         def tagname(val)
           val = val.split(':').map! { |s| charname(s.sub(/^\W+/, '')) }
           ret = val.join(':')

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

@@ -14,7 +14,11 @@ module Squared
         check = ->(proj) { proj.is_a?(Project::Git) && !proj.exclude?(Project::Git.ref) && git_clone?(proj.path) }
         if uri.is_a?(Array)
           base = name
-          uri.each { |val| repo << proj if (proj = @project[val.to_s]) && check.call(proj) }
+          uri.each do |val|
+            if (proj = @project[val.to_s]) && check.call(proj)
+              repo << proj
+            end
+          end
         elsif uri
           data[name.to_s] = uri
         elsif name.is_a?(Enumerable)
@@ -121,20 +125,18 @@ module Squared
       def rev_write(name = nil, data = nil, sync: true, utc: nil)
         return unless @revfile
 
+        sleep 0 while !sync && @revlock
+        @revlock = true
         if name
           data&.each { |key, val| rev_entry(name, key, val: val) }
           rev_timeutc(name, utc) if utc
         end
-        sleep 0 while !sync && @revlock
-        begin
-          @revlock = true
-          File.write(@revfile, JSON.pretty_generate(@revdoc))
-        rescue StandardError => e
-          log&.debug e
-          warn log_message(Logger::WARN, e, pass: true) if warning?
-        ensure
-          @revlock = false
-        end
+        File.write(@revfile, JSON.pretty_generate(@revdoc))
+      rescue StandardError => e
+        log&.debug e
+        warn log_message(Logger::WARN, e, pass: true) if warning?
+      ensure
+        @revlock = false
       end
 
       def git_clone?(path, name = nil)
@@ -457,8 +459,8 @@ module Squared
                   when 'stash'
                     format_desc(action, flag, 'opts*', after: case flag
                                                               when :push then 'pathspec*'
-                                                              when :list then nil
-                                                              else 'commit?' end)
+                                                              when :clear, :list then nil
+                                                              else 'stash?|:' end)
                     task flag do |_, args|
                       stash flag, args.to_a
                     end
@@ -516,15 +518,7 @@ module Squared
                           index = choice_commit(multiple: true)
                         else
                           index = []
-                          args.each do |val|
-                            if matchhead(val)
-                              index << commithead(val)
-                            elsif (sha = commithash(val))
-                              index << sha
-                            else
-                              break
-                            end
-                          end
+                          args.each { |val| index << (commithead(val) || commithash(val) || break) }
                           args = args.drop(index.size)
                         end
                         diff(flag, args, index: index)
@@ -990,7 +984,14 @@ module Squared
             end
           end
           opts[:origin] = val if (val = option('origin', ignore: false))
-          opts[:branch] = val if (val = option('branch', strict: true))
+          if (val = option('branch', strict: true))
+            opts[:branch] = val
+            opts.delete(:revision)
+          elsif (val = option('revision', strict: true))
+            opts[:revision] = val
+            opts.delete(:branch)
+            opts.delete(:mirror)
+          end
           opts[:local] = val != '0' if (val = option('local', strict: true))
           opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(from: :clone)
           append_hash opts
@@ -1012,10 +1013,13 @@ module Squared
             when :push
               append_pathspec op.extras
             when :pop, :apply, :drop
-              unless op.empty?
+              if op.extras.delete(':')
+                op << choice_index('Choose a stash', git_spawn('stash list', stdout: false),
+                                   column: /^[^@]+@\{(\d+)\}/, force: true)
+              elsif !op.empty?
                 op << shell_escape(op.pop)
-                op.clear
               end
+              op.clear
             when :clear
               if confirm("Remove #{sub_style('all', styles: theme[:active])} stash entries? [y/N] ", 'N')
                 source(stdout: true)
@@ -1064,7 +1068,7 @@ module Squared
                       { pat: /^(## )(.+?)(\.{3})(.+)$/, styles: [nil, g, nil, r], index: -1 }
                     ]
                   else
-                    [{ pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2 }]
+                    [pat: /^(\t+)([a-z]+: +.+)$/, styles: r, index: 2]
                   end
           end
           out, banner, from = source(io: true)
@@ -1072,7 +1076,7 @@ module Squared
           list_result(ret, 'files', from: from, action: 'modified')
         end
 
-        def revbuild(flag = nil, opts = [], sync: invoked_sync?('revbuild', flag), **kwargs)
+        def revbuild(flag = nil, opts = [], sync: nil, **kwargs)
           statusargs = lambda do
             {
               include: relativepath(as_a(kwargs[:include]), all: true),
@@ -1090,6 +1094,7 @@ module Squared
           sha = git_spawn('rev-parse --verify HEAD').chomp
           return if sha.empty?
 
+          sync = invoked_sync?('revbuild', flag) if sync.nil?
           kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? statusargs.call : @revbuild || {}
           case flag
           when :build
@@ -1457,7 +1462,7 @@ module Squared
             else
               git_spawn 'fetch --all --prune --quiet' if option('sync')
               out, banner, from = source(cmd << '-vv --no-abbrev --list', io: true)
-              ret = write_lines(out, grep: /^\*\s+#{Regexp.escape(head)}\s/, banner: banner, first: true) do |line|
+              ret = write_lines(out, grep: [/^\*\s+#{Regexp.escape(head)}\s/], banner: banner, first: true) do |line|
                 next line if stdin?
 
                 data = line.sub(/^\*\s+/, '').split(/\s+/)
@@ -1585,7 +1590,7 @@ module Squared
           op << shell_quote(remote) if remote
           out, banner, from = source(io: true)
           print_item banner
-          ret = write_lines(out, grep: op.extras)
+          ret = write_lines(out, grep: op.extras, prefix: "refs/#{flag}/")
           list_result(ret, flag.to_s, from: from, grep: op.extras)
         end
 
@@ -1662,7 +1667,7 @@ module Squared
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
                    multiple: false, **kwargs)
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          banner = nil if multiple && banner
+          banner = nil if banner && (multiple || !banner?)
           if cmd.respond_to?(:done)
             if io && banner == false
               from = nil
@@ -1723,15 +1728,27 @@ module Squared
           end
         end
 
-        def write_lines(data, banner: nil, loglevel: nil, grep: nil, sub: nil, pass: false, first: false)
-          grep &&= as_a(grep).yield_self { |a| a.empty? || a.include?('*') ? nil : a.map { |val| Regexp.new(val) } }
-          sub &&= stdin? ? nil : as_a(sub)
+        def write_lines(data, grep: [], prefix: nil, sub: nil, banner: nil, loglevel: nil, pass: false, first: false)
+          grep = unless grep.empty?
+                   grep.map do |val|
+                     if val.is_a?(Regexp)
+                       val
+                     else
+                       val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
+                       Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
+                     end
+                   end
+                 end
+          sub = nil if stdin?
           ret = 0
           out = []
           data.each do |line|
             next if grep&.none? { |pat| pat.match?(line) }
 
-            line = yield line if block_given?
+            if block_given?
+              line = yield line
+              next unless line
+            end
             if loglevel
               log&.add loglevel, line
             else
@@ -1749,21 +1766,14 @@ module Squared
           ret
         end
 
-        def list_result(size, type, from: nil, action: 'found', grep: nil)
-          if verbose
-            if size > 0
-              styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
-              styles << :bold if styles.size <= 1
-              puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
-                                sub: { pat: /^(\d+)(.+)$/, styles: styles })
-            else
-              puts empty_status("No #{type} were #{action}", 'grep', grep.is_a?(Array) ? case grep.size
-                                                                                         when 0
-                                                                                           nil
-                                                                                         else
-                                                                                           grep.join(', ')
-                                                                                         end : grep.to_s)
-            end
+        def list_result(size, type, grep: [], action: 'found', from: nil)
+          if size == 0
+            puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
+          elsif verbose
+            styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
+            styles << :bold if styles.size <= 1
+            puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
+                              sub: [pat: /^(\d+)(.+)$/, styles: styles])
           end
           on :last, from
         end
@@ -1843,7 +1853,7 @@ module Squared
               when 'refspec'
                 refspec << shell_escape($2, quote: true)
               end
-            elsif op.arg?('--multiple')
+            elsif op.arg?('multiple')
               op.found << opt
             else
               op.errors << opt
@@ -1858,7 +1868,7 @@ module Squared
               op.merge(refspec)
             end
             op.delete('--all')
-          elsif op.arg?('--multiple')
+          elsif op.arg?('multiple')
             op.swap.merge(op.map! { |opt| shell_escape(opt, quote: true) })
             return
           elsif option('all')
@@ -1975,7 +1985,7 @@ module Squared
         end
 
         def commithash(val)
-          val[/:(\h{5,40})\z/, 1] || val[/\A#\{(\h{5,40})\}\z/, 1]
+          val[/\A:(\h{5,40})\z/, 1] || val[/\A#\{(\h{5,40})\}\z/, 1]
         end
 
         def commithead(val)