squared 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2fd23c5964fe7c987966b8d237b569883b2dae5b70d9c120a924e2cc0227873
-  data.tar.gz: 8ef09d80e13c53fda678aa6a7194e33abf04728fb9d1c17739a5dc6c814e3b03
+  metadata.gz: 5fb2101a0fb0c5a8f651bf471b44a5dc3be21c3b87d6e53f708d752b6e8c8ffd
+  data.tar.gz: eb322ca0cab89e5f41f719e06e182120efd96280f88a5f2625f3954331500a19
 SHA512:
-  metadata.gz: c41b98512dfc370a056716c3af2a599321b6113fa4883ab1f9c6b1418332f6b973560ce2cb1550c3813521eaa326150371ef3e60906cb694d6a6fd41ac1e0f05
-  data.tar.gz: cedbdcb188a6fb4a8407fc36836ffbeb4b93893217cec168d291845ce9a4f3f4dede9936022b8c950efa48ec21e2f93d013dc7e6fa929397ac80df7d6e3b099a
+  metadata.gz: a6947106acb6d33789f3ae79a84e87c3119b799f556a8570920904338b3955b795578f392860fce83260af5b1c17159ba4c64e9f4eeeaed6b5886e06dfe12a06
+  data.tar.gz: dd9416a0457a2ead233f32c9592b2061e569161d54482d4ab949fd7acb6ceb6139c26329a4fdb6ea1853ab6f840ab145e17f4b58a386bd68eb066c14ea3f85cd

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.1.2] - 2024-12-23
+
+### Added
+
+- Git command tag was implemented.
+
+### Deprecated
+
+- Repo static method empty? was relocated into Application.
+
+### Fixed
+
+- Namespace prefix was sometimes missing or duplicated.
+- Silent operation used undefined variable.
+- Unnecessary shell option escapes were removed.
+- Ruby command outdated did not display in order when threaded.
+- Regexp uses \A|\z format and not ^|$ for standard matches.
+- Rake being called by a project did not escape options.
+- Workspace did not check base project for Windows filename.
+- Regexp for SemVer did not recognize package names.
+
 ## [0.1.1] - 2024-12-14
 
 ### Added
@@ -50,6 +71,7 @@
 
 - Changelog was created.
 
+[0.1.2]: https://github.com/anpham6/squared/releases/tag/v0.1.2-ruby
 [0.1.1]: https://github.com/anpham6/squared/releases/tag/v0.1.1-ruby
 [0.1.0]: https://github.com/anpham6/squared/releases/tag/v0.1.0-ruby
 [0.0.12]: https://github.com/anpham6/squared/releases/tag/v0.0.12-ruby

data/README.ruby.md

@@ -37,17 +37,23 @@ Projects from any accessible folder can be added relative to the parent director
 require "squared"
 
 require "squared/workspace"
-require "squared/workspace/repo"           # Optional
-require "squared/workspace/project/node"   #
-require "squared/workspace/project/python" #
-require "squared/workspace/project/ruby"   #
+require "squared/workspace/repo"                     # Optional
+require "squared/workspace/project/node"             #
+require "squared/workspace/project/python"           #
+require "squared/workspace/project/ruby"             #
 # OR
-require "squared/app"                      # All workspace related modules
+require "squared/app"                                # All workspace related modules
 
 # NODE_ENV  = production
-# REPO_ROOT = /workspaces
-# REPO_HOME = /workspaces/squared
-# rake      = /workspaces/squared/Rakefile
+
+# REPO_ROOT = /workspaces                            #
+# REPO_HOME = /workspaces/squared                    # Dir.pwd
+# rake      = /workspaces/squared/Rakefile           # main?
+# OR
+# REPO_ROOT = /workspaces                            # Dir.pwd
+# rake      = /workspaces/Rakefile                   #
+# REPO_HOME = /workspaces/squared                    # main: "squared"
+
 # pathname  = /workspaces/pathname
 # optparse  = /workspaces/optparse
 # log       = /workspaces/logger

data/lib/squared/common/class.rb

@@ -9,7 +9,7 @@ module Squared
       extend Forwardable
 
       def self.to_s
-        super.match(/[^:]+$/)[0]
+        super.match(/[^:]+\z/)[0]
       end
 
       def_delegators :@data, :+, :each, :each_with_index, :entries, :to_a, :include?
@@ -31,7 +31,7 @@ module Squared
 
     class JoinSet < Set
       def self.to_s
-        super.match(/[^:]+$/)[0]
+        super.match(/[^:]+\z/)[0]
       end
 
       def initialize(data = [], delim: ' ')

data/lib/squared/common/format.rb

@@ -46,7 +46,7 @@ module Squared
         if pat && index != 0
           return val unless (data = pat.match(val))
 
-          ret = index == -1 ? data.to_a[1..-1] : data[index]
+          ret = index == -1 ? data.to_a.drop(1) : data[index]
         else
           ret = val
           index = 0
@@ -170,7 +170,7 @@ module Squared
         args = args.map(&:to_s)
         if args.size > 1
           title = log_title(level, color: false)
-          sub = { pat: /^(#{title})(.+)$/, styles: __get__(:theme)[:logger][log_sym(level)] } if color
+          sub = { pat: /\A(#{title})(.+)\z/m, styles: __get__(:theme)[:logger][log_sym(level)] } if color
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub)
         else
           msg = [log_title(level, color: color)]
@@ -235,8 +235,8 @@ module Squared
           sub.each { |h| s = sub_style(s, **h) }
           s = "| #{s} |"
           if border
-            s = sub_style(s, pat: /^(\|)(.+)$/m, styles: border)
-            s = sub_style(s, pat: /^(.+)(\|)$/m, styles: border, index: 2)
+            s = sub_style(s, pat: /\A(\|)(.+)\z/m, styles: border)
+            s = sub_style(s, pat: /\A(.+)(\|)\z/m, styles: border, index: 2)
           end
           s
         end

data/lib/squared/common/prompt.rb

@@ -8,8 +8,8 @@ module Squared
       def confirm(msg, default = nil, agree: 'Y', cancel: 'N', attempts: 5, timeout: 15)
         require 'readline'
         require 'timeout'
-        agree = /^#{agree}$/i if agree.is_a?(::String)
-        cancel = /^#{cancel}$/i if cancel.is_a?(::String)
+        agree = /\A#{agree}\z/i if agree.is_a?(::String)
+        cancel = /\A#{cancel}\z/i if cancel.is_a?(::String)
         Timeout.timeout(timeout) do
           begin
             while (ch = Readline.readline(msg, true))

data/lib/squared/common/shell.rb

@@ -8,38 +8,51 @@ module Squared
     module Shell
       module_function
 
-      def shell_escape(val, quote: false)
-        val = val.to_s
-        return ::Shellwords.escape(val) unless ::Rake::Win32.windows?
+      def shell_escape(val, quote: false, force: false)
+        if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
+          return val unless data[2]
 
-        quote ? shell_quote(val, force: false) : val
+          join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
+          if data[4] == data[6]
+            data[4] ? val : join.(data[5])
+          else
+            join.("#{data[4]}#{data[5]}#{data[6]}")
+          end
+        elsif Rake::Win32.windows?
+          quote ? shell_quote(val, force: force) : val
+        else
+          Shellwords.escape(val)
+        end
       end
 
       def shell_quote(val, force: true)
-        ret = val.to_s.strip
-        return ret if (!force && !ret.include?(' ')) || ret =~ /(?:^|\S=|[^=]\s+)(["']).+\1$/m
+        val = val.to_s
+        return val if (!force && !val.include?(' ')) || val =~ /(?:^|\S=|[^=]\s+)(["']).+\1\z/m
 
-        ::Rake::Win32.windows? ? "\"#{double_quote(ret)}\"" : "'#{single_quote(ret)}'"
+        Rake::Win32.windows? ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
 
-      def shell_split(val, quote: false, join: false)
-        ret = ::Shellwords.split(val).map do |opt|
-          if (data = /^(--?[^= ]+)(=|\s+)?(["'])?(.+?)\3?$/m.match(opt))
-            next opt unless data[2] && !data[3]
+      def shell_split(val, quote: false, join: nil)
+        val = Shellwords.split(val).map { |opt| shell_escape(opt, quote: quote) }
+        return val unless join
 
-            data[1] + data[2] + shell_quote(data[4], force: !::Rake::Win32.windows?)
-          else
-            shell_escape(opt, quote: quote)
-          end
-        end
-        join ? ret.join(' ') : ret
+        val.join(join.is_a?(::String) ? join : ' ')
+      end
+
+      def shell_option(flag, val = nil, quote: false, escape: true)
+        "--#{flag}#{if val
+                      "=#{if escape
+                            shell_escape(val, quote: quote)
+                          else
+                            quote ? shell_quote(val) : val
+                          end}"
+                    end}"
       end
 
       def fill_option(val)
-        return "-#{val}" if val.size == 1 || val =~ /^[a-z]\d+$/i
+        return "-#{val}" if val.size == 1 || val =~ /\A[a-z]\d+\z/i
 
-        val = "--#{val}" unless val.start_with?('-')
-        shell_escape(val).sub('\\=', '=')
+        shell_escape(val.start_with?('-') ? val : "--#{val}")
       end
 
       def single_quote(val)

data/lib/squared/common/system.rb

@@ -9,7 +9,7 @@ module Squared
       module_function
 
       def shell(*args, **kwargs)
-        if RUBY_VERSION =~ /^2\.[0-5]\./
+        if RUBY_VERSION < '2.6'
           exception = kwargs.delete(:exception)
           ret = system(*args, **kwargs)
           return ret if ret || !exception

data/lib/squared/config.rb

@@ -12,7 +12,7 @@ module Squared
       include Rake::DSL
 
       def self.to_s
-        super.match(/[^:]+$/)[0]
+        super.match(/[^:]+\z/)[0]
       end
 
       attr_reader :main, :name, :project, :theme
@@ -199,17 +199,18 @@ module Squared
         title = Pathname.new(file)
                         .realpath
                         .to_s
-                        .sub(Regexp.new("^#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
+                        .sub(Regexp.new("\\A#{Regexp.escape(File.join(Dir.pwd, ''))}"), '')
         emphasize(lines, title: title, sub: unless stdin?
                                               [
-                                                { pat: /^((?:[^:]|(?<! ):(?! ))+)$/, styles: theme[:banner] },
-                                                { pat: /^(.*?)(<[^>]+>)(.+)$/m, styles: theme[:undefined], index: 2 },
-                                                { pat: /^(.+)( : (?!undefined).+)$/m, styles: theme[:key] },
-                                                { pat: /^(.+ : )(-?[\d.]+)(\s*)$/m, styles: theme[:number], index: 2 },
-                                                { pat: /^(.+ : ")(.+)("\s*)$/m, styles: theme[:string], index: 2 },
-                                                { pat: /^(.+ : \{)(.+)(\}\s*)$/m, styles: theme[:hash], index: 2 },
-                                                { pat: /^(.+ : \[)(.+)(\]\s*)$/m, styles: theme[:array], index: 2 },
-                                                { pat: /^(.+ : (?!undefined))([^"\[{].*)$/m, styles: theme[:value],
+                                                { pat: /\A((?:[^:]|(?<! ):(?! ))+)\z/, styles: theme[:banner] },
+                                                { pat: /\A(.*?)(<[^>]+>)(.+)\z/m, styles: theme[:undefined], index: 2 },
+                                                { pat: /\A(.+)( : (?!undefined).+)\z/m, styles: theme[:key] },
+                                                { pat: /\A(.+ : )(-?[\d.]+)(\s*)\z/m, styles: theme[:number],
+                                                  index: 2 },
+                                                { pat: /\A(.+ : ")(.+)("\s*)\z/m, styles: theme[:string], index: 2 },
+                                                { pat: /\A(.+ : \{)(.+)(\}\s*)\z/m, styles: theme[:hash], index: 2 },
+                                                { pat: /\A(.+ : \[)(.+)(\]\s*)\z/m, styles: theme[:array], index: 2 },
+                                                { pat: /\A(.+ : (?!undefined))([^"\[{].*)\z/m, styles: theme[:value],
                                                   index: 2 }
                                               ]
                                             end)
@@ -261,6 +262,8 @@ module Squared
       end
 
       def format_desc(command, *ext, exist: exist?)
+        return unless Rake::TaskManager.record_task_metadata
+
         val = "#{ext.first}[#{exist ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
         message(@prefix, *name.split(':'), command, val, empty: true)
       end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -56,7 +56,7 @@ module Squared
         end
 
         def to_s
-          super.match(/[^:]+$/)[0]
+          super.match(/[^:]+\z/)[0]
         end
 
         attr_reader :kind_project
@@ -70,8 +70,14 @@ module Squared
       def initialize(home = Dir.pwd, *, main: nil, prefix: nil,
                      verbose: ARG[:VERBOSE], common: ARG[:COMMON], pipe: ARG[:PIPE], exception: ARG[:FAIL], **)
         @home = Pathname.new(home).realdirpath
+        basename = @home.basename.to_s
+        if main
+          @main = main.to_s.freeze
+          @home = @home.join(@main) unless @main == basename || (windows? && @main.downcase == basename.downcase)
+        else
+          @main = basename.freeze
+        end
         @root = @home.parent
-        @main = (main || @home.basename).to_s.freeze
         @prefix = prefix
         @series = Application.impl_series.new(self)
         @project = {}
@@ -322,7 +328,7 @@ module Squared
 
       def task_name(val, desc: false)
         ret = @prefix ? task_join(@prefix, val) : val.to_s
-        desc ? ret.split(':').join(ARG[:SPACE]) : ret
+        desc ? message(*ret.split(':')) : ret
       end
 
       def task_namespace(val, first: false)
@@ -383,7 +389,7 @@ module Squared
 
           return ret
         end
-        @script[:ref!][:_] || SCRIPT_OBJ
+        @script[:ref!][:''] || SCRIPT_OBJ
       end
 
       def script_get(*args, group: nil, ref: nil)
@@ -409,7 +415,7 @@ module Squared
         return ret if group && (ret = @banner[:group][group.to_sym])
 
         ref.reverse_each { |val| return ret if (ret = @banner[:ref][val]) }
-        @banner[:ref][:_]
+        @banner[:ref][:'']
       end
 
       def enabled?
@@ -444,6 +450,10 @@ module Squared
         !(proj = find(home)).nil? && proj.enabled?
       end
 
+      def windows?
+        Rake::Win32.windows?
+      end
+
       def rootpath(*args)
         root.join(*args)
       end
@@ -505,7 +515,21 @@ module Squared
         elsif ref
           as_a(ref).each { |val| @script[:ref!][val.to_sym] = data }
         else
-          @script[:ref!][:_] = data
+          @script[:ref!][:''] = data
+        end
+      end
+
+      def root?(path, pass: [])
+        return false unless path.directory?
+
+        case path.children.size
+        when 0
+          true
+        when 1
+          target = path.children.first
+          target.to_s == __FILE__ || pass.any? { |val| val == target.basename.to_s }
+        else
+          false
         end
       end
 

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

@@ -15,7 +15,7 @@ module Squared
         include Rake::DSL
 
         VAR_SET = %i[parent global envname dependfile theme run script env].freeze
-        SEM_VER = /(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?/.freeze
+        SEM_VER = /\b(\d+)(?:(\.)(\d+))?(?:(\.)(\d+)(\S+)?)?\b/.freeze
         private_constant :VAR_SET, :SEM_VER
 
         class << self
@@ -46,7 +46,7 @@ module Squared
           end
 
           def to_s
-            super.match(/[^:]+$/)[0]
+            super.match(/[^:]+\z/)[0]
           end
         end
 
@@ -264,9 +264,9 @@ module Squared
                           val
                         end
                         emphasize(out, title: path, right: true, border: borderstyle, sub: [
-                          { pat: /^(#{Regexp.escape(path.to_s)})(.*)$/, styles: theme[:header] },
-                          { pat: /^(#{Regexp.escape(name)})(.*)$/, styles: theme[:active] },
-                          { pat: /^(.+ )(\()(\d+)(\))(.*)$/, styles: theme[:inline], index: 3 }
+                          { pat: /\A(#{Regexp.escape(path.to_s)})(.*)\z/, styles: theme[:header] },
+                          { pat: /\A(#{Regexp.escape(name)})(.*)\z/, styles: theme[:active] },
+                          { pat: /\A(.+ )(\()(\d+)(\))(.*)\z/, styles: theme[:inline], index: 3 }
                         ])
                       end
                     end
@@ -550,7 +550,7 @@ module Squared
           cmd = session_done(cmd)
           log.info cmd
           begin
-            if cmd =~ /^[^:]+:[^:]/ && workspace.task_defined?(cmd)
+            if cmd =~ /\A[^:]+:[^:]/ && workspace.task_defined?(cmd)
               log.warn "ENV was discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
@@ -749,6 +749,8 @@ module Squared
         end
 
         def format_desc(action, flag, opts = nil, req: nil, arg: 'opts*')
+          return unless Rake::TaskManager.record_task_metadata
+
           opts = "#{arg}=#{opts.join(',')}" if opts.is_a?(Array)
           out = [@desc]
           if flag
@@ -771,7 +773,7 @@ module Squared
           end
           if verbose
             out = []
-            out << cmd.sub(/^\S+/, &:upcase) if data[:command]
+            out << cmd.sub(/\A\S+/, &:upcase) if data[:command]
             data[:order].each do |val|
               if val.is_a?(Array)
                 s = ' '
@@ -793,7 +795,7 @@ module Squared
               out << val.to_s
             end
             print_banner(*out, styles: data[:styles], border: data[:border], client: client)
-          elsif multiple && workspace.series.multiple?
+          elsif workspace.series.multiple?
             "## #{__send__(data[:order].first || :path)} ##"
           end
         end
@@ -818,10 +820,10 @@ module Squared
             end
             if from
               out << from
-              pat = /^(#{Regexp.escape(out.last)})(.*)$/
+              pat = /\A(#{Regexp.escape(out.last)})(.*)\z/m
             end
           else
-            pat = /^(\s*\d+\.)(.+)$/
+            pat = /\A(\s*\d+\.)(.+)\z/m
           end
           sub = [headerstyle]
           sub << { pat: pat, styles: theme[:active] } if pat
@@ -833,16 +835,32 @@ module Squared
         end
 
         def append_repeat(flag, opts)
-          opts.each { |val| @session << "--#{flag}=#{shell_escape(val, quote: true)}" }
+          opts.each { |val| @session << shell_option(flag, val, quote: true) }
         end
 
-        def append_value(opts, delim: false)
+        def append_value(opts, delim: false, escape: true)
           @session << '--' if delim && !opts.empty?
-          opts.each { |val| @session << shell_escape(val) }
+          opts.each { |val| @session << (escape ? shell_escape(val) : shell_quote(val)) }
         end
 
-        def append_option(list, **kwargs)
-          list.each { |val| @session << "--#{val}" if option(val, **kwargs) }
+        def append_first(list, flag: true, equals: false, quote: false, **kwargs)
+          list.each do |opt|
+            next unless (val = option(opt, **kwargs))
+
+            return @session << (if flag
+                                  shell_option(opt, equals ? val : nil, quote: quote)
+                                else
+                                  shell_quote(val)
+                                end)
+          end
+        end
+
+        def append_option(list, equals: false, quote: false, **kwargs)
+          list.each do |flag|
+            next unless (val = option(flag, **kwargs))
+
+            @session << shell_option(flag, equals ? val : nil, quote: quote)
+          end
         end
 
         def append_nocolor(flag = nil)
@@ -1014,7 +1032,7 @@ module Squared
         end
 
         def headerstyle
-          { pat: /^(\S+)(\s+)$/, styles: theme[:header] }
+          { pat: /\A(\S+)(\s+)\z/, styles: theme[:header] }
         end
 
         def scriptargs

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

@@ -4,8 +4,8 @@ module Squared
   module Workspace
     module Project
       class Git < Base
-        OPT_PULL = %w[all ff-only autostash prune tags depth=n since=d jobs=n dry-run].freeze
-        OPT_FETCH = %w[prune-tags].concat(OPT_PULL[3..-1]).freeze
+        OPT_FETCH = %w[all tags prune append atomic unshallow dry-run depth=i deepen=i since=d jobs=i].freeze
+        OPT_PULL = %w[ff ff-only edit autostash squash verify <fetch].freeze
         private_constant :OPT_PULL, :OPT_FETCH
 
         class << self
@@ -17,7 +17,7 @@ module Squared
             namespace(name = ws.task_name('git')) do
               all = ws.task_join(name, 'all')
 
-              desc ws.task_name("#{all}[git?=rebase|stash,depend?]", desc: true)
+              desc Common::Format.message(*"#{all}[git?=rebase|stash,depend?]".split(':'))
               task 'all', [:git, :depend] do |_, args|
                 cmd = case args.git
                       when 'rebase'
@@ -63,7 +63,8 @@ module Squared
           reset: %i[head soft mixed hard merge keep submodules].freeze,
           restore: %i[worktree staged overlay].freeze,
           rev: %i[commit branch].freeze,
-          show: %i[oneline pretty format].freeze
+          show: %i[oneline pretty format].freeze,
+          tag: %i[add delete list merged].freeze
         }.freeze
 
         def initialize(*, **)
@@ -85,7 +86,7 @@ module Squared
                 flags.each do |flag|
                   case action
                   when :pull, :fetch
-                    desc format_desc(action, flag, flag == :pull ? OPT_PULL : OPT_FETCH)
+                    desc format_desc(action, flag, action == :pull ? OPT_PULL : OPT_FETCH)
                     task flag, [:opts] do |_, args|
                       __send__(action, flag, opts: args.to_a)
                     end
@@ -102,6 +103,32 @@ module Squared
                         __send__(action, flag, files)
                       end
                     end
+                  when :tag
+                    case flag
+                    when :list
+                      desc format_desc(action, flag, 'pattern*')
+                      task flag, [:pattern] do |_, args|
+                        tag(flag, args.to_a)
+                      end
+                    when :merged
+                      desc format_desc(action, flag, 'commit,pattern*')
+                      task flag, [:commit, :pattern] do |_, args|
+                        commit = guard_params(action, flag, args: args, key: :commit)
+                        tag(flag, args.to_a.drop(1), commit: commit)
+                      end
+                    when :delete
+                      desc format_desc(action, flag, 'name+')
+                      task flag, [:name] do |_, args|
+                        name = guard_params(action, flag, args: args.to_a)
+                        tag(flag, name)
+                      end
+                    else
+                      desc format_desc(action, flag, 'name,message?,commit?')
+                      task flag, [:name, :message, :commit] do |_, args|
+                        name = guard_params(action, flag, args: args, key: :name)
+                        tag(flag, [name], message: args.message, commit: args.commit)
+                      end
+                    end
                   when :stash
                     if flag == :push
                       desc format_desc(action, flag, 'pathspec*')
@@ -130,7 +157,7 @@ module Squared
                       desc format_desc(action, flag, 'index?=0,pathspec*')
                       task flag, [:pathspec] do |_, args|
                         files = args.to_a
-                        diff(flag, files, index: /^\d+$/.match?(files[0]) && !option('index') ? files.shift.to_i : 0)
+                        diff(flag, files, index: /\A\d+\z/.match?(files[0]) && !option('index') ? files.shift.to_i : 0)
                       end
                     when :cached
                       desc format_desc(action, flag, 'pathspec*')
@@ -139,9 +166,9 @@ module Squared
                       end
                     when :branch
                       desc format_desc(action, flag, 'name,pathspec*')
-                      task flag, [:name, :pathspec] do |_, args|
+                      task flag, [:name] do |_, args|
                         branch = guard_params(action, flag, args: args, key: :name)
-                        diff(flag, args.to_a[1..-1] || [], branch: branch)
+                        diff(flag, args.to_a.drop(1), branch: branch)
                       end
                     when :files
                       desc format_desc(action, flag, 'path1,path2')
@@ -173,7 +200,7 @@ module Squared
                           detach = args.detach
                           commit = args.commit
                         end
-                        guard_params(action, flag, args: { create: create }, key: :create, pat: /^b$/i) if create
+                        guard_params(action, flag, args: { create: create }, key: :create, pat: /\Ab\z/i) if create
                         checkout(flag, branch: branch, create: create, commit: commit, detach: detach)
                       end
                     when :detach
@@ -191,7 +218,7 @@ module Squared
                     if flag == :head
                       desc format_desc(action, flag, 'ref,pathspec+')
                       task flag, [:ref, :pathspec] do |_, args|
-                        files = guard_params(action, flag, args: args.to_a[1..-1] || [])
+                        files = guard_params(action, flag, args: args.to_a.drop(1))
                         reset(flag, files, ref: args.ref)
                       end
                     else
@@ -204,15 +231,12 @@ module Squared
                     if flag == :oneline
                       desc format_desc(action, flag, 'object*')
                       task flag, [:object] do |_, args|
-                        objs = args.to_a
-                        show(objs, pretty: 'oneline', abbrev: true)
+                        show(args.to_a, pretty: 'oneline', abbrev: true)
                       end
                     else
                       desc format_desc(action, flag, 'format,object*')
                       task flag, [:format, :object] do |_, args|
-                        format = guard_params(action, flag, args: args, key: :format)
-                        objs = args.to_a[1..-1] || []
-                        show(objs, "#{flag}": format)
+                        show(args.to_a.drop(1), "#{flag}": args.format)
                       end
                     end
                   end
@@ -237,8 +261,8 @@ module Squared
           append_pull opts, OPT_PULL, flag
           sub = if verbose
                   [
-                    { pat: /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, styles: :red, index: 4 },
-                    { pat: /^(.+)(\|\s+\d+\s+)(\++)(-*)(.*)$/, styles: :green, index: 3 }
+                    { pat: /\A(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)\z/, styles: :red, index: 4 },
+                    { pat: /\A(.+)(\|\s+\d+\s+)(\++)(-*)(.*)\z/, styles: :green, index: 3 }
                   ]
                 end
           source(sync: sync, sub: sub, **threadargs)
@@ -272,16 +296,16 @@ module Squared
         def status
           cmd = git_session 'status', option('long') ? '--long' : '--short'
           if (val = option('ignore-submodules', ignore: false))
-            cmd << "--ignore-submodules=#{case val
-                                          when '0', 'none'
-                                            'none'
-                                          when '1', 'untracked'
-                                            'untracked'
-                                          when '2', 'dirty'
-                                            'dirty'
-                                          else
-                                            'all'
-                                          end}"
+            cmd << shell_option('ignore-submodules', case val
+                                                     when '0', 'none'
+                                                       'none'
+                                                     when '1', 'untracked'
+                                                       'untracked'
+                                                     when '2', 'dirty'
+                                                       'dirty'
+                                                     else
+                                                       'all'
+                                                     end, escape: false)
           end
           append_pathspec
           out, banner = source(io: true)
@@ -291,10 +315,10 @@ module Squared
           end
           ret = write_lines(out, banner: banner, sub: if verbose
                                                         [
-                                                          { pat: /^(.)([A-Z])(.+)$/, styles: :red, index: 2 },
-                                                          { pat: /^([A-Z])(.+)$/, styles: :green },
-                                                          { pat: /^(\?\?)(.+)$/, styles: :red },
-                                                          { pat: /^(## )(.+)(\.{3})(.+)$/,
+                                                          { pat: /\A(.)([A-Z])(.+)\z/, styles: :red, index: 2 },
+                                                          { pat: /\A([A-Z])(.+)\z/, styles: :green },
+                                                          { pat: /\A(\?\?)(.+)\z/, styles: :red },
+                                                          { pat: /\A(## )(.+)(\.{3})(.+)\z/,
                                                             styles: [nil, :green, nil, :red], index: -1 }
                                                         ]
                                                       end)
@@ -339,18 +363,39 @@ module Squared
             cmd << "--#{flag}" << commit
           else
             cmd << "--#{flag}"
-            append_ours
+            append_first %w[ours theirs]
             append_head
             append_pathspec files
           end
           source
         end
 
+        def tag(flag, refs, message: nil, commit: nil)
+          cmd = git_session 'tag'
+          case flag
+          when :add
+            if option('sign')
+              cmd << '--sign'
+            else
+              out = cmd.to_s
+              cmd << '--annotate' if %w[-s --sign -u --local-user].none? { |val| out.include?(" #{val}") }
+            end
+            append_message message
+            append_value(refs, escape: false)
+            append_head commit
+          when :delete, :list, :merged
+            cmd << shell_option(flag, commit)
+            append_option(%w[contains sort] + (flag == :list ? ['merged'] : []), equals: true) unless flag == :delete
+            append_value(refs, escape: false)
+          end
+          source
+        end
+
         def rev(flag, ref: nil, size: nil)
           git_session 'rev-parse', if flag == :branch
                                      '--abbrev-ref'
                                    else
-                                     (n = size.to_i) > 0 ? "--short=#{[n, 5].max}" : '--verify'
+                                     (n = size.to_i) > 0 ? shell_option('short', [n, 5].max, escape: false) : '--verify'
                                    end
           append_commit ref
           source
@@ -375,7 +420,7 @@ module Squared
         def diff(flag, files = [], branch: nil, index: 0)
           cmd = git_session 'diff'
           unless flag == :files
-            if /^#[0-9a-f]{5,40}\#$/.match?(sha = files.first)
+            if /\A#\h{5,40}\#\z/.match?(sha = files.first)
               sha = sha[1..-2]
               files.shift
             else
@@ -383,7 +428,7 @@ module Squared
             end
           end
           if (val = option('unified')).to_i > 0
-            cmd << "--unified=#{val}"
+            cmd << shell_option('unified', val, escape: false)
           end
           append_nocolor
           case flag
@@ -425,14 +470,14 @@ module Squared
           upstream = false
           source('git fetch --no-tags --quiet', io: true, banner: false)
           source('git branch -vv --list', io: true, banner: false).first.each do |val|
-            next unless (data = /^\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
+            next unless (data = /\A\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
 
             branch = data[1]
             sha = data[2]
             if !data[3]
               unless (origin = option('repository', prefix: 'git', ignore: false))
                 out = source('git log -n1 --format=%h%d', io: true, stdout: true, banner: false).first
-                if (data = /^#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/m.match(out))
+                if (data = /\A#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)\z/.match(out))
                   split_escape(data[1]).each do |val|
                     next unless val.end_with?("/#{branch}")
 
@@ -442,7 +487,7 @@ module Squared
                 end
               end
               upstream = !origin.nil?
-            elsif (data = Regexp.new("^(.+)/#{Regexp.escape(branch)}$").match(data[3]))
+            elsif (data = Regexp.new("\\A(.+)/#{Regexp.escape(branch)}\\z").match(data[3]))
               origin = data[1]
             end
             break
@@ -478,27 +523,25 @@ module Squared
 
         def restore(flag, files)
           git_session 'restore', "--#{flag}"
-          append_ours
+          append_first %w[ours theirs]
           append_pathspec(files, expect: true)
           source(stdout: true)
         end
 
         def show(objs, pretty: nil, format: nil, abbrev: nil)
           cmd = git_session 'show'
-          case (flag = pretty&.downcase)
-          when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
-            cmd << "--pretty=#{flag}"
-          else
-            if pretty
-              cmd << "--pretty=#{shell_escape("tformat:#{pretty}", quote: true)}"
-            elsif format
-              cmd << "--format=#{shell_escape(format, quote: true)}"
-            end
+          if (flag = pretty || format)
+            cmd << case (val = flag.downcase)
+                   when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'
+                     shell_option('format', val, escape: false)
+                   else
+                     shell_option('pretty', flag, escape: false, quote: true)
+                   end
           end
           if (abbrev ||= option('abbrev')) == true
             cmd << '--abbrev-commit'
           elsif abbrev.to_i > 0
-            cmd << "--abbrev=#{abbrev}"
+            cmd << shell_option('abbrev', abbrev, escape: false)
           end
           append_value objs
           source(exception: false)
@@ -511,7 +554,7 @@ module Squared
           cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner)
-          cmd = cmd.sub(/^git\b/, "git --work-tree=#{shell_quote(path)} --git-dir=#{shell_quote(gitpath)}")
+          cmd = cmd.sub(/\Agit\b/, "git --work-tree=#{shell_quote(path)} --git-dir=#{shell_quote(gitpath)}")
           begin
             if io
               [stdout ? `#{cmd}` : IO.popen(cmd), banner]
@@ -580,8 +623,8 @@ module Squared
           if size > 0
             styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
             styles << :bold if styles.size <= 1
-            puts print_footer("#{size} #{size == 1 ? type.sub(/s$/, '') : type}",
-                              sub: { styles: styles, pat: /^(\d+)(.+)$/ })
+            puts print_footer("#{size} #{size == 1 ? type.sub(/s\z/, '') : type}",
+                              sub: { styles: styles, pat: /\A(\d+)(.+)\z/ })
           else
             puts empty_status("No #{type} were #{action}", 'grep', grep)
           end
@@ -589,11 +632,14 @@ module Squared
 
         def append_pull(opts, list, flag = nil)
           append_submodules flag
+          list = list.grep_v(/[^a-z\-]/)
           opts.each do |opt|
-            if list.include?(opt) || opt.match(/^(?:depth|jobs)=\d+$/)
+            if list.include?(opt) || opt.match(/^(?:de(?:pth|epen)|jobs)=\d+$/)
               @session << "--#{opt}"
-            elsif opt.match(/^since=(.+)$/) && (val = Date.parse($1))
-              @session << "--shallow-since=\"#{val.strftime('%F %T')}\""
+            elsif opt.match(/^(?:shallow-)?since=(.+)$/) && (val = Date.parse($1))
+              @session << shell_option('shallow-since', val.strftime('%F %T'), escape: false, quote: true)
+            elsif opt.end_with?('!') && list.include?(opt = opt[0..-2])
+              @session << "--no-#{opt}"
             end
           end
         end
@@ -616,19 +662,13 @@ module Squared
         end
 
         def append_message(val)
-          @session << "--message=\"#{double_quote(val)}\"" if val
+          @session << "--message=\"#{double_quote(val)}\"" unless val.to_s.empty?
         end
 
-        def append_head
-          @session << (option('head') || option('tree-ish'))
-        end
+        def append_head(val = nil)
+          return @session << val if val
 
-        def append_ours
-          if option('ours')
-            @session << '--ours'
-          elsif option('theirs')
-            @session << '--theirs'
-          end
+          append_first(%w[head tree-ish object], flag: false, ignore: false)
         end
 
         def append_submodules(flag = nil)

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

@@ -12,11 +12,11 @@ module Squared
           end
 
           def batchargs
-            [ref, { refresh: %i[build copy] }]
+            [ref, { refresh: %i[build copy] }].freeze
           end
 
           def aliasargs
-            [ref, { refresh: :build }]
+            [ref, { refresh: :build }].freeze
           end
 
           def bannerargs
@@ -103,7 +103,7 @@ module Squared
                     when :install
                       desc format_desc(action, flag)
                       task flag do
-                        depend(flag)
+                        depend flag
                       end
                     when :outdated
                       desc format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
@@ -144,7 +144,7 @@ module Squared
           items += as_a(also) if also
           return if items.empty?
 
-          print_item unless @output[0] || !verbose || task_invoked?(/^copy(?::#{Node.ref}|$)/)
+          print_item unless @output[0] || !verbose || task_invoked?(/\Acopy(?::#{Node.ref}|$)/)
           items.each do |dir|
             case dir
             when Pathname
@@ -243,7 +243,7 @@ module Squared
               end
               cmd << '--prod' if flag && prod?
               if (val = option('public-hoist-pattern', ignore: false))
-                split_escape(val).each { |opt| cmd << "--public-hoist-pattern=#{shell_escape(opt, quote: true)}" }
+                split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt, quote: true) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
               append_nocolor option('no-color')
@@ -279,10 +279,7 @@ module Squared
           end
           log.info cmd
           banner = format_banner("#{cmd}#{dryrun ? ' --dry-run' : ''}")
-          if sync
-            print_item banner
-            banner = nil
-          end
+          print_item banner if sync
           begin
             data = pwd_set { `#{cmd} --json --loglevel=error` }
             json = JSON.parse(doc = dependfile.read)
@@ -316,8 +313,9 @@ module Squared
                 avail << [key, file, latest, true]
                 next
               end
+              current = val['current'] || file
               want = rev == :major && (ver = latest.match(SEM_VER)) && !ver[6] ? latest : val['wanted']
-              next unless (val['current'] != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
+              next unless (current != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
               f = semscan(file)
               w = semscan(want)
@@ -345,7 +343,7 @@ module Squared
                         end
                 found << [key, file, want, index, major, f, w]
               elsif !major
-                avail << [key, file, latest, false]
+                avail << [key, file, latest, latest != current]
               end
             end
           end
@@ -366,7 +364,7 @@ module Squared
                         end
             puts print_footer(empty_status(msg, hint, pending + val))
           end
-          print_item banner if banner
+          print_item banner unless sync
           if !found.empty?
             col1 = size_col.(found, 0) + 4
             col2 = size_col.(found, 1) + 4
@@ -465,8 +463,8 @@ module Squared
                 major = flag == :major
                 emphasize("version: #{out}", title: name, border: borderstyle, sub: [
                   headerstyle,
-                  { pat: /^(version:)( )(\S+)(.*)$/, styles: color(major ? :green : :yellow), index: 3 },
-                  { pat: /^(version:)(.*)$/, styles: theme[major ? :major : :active] }
+                  { pat: /\A(version:)( )(\S+)(.*)\z/, styles: color(major ? :green : :yellow), index: 3 },
+                  { pat: /\A(version:)(.*)\z/, styles: theme[major ? :major : :active] }
                 ])
               elsif stdin?
                 puts out
@@ -653,19 +651,19 @@ module Squared
             end
           elsif pnpm?
             if silent
-              @session << '--reporter=silent'
+              @session << shell_option('reporter', 'silent', escape: false)
               level ||= 'error'
             end
             case level
             when 'debug', 'info', 'warn', 'error'
-              @session << "--loglevel=#{level}"
+              @session << shell_option('loglevel', level, escape: false)
             end
           elsif silent
-            @session << '--loglevel=silent'
+            @session << shell_option('loglevel', 'silent', escape: false)
           else
             case level
             when 'error', 'warn', 'notice', 'http', 'info', 'verbose', 'silly'
-              @session << "--loglevel=#{level}"
+              @session << shell_option('loglevel', level, escape: false)
             end
           end
         end

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

@@ -80,7 +80,7 @@ module Squared
                     if flag == :target
                       task flag, [:dir, :opts] do |_, args|
                         dir = guard_params(action, flag, args: args, key: :dir)
-                        depend(flag, dir: dir, opts: args.to_a[1..-1] || [])
+                        depend(flag, dir: dir, opts: args.to_a.drop(1))
                       end
                     else
                       task flag do |_, args|
@@ -106,7 +106,7 @@ module Squared
                 cmd << '--user'
                 append_pip opts, OPT_USER
               when :target
-                cmd << "--target=#{shell_escape(basepath(dir), quote: true)}"
+                cmd << shell_option('target', basepath(dir), quote: true)
                 append_pip opts, OPT_USER + ['upgrade']
                 append_eager opts
               when :upgrade
@@ -164,21 +164,20 @@ module Squared
 
         def append_pip(opts = [], list = [])
           opts.each do |opt|
-            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^v+$/))
+            next unless list.include?(opt) || OPT_GENERAL.include?(opt) || (v = opt.match(/^verbose|(v+)$/))
 
             @session << case opt
                         when 'venv'
                           '--require-virtualenv'
                         else
-                          (v ? "-#{v[0]}" : "--#{opt}")
+                          (v && v[1] ? "-#{v[1]}" : "--#{opt}")
                         end
           end
-          if (val = option('proxy', ignore: false))
-            @session << "--proxy=#{shell_escape(val, quote: true)}"
-          end
-          @session << "--python=#{shell_escape(basepath(val), quote: true)}" if (val = option('python', ignore: false))
-          @session << "--log=#{shell_escape(basepath(val), quote: true)}" if (val = option('log', ignore: false))
-          @session << '--user' if option('user')
+          val = nil
+          @session << shell_option('proxy', val, quote: true) if (val = option('proxy'))
+          @session << shell_option('python', basepath(val), quote: true) if (val = option('python'))
+          @session << shell_option('log', basepath(val), quote: true) if (val = option('log', ignore: false))
+          @session << '--user' if !list.empty? && option('user')
           @session << '--no-input' if option('no-input')
           append_nocolor option('no-color')
         end

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

@@ -103,9 +103,10 @@ module Squared
                       elsif exception
                         indexerror n, list
                       else
-                        next log.warn "rake task #{n} of #{list.size} (out of range)"
+                        log.warn "rake task #{n} of #{list.size} (out of range)"
+                        next
                       end
-                      rake(args.extras.empty? ? cmd : "#{cmd}[#{args.extras.join(',')}]")
+                      rake(args.extras.empty? ? cmd : "#{cmd}#{shell_escape("[#{args.extras.join(',')}]")}")
                     else
                       rake(*args.to_a)
                     end
@@ -182,20 +183,20 @@ module Squared
             when :redownload, :local, :'prefer-local'
               cmd = bundle_session 'install', "--#{flag}"
               if (val = option('trust-policy', ignore: false))
-                cmd << "--trust-policy=#{case val
-                                         when '0'
-                                           'NoSecurity'
-                                         when '1'
-                                           'AlmostNoSecurity'
-                                         when '2'
-                                           'LowSecurity'
-                                         when '3'
-                                           'MediumSecurity'
-                                         when '4'
-                                           'HighSecurity'
-                                         else
-                                           val
-                                         end}"
+                cmd << shell_option('trust-policy', case val
+                                                    when '0'
+                                                      'NoSecurity'
+                                                    when '1'
+                                                      'AlmostNoSecurity'
+                                                    when '2'
+                                                      'LowSecurity'
+                                                    when '3'
+                                                      'MediumSecurity'
+                                                    when '4'
+                                                      'HighSecurity'
+                                                    else
+                                                      val
+                                                    end, escape: false)
               end
               append_bundle opts, OPT_INSTALL
             else
@@ -218,7 +219,7 @@ module Squared
           return unless into
 
           dest = Pathname.new(into).realpath
-          print_item unless @output[0] || task_invoked?(/^copy(?::#{Ruby.ref}|$)/)
+          print_item unless @output[0] || task_invoked?(/\Acopy(?::#{Ruby.ref}|\z)/)
           glob = as_a(glob || '**/*')
           as_a(from).each_with_index do |val, i|
             a = basepath(val)
@@ -235,14 +236,13 @@ module Squared
           cmd = session_done(cmd)
           log.info cmd
           banner = format_banner(cmd)
-          if sync
-            print_item banner
-            banner = nil
-          end
+          print_item banner if sync
           start = 0
           found = 0
           major = 0
           pwd_set do
+            buffer = []
+            out = ->(val) { sync ? puts(val) : buffer << val }
             IO.popen("#{cmd} --no-color").each do |line|
               if start > 0
                 unless stdin?
@@ -302,24 +302,24 @@ module Squared
                     when :yellow
                       found += 1
                     end
-                    styles = styles.compact
-                                   .map { |s| s == :green || s == :yellow ? color(s) : s }
-                                   .flatten
-                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/, styles: styles,
-                                           index: 2)
+                    styles = styles.compact.map { |s| color(s) }.flatten
+                    line = sub_style(line, pat: /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/, index: 2, styles: styles)
                   end
                 end
-                puts "#{start.to_s.rjust(2)}. #{line}"
+                out.("#{start.to_s.rjust(2)}. #{line}")
                 start += 1
               elsif line =~ /^Gem /
-                print_item banner if banner
                 unless stdin?
                   sub = { pat: /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, styles: theme[:header], index: 2 }
-                  puts print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub])
+                  out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
                 end
                 start += 1
               end
             end
+            unless sync
+              print_item banner
+              puts buffer
+            end
             if found > 0
               begin
                 if major == 0 && (data = /\b(?:source\s+(["'])(.+?)\1|remote:\s+(\S+))/.match(dependfile.read))
@@ -353,7 +353,7 @@ module Squared
             cmd << '--all'
             append_repeat 'skip', opts
           when :version
-            cmd << project << "--version=#{shell_escape(version)}"
+            cmd << project << shell_option('version', version)
           end
           run_rb
         end
@@ -364,11 +364,11 @@ module Squared
         end
 
         def rake(*cmd)
-          file = shell_quote(Rake.application.rakefile)
+          rakefile = shell_option('rakefile', Rake.application.rakefile, quote: true, escape: false)
           if cmd.empty?
-            run_s("rake --rakefile=#{file}", chdir: workspace.pwd)
+            run_s("rake #{rakefile}", chdir: workspace.pwd)
           else
-            run_s(*cmd.map { |val| "rake --rakefile=#{file} #{val}" }, chdir: workspace.pwd, banner: false)
+            run_s(*cmd.map { |val| "rake #{rakefile} #{val}" }, chdir: workspace.pwd, banner: false)
           end
         end
 
@@ -429,7 +429,7 @@ module Squared
             if list.include?(opt)
               @session << "--#{opt}"
             elsif opt.match(/^g(?:roup)?=(.+)$/)
-              @session << "--group=#{shell_escape($1)}"
+              @session << shell_option('group', $1)
             end
           end
         end
@@ -437,7 +437,7 @@ module Squared
         def gem_session(*cmd)
           ret = session('gem', *cmd)
           if (val = option('config-file', ignore: false))
-            ret << "--config-file=#{shell_escape(basepath(val), quote: true)}"
+            ret << shell_option('config-file', basepath(val), quote: true)
           end
           ret << '--norc' if option('norc')
           ret
@@ -456,7 +456,7 @@ module Squared
           pass = Rake::VERSION >= '13.0.4'
           pwd_set(pass: pass) do
             IO.popen("rake#{pass ? " -C #{shell_quote(path)}" : ''} -AT").each do |line|
-              next unless (data = /^rake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
+              next unless (data = /\Arake ((?:[^\[: ]+:?)+)(\[[^\]]+\])?/.match(line))
 
               ret << [data[1], data[2]]
             end

data/lib/squared/workspace/repo.rb

@@ -33,11 +33,11 @@ module Squared
 
       def repo(url, manifest = 'latest', run: nil, script: nil, dev: nil, prod: nil, ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
-                  home = Pathname.new(val)
-                  if main == home.basename.to_s
-                    @root = home.parent
-                    if home.exist?
-                      @root = nil unless home.directory?
+                  path = Pathname.new(val)
+                  if main == path.basename.to_s
+                    @root = path.parent
+                    if path.exist?
+                      @root = nil unless path.directory?
                     elsif !@root.exist?
                       @root.mkpath
                     elsif !repo_install?
@@ -45,7 +45,7 @@ module Squared
                     end
                   end
                   raise_error('REPO_HOME', val, hint: 'invalid') unless @root
-                  home.realdirpath
+                  path.realdirpath
                 elsif (val = env('REPO_ROOT'))
                   @root = Pathname.new(val).realdirpath
                   if !@root.exist?
@@ -54,12 +54,12 @@ module Squared
                     raise_error('REPO_ROOT', val, hint: 'exist') unless repo_confirm
                   end
                   @root.join(main).realdirpath
+                elsif repo_install?(parent: true) && (!@home.exist? || @root.join(main) == @home)
+                  @home
                 elsif repo_install?(@home)
                   @home.join(main)
-                elsif @home != pwd && repo_install?(pwd)
-                  pwd.join(main)
                 else
-                  @home
+                  (path = pwd) == @home || !repo_install?(path) ? @home : path.join(main)
                 end
         @root = @home.parent
         @manifest_url = url
@@ -106,7 +106,7 @@ module Squared
             found = true
           end
           script_set(data, group: group, ref: ref) unless found
-          @warning = env_match('REPO_WARN', @warning && !Repo.empty?(@root), suffix: @envname) != false
+          @warning = env_match('REPO_WARN', @warning && !root?(@root, pass: ['.repo']), suffix: @envname) != false
           @extensions << :__repo__
         elsif script || run
           if script
@@ -153,7 +153,7 @@ module Squared
         status = lambda do |val, alt = nil|
           return 'inactive' unless (ver = branch || alt)
 
-          message(@prefix, 'repo', val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver, empty: true)
+          message(task_name('repo'), val.sub('{0}', 'opts*=force,rebase,detach,gc,no-update,no-fail'), ver)
         end
 
         namespace(name = task_name('repo')) do |repo|
@@ -230,7 +230,7 @@ module Squared
       end
 
       def repo_install?(dir = root, parent: false)
-        return true if Repo.empty?(dir) || dir.join('.repo').directory?
+        return true if root?(dir, pass: ['.repo']) || dir.join('.repo').directory?
 
         parent && root.children.none? { |ent| ent.directory? && ent.basename.to_s[0] != '.' && ent != home }
       end

data/lib/squared/workspace/series.rb

@@ -97,8 +97,9 @@ module Squared
             items.concat(tasks)
           end
           if tasks.size > 1 && (data = batch_get(key)) && data.keys.any? { |ref| proj.ref?(ref) }
-            desc ws.task_name(t = ws.task_join(proj.name, key), desc: true)
-            task ws.task_name(t) => tasks
+            t = ws.task_join(proj.name, key)
+            desc Common::Format.message(*t.split(':'))
+            task t => tasks
           end
           next unless (b = ws.find_base(proj)) && (n = b.ref.to_s) != g
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - An Pham
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-15 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake