squared 0.7.5 → 0.7.7

data/lib/squared/workspace/application.rb

@@ -663,11 +663,7 @@ module Squared
         if group && @banner.group.key?(group = group.to_sym)
           @banner.group[group]
         else
-          ref.reverse_each do |val|
-            next unless @banner.ref.key?(val)
-
-            return @banner.ref[val]
-          end
+          ref.reverse_each { |val| return @banner.ref[val] if @banner.ref.key?(val) }
           @banner.ref[:_] if @banner.ref.key?(:_)
         end
       end
@@ -950,7 +946,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 +957,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 +1010,8 @@ module Squared
           nil
         elsif ref && target[:ref].key?(ref)
           target[:ref][ref]
+        else
+          target[:ref][:_]
         end
       end
 

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

@@ -25,7 +25,7 @@ module Squared
         VAR_SET = %i[parent global script index envname desc dependfile dependname dependindex theme archive env graph
                      dev prod timeout pass only exclude serve asdf].freeze
         BLK_SET = %i[run depend doc lint test copy clean].freeze
-        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?[-.]?(\S+)?\b/.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+))?(?:([-.])?(\S+))?\b/.freeze
         URI_SCHEME = %r{\A([a-z][a-z\d+-.]*)://[^@:\[\]\\^<>|\s]}i.freeze
         TASK_METADATA = Rake::TaskManager.record_task_metadata
         private_constant :OPTIONS, :VAR_SET, :BLK_SET, :SEM_VER, :URI_SCHEME, :TASK_METADATA
@@ -1351,7 +1351,7 @@ module Squared
           else
             if series?(obj)
               obj.each(&:call)
-            elsif obj.is_a?(Array) && obj.none?(String)
+            elsif obj.is_a?(Array) && obj.any? { |val| !val.is_a?(String) }
               build(*obj, **kwargs)
             elsif obj
               run_s(*Array(obj), **kwargs)
@@ -1557,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
@@ -1576,7 +1576,9 @@ module Squared
                             command = :"#{prefix}_#{$1}"
                             cache[1][command] || @timeout[command]
                           end || cache[1][prefix.to_sym] || @timeout[prefix.to_sym]
-          main ? @session = ret : ret
+          return ret unless main
+
+          @session = ret
         end
 
         def session_timeout(cmd)
@@ -1622,7 +1624,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
 
@@ -1638,7 +1640,7 @@ module Squared
           return cmd.to_s unless cmd.respond_to?(:done)
 
           raise_error 'no command added', hint: cmd.first unless cmd.size > 1
-          @session = nil if cmd == @session
+          @session = nil if cmd.equal?(@session)
           cmd.done
         end
 
@@ -1655,12 +1657,14 @@ module Squared
           args.each do |key|
             next unless (ret = env(env_key(prefix.to_s.stripext, key), **kwargs)) && (!pat || ret.match?(pat))
 
-            if path
-              target << quote_option(key, basepath(ret))
-            elsif quote
-              target << quote_option(key, ret)
-            elsif escape
-              target << shell_option(key, ret)
+            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
@@ -1790,7 +1794,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))
@@ -1803,15 +1807,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 = 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|
@@ -1827,7 +1833,7 @@ module Squared
                     __send__ meth
                   end
                 end
-                val = val.compact.join(s)
+                val = val.reject { |item| !item || item == true }.join(s)
                 next unless found && !val.empty?
               elsif (val = __send__(val)).nil?
                 next
@@ -2231,9 +2237,9 @@ module Squared
 
           a, b = [a.first, b.first].map do |c|
             d = begin
-              Integer(c[5]).to_s
+              Integer(c[6]).to_s
             rescue
-              c[5] ? '-1' : '0'
+              c[6] ? '-1' : '0'
             end
             [c[0], c[2], c[4] || '0', d]
           end
@@ -2276,7 +2282,7 @@ module Squared
         end
 
         def semmajor?(cur, want)
-          (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[5]
+          (cur[0] == '0' && want[0] == '0' ? cur[2] != want[2] : cur[0] != want[0]) && !want[6]
         end
 
         def semgte?(val, other = nil)
@@ -2393,7 +2399,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
@@ -2671,7 +2677,7 @@ module Squared
                 when true, false
                   run
                 else
-                  $?.success?
+                  $?&.success?
                 end
           if cond.none? { |val| val == false }
             if block_given?
@@ -2696,7 +2702,7 @@ module Squared
         end
 
         def stdout?
-          !!verbose && !stdin?
+          !quiet? && !stdin?
         end
 
         def verbose?

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

@@ -419,9 +419,15 @@ module Squared
           when :bake
             append_file(0, index: 3) unless from || op.arg?('f', 'file') || !anypath?(*COMPOSEFILE)
             unless op.empty?
-              context = op.pop if Dir.exist?(op.last) && projectpath?(op.last)
+              if !context && op.size > 1 && exist?(op.last, type: 'd')
+                pat = /\btarget\s+"#{Regexp.escape(op.last)}"/
+                context = op.pop if op.values_of('f', 'file').none? { |f| basepath!(f)&.read&.match?(pat) }
+              end
+              if context
+                context = basepath context
+                op.each { |name| op.add_option('set', "#{name}.context=#{context}", escape: false) }
+              end
               op.append(escape: true, strip: /^:/, clear: true)
-              contextdir context if context
             end
           end
           op.clear(pass: false)
@@ -472,6 +478,7 @@ module Squared
           end
           run(from: from)
         end
+        alias compose_ compose!
 
         def container(flag, opts = [], id: nil)
           cmd, opts = docker_session('container', flag, opts: opts)

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

@@ -332,7 +332,7 @@ module Squared
         end
 
         subtasks({
-          'branch' => %i[create track delete move copy list current].freeze,
+          'branch' => %i[create track delete move copy list all current].freeze,
           'checkout' => %i[commit branch track detach path].freeze,
           'commit' => %i[add all amend amend-orig fixup].freeze,
           'diff' => %i[head branch files view between contain].freeze,
@@ -730,12 +730,7 @@ module Squared
                       task flag do |_, args|
                         branch flag, args.to_a
                       end
-                    when :current
-                      format_desc action, flag
-                      task flag do
-                        branch flag
-                      end
-                    else
+                    when :move, :copy
                       format_desc action, flag, 'branch,oldbranch?'
                       task flag, [:branch, :oldbranch] do |_, args|
                         if (branch = args.branch)
@@ -746,6 +741,11 @@ module Squared
                         end
                         branch(flag, refs: [oldbranch, branch])
                       end
+                    else
+                      format_desc action, flag
+                      task flag do
+                        branch flag
+                      end
                     end
                   when 'switch'
                     case flag
@@ -1090,7 +1090,7 @@ module Squared
           cmd, opts = git_session('rebase', opts: opts)
           case flag
           when :branch
-            return unless upstream
+            raise ArgumentError, 'no upstream branch' unless upstream
 
             op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, strict: strict?,
                                                                   no: OPT_GIT[:no][:rebase])
@@ -1098,7 +1098,7 @@ module Squared
             append_head op.shift&.delete_prefix(':')
             op.clear(pass: false)
           when :onto
-            return unless upstream
+            raise ArgumentError, 'no base branch/commit' unless upstream
 
             cmd << '--interactive' if option('interactive', 'i')
             cmd << shell_option('onto', commit) if commit
@@ -1169,7 +1169,7 @@ module Squared
           option('no-tags') { opts[:'no-tags'] = true }
           opts.delete(:'recurse-submodules') || opts.delete(:'no-recurse-submodules') if append_submodules(from: :clone)
           append_hash opts
-          cmd << '--quiet' if option('quiet') || !verbose
+          cmd << '--quiet' if quiet? || option('quiet')
           append_value(data[0], path, delim: true)
           source(sync: sync, banner: sync && !quiet?, multiple: !sync || quiet?)
         end
@@ -1480,6 +1480,7 @@ module Squared
           append_pathspec op.extras
           source(exception: false)
         end
+        alias log_ log!
 
         def diff(flag, opts = [], refs: [], branch: nil, range: [], index: [], from: :diff)
           cmd, opts = git_session(from, opts: opts)
@@ -1610,7 +1611,7 @@ module Squared
           elsif flag == :'amend-orig' || option('edit', equals: '0')
             co << '--no-edit'
           end
-          pu << '--force-with-lease' if amend
+          pu << (option('f', 'force') ? '--force' : '--force-with-lease') if amend
           pu.merge(repotrack(origin, branch))
           adding = git_spawn 'diff --name-only --no-color'
           source op
@@ -1691,7 +1692,7 @@ module Squared
             end
           when :delete
             remote&.each { |val| source git_output('push --delete', *val.split('/', 2).quote!) }
-            force, list = refs.partition { |val| val.start_with?('~', '^') }
+            force, list = refs.partition { |val| val.start_with?(/[~^]/) }
             force.each do |val|
               r = '-r' if val.delete!('~')
               source git_output('branch', val.delete!('^') ? '-D' : '-d', r, shell_quote(val))
@@ -1921,7 +1922,7 @@ module Squared
                                                            end)
           case flag
           when :blame
-            raise Errno::ENOENT, 'no file target' unless (n = op.index { |s| basepath(s).file? })
+            raise Errno::ENOENT, 'no file target' unless (n = op.index { |val| basepath(val).file? })
 
             op.append(basepath(op.remove_at(n)), delim: true)
               .clear
@@ -1929,7 +1930,7 @@ module Squared
             if op.arg?(*VAL_GIT[:rebase][:send])
               op.clear
             elsif op.empty?
-              raise 'no commit target'
+              raise ArgumentError, 'no commit target'
             else
               append_commit(*op.extras)
             end
@@ -2001,6 +2002,10 @@ module Squared
 
         def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false, banner: true,
                    multiple: false, hint: nil, from: nil, timeout: nil, send: :system, **kwargs)
+          unless cmd
+            print_error('no git session started', subject: project, hint: from, pass: true)
+            return
+          end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
           if io && banner == false
             from = nil
@@ -2068,7 +2073,7 @@ module Squared
           if size == 0
             puts empty_status("No #{type} were #{action}", 'grep', grep.join(', '))
           elsif stdout?
-            styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
+            styles = theme.fetch(:banner, []).reject { |val| val.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
             puts print_footer("#{size} #{size == 1 ? type.sub(/(?:(?<!l)e)?s\z/, '') : type}",
                               sub: opt_style(styles, /^(\d+)(.+)$/))
@@ -2118,7 +2123,7 @@ module Squared
           glob = kwargs.fetch(:include, [])
           pass = kwargs.fetch(:exclude, [])
           status_data(*args).map(&:first).each_with_object({}) do |file, out|
-            next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
+            next unless glob.empty? || glob.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
             next if pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
 
             out[file] = algorithm.hexdigest(File.read(basepath(file)))
@@ -2159,7 +2164,7 @@ module Squared
           end
           op << '--verbose' if (flag || from == :fetch) && stdout? && !op.arg?('quiet')
           if remote
-            op.append(remote, delim: true)
+            op.append(remote)
             if (val = option('refspec', target: target, strict: true))
               op.append(split_escape(val))
             else
@@ -2194,12 +2199,10 @@ module Squared
             if !files.empty?
               target << '--' << files.join(' ')
               true
+            elsif expect.is_a?(String)
+              raise expect
             elsif expect
-              raise(if expect.is_a?(String)
-                      expect
-                    else
-                      kwargs[:parent] ? 'pathspec not present' : 'pathspec not within worktree'
-                    end)
+              raise(kwargs[:parent] ? 'pathspec not present' : 'pathspec not within worktree')
             else
               false
             end
@@ -2242,13 +2245,15 @@ module Squared
         end
 
         def foreachref(path, *args, format: nil, chomp: true)
-          path = Array(path).map { |val| "refs/#{val}" }
           format &&= quote_option('format', format)
-          ret = git_spawn('for-each-ref', format, *args, *path, stdout: workspace.windows?)
+          ret = git_spawn('for-each-ref', format, *args.concat(Array(path).map { |val| "refs/#{val}" }),
+                          stdout: workspace.windows?)
           if ret.is_a?(String)
             ret.lines(chomp: chomp)
+          elsif chomp
+            ret.readlines(chomp: chomp)
           else
-            chomp ? ret.readlines(chomp: chomp) : ret
+            ret
           end
         end
 
@@ -2292,11 +2297,10 @@ module Squared
         end
 
         def repotrack(origin, branch, quote: true)
-          unless origin && branch && (i = origin.index('/'))
-            raise_error(ArgumentError, "missing #{origin ? 'branch' : 'remote'} name", hint: origin)
-          end
-          branch = "#{branch}:#{origin[i.succ..-1]}" unless origin.end_with?("/#{branch}")
-          ret = [origin[0..i.pred], branch]
+          n = origin&.index('/')
+          raise_error "missing #{origin ? 'branch' : 'remote'} name", hint: origin unless n && branch
+          branch = "#{branch}:#{origin[n.succ..-1]}" unless origin.end_with?("/#{branch}")
+          ret = [origin[0..n.pred], branch]
           ret.quote! if quote
           ret
         end
@@ -2316,7 +2320,7 @@ module Squared
         end
 
         def matchhead(val)
-          val =~ /^(?:(?:HEAD|@)([~^]\d*)?|H(\d+))$/ ? $2 || $1 || '' : nil
+          $2 || $1 || '' if val =~ /^(?:(?:HEAD|@)([~^]\d*)?|H(\d+))$/
         end
 
         def matchpathspec