squared 0.8.6 → 0.9.0.pre2

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

@@ -102,7 +102,7 @@ module Squared
 
         @@tasks = {}
         @@graph = { _: [] }
-        @@asdf = Pathname.new(ENV['ASDF_DIR'] || "#{Dir.home}/.asdf").yield_self do |path|
+        @@asdf = Pathname.new(ENV['ASDF_DIR'] || "#{Dir.home}/.asdf").then do |path|
           version = if path.join('asdf.sh').exist?
                       15
                     elsif ENV['ASDF_DATA_DIR'] && (path = Pathname.new(ENV['ASDF_DATA_DIR'])).exist?
@@ -640,7 +640,7 @@ module Squared
           end
           env('GRAPH', suffix: 'PASS') { |val| pass.concat(split_escape(val)) }
           start, neg = start.partition { |name| !name.start_with?('-') }
-          data = graph_collect(self, start, pass: neg.map { |name| name[1..-1] })
+          data = graph_collect(self, start, pass: neg.map { |name| name[1..] })
           unless out
             data[name] << self
             on :first, :graph
@@ -700,7 +700,7 @@ module Squared
             headers = headers.is_a?(Hash) ? headers.merge(data) : data
           end
           if file
-            ext ||= File.extname(file)[1..-1]
+            ext ||= File.extname(file)[1..]
           else
             require 'open-uri'
             data = nil
@@ -876,7 +876,7 @@ module Squared
             return
           end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          if interactive && sync && (!@session || !option('y'))
+          if interactive && sync && !(@session && option('y'))
             print_item(series: true)
             msg, y, h = case interactive
                         when Array
@@ -924,9 +924,9 @@ module Squared
           end
         end
 
-        def scope(*args, **kwargs, &blk)
+        def scope(...)
           namespace name do
-            task(*args, **kwargs, &blk)
+            task(...)
           end
         end
 
@@ -1298,26 +1298,25 @@ module Squared
           file = if (val = env('LOG_FILE'))
                    Time.now.strftime(val)
                  elsif (val = env('LOG_AUTO'))
-                   require 'date'
+                   d = Time.now
                    "#{@name}-%s.log" % [case val
                                         when 'y', 'year'
-                                          Date.today.year
+                                          d.year
                                         when 'm', 'month'
-                                          Date.today.strftime('%Y-%m')
+                                          d.strftime('%Y-%m')
                                         when 'd', 'day', '1'
-                                          Date.today
+                                          d.strftime('%Y-%m-%d')
                                         else
-                                          val.include?('%') ? Time.now.strftime(val) : Time.now.strftime('%FT%T%:z')
+                                          val.include?('%') ? d.strftime(val) : d.strftime('%FT%T%:z')
                                         end]
                  elsif (val = log[:file])
                    if val.is_a?(String)
                      Time.now.strftime(val)
                    else
-                     require 'date'
-                     "#{@name}-#{Date.today}.log"
+                     "#{@name}-#{Time.now.strftime('%Y-%m-%d')}.log"
                    end
                  end
-                 .yield_self do |path|
+                 .then do |path|
                    next unless path
 
                    @workspace.home.join(env('LOG_DIR', ''), path).realdirpath
@@ -1476,7 +1475,7 @@ module Squared
 
             t = uniq.call(name = proj.name)
             j = if out
-                  if i == items.size.pred || (post = items[i.succ..-1] - done).empty?
+                  if i == items.size.pred || (post = items[i.succ..] - done).empty?
                     true
                   elsif !t.empty? && depth > 0
                     (post - t).empty?
@@ -1582,14 +1581,18 @@ module Squared
         end
 
         def env(key, default = nil, suffix: nil, strict: false, ignore: nil, **kwargs, &blk)
-          name = "#{key}_#{envname_get}"
+          name = suffix == false ? key : "#{key}_#{envname_get}"
           ret = if suffix
                   ENV["#{name}_#{suffix}"] || (ignore == false && ENV["#{key}_#{suffix}"]) || ''
                 elsif strict
                   ENV[name].to_s
                 else
                   ignore = ['0'].freeze if ignore.nil?
-                  ENV[name] || ENV.fetch(key, '')
+                  if key =~ /^(.+)_(FORCE|YES|Y)$/ && !(ret = __arg__($2 == 'Y' ? 'YES' : $2, $1)).nil?
+                    ret
+                  else
+                    ENV[name] || ENV.fetch(key, '')
+                  end
                 end
           env_yield(ret, default, ignore: ignore, **kwargs, &blk)
         end
@@ -1693,19 +1696,38 @@ module Squared
                    **kwargs)
           return unless prefix
 
+          getarg = ->(key) { ARG[key][s = prefix.downcase] || ARG[key][s.to_sym] }
           args.each do |key|
-            next unless (ret = env(env_key(prefix.to_s.stripext, key), **kwargs)) && (!pat || ret.match?(pat))
-
-            if target
-              if path
-                target << quote_option(key, basepath(ret))
-              elsif quote
-                target << quote_option(key, ret)
-              elsif escape
-                target << shell_option(key, ret)
+            ret = case key.downcase
+                  when 'force'
+                    getarg.call(:FORCE)
+                  when 'y'
+                    getarg.call(:YES)
+                  end
+            return yield(ret) if !ret.nil? && block_given?
+
+            case ret.to_s
+            when '0'
+              next
+            when 'true'
+              return true
+            when 'false'
+              return false
+            else
+              ret ||= env(env_key(prefix.to_s.stripext, key), **kwargs)
+              next unless ret && (!pat || ret.match?(pat))
+
+              if target
+                if path
+                  target << quote_option(key, basepath(ret))
+                elsif quote
+                  target << quote_option(key, ret)
+                elsif escape
+                  target << shell_option(key, ret)
+                end
               end
+              return block_given? ? yield(ret) : ret
             end
-            return block_given? ? yield(ret) : ret
           end
           nil
         end
@@ -1818,6 +1840,8 @@ module Squared
 
           case from
           when :outdated
+            return if ENV['BANNER'] == 'false'
+
             out = print_footer("major #{args[0]} / minor #{args[1]} / patch #{args[2]}", right: true).split("\n")
             sub_style!(out[1], **opt_style(theme[:major], /^( +major )(\d+)(.+)$/, 2))
             sub_style!(out[1], **opt_style(theme[:active], /^(.+)(minor )(\d+)(.+)$/, 3))
@@ -2040,27 +2064,27 @@ module Squared
                          val
                        end
           end
-          base.update(data)
-              .update(ret)
+          base.update(data, ret)
         end
 
         def merge_opts(base, data)
+          s = '%s %s'
           case data
           when String
             case base
             when String
-              "#{base} #{data}"
+              s % [base, data]
             when Hash
-              "#{append_hash(base, target: []).join(' ')} #{data}"
+              s % [append_hash(base, target: []).join(' '), data]
             when Enumerable
-              "#{base.to_a.join(' ')} #{data}"
+              s % [base.to_a.join(' '), data]
             else
               data
             end
           when Hash
             case base
             when String
-              "#{base} #{append_hash(data, target: []).join(' ')}"
+              s % [base, append_hash(data, target: []).join(' ')]
             when Hash
               base.merge(data)
             when Enumerable
@@ -2071,9 +2095,9 @@ module Squared
           when Enumerable
             case base
             when String
-              "#{base} #{data.to_a.join(' ')}"
+              s % [base, data.to_a.join(' ')]
             when Hash
-              "#{append_hash(base, target: []).join(' ')} #{data.to_a.join(' ')}"
+              s % [append_hash(base, target: []).join(' '), data.to_a.join(' ')]
             when Enumerable
               Set.new(base.to_a + data.to_a).to_a
             else
@@ -2107,8 +2131,23 @@ module Squared
           end || []
         end
 
+        def parse_select(kwargs = {})
+          pa, ch = ENV.fetch('SELECT', '0:0').split(':').map(&:to_i)
+          if pa > 0
+            kwargs[:page] = pa
+          elsif !kwargs.key?(:page)
+            kwargs[:page] = ARG[:PAGE]
+          end
+          kwargs[:max] = ch if ch > 0
+          kwargs
+        end
+
         def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
+            if key.is_a?(Array)
+              return key.map { |val| param_guard(action, flag, args: args, key: val, pat: pat, values: values) }
+            end
+
             val = args.fetch(key, nil)
             return val unless val.nil? || (pat && !val.match?(pat)) || (values && !values.include?(val))
 
@@ -2140,9 +2179,9 @@ module Squared
         end
 
         def choice_index(msg, list, values: nil, accept: nil, series: false, trim: nil, column: nil, multiple: false,
-                         force: true, **kwargs)
+                         force: true, pipe: self.pipe, **kwargs)
           puts unless series || printfirst?
-          ret = choice(msg, list, multiple: multiple, force: force, **kwargs)
+          ret = choice(msg, list, multiple: multiple, force: force, pipe: pipe, **parse_select(kwargs))
           unless ret && !ret.empty?
             exit 1 if force
             return
@@ -2226,12 +2265,12 @@ module Squared
         end
 
         def relativepath(*list, all: false)
-          list.map { |val| Pathname.new(val) }
-              .select { |val| projectpath?(val) }
-              .map do |val|
-                ret = (val.absolute? ? val.relative_path_from(path) : val.cleanpath).to_s
-                all && val.to_s.end_with?('/') ? "#{ret}/*" : ret
-              end
+          list.filter_map do |val|
+            next unless projectpath?(file = Pathname.new(val))
+
+            out = (file.absolute? ? file.relative_path_from(path) : file.cleanpath).to_s
+            all && file.to_s.end_with?('/') ? "#{out}/*" : out
+          end
         end
 
         def projectmap(files, resolve: true, parent: false, pass: true)
@@ -2334,6 +2373,19 @@ module Squared
           cur[2] == lat[2] ? 3 : 2
         end
 
+        def semapp(name, *args, minor: true, patch: true, pre: false, env: false)
+          if args.empty?
+            args << '--version'
+          else
+            args.map! { |s| shell_quote(s, force: false) }
+          end
+          n = minor ? patch ? pre ? -1 : 4 : 2 : 0
+          IO.popen([shell_bin(name, env: env), *args], chdir: path, &:read).scan(SEM_VER).first
+            &.slice(0..n)&.join or raise
+        rescue
+          '0.0.0'
+        end
+
         def semmajor?(cur, want)
           (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[6]
         end
@@ -2347,7 +2399,7 @@ module Squared
         end
 
         def indexitem(val)
-          [$1.to_i, $2 && $2[1..-1]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
+          [$1.to_i, $2 && $2[1..]] if val =~ /\A[=^#{indexchar}](\d+)(:.+)?\z/
         end
 
         def indexerror(val, list = nil)
@@ -2451,7 +2503,6 @@ module Squared
         def pwd_set(cmd = nil, pass: false, timeout: nil, from: @on[:from].last, **kwargs, &blk)
           return if from == false
 
-          require 'timeout'
           unless (path.to_s == Dir.pwd || pass) && (mri? || !windows?)
             pwd = Dir.pwd
             Dir.chdir(path)
@@ -2748,7 +2799,15 @@ module Squared
         end
 
         def dryrun?(target: @session, prefix: target&.first, **)
-          Array(target).include?('--dry-run') || !option('dry-run', target: target, prefix: prefix).nil?
+          val = ENV['DRY_RUN'] if (val = option('dry-run', target: target, prefix: prefix)).nil?
+          case val.to_s
+          when '0' then nil
+          when 'false'
+            return false
+          else
+            return true if val
+          end
+          Array(target).include?('--dry-run')
         end
 
         def pwd?

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

@@ -128,6 +128,7 @@ module Squared
           'image' => %i[ls rm pull push tag save inspect history].freeze,
           'container' => %i[attach commit create diff exec inspect kill logs pause restart rm run start stats stop top
                             unpause update].freeze,
+          'run' => %i[rmi rmd mount volume entrypoint].freeze,
           'network' => %i[connect disconnect create rm].freeze,
           'ls' => nil
         })
@@ -303,13 +304,22 @@ module Squared
                           end
                         end
                       else
-                        format_desc action, flag, "opts*,id/name#{case flag
-                                                                  when :stats then '*'
-                                                                  when :logs, :diff, :attach, :top then nil
-                                                                  else '+'
-                                                                  end}"
+                        single = %i[logs diff attach top].freeze
+                        format_desc action, flag, "opts*,id/name#{if flag == :stats
+                                                                    '*'
+                                                                  elsif !single.include?(flag)
+                                                                    '+'
+                                                                  end}|:"
                         task flag do |_, args|
-                          container flag, args.to_a
+                          args = args.to_a
+                          if choice!(args, first: false)
+                            args.concat(Array(choice_command(:container, multiple: !single.include?(flag))))
+                            if flag == :rm
+                              stop = filter_ps(:stop, column: 'ID').select { |id| args.include?(id) }
+                              container :stop, stop if !stop.empty? && confirm_basic('Stop?', stop.join(', '))
+                            end
+                          end
+                          container flag, args
                         end
                       end
                     when 'image'
@@ -358,18 +368,47 @@ module Squared
                           end
                         end
                       end
+                    when 'run'
+                      format_desc action, flag, 'id|:,opts*'
+                      task flag, [:id] do |_, args|
+                        id = if args.id == ':'
+                               choice_command(:image, multiple: false)
+                             else
+                               param_guard(action, flag, args: args, key: :id)
+                             end
+                        args = case flag
+                               when :mount
+                                 mount = []
+                                 loop do
+                                   s = readline("Enter mount ##{mount.size.succ}", force: false)
+                                   break if s.empty?
+
+                                   mount << (s.include?('type=') ? s : "type=bind,#{s}")
+                                 end
+                                 mount.map { |val| quote_option('mount', val, double: true) }
+                               when :volume
+                                 choice_command(:volume, multiple: true, series: true).map do |val|
+                                   basic_option 'volume', val
+                                 end
+                               when :entrypoint
+                                 ["entrypoint=#{shell_quote(readline('Entrypoint', force: true), double: true)}"]
+                               when :rmi
+                                 %w[rm i t]
+                               when :rmd
+                                 %w[rm d]
+                               end + args.extras
+                        container(:run, args.uniq, id: id)
+                      end
                     when 'network'
                       format_desc action, flag, 'name,opts*'
                       task flag, [:name] do |_, args|
-                        name = if flag == :create || flag == :rm
-                                 param_guard(action, flag, args: args, key: :name)
-                               else
-                                 args.name
-                               end
+                        name = flag == :create ? param_guard(action, flag, args: args, key: :name) : args.name
                         if name
                           network(flag, args.extras, name: name)
+                        elsif flag == :rm
+                          choice_command :'network:rm'
                         else
-                          choice_command flag
+                          choice_command(flag, id: choice_command(:container, force: false), series: true)
                         end
                       end
                     end
@@ -501,7 +540,7 @@ module Squared
             if flag == :publish
               id ||= option('tag', ignore: false) || op.shift || tagmain
               registry ||= option('registry') || op.shift || @oci
-              emptyargs op, flag
+              op.clear(strict: true)
               op << shell_quote(tagjoin(registry, id))
               return unless confirm_command(op.to_s, title: from, target: id)
             else
@@ -516,10 +555,10 @@ module Squared
               if multiple
                 op.concat(service) if service
                 op.append(delim: true, escape: true, strip: ':')
-              else
-                raise ArgumentError, message('no service was selected', hint: flag) unless service
-
+              elsif service
                 append_command(flag, service, op.extras, prompt: '::')
+              else
+                raise ArgumentError, message('no service was selected', hint: flag)
               end
             end
           end
@@ -668,7 +707,7 @@ module Squared
                 args = if name
                          index += 1
                          opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
-                       elsif choice!(opts, only: true)
+                       elsif choice!(opts, empty: true, only: true)
                          OptionPartition.strip(readline('Enter arguments', force: false))
                        else
                          opts
@@ -720,9 +759,9 @@ module Squared
           when :push
             id ||= option('tag', ignore: false) || op.shift || tagmain
             registry ||= option('registry') || op.shift || self.registry
-            emptyargs op, flag
             raise ArgumentError, message('username/registry not specified', hint: flag) unless registry
 
+            op.clear(strict: true)
             uri = shell_quote tagjoin(registry, id)
             op << uri
             img = docker_output 'image tag', id, uri
@@ -745,7 +784,7 @@ module Squared
           success?(run(sync: sync, exception: exception, banner: banner, from: from), status)
         end
 
-        def network(flag, opts = [], target: nil, name: target)
+        def network(flag, opts = [], name: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
           op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, **dockerinit)
                               .clear
@@ -891,7 +930,7 @@ module Squared
           target
         end
 
-        def filter_ps(flag, meth = nil, column: nil, from: meth || :'container:ps')
+        def filter_ps(flag, column: nil, from: :'container:ps')
           no = false
           status = case flag.to_sym
                    when :start
@@ -927,7 +966,7 @@ module Squared
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
-            y = from.to_s.end_with?(':rm') && option('y', prefix: 'docker')
+            y = from == :'image:rm' && option('y', prefix: 'docker')
             filter = env('DOCKER_FILTER', filter).to_s
             pat = if OptionPartition.pattern?(filter)
                     Regexp.new(filter)
@@ -1009,18 +1048,22 @@ module Squared
           confirm "#{s} #{sub_style(target, theme[:subject])}#{" as #{sub_style(as, theme[:inline])}" if as}?", 'N'
         end
 
-        def choice_command(flag, *action)
+        def choice_command(flag, *action, id: nil, multiple: nil, series: false, force: true)
           msg, cmd = case flag
-                     when :exec
+                     when :exec, :container
                        ['Choose a container', 'ps -a']
                      when :bake
                        ['Choose a target', 'buildx bake --list=type=targets']
-                     when :connect, :disconnect
+                     when :connect, :disconnect, :'network:rm'
                        ['Choose a network', 'network ls']
                      when :service
                        ['Choose a service',
                         'compose ps -a ' \
                         '--format="table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}"']
+                     when :volume
+                       ['Choose a volume',
+                        'volume ls ' \
+                        '--format="table {{.Name}}\t{{.Driver}}\t{{.Mountpoint}}"']
                      else
                        ['Choose an image',
                         'images -a ' \
@@ -1031,28 +1074,40 @@ module Squared
             puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0, 2].join(' ')}")
             return
           end
-          puts " #  #{lines.shift}"
-          multiple = false
+          parse = lambda do |list|
+            ret = Array(list).map { |val| val.split(/\s+/, 2).first }.reject(&:empty?)
+            return ret.first if multiple == false
+
+            ret unless ret.empty?
+          end
+          puts "#{"\n" if id && !printfirst?} #  #{lines.shift}"
           ctx = flag.to_s
           case flag
           when :run, :exec
             values = [['Options', flag == :run], ['Arguments', flag == :exec]]
           when :rm, :bake
             values = ['Options']
-            multiple = true
+            multiple = true if multiple.nil?
             ctx = flag == :rm ? 'image rm' : "buildx bake -f #{shell_quote(dockerfile)}"
           when :save
             values = [['Output', true], 'Platform']
-            multiple = true
+            multiple = true if multiple.nil?
           when :service
-            values = []
-            multiple = true
+            values = ['Options']
+            multiple = true if multiple.nil?
             ctx = 'compose'
           when :connect, :disconnect
-            values = ['Options', ['Container', true]]
+            values = id ? ['Options'] : ['Options', ['Container', true]]
             ctx = "network #{flag}"
+          when :'network:rm'
+            values = ['Options']
+            multiple = true if multiple.nil?
+            ctx = 'network rm'
+          when :container, :image, :volume
+            return parse.call(choice_index(msg, lines, multiple: multiple, series: series, force: force,
+                                                       attempts: force ? 3 : 1))
           end
-          out, opts, args = choice_index(msg, lines, multiple: multiple, values: values)
+          out, opts, args = choice_index(msg, lines, values: values, multiple: multiple, series: series)
           cmd = docker_output(ctx, *action)
           case flag
           when :tag
@@ -1067,8 +1122,10 @@ module Squared
           else
             cmd << opts << '--'
           end
-          cmd.merge(Array(out).map { |val| val.split(/\s+/, 2).first })
-          success?(run(cmd << args, { 'NO_COLOR' => 'true' }), ctx.start_with?('network', 'tag', 'save'))
+          cmd.merge(parse.call(out))
+          cmd << args
+          cmd.merge(Array(id)) if id
+          success?(run(cmd, { 'NO_COLOR' => 'true' }), ctx.start_with?('network', 'tag', 'save'))
         end
 
         def filetype(val = dockerfile)
@@ -1108,14 +1165,14 @@ module Squared
             s = val.join(':')
             return s unless s.size > max
           end
-          ret[0...max]
+          ret[...max]
         end
 
         def dnsname(val, max: 63, char: nil)
           ret = val.sub(/^[^a-z]+/i, '')
                    .sub(/[^a-z\d]+$/i, '')
                    .gsub(/[^a-z\d#{char}]+/i, '-')
-                   .gsub(/-{2,}/, '-')[0...max]
+                   .gsub(/-{2,}/, '-')[...max]
           char ? ret : ret.downcase
         end
 
@@ -1123,10 +1180,6 @@ module Squared
           dnsname(val, max: 128, char: '.').gsub(/\.{2,}/, '.')
         end
 
-        def charname(val)
-          val.gsub(/[^\w.-]+/, '_')
-        end
-
         def tagmain
           tag.is_a?(Array) ? tag.first : tag
         end
@@ -1135,10 +1188,6 @@ module Squared
           { project: self, strict: strict?, explicit: '=', bool: %w[1 0 true false] }
         end
 
-        def emptyargs(list, hint = nil)
-          raise ArgumentError, message('unrecognized args', list.join(', '), hint: hint) unless list.empty?
-        end
-
         def anypath?(*args)
           args.any? { |val| basepath!(val) }
         end