squared 0.6.4 → 0.6.6

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

@@ -251,7 +251,7 @@ module Squared
                    print_error e
                  end
           log[:progname] ||= @name
-          log[:level] = val.match?(/\d/) ? log_sym(val.to_i) : val if (val = env('LOG_LEVEL', ignore: false))
+          env('LOG_LEVEL', ignore: false) { |val| log[:level] = val.start_with?(/\d/) ? log_sym(val.to_i) : val }
           log.delete(:file)
           @log = [file, log]
         end
@@ -259,28 +259,24 @@ module Squared
         def initialize_env(dev: nil, prod: nil, **)
           @dev = env_match('BUILD', dev, suffix: 'DEV', strict: true)
           @prod = env_match('BUILD', prod, suffix: 'PROD', strict: true)
-          if @output[2] != false && (val = env('BUILD', suffix: 'ENV'))
-            @output[2] = parse_json(val, hint: "BUILD_#{@envname}_ENV") || @output[2]
-          end
+          env('BUILD', suffix: 'ENV') { |val| @output[2] = val if (val = parse_json(val)) } unless @output[0] == false
           unless @output[0] == false || @output[0].is_a?(Array)
-            if (val = env('BUILD', suffix: 'OPTS'))
+            env('BUILD', suffix: 'OPTS') do |val|
               n = @output[0] ? 1 : 3
               @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))
+            env(ref.to_s.upcase, suffix: 'OPTS') { |val| @output[4] = merge_opts(@output[4], shell_split(val)) }
+          end
+          env('BUILD', suffix: 'VERSION') { |val| self.version = val }
+          env('BUILD', strict: true) do |val|
+            if val == '0'
+              @output = [false]
+            elsif script?
+              script_set val
+            else
+              run_set val
             end
           end
-          @version = val if (val = env('BUILD', suffix: 'VERSION'))
-          return unless (val = env('BUILD', strict: true))
-
-          if val == '0'
-            @output = [false]
-          elsif script?
-            script_set val
-          else
-            run_set val
-          end
         end
 
         def ==(other)
@@ -433,7 +429,7 @@ module Squared
                                                                       .sort { |a, b| b <=> a }
                                                                       .push('latest', 'system'),
                                                               accept: [accept_y('Confirm?')],
-                                                              values: 'Options', force: true)
+                                                              values: 'Options')
                                  OptionPartition.strip(opts)
                                end
                         asdf(flag, args, version: version)
@@ -702,7 +698,9 @@ module Squared
             if order
               out.map! do |val|
                 name = ret.find { |proj| val.match?(/ #{Regexp.escape(proj.name)}(?:@\d|\z)/) }&.name
-                (n = name && order[name]) ? val.subhint(n.succ) : val
+                next val unless (n = name && order[name])
+
+                val.subhint(n.succ)
               end
             else
               [out, ret]
@@ -743,9 +741,9 @@ module Squared
                    end
           end
           env('HEADERS') do |val|
-            if (data = parse_json(val, hint: "HEADERS_#{@envname}"))
-              headers = headers.is_a?(Hash) ? headers.merge(data) : data
-            end
+            next unless (data = parse_json(val))
+
+            headers = headers.is_a?(Hash) ? headers.merge(data) : data
           end
           if file
             ext ||= File.extname(file)[1..-1]
@@ -888,13 +886,9 @@ module Squared
         end
 
         def event(name, key, *args, override: false, **kwargs, &blk)
-          data = @events[name.to_sym]
-          items = if override
-                    data[key.to_sym] = []
-                  else
-                    data[key.to_sym] ||= []
-                  end
-          items << [block_given? ? [blk] + args : args, kwargs]
+          args.unshift(blk) if block_given?
+          ev = @events[name.to_sym]
+          (override ? ev[key.to_sym] = [] : ev[key.to_sym] ||= []) << [args, kwargs]
           self
         end
 
@@ -919,8 +913,10 @@ module Squared
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, banner: true, from: nil, chdir: path,
                 interactive: nil, hint: nil, series: false, **)
-          return print_error('no command session started', subject: project, hint: from, pass: true) unless cmd
-
+          unless cmd
+            print_error('no command session started', subject: project, hint: from, pass: true)
+            return
+          end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           if interactive && sync && (!@session || !option('y'))
             msg, y, h = case interactive
@@ -1120,14 +1116,41 @@ module Squared
           @log = Logger.new((@log.first if enabled?), **@log.last)
         end
 
-        def allref
-          @ref.reverse_each
+        def allref(&blk)
+          @ref.reverse_each(&blk)
         end
 
         def basepath(*args)
           path.join(*args)
         end
 
+        def basepath!(*args, type: nil)
+          ret = basepath(*args)
+          return unless ret.exist?
+
+          if type
+            (type.is_a?(String) ? type.chars : type).each do |ch|
+              case ch
+              when 'f'
+                return nil unless ret.file?
+              when 'd'
+                return nil unless ret.directory?
+              when 'l'
+                return nil unless ret.symlink?
+              when 'r'
+                return nil unless ret.readable?
+              when 'w'
+                return nil unless ret.writable?
+              when 'e'
+                return nil unless ret.executable?
+              else
+                return nil
+              end
+            end
+          end
+          ret
+        end
+
         def rootpath(*args, ascend: nil)
           ret = basepath(*args)
           return ret unless ascend && !ret.exist?
@@ -1135,7 +1158,7 @@ module Squared
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-            break if (ascend && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
+            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
           end
           ret
         end
@@ -1162,6 +1185,15 @@ module Squared
           name.to_sym
         end
 
+        protected
+
+        def script_get(*args, key: nil)
+          ret = workspace.script_get(*args, group: group, ref: allref)
+          return ret unless ret && key
+
+          ret.fetch(key, nil)
+        end
+
         private
 
         def puts(*args, **kwargs)
@@ -1216,9 +1248,8 @@ module Squared
         def graph_branch(target, data, tasks = nil, out = nil, sync: true, pass: [], done: [], order: nil, depth: 0,
                          single: false, last: false, context: nil)
           tag = ->(proj) { "#{proj.name}#{"@#{proj.version}" if SEM_VER.match?(proj.version)}" }
-          script = ->(proj) { workspace.script_get(:graph, group: proj.group, ref: proj.allref)&.fetch(:graph, nil) }
           uniq = lambda do |name|
-            next [] unless (ret = data[name])
+            return [] unless (ret = data[name])
 
             ret.dup.each do |proj|
               next if proj.name == name
@@ -1296,21 +1327,22 @@ module Squared
                                 end
               end
             else
-              (tasks || (subtasks = script.call(proj)) || (dev? ? %w[build copy] : %w[depend build])).each do |meth|
-                next if pass.include?(meth)
+              (tasks || (graph = proj.script_get(:graph, key: :graph)) || (dev? ? %w[build copy] : %w[depend build]))
+                .each do |meth|
+                  next if pass.include?(meth)
 
-                if workspace.task_defined?(cmd = task_join(name, meth))
-                  if ENV.key?(key = "BANNER_#{name.upcase}")
-                    key = nil
-                  else
-                    ENV[key] = '0'
+                  if workspace.task_defined?(cmd = task_join(name, meth))
+                    if ENV.key?(key = "BANNER_#{name.upcase}")
+                      key = nil
+                    else
+                      ENV[key] = '0'
+                    end
+                    run(cmd, sync: false, banner: false)
+                    ENV.delete(key) if key
+                  elsif proj.has?(meth, (workspace.baseref unless tasks || graph))
+                    proj.__send__(meth.to_sym, sync: sync)
                   end
-                  run(cmd, sync: false, banner: false)
-                  ENV.delete(key) if key
-                elsif proj.has?(meth, (workspace.baseref unless tasks || subtasks))
-                  proj.__send__(meth.to_sym, sync: sync)
                 end
-              end
             end
             done << proj
           end
@@ -1376,12 +1408,13 @@ module Squared
                   ignore = ['0'].freeze if ignore.nil?
                   ENV[name] || ENV.fetch(key, '')
                 end
-          if !equals.nil?
+          if equals.nil?
+            ret = default if ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s })
+            return ret if ret.nil?
+          else
             ret = Array(equals).any? { |val| ret == val.to_s }
-          elsif ret.empty? || (ignore && Array(ignore).any? { |val| ret == val.to_s })
-            ret = default
           end
-          return yield ret if block_given? && !ret.nil?
+          return yield ret if block_given?
 
           ret
         end
@@ -1495,7 +1528,9 @@ module Squared
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
-          warn log_message(loglevel, *args, **kwargs) if warning?
+          return unless warning?
+
+          warn log_message(loglevel, *args, **kwargs)
         end
 
         def print_run(cmd, banner = true, verbose: nil, **)
@@ -1658,11 +1693,13 @@ module Squared
         end
 
         def empty_status(msg, title, obj, always: false)
-          "#{msg}#{message(hint: message(title, obj.to_s)) unless !always && (!obj || obj == 0 || obj.to_s.empty?)}"
+          return msg if !always && (!obj || obj == 0 || obj.to_s.empty?)
+
+          msg.subhint(obj.is_a?(Numeric) ? "#{obj} #{title}" : message(title, obj.to_s))
         end
 
-        def append_repeat(flag, opts, target: @session)
-          opts.each { |val| target << shell_option(flag, val) }
+        def append_repeat(flag, opts, target: @session, **kwargs)
+          opts.each { |val| target << shell_option(flag, val, **kwargs) }
         end
 
         def append_hash(data, target: @session || [], build: false)
@@ -1687,6 +1724,8 @@ module Squared
               target << basic_option(key, val)
             when FalseClass
               target << shell_option(key).sub(/^--(?!no-)/, '--no-')
+            when Pathname
+              target << shell_option(key, val, escape: false)
             else
               target << shell_option(key, (val if val.is_a?(String)))
             end
@@ -1739,20 +1778,18 @@ module Squared
           return if list.empty?
 
           kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
-          [].tap do |ret|
-            list.flatten.each do |flag|
-              next unless (val = option(flag, target: target, **kwargs))
+          ret = []
+          list.flatten.each do |flag|
+            next unless (val = option(flag, target: target, **kwargs))
 
-              if no && val == '0'
-                flag = "no-#{flag}"
-                val = nil
-              end
-              ret << shell_option(flag, (val if equals), escape: escape, quote: quote, force: force)
+            if no && val == '0'
+              flag = "no-#{flag}"
+              val = nil
             end
-            next if ret.empty?
-
-            merge_list target, ret
+            ret << shell_option(flag, (val if equals), escape: escape, quote: quote, force: force)
           end
+          merge_list target, ret unless ret.empty?
+          ret
         end
 
         def append_nocolor(target: @session)
@@ -1959,22 +1996,27 @@ module Squared
         end
 
         def block_args(fallback = nil, &blk)
-          (ret = instance_eval(&blk)).nil? ? fallback : Array(ret)
+          return fallback if (ret = instance_eval(&blk)).nil?
+
+          Array(ret)
         end
 
         def runenv
           nil
         end
 
-        def command(*args)
-          return args.join(' && ') unless workspace.powershell?
-
-          "powershell.exe -Command #{shell_quote("& {#{args.join(' ; ')}}", option: false, double: true)}"
+        def command(*args, verbose: true)
+          out = unless verbose
+                  [">#{File::NULL}", '2>&1'].tap { |a| a.reverse if File::NULL == 'NUL' }.unshift('').join(' ')
+                end
+          if workspace.powershell?
+            "#{shell_bin('powershell.exe')} -Command \"& {#{args.join(' ; ')}}\"#{out}"
+          else
+            args.map! { |val| "#{val}#{out}" }.join(' && ')
+          end
         end
 
         def relativepath(*list, all: false)
-          return [] if list.empty?
-
           list.flatten.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
@@ -2082,7 +2124,11 @@ module Squared
           end
         end
 
-        def semgte?(val, other)
+        def semgte?(val, other = nil)
+          unless other
+            other = val
+            val = RUBY_VERSION
+          end
           semcmp(val, other) != 1
         end
 
@@ -2175,13 +2221,15 @@ module Squared
         end
 
         def pwd_set(pass: false, exception: self.exception, dryrun: false, from: nil)
-          pwd = Dir.pwd
-          return yield if (path.to_s == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+          return yield if (path.to_s == Dir.pwd || pass == true) && (workspace.mri? || !workspace.windows?)
 
-          Dir.chdir path
-          yield.tap { Dir.chdir pwd }
+          pwd = Dir.pwd
+          Dir.chdir(path)
+          yield
         rescue StandardError => e
           on_error(e, from, exception: exception, dryrun: dryrun)
+        ensure
+          Dir.chdir(pwd) if pwd
         end
 
         def run_set(cmd, val = nil, opts: nil, global: false, **)
@@ -2286,7 +2334,7 @@ module Squared
         def asdf_set(val)
           @asdf = if @@asdf && val
                     dir = @@asdf.path.join('installs', val)
-                    [val, dir] if dir.exist? && !dir.empty?
+                    [val, dir] if dir.directory? && !dir.empty?
                   end
         end
 
@@ -2310,7 +2358,7 @@ module Squared
         end
 
         def as_get(val, from)
-          (@global && @as[from][val]) || val
+          (global && @as[from][val]) || val
         end
 
         def task_build(keys)
@@ -2449,7 +2497,7 @@ module Squared
           return false unless target.is_a?(Enumerable)
 
           args = args.first if args.size == 1 && args.first.is_a?(Enumerable)
-          args.any? { |obj| target.include?(obj) }
+          args.any? { |obj,| target.include?(obj) }
         end
 
         def has_value!(target, *args, first: false)
@@ -2487,7 +2535,7 @@ module Squared
         end
 
         def scriptargs
-          { target: script? ? @output[1] : @output[0], script: script?, ref: ref, group: group, global: @global }
+          { target: script? ? @output[1] : @output[0], script: script?, ref: ref, group: group, global: global }
         end
       end
 

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

@@ -154,33 +154,34 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    cmd = docker_output(command, case command
+                    cmd = docker_output command, case command
                                                  when 'image', 'container', 'network'
                                                    'ls'
                                                  when 'compose'
                                                    'ps'
                                                  else
                                                    raise_error ArgumentError, 'unrecognized command', hint: command
-                                                 end)
+                                                 end
                     cmd << '-a' if has_value!(args, 'a', 'all') && command != 'network'
                     data = VAL_DOCKER[:ls][command.to_sym]
-                    if has_value!(args, 's', 'standard')
-                      cols = data.first(data.index('CreatedAt'))
-                    else
-                      cols = []
-                      args.each do |val|
-                        if val =~ /^(\d+)$/
-                          cols << data[$1.to_i.pred]
-                        elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
-                          j = $1.to_i.pred
-                          k = $3.to_i - ($2 == '..' ? 2 : 1)
-                          cols.concat(data[j..k]) if k > j
-                        end
-                      end
-                      if cols.empty?
-                        cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
-                      end
-                    end
+                    cols = if has_value!(args, 's', 'standard')
+                             data.first(data.index('CreatedAt'))
+                           else
+                             [].tap do |out|
+                               args.each do |val|
+                                 if val =~ /^(\d+)$/
+                                   out << data[$1.to_i.pred]
+                                 elsif val =~ /^(\d+)(-|\.{2,3})(\d+)$/
+                                   j = $1.to_i.pred
+                                   k = $3.to_i - ($2 == '..' ? 2 : 1)
+                                   out.concat(data[j..k]) if k > j
+                                 end
+                               end
+                               next unless out.empty?
+
+                               out.replace(choice_index('Select a column', data, multiple: true, attempts: 1))
+                             end
+                           end
                     cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
@@ -200,7 +201,7 @@ module Squared
 
                       case flag
                       when :build
-                        format_desc action, flag, 'opts*,target*,context/:'
+                        format_desc action, flag, 'opts*,target*,context|:'
                         task flag do |_, args|
                           args = args.to_a
                           if args.first == ':'
@@ -221,7 +222,7 @@ module Squared
 
                       case flag
                       when :exec, :run
-                        format_desc action, flag, "service|:,command#{'?' unless flag == :exec}|::,args*,opts*"
+                        format_desc action, flag, "service/:,command#{'?' unless flag == :exec}/::,args*,opts*"
                         task flag, [:service] do |_, args|
                           service = param_guard(action, flag, args: args, key: :service)
                           compose!(flag, args.extras, service: service)
@@ -417,7 +418,7 @@ module Squared
               lines = IO.popen(cmd.temp('--services')).map(&:strip).reject(&:empty?)
               return list_empty(hint: status) if lines.empty?
 
-              service = choice_index('Choose a service', lines, multiple: true, force: true, attempts: 1)
+              service = choice_index('Choose a service', lines, multiple: true, attempts: 1)
             end
             docker_session('compose', command, '--', *service)
           else
@@ -545,11 +546,12 @@ module Squared
             if opts.size == op.size
               index = 0
               name = nil
-              opts.reverse_each do |opt|
-                if (name = opt[/^name=["']?(.+?)["']?$/, 1])
-                  opts.delete(opt)
-                  break
-                end
+              opts.reverse_each do |val|
+                next unless (arg = OptionPartition.parse_arg!('name', val))
+
+                name = arg[1]
+                opts.delete(val)
+                break
               end
               list_image(:run, from: from) do |val|
                 container(:run, if name
@@ -711,7 +713,7 @@ module Squared
             when 2, 4
               return
             when 3
-              return unless COMPOSEFILE.select { |val| basepath(val).exist? }.size > 1
+              return unless COMPOSEFILE.select { |val| basepath!(val) }.size > 1
             end
           end
           files = Array(@file).map { |val| quote_option('file', basepath(val)) }
@@ -732,21 +734,17 @@ module Squared
         end
 
         def append_tag(val, target: @session)
+          ver = option('version', target: target, ignore: false)
           case val
           when String
             split_escape val
-          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
+            Array(val)
+          end.each do |s|
+            s = "#{s}:#{ver}" if ver && (!s.include?(':') || s.delete_suffix!(':latest'))
+            target << basic_option('tag', tagname(s))
           end
+          target
         end
 
         def filter_ps(flag, from = :'container:ps')
@@ -873,14 +871,12 @@ module Squared
                         "--format='table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}'"]
                      end
           lines = `#{docker_output(cmd)}`.lines
-          header = lines.shift
-          if lines.empty?
-            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0...2].join(' ')}")
+          if lines.size <= 1
+            puts log_message('none found', subject: name, hint: "docker #{cmd.split(' ', 3)[0, 2].join(' ')}")
             return
           end
-          puts " #  #{header}"
+          puts " #  #{lines.shift}"
           multiple = false
-          parse = ->(val) { val.split(/\s+/)[0] }
           ctx = flag.to_s
           case flag
           when :run, :exec
@@ -915,7 +911,7 @@ module Squared
           else
             cmd << opts << '--'
           end
-          cmd.merge(Array(out).map! { |val| parse.call(val) })
+          cmd.merge(Array(out).map! { |val| val.split(/\s+/, 2).first })
           cmd << args
           success?(run(cmd), ctx.start_with?(/network|tag|save/))
         end