squared 0.7.4 → 0.7.6

data/lib/squared/common/shell.rb

@@ -53,7 +53,7 @@ module Squared
         end
       end
 
-      def shell_quote(val, option: true, force: true, double: false, preserve: true, override: false)
+      def shell_quote(val, option: true, force: true, double: false, preserve: true, pass: false, override: false)
         val = val.to_s
         return val if (!force && !val.include?(' ')) || val.empty?
 
@@ -61,16 +61,16 @@ module Squared
           pat = /\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
           return val if val.match?(pat)
         end
-        q = ->(s) { s.gsub("'\\\\''", "'") }
         if val =~ QUOTE_VALUE
-          return val if $1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o)
+          return val if pass || ($1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o))
 
           base = $2 unless preserve
         end
+        q = -> { (base || val).gsub("'\\\\''", "'") }
         if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
-          "\"#{q.call(base || val).gsub(/(?<!\\)"/, '\\"')}\""
+          "\"#{q.call.gsub(/(?<!\\)"/, '\\"')}\""
         else
-          base ? val : "'#{q.call(val).gsub("'", "'\\\\''")}'"
+          "'#{q.call.gsub("'", "'\\\\''")}'"
         end
       end
 
@@ -124,18 +124,18 @@ module Squared
         b = []
         c = []
         d = []
-        e = [a, b]
+        target = [a, b]
         j = -1
         val.shellsplit.each_with_index do |opt, i|
           if opt == '--'
-            e = [c, d]
+            target = [c, d]
           elsif opt =~ /\A--?[^=]+(=|\z)/
             j = $1 == '=' ? -1 : i
-            e[0] << [opt]
+            target[0] << [opt]
           elsif j >= 0
-            e[0][j] << opt
+            target[0][j] << opt
           else
-            e[1] << shell_quote(opt, option: false, force: force)
+            target[1] << shell_quote(opt, option: false, force: force)
           end
         end
         ret = [[a, b], [], [c, d]].flat_map do |e, f|

data/lib/squared/common/system.rb

@@ -29,6 +29,7 @@ module Squared
       module_function
 
       def shell(*args, name: :system, **kwargs)
+        kwargs.delete(:exception) unless name == :system
         if RUBY_ENGINE == 'jruby' && Rake::Win32.windows?
           ex = kwargs[:exception]
           if (dir = kwargs[:chdir]) && Dir.pwd != dir
@@ -43,7 +44,7 @@ module Squared
         else
           return Kernel.send(name, *args, **kwargs)
         end
-        raise $?.to_s if !ret && ex && name == :system
+        raise $?.to_s if !ret && ex
 
         ret
       end

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.7.4'
+  VERSION = '0.7.6'
 end

data/lib/squared/workspace/application.rb

@@ -206,7 +206,7 @@ module Squared
 
               return self
             end
-            raise_error 'method not found'
+            raise 'method not found'
           rescue => e
             warn log_message(Logger::WARN, e, subject: main, hint: hint || args)
           end
@@ -226,7 +226,7 @@ module Squared
         when Symbol
           @ref = val
         else
-          raise_error TypeError, "not a group/ref: #{kind || 'nil'}" if block_given?
+          raise TypeError, "not a group/ref: #{kind || 'nil'}" if block_given?
         end
         if block_given?
           instance_eval(&blk)
@@ -934,8 +934,8 @@ module Squared
               group.each { |val| failed += val.action }
               puts log_message(Logger::ERROR, *failed, subject: 'failed placement', hint: false), pipe: 2
             end
-            level.each_with_index do |grp, i|
-              title = "Step #{i.succ}#{if sync.include?(grp) && !(grp.size == 1 && series.parallel.include?(grp.first))
+            level.each_with_index do |grp, j|
+              title = "Step #{j.succ}#{if sync.include?(grp) && !(grp.size == 1 && series.parallel.include?(grp.first))
                                          ' (sync)'
                                        end}"
               emphasize(grp, title: title, cols: level.flatten(1).push(title), border: theme[:border],
@@ -950,7 +950,7 @@ module Squared
         log_console(*args, pipe: kwargs[:pipe] || pipe)
       end
 
-      def script_command(task, val, group, ref, on, &blk)
+      def script_command(task, val, group, ref, on = nil, &blk)
         if block_given?
           val = Struct::RunData.new(val, blk)
         elsif !val
@@ -961,7 +961,7 @@ module Squared
           as_a group, :to_sym
         else
           label = :ref
-          as_a ref, :to_sym
+          as_a(ref || :_, :to_sym)
         end.each do |name|
           @script[label][name][task] = val
           @events[label][name][task] = on if on.is_a?(Hash)
@@ -1014,6 +1014,8 @@ module Squared
           nil
         elsif ref && target[:ref].key?(ref)
           target[:ref][ref]
+        else
+          target[:ref][:_]
         end
       end
 
@@ -1027,6 +1029,7 @@ module Squared
           require_relative rb
           break
         end
+        nil
       end
 
       def root?(path, pass: [])

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

@@ -399,7 +399,7 @@ module Squared
         end
 
         def with(**kwargs, &blk)
-          @withargs = kwargs.empty? ? nil : kwargs
+          @withargs = (kwargs unless kwargs.empty?)
           if block_given?
             instance_eval(&blk)
             @withargs = nil
@@ -862,13 +862,14 @@ module Squared
         end
 
         def run(cmd = @session, var = nil, exception: exception?, sync: true, banner: true, from: nil, chdir: path,
-                interactive: nil, hint: nil, series: false, timeout: nil, **)
+                interactive: nil, hint: nil, series: false, timeout: nil, send: :system, **)
           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'))
+            print_item(series: true)
             msg, y, h = case interactive
                         when Array
                           interactive
@@ -901,7 +902,7 @@ module Squared
                 end
               end
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
-              ret = shell_t(*args, chdir: chdir, exception: exception, timeout: timeout || 0)
+              ret = shell_t(*args, name: send, chdir: chdir, exception: exception, timeout: timeout || 0)
             end
           rescue Timeout::Error => e
             print_error(Logger::ERROR, cmd, subject: name, hint: e)
@@ -1350,7 +1351,7 @@ module Squared
           else
             if series?(obj)
               obj.each(&:call)
-            elsif obj.is_a?(Array) && obj.any? { |val| !val.is_a?(String) }
+            elsif obj.is_a?(Array) && obj.any? { |val| val.nil? || !val.is_a?(String) }
               build(*obj, **kwargs)
             elsif obj
               run_s(*Array(obj), **kwargs)
@@ -1556,8 +1557,8 @@ module Squared
 
         def session(*cmd, prefix: cmd.first, main: true, path: true, options: true)
           prefix = prefix.to_s.stripext
-          if path && (val = shell_bin(prefix))
-            cmd[0] = shell_quote(val, force: false)
+          if path && (bin = shell_bin(prefix))
+            cmd[0] = shell_quote(bin, force: false)
           end
           ret = JoinSet.new(cmd)
           if options
@@ -1621,7 +1622,7 @@ module Squared
             args.unshift(*a)
             OptionPartition.uniq!(args, pass) if pass
           end
-          kwargs&.update(b) { |_, val| val }
+          kwargs&.update(b) { |_, obj| obj }
           nil
         end
 
@@ -1667,8 +1668,8 @@ module Squared
         end
 
         def write_lines(data, grep: [], prefix: nil, sub: nil, banner: nil, loglevel: nil, pass: false, first: false)
-          grep = grep.empty? ? nil : matchmap(grep, prefix)
-          sub = stdin? ? nil : as_a(sub)
+          grep = (matchmap(grep, prefix) unless grep.empty?)
+          sub = (as_a(sub) unless stdin?)
           ret = 0
           lines = data.each_with_object([]) do |line, out|
             next if grep&.none? { |pat| pat.match?(line) }
@@ -1789,7 +1790,7 @@ module Squared
           workspace.format_desc([@desc, action, flag].compact, opts, **kwargs)
         end
 
-        def format_banner(cmd, banner: true, hint: nil, strip: nil, quote: false)
+        def format_banner(cmd, banner: true, hint: nil, strip: nil, quote: false, command: true)
           return unless banner && banner?
 
           if (data = workspace.banner_get(*@ref, group: group))
@@ -1802,15 +1803,17 @@ module Squared
           if verbose
             out = []
             if data.command
-              if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+))( |\z)/
-                arg = $3 || $2 || $1
-                cmd = cmd.sub(arg, data.command == 0 ? arg.stripext : arg.stripext.upcase)
-              end
-              if strip || (strip.nil? && data.order.include?(:path))
-                cmd = cmd.gsub(/(?:#{s = Regexp.escape(File.join(path, ''))}?(?=["'])|#{s})/, '')
-                         .gsub(/(?: -[^ ])? (?:""|'')/, '')
+              if command
+                if cmd =~ /\A(?:"((?:[^"]|(?<=\\)")+)"|'((?:[^']|(?<=\\)')+)'|(\S+))( |\z)/
+                  arg = $3 || $2 || $1
+                  cmd = cmd.sub(arg, data.command == 0 ? arg.stripext : arg.stripext.upcase)
+                end
+                if strip || (strip.nil? && data.order.include?(:path))
+                  cmd = cmd.gsub(/(?:#{s = Regexp.escape(File.join(path, ''))}?(?=["'])|#{s})/, '')
+                           .gsub(/(?: -[^ ])? (?:""|'')/, '')
+                end
+                cmd.gsub!(/(?<= )(["'])([\w.-]+)\1(?= |\z)/, '\2') unless quote
               end
-              cmd.gsub!(/(?<= )(["'])([\w.-]+)\1(?= |\z)/, '\2') unless quote
               out << cmd.subhint(hint)
             end
             data.order.each do |val|
@@ -2129,7 +2132,7 @@ module Squared
                 force = false
               end
               val = readline(val, force: force)
-              ret << (val.empty? ? nil : val)
+              ret << (val unless val.empty?)
             end
           end
           printsucc unless series
@@ -2188,7 +2191,7 @@ module Squared
             files = files.select { |val| projectpath?(val) }.tap do |list|
               next if pass || files.size == list.size
 
-              raise_error 'pathspec not within worktree'
+              raise 'pathspec not within worktree'
             end
           end
           files.map do |val|
@@ -2392,7 +2395,7 @@ module Squared
           return if from == false
 
           require 'timeout'
-          unless (path.to_s == Dir.pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+          unless (path.to_s == Dir.pwd || pass) && (workspace.mri? || !workspace.windows?)
             pwd = Dir.pwd
             Dir.chdir(path)
           end
@@ -2715,6 +2718,10 @@ module Squared
           level.empty? ? ex != false && ex != Logger::INFO : ex.is_a?(Numeric) && level.include?(ex)
         end
 
+        def strict?
+          (ARG[:STRICT] || exception?(Logger::FATAL)) && env('STRICT', notequals: '0')
+        end
+
         def serve?
           false
         end

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

@@ -20,7 +20,7 @@ module Squared
                        sbom=q].freeze
           }.freeze,
           compose: {
-            common: %w[all-resources ansi|b compatibility dry-run env-file=p f|file=p parallel=n profile=b progress=b
+            common: %w[all-resources ansi=b compatibility dry-run env-file=p f|file=p parallel=n profile=b progress=b
                        project-directory=p p|project-name=e].freeze,
             build: %w[check no-cache print pull push with-dependencies q|quiet build-arg=qq builder=b m|memory=b
                       provenance=q sbom=q ssh=qq].freeze,
@@ -399,28 +399,28 @@ module Squared
         end
 
         def buildx(flag, opts = [], tag: nil, context: nil, from: nil)
+          if flag == :bake && context&.match?(%r{^["']?(https?|git)://}i)
+            shared = data[:shared].dup.push('f|file=q')
+            shared.delete('f|file=p')
+          end
           cmd, opts = docker_session('buildx', opts: opts)
           data = OPT_DOCKER[:buildx]
-          op = OptionPartition.new(opts, data[:common], cmd, project: self)
+          op = OptionPartition.new(opts, data[:common], cmd, project: self, strict: strict?)
           op.append(flag, quote: false)
-            .parse(data[flag == :bake ? :bake : :build] + data[:shared])
+            .parse(data[flag == :bake ? :bake : :build] + (shared || data[:shared]))
           case flag
           when :build, :context
             append_tag(tag || option('tag', ignore: false) || self.tag)
-            append_context context
+            if shared
+              op.add_quote(context, preserve: false)
+            else
+              append_context context
+            end
           when :bake
             append_file(0, index: 3) unless from || op.arg?('f', 'file') || !anypath?(*COMPOSEFILE)
             unless op.empty?
-              args = op.dup
-              op.reset
-              if Dir.exist?(args.last)
-                if projectpath?(val = args.pop)
-                  context = val
-                else
-                  op.push(val)
-                end
-              end
-              op.append(args, escape: true, strip: /^:/)
+              context = op.pop if Dir.exist?(op.last) && projectpath?(op.last)
+              op.append(escape: true, strip: /^:/, clear: true)
               contextdir context if context
             end
           end
@@ -442,7 +442,7 @@ module Squared
             docker_session('compose', command, '--', *service)
           else
             cmd, opts = docker_session('compose', opts: opts)
-            op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self)
+            op = OptionPartition.new(opts, OPT_DOCKER[:compose][:common], cmd, project: self, strict: strict?)
             append_file(filetype, force: flag == :publish) unless op.arg?('f', 'file')
             op << flag
             op.parse(OPT_DOCKER[:compose].fetch(flag, []))
@@ -479,7 +479,7 @@ module Squared
           list = data.fetch(flag, [])
           list += data[:create] if (rc = flag == :run)
           list += data[:update] if rc ||= flag == :create
-          op = OptionPartition.new(opts, list, cmd, project: self, args: rc || flag == :exec)
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, args: rc || flag == :exec)
           from = symjoin 'container', flag
           case flag
           when :run, :create, :exec
@@ -562,7 +562,7 @@ module Squared
 
         def image(flag, opts = [], sync: true, id: nil, registry: nil, filter: nil)
           cmd, opts = docker_session('image', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:image].fetch(flag, []), cmd, project: self, strict: strict?)
           exception = exception?
           banner = true
           from = symjoin 'image', flag
@@ -645,7 +645,7 @@ module Squared
 
         def network(flag, opts = [], target: nil)
           cmd, opts = docker_session('network', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:network].fetch(flag, []), cmd, project: self, strict: strict?)
                               .clear
           from = symjoin 'network', flag
           if flag == :create
@@ -712,7 +712,7 @@ module Squared
         def docker_session(*cmd, opts: nil)
           return session('docker', *cmd) unless opts
 
-          op = OptionPartition.new(opts, OPT_DOCKER[:common], project: self)
+          op = OptionPartition.new(opts, OPT_DOCKER[:common], project: self, strict: strict?)
           [session('docker', *op.to_a, *cmd), op.extras]
         end
 
@@ -898,11 +898,11 @@ module Squared
                      when :service
                        ['Choose a service',
                         'compose ps -a ' \
-                        "--format='table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}'"]
+                        '--format="table {{.Service}}\t{{.Name}}\t{{.Image}}\t{{.Command}}\t{{.Status}}\t{{.Ports}}"']
                      else
                        ['Choose an image',
                         'images -a ' \
-                        "--format='table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}'"]
+                        '--format="table {{.ID}}\t{{.Repository}}\t{{.Tag}}\t{{.CreatedSince}}\t{{.Size}}"']
                      end
           lines = `#{docker_output(cmd)}`.lines
           if lines.size <= 1