squared 0.4.8 → 0.4.9

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

@@ -213,7 +213,7 @@ module Squared
             file = val.is_a?(String) ? Time.now.strftime(val) : "#{@name}-#{Date.today}.log"
           end
           if file
-            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home.join(file)
+            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home + file
             begin
               file = file.realdirpath
             rescue StandardError => e
@@ -225,7 +225,7 @@ module Squared
           end
           log[:progname] ||= @name
           if (val = env('LOG_LEVEL', ignore: false))
-            log[:level] = val.match?(/^\d$/) ? log_sym(val.to_i) : val
+            log[:level] = val.match?(/\d/) ? log_sym(val.to_i) : val
           end
           log.delete(:file)
           @log = [file, log]
@@ -240,10 +240,10 @@ module Squared
           unless @output[0] == false || @output[0].is_a?(Array)
             if (val = env('BUILD', suffix: 'OPTS'))
               n = @output[0] ? 1 : 3
-              @output[n] = merge_opts(@output[n], shell_split(val, escape: false))
+              @output[n] = merge_opts(@output[n], shell_split(val))
             end
             if (val = env(ref.to_s.upcase, suffix: 'OPTS'))
-              @output[4] = merge_opts(@output[4], shell_split(val, escape: false))
+              @output[4] = merge_opts(@output[4], shell_split(val))
             end
           end
           @version = val if (val = env('BUILD', suffix: 'VERSION'))
@@ -324,7 +324,7 @@ module Squared
                       else
                         force = args.fetch(:force, false)
                       end
-                      unpack(basepath(dir), uri: tag, digest: digest, ext: ext, force: force)
+                      unpack(path + dir, uri: tag, digest: digest, ext: ext, force: force)
                     end
                   end
                 end
@@ -401,10 +401,10 @@ module Squared
           self
         end
 
-        def build(*args, sync: invoked_sync?('build'), from: @buildtype || :build, **)
+        def build(*args, sync: invoked_sync?('build'), from: :run, **)
           banner = verbose
           if args.empty?
-            return unless from == (@buildtype || :build)
+            return unless from == :run
 
             run_b(@run, sync: sync, from: from) if series?(@run)
             args = @output
@@ -443,7 +443,7 @@ module Squared
             cmd, opts, var, flags, extra = args
           end
           if cmd
-            cmd = as_get(cmd)
+            cmd = as_get cmd
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
             flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
             case opts
@@ -461,6 +461,7 @@ module Squared
             return unless (opts || extra) && respond_to?(:compose)
 
             cmd = compose(as_get(opts), flags, script: true, args: extra, from: from)
+            from = :script if from == :run && script?
           end
           run(cmd, var, from: from, banner: banner, sync: sync)
         end
@@ -516,13 +517,13 @@ module Squared
           else
             if @clean.is_a?(Enumerable) && !series?(@clean)
               @clean.each do |val|
-                path = basepath(val = val.to_s)
-                if path.directory? && val.match?(%r{[\\/]$})
-                  log&.warn "rm -rf #{path}"
-                  rm_rf(path, verbose: verbose)
+                entry = path + (val = val.to_s)
+                if entry.directory? && val.match?(%r{[\\/]$})
+                  log&.warn "rm -rf #{entry}"
+                  rm_rf(entry, verbose: verbose)
                 else
-                  log&.warn "rm #{path}"
-                  (val.include?('*') ? Dir[path] : [path]).each do |file|
+                  log&.warn "rm #{entry}"
+                  (val.include?('*') ? Dir[entry] : [entry]).each do |file|
                     next unless File.file?(file)
 
                     begin
@@ -571,7 +572,7 @@ module Squared
           end
         end
 
-        def unpack(target, sync: true, uri: nil, digest: nil, ext: nil, force: false, depth: 1, headers: {},
+        def unpack(target, uri:, sync: true, digest: nil, ext: nil, force: false, depth: 1, headers: {},
                    from: :unpack)
           if !target.exist?
             target.mkpath
@@ -685,7 +686,7 @@ module Squared
               break unless entry.directory?
 
               i = 0
-              while (dest = target.join("#{File.basename(file.path)}-#{i}")).exist?
+              while (dest = target + "#{File.basename(file.path)}-#{i}").exist?
                 i += 1
               end
               FileUtils.mv(entry, dest)
@@ -915,7 +916,7 @@ module Squared
             end
             return
           end
-          cmd = session_done(cmd)
+          cmd = session_done cmd
           log&.info cmd
           on :first, from
           begin
@@ -1122,7 +1123,7 @@ module Squared
           end
           ret = JoinSet.new(cmd.flatten(1))
           if options && (val = env("#{prefix}_OPTIONS"))
-            split_escape(val).each { |opt| ret.last(fill_option(opt), /^(--?[^ =]+)[ =].+$/) }
+            split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^ =]+)[ =].+\z/m) }
           end
           main ? @session = ret : ret
         end
@@ -1130,7 +1131,7 @@ module Squared
         def session_delete(*args, target: @session)
           ret = []
           args.each do |val|
-            pat = /^#{Regexp.escape(shell_option(val))}(?: |=|$)/
+            pat = /\A#{Regexp.escape(shell_option(val))}(?: |=|\z)/
             if (key = target.find { |opt| opt.match?(pat) })
               target.delete(key)
               ret << key
@@ -1172,6 +1173,10 @@ module Squared
           OptionPartition.clear(target, opts, styles: theme[:inline], **kwargs)
         end
 
+        def print_success(*)
+          puts 'Success'
+        end
+
         def print_item(*val)
           puts if @@print_order > 0 && stdout?
           @@print_order += 1
@@ -1204,7 +1209,7 @@ module Squared
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
           n = Project.max_width(lines)
-          sub = as_a(sub)
+          sub = as_a sub
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
             sub.each { |h| s = sub_style(s, **h) }
@@ -1471,7 +1476,7 @@ module Squared
           end
         end
 
-        def param_guard(action, flag, args: nil, key: nil, pat: nil, values: nil)
+        def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
             return val unless val.nil? || (pat && !val.match?(pat)) || (values && !values.include?(val))
@@ -1497,24 +1502,59 @@ module Squared
           b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
           c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
           e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d, timeout: 60)
+          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d)
         end
 
-        def choice_index(msg, list, values: nil, multiple: false, accept: nil, trim: nil)
-          puts if @@print_order > 0
-          raise_error 'user cancelled' unless (ret = choice(msg, list, multiple: multiple))
+        def choice_index(msg, list, values: nil, multiple: false, accept: nil, series: false, trim: nil, column: nil,
+                         attempts: 5, force: true)
+          puts if !series && @@print_order > 0
+          msg = "#{msg} (optional)" unless force
+          unless (ret = choice(msg, list, multiple: multiple, force: force, attempts: attempts)) || !force
+            raise_error 'user cancelled'
+          end
+          if ret.nil? || ret.empty?
+            return unless force
+
+            exit 1
+          end
           ret = multiple ? ret.map! { |val| val.sub(trim, '') } : ret.sub(trim, '') if trim
-          exit 1 if accept && !confirm("#{accept} [#{ret.join(', ')}] [y/N] ", 'N', timeout: 60)
+          if column
+            a, b = as_a(column)
+            ret = as_a(ret).map! { |val| val[a, b || 1] }
+            ret = ret.first unless multiple
+          end
+          if accept
+            a = as_a(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
+            accept = as_a(accept).map { |val| as_a(val) }
+            if accept.any? { |val| val[1] == true }
+              ret = [ret]
+              multiple = -1
+            end
+            loop do
+              c = confirm("#{accept.first[0]}#{a ? " [#{a}]" : ''} [y/N] ", 'N', timeout: 60)
+              if accept.shift[1] == true
+                ret << c
+              elsif !c
+                break
+              end
+              a = nil
+              break if accept.empty?
+            end
+            exit 1 unless accept.empty?
+          end
           if values
-            ret = [ret]
+            ret = [ret] unless accept && multiple == -1
             values.each do |val|
-              val, req = val if val.is_a?(Array)
-              val = Readline.readline("#{val} (#{req ? 'required' : 'optional'}): ", true).strip
-              raise_error 'user cancelled' if req && val.empty?
+              if val.is_a?(Array)
+                val, force = val
+              else
+                force = false
+              end
+              val = readline(val, force: force)
               ret << (val.empty? ? nil : val)
             end
           end
-          @@print_order += 1
+          @@print_order += 1 unless series
           ret
         end
 
@@ -1547,7 +1587,7 @@ module Squared
             raise_error 'pathspec not within worktree' unless pass || files.size == proj.size
             files = proj
           end
-          files.map { |val| val == '.' ? '.' : shell_quote(basepath(val)) }
+          files.map { |val| val == '.' ? '.' : shell_quote(path + val) }
         end
 
         def semver(val)
@@ -1583,7 +1623,7 @@ module Squared
         end
 
         def colormap(val)
-          val.compact.map! { |s| color(s) }.flatten
+          val.compact.flat_map { |s| color(s) }
         end
 
         def epochtime
@@ -1592,7 +1632,7 @@ module Squared
 
         def verbosetype
           case verbose
-          when TrueClasss
+          when TrueClass
             1
           when Numeric
             verbose.succ
@@ -1627,7 +1667,7 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join >= RUBY_VERSION)
+              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
                 ret = yield
               else
                 Dir.chdir(path)
@@ -1794,6 +1834,10 @@ module Squared
           end
         end
 
+        def success?(ret)
+          ret == true && stdout? && banner?
+        end
+
         def banner?
           ARG[:BANNER] && !env('BANNER', equals: '0')
         end

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

@@ -4,8 +4,6 @@ module Squared
   module Workspace
     module Project
       class Docker < Base
-        include Prompt
-
         COMPOSEFILE = %w[compose.yaml compose.yml docker-compose.yaml compose.yml docker-compose.yml].freeze
         BAKEFILE = %w[docker-bake.json docker-bake.hcl docker-bake.override.json docker-bake.override.hcl].freeze
         DIR_DOCKER = (COMPOSEFILE + BAKEFILE).freeze
@@ -37,15 +35,15 @@ module Squared
             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,
+                    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,
             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
@@ -163,7 +161,7 @@ module Squared
                   when 'container'
                     case flag
                     when :exec, :commit
-                      format_desc(action, flag, flag == :exec ? 'id/name?,opts*,args+' : 'id/name,tag?,opts*')
+                      format_desc(action, flag, flag == :exec ? 'id/name,opts*,args+' : 'id/name,tag?,opts*')
                       task flag, [:id] do |_, args|
                         if flag == :exec && !args.id
                           choice_command flag
@@ -173,7 +171,7 @@ module Squared
                         end
                       end
                     when :run
-                      format_desc action, flag, 'image?,opts*,args*'
+                      format_desc action, flag, 'image,opts*,args*'
                       task flag, [:image] do |_, args|
                         if args.image
                           container(flag, args.extras, id: args.image)
@@ -204,8 +202,8 @@ module Squared
                   when 'network'
                     format_desc action, flag, 'target,opts*'
                     task flag, [:target] do |_, args|
-                      if (target = args.target)
-                        network(flag, args.extras, target: target)
+                      if args.target
+                        network(flag, args.extras, target: args.target)
                       else
                         choice_command flag
                       end
@@ -307,7 +305,7 @@ module Squared
                 end
               end
               op.append(args, escape: true)
-              contextdir(context) if context
+              contextdir context if context
             end
           end
           op.clear(pass: false)
@@ -361,7 +359,7 @@ module Squared
                     args << k
                     next
                   when 'source', 'src', 'destination', 'dst', 'target'
-                    v = basepath(v)
+                    v = path + v
                     v = shell_quote(v, option: false, force: false) if q == ''
                     tmpfs = false if k[0] == 's'
                   end
@@ -420,7 +418,7 @@ module Squared
               when :rm
                 status = %w[created exited dead]
               end
-              ps = docker_output('ps -a', *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
@@ -489,7 +487,7 @@ module Squared
           op.clear
           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?
+            print_success if success?(run(cmd.temp(target, img), from: from))
           end
         end
 
@@ -550,7 +548,7 @@ module Squared
         def append_file(type, target: @session)
           return unless type == 2 || type == 4 || @file.is_a?(Array)
 
-          files = as_a(@file).map { |val| quote_option('file', basepath(val)) }
+          files = as_a(@file).map { |val| quote_option('file', path + val) }
           if target.is_a?(Set)
             target.merge(files)
           else
@@ -585,7 +583,7 @@ module Squared
           pwd_set do
             found = false
             index = 0
-            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':').first})(?:[_.,:-]|$)/
+            pat = /^(?:#{dnsname(name)}|#{tagname(project)}|#{tagmain.split(':', 2).first})(?:[_.,:-]|$)/
             IO.popen(session_done(cmd << '--format=json')).each do |line|
               data = JSON.parse(line)
               id = data['ID']
@@ -675,7 +673,7 @@ module Squared
             puts " #  #{header}"
             case flag
             when :run, :exec
-              values = [['Options', flag == :run], ['Command arguments', flag == :exec]]
+              values = [['Options', flag == :run], ['Arguments', flag == :exec]]
               cmd = flag.to_s
             else
               values = [['Options', false], ['Container', true]]
@@ -683,7 +681,7 @@ module Squared
             end
             out, opts, args = choice_index(msg, lines, values: values)
             ret = run docker_output(cmd, opts, '--', out.split(/\s+/)[index], args)
-            puts 'Success' if ret && cmd.start_with?('network')
+            print_success if success?(ret && cmd.start_with?('network'))
           end
         end
 
@@ -703,7 +701,7 @@ module Squared
         end
 
         def contextdir(val = nil)
-          val && projectpath?(val) ? shell_quote(basepath(val)) : '.'
+          val && projectpath?(val) ? shell_quote(path + val) : '.'
         end
 
         def tagname(val)