squared 0.4.29 → 0.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eac34fc8ad46d1059142ac793918cfc1382f3ab4a1d9d07feb22c3efed560e36
-  data.tar.gz: eaebe84ed6329e2bdee4930a410aa0986b92e247b11599b3b76a7f0108619ee9
+  metadata.gz: e24f3f18639483d5b698d06a1fd471251623658359121940dd4d6597d3e5f453
+  data.tar.gz: 90eb6cd2b8b5e28497d666d655758422d124b4eb47701164ce3712a11ecc2936
 SHA512:
-  metadata.gz: 8ddcc4b63db14643603eef839c605a7e1b463355da2f8a576a16488d947c3f0c6fafd6acacd9341394d9e84e12e9d83a4ed08847f9d7aaff58f14e771459c897
-  data.tar.gz: 368b7ebad234d430b79582560253542b13e15258aa0f490f9aa14acde904685192c3dda5a68726c5ec0798b569635bcd737e3af83ecbd1486407856204966f67
+  metadata.gz: 4a7a4c5283e6bd65ed22fe9053d3f14552f2de61200e48c8c0c8e8013d0915db2c72a76ad2f7de784d0127ac47a8dd87c48ceea7a6c8c93468119487820886d7
+  data.tar.gz: 8aee7c98eb186fec5968373ab0f3acffefcbe45d6c85adce46c581536ca51d77c71af89f1c0b95cf4be10e850a24df6b783c35eb9fc32da0fa3918d360f8d779

data/CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## [0.4.31] - 2025-11-22
+
+### Changed
+
+- Project base attribute project was converted into an accessor.
+- Ruby command flag is given precedence to a program file.
+
+### Fixed
+
+- Repo application tasks are not created on Windows.
+- Repo module used conflicting REPO_URL with Repo application.
+- Project task outdated did not check pass and only exclusions.
+- Workspace static method resolve did nothing when given a String.
+- Project base run command types did not include Struct.
+- Project change directory context did not always restore when raised.
+- Ruby file method attributes did not always return nil.
+- JoinSet with a delimiter did not report correct size.
+
+## [0.4.30] - 2025-11-14
+
+### Added
+
+- Config viewer can read items by index in an Array.
+
+### Fixed
+
+- Node command add uses event name "add" and not "depend".
+- Node command add did not include packages with Yarn and PNPM.
+- Git method revbuild did not splat build arguments.
+
 ## [0.4.29] - 2025-11-08
 
 ### Fixed
@@ -1091,6 +1121,8 @@
 
 - Changelog was created.
 
+[0.4.31]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.31
+[0.4.30]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.30
 [0.4.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29
 [0.4.28]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.28
 [0.4.27]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.27

data/README.md

@@ -20,23 +20,9 @@ The range chart indicates the latest Ruby tested against at the time of release.
 gem install squared
 ```
 
-### Optional
-
-* [Repo](https://source.android.com/docs/setup/reference/repo)
-* https://github.com/anpham6/squared-repo
-* Python 3.6
-* Not compatible with Windows
-
-```sh
-mkdir -p ~/.bin
-PATH="${HOME}/.bin:${PATH}"
-curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
-chmod a+rx ~/.bin/repo
-```
-
 ## Example - Rakefile
 
-Projects from any accessible folder can be added relative to the parent directory (e.g. *REPO_ROOT*) or absolutely. The same Rakefile can also manage other similarly cloned `Repo` repositories remotely by setting the `REPO_ROOT` environment variable to the location. Missing projects will simply be excluded from the task runner.
+Projects from any accessible folder can be added relative to the parent directory or absolutely. Missing projects will simply be excluded from the task runner.
 
 ```ruby
 require "squared"
@@ -52,14 +38,6 @@ require "squared/app"                                # All workspace related mod
 
 # NODE_ENV  = production
 
-# 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
@@ -74,7 +52,6 @@ require "squared/app"                                # All workspace related mod
 Workspace::Application
   .new(Dir.pwd, main: "squared") # Dir.pwd? (main? is implicitly basename)
   .banner("group", "project", styles: ["yellow", "black"], border: "bold") # name | project | path | ref | group? | parent? | version?
-  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "build:prod"], ref: :node) # Repo (optional)
   .run("rake install", ref: :ruby)
   .depend(false, group: "default")
   .clean("rake clean", group: "default")
@@ -708,7 +685,37 @@ DOCKER_Y=1                               # confirm all
 
 ### Repo
 
-These global options also can target the application main suffix `${NAME}`. (e.g. REPO_ROOT_SQUARED)
+* [Repo](https://source.android.com/docs/setup/reference/repo)
+* https://github.com/anpham6/squared-repo
+* Python 3.6
+* Not compatible with Windows
+
+```sh
+mkdir -p ~/.bin
+PATH="${HOME}/.bin:${PATH}"
+curl https://storage.googleapis.com/git-repo-downloads/repo > ~/.bin/repo
+chmod a+rx ~/.bin/repo
+```
+
+```ruby
+# 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"
+
+Workspace::Application
+  .new(main: "squared")
+  .repo("https://github.com/anpham6/squared-repo", "nightly", script: ["build:dev", "prod"], ref: :node)
+  .add("squared", script: ["build:stage1", "build:stage2"])
+  .build
+```
+
+These global options also can target the application main suffix `${NAME}`. (e.g. *REPO_ROOT_SQUARED*)
 
 ```sh
 REPO_ROOT            # parent dir
@@ -720,7 +727,7 @@ REPO_DEV             # pattern,0,1
 REPO_PROD            # pattern,0,1
 REPO_WARN            # 0,1
 REPO_SYNC            # 0,1
-REPO_URL             # manifest repository
+REPO_GIT             # manifest repository
 REPO_MANIFEST        # e.g. latest,nightly,prod
 REPO_GROUPS          # e.g. base,prod,docs
 REPO_STAGE           # 0,1,2,3,4
@@ -728,6 +735,8 @@ REPO_SUBMODULLES     # 0,1
 REPO_TIMEOUT         # confirm dialog (seconds)
 ```
 
+Other similarly cloned `Repo` repositories can be managed remotely by setting the `REPO_ROOT` environment variable to the location.
+
 ## LICENSE
 
 BSD 3-Clause

data/lib/squared/common/class.rb

@@ -42,7 +42,7 @@ module Squared
 
       attr_reader :delim, :extras
 
-      def initialize(data = [], delim: ' ', partition: '--', uniq: /\A--?[^\[\]=\s-][^\[\]=\s]*(?:=|\s+)\S/)
+      def initialize(data = [], delim: ' ', partition: '--', uniq: /\A--?[^=\s-][^=\s]*(?:=|\s+)\S/)
         @delim = delim
         @partition = partition
         @uniq = uniq
@@ -50,13 +50,17 @@ module Squared
         super(data.compact)
       end
 
+      def compact
+        to_ary.map!(&:to_s).reject(&:empty?)
+      end
+
       def last(val, pat)
         (@last ||= []).push([val, pat, $1]) if val =~ pat
         self << val
       end
 
       def pass(&blk)
-        ret = to_ary.map!(&:to_s).reject(&:empty?)
+        ret = compact
         @last&.each do |val, pat, key|
           i = []
           j = nil
@@ -130,8 +134,8 @@ module Squared
         extras!(obj) || super
       end
 
-      def add?(obj)
-        extras!(obj) || super
+      def size
+        super + extras.size
       end
 
       def to_a
@@ -139,21 +143,24 @@ module Squared
       end
 
       def to_s
-        pass.join(@delim)
+        to_a.join(@delim)
       end
 
       def to_enum(*args)
-        pass.to_enum(*args)
+        to_a.to_enum(*args)
       end
 
       def to_json(*args)
-        pass.to_json(*args)
+        to_a.to_json(*args)
       end
 
       def to_yaml(*args)
-        pass.to_yaml(*args)
+        to_a.to_yaml(*args)
       end
 
+      alias add :<<
+      alias add? :<<
+
       private
 
       def extras!(obj)

data/lib/squared/common/format.rb

@@ -67,6 +67,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
+        args.clear if args.size == 1 && args.first.nil?
         args.concat(Array(styles)).flatten.each_with_index do |type, i|
           next unless type
 
@@ -178,19 +179,20 @@ module Squared
         args = args.map(&:to_s)
         if level.is_a?(::Numeric)
           if append && respond_to?(:log)
-            (log rescue nil).tap do |ref|
-              ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
-            end
+            ref = log rescue nil
+            ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(::Logger)
           end
-          return false if !pass && level < ARG[:LEVEL]
+          return false unless pass || level >= ARG[:LEVEL]
         end
-        if (args.size > 1 && !hint) || hint == false
+        if hint.nil? ? args.size > 1 : !hint
           title = log_title(level, color: false)
           sub = [pat: /\A(#{Regexp.escape(title)})(.*)\z/m, styles: __get__(:theme)[:logger][log_sym(level)]] if color
           emphasize(args, title: title + (subject ? " #{subject}" : ''), sub: sub, pipe: -1)
         else
           msg = [log_title(level, color: color)]
-          msg << (color ? sub_style(subject.to_s, styles: (@theme && @theme[:subject]) || :bold) : subject) if subject
+          if subject
+            msg << (color ? sub_style(subject.to_s, (@theme.is_a?(::Hash) && @theme[:subject]) || :bold) : subject)
+          end
           msg << args.shift if msg.size == 1
           message(msg.join(' '), *args, hint: hint)
         end
@@ -223,7 +225,7 @@ module Squared
       end
 
       def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, pipe: nil,
-                    border: @theme && @theme[:border])
+                    border: @theme.is_a?(::Hash) && @theme[:border])
         n = 0
         max = ->(a) { n = [n, a.max_by(&:size).size].max }
         set = ->(s) { Array(s).map(&:to_s).tap { |a| max.call(a) } }
@@ -288,7 +290,7 @@ module Squared
           else
             pipe = $stdout unless pipe.respond_to?(:puts)
           end
-          pipe.puts out
+          pipe.puts(out)
         else
           err ? warn(out) : puts(out)
         end

data/lib/squared/common/prompt.rb

@@ -49,9 +49,9 @@ module Squared
           raise_error 'empty selection list' if max == 0
           min = grep ? 1 : [min, max].min
           if auto
-            msg = "#{msg + (force ? ':' : '?')} [#{min}-#{max}#{if (n = multiple)
-                                                                  "|,#{n.is_a?(::Numeric) ? "{#{n}}" : ''}"
-                                                                end}] "
+            msg = "#{msg}: [#{min}-#{max}#{if multiple
+                                             "|,#{multiple.is_a?(::Numeric) ? "{#{multiple}}" : ''}"
+                                           end}] "
           end
         end
         valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }

data/lib/squared/common/shell.rb

@@ -29,7 +29,7 @@ module Squared
                   r[7]
                 end
           r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, force: force, double: double, override: override)
-        elsif option && val =~ /\A(-{0,2}[^\[\]=\s-][^\[\]=\s]*)=(.+)\z/m
+        elsif option && val =~ /\A(-{0,2}[^=\s-][^=\s]*)=(.+)\z/m
           return val if $2.match?(QUOTE_VALUE)
 
           "#{$1}=%s" % if $2.include?(' ')
@@ -51,7 +51,7 @@ module Squared
         return val if (!force && !val.include?(' ')) || val.empty?
 
         if option
-          pat = /\A(?:-[^\[\]=\s-](?:=|\s+)?|(--)?[^\[\]=\s-][^\[\]=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
+          pat = /\A(?:-[^=\s-](?:=|\s+)?|(--)?[^=\s-][^=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
           return val if val.match?(pat)
         end
         q = ->(s) { s.gsub("'\\\\''", "'") }
@@ -78,7 +78,11 @@ module Squared
         end
         sep = unless flag.empty?
                 if flag[0] == '-'
-                  flag[1] == '-' ? '=' : ' '
+                  if flag[1] == '-'
+                    '='
+                  else
+                    merge ? '' : ' '
+                  end
                 elsif flag.size == 1
                   pre = '-'
                   merge ? '' : ' '
@@ -112,6 +116,7 @@ module Squared
       end
 
       def fill_option(val, **kwargs)
+        return val unless val.is_a?(::String)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
         shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)

data/lib/squared/config.rb

@@ -12,15 +12,14 @@ module Squared
       include Rake::DSL
 
       class << self
-        def parse(gem, namespace, ext = [pkg])
+        def parse(gem, namespace, ext = [gem])
           require gem
-          obj = eval namespace
-          Array(ext).each { |val| @@mime_obj[val] = [obj, ext] }
+          [eval(namespace), Array(ext)].tap do |data|
+            data.last.each { |key| @@mime_obj[key] = data }
+          end
         rescue LoadError, NameError => e
           warn e
           nil
-        else
-          @@mime_obj[ext.first]
         end
 
         def link(project, main = project.dependfile.basename, name = nil, **kwargs, &blk)
@@ -246,7 +245,7 @@ module Squared
                                                 { 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[:hash], index: 2 },
                                                 { pat: /\A(.+ : \[)(.+)(\]\s*)\z/m, styles: theme[:array], index: 2 },
                                                 { pat: /\A(.+ : )(true|false)(\s*)\z/m, styles: theme[:boolean],
                                                   index: 2 },
@@ -262,7 +261,7 @@ module Squared
         symbolize = opts[:symbolize_names]
         keys.each do |key|
           begin
-            items = key.split('.')
+            items = key.split('.').flat_map { |name| name =~ /^(.+)\[(\d+)\]$/ ? [$1, $2.to_i] : name }
             items = items.map(&:to_sym) if symbolize
             val = data.dig(*items)
             if val.nil?

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -488,7 +488,7 @@ module Squared
         if (base = task_base?(key))
           tasks << key if obj.has?(key, baseref)
         elsif (batch = series.batch_get(key))
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (data = batch[ref])
 
             data.each do |val|
@@ -507,7 +507,7 @@ module Squared
         if tasks.empty?
           return [] if (base && !obj.ref?(baseref)) || !(data = series.alias_get(key))
 
-          obj.allref.each do |ref|
+          obj.allref do |ref|
             next unless obj.has?(key, ref) && (alt = data[ref])
 
             ret = task_resolve(obj, alt)

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

@@ -72,9 +72,9 @@ module Squared
           'unpack' => %i[zip tar gem ext].freeze
         })
 
-        attr_reader :name, :project, :workspace, :path, :theme, :group, :parent, :dependfile,
+        attr_reader :name, :workspace, :path, :theme, :group, :parent, :dependfile,
                     :exception, :pipe, :verbose
-        attr_accessor :global
+        attr_accessor :global, :project
 
         def initialize(workspace, path, name, *, group: nil, first: {}, last: {}, error: {}, common: ARG[:COMMON],
                        **kwargs)
@@ -1005,8 +1005,8 @@ module Squared
           @log = Logger.new(enabled? ? @log.first : nil, **@log.last)
         end
 
-        def allref
-          @ref.reverse_each
+        def allref(&blk)
+          @ref.reverse_each(&blk)
         end
 
         def basepath(*args)
@@ -1020,7 +1020,7 @@ module Squared
           path.parent.ascend.each do |dir|
             target = dir.join(*args)
             return target if target.exist?
-            break if (ascend && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
+            break if (ascend.is_a?(String) && dir.join(ascend).exist?) || workspace.root == dir || parent&.path == dir
           end
           ret
         end
@@ -1290,7 +1290,9 @@ module Squared
         end
 
         def print_error(*args, loglevel: Logger::WARN, **kwargs)
-          warn log_message(loglevel, *args, **kwargs) if warning?
+          return unless warning?
+
+          warn log_message(loglevel, *args, **kwargs)
         end
 
         def print_item(*val)
@@ -1444,8 +1446,8 @@ module Squared
           "#{msg}#{!always && (!obj || obj == 0 || obj.to_s.empty?) ? '' : message(hint: message(title, obj.to_s))}"
         end
 
-        def append_repeat(flag, opts, target: @session)
-          opts.each { |val| target << shell_option(flag, val) }
+        def append_repeat(flag, opts, target: @session, **kwargs)
+          opts.each { |val| target << shell_option(flag, val, **kwargs) }
         end
 
         def append_hash(data, target: @session || [], build: false)
@@ -1471,6 +1473,8 @@ module Squared
               target << basic_option(key, val)
             when FalseClass
               target << shell_option(key).sub(/^--(?!no-)/, '--no-')
+            when Pathname
+              target << shell_option(key, val, escape: false)
             else
               target << shell_option(key, val.is_a?(String) ? val : nil)
             end
@@ -1855,17 +1859,15 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              if (path == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
-                ret = yield
-              else
-                Dir.chdir path
-                ret = yield
-                Dir.chdir pwd
+              unless (path == pwd || pass == true) && (workspace.mri? || !workspace.windows?)
+                restore = true
+                Dir.chdir(path)
               end
+              yield
             rescue StandardError => e
               on_error(e, from, dryrun: dryrun)
-            else
-              ret
+            ensure
+              Dir.chdir(pwd) if restore
             end
           elsif @pwd == pwd
             @pwd = nil
@@ -2052,7 +2054,7 @@ module Squared
 
         def runnable?(val)
           case val
-          when String, Enumerable, Proc, Method
+          when String, Enumerable, Proc, Method, Struct
             true
           else
             false
@@ -2111,14 +2113,9 @@ module Squared
         end
 
         def has_value?(data, other)
-          case data
-          when Hash
-            other.is_a?(Enumerable) ? other.any? { |obj| data.value?(obj) } : data.value?(other)
-          when Enumerable
-            other.is_a?(Enumerable) ? other.any? { |obj| data.include?(obj) } : data.include?(other)
-          else
-            false
-          end
+          return false unless data.is_a?(Enumerable)
+
+          other.is_a?(Enumerable) ? other.any? { |obj,| data.include?(obj) } : data.include?(other)
         end
 
         def variables

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

@@ -375,7 +375,6 @@ module Squared
           case flag
           when :run, :create, :exec
             if rc && !op.arg?('mount')
-              run = VAL_DOCKER[:run]
               all = collect_hash VAL_DOCKER[:run]
               delim = Regexp.new(",\\s*(?=#{all.join('|')})")
               Array(@mounts).each do |val|
@@ -392,8 +391,8 @@ module Squared
                     end
                   elsif all.include?(k)
                     unless type
-                      run.each_pair do |key, val|
-                        next unless val.include?(k)
+                      VAL_DOCKER[:run].each_pair do |key, a|
+                        next unless a.include?(k)
 
                         type = key.to_s unless key == :common
                         break

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

@@ -134,7 +134,7 @@ module Squared
         File.write(@revfile, JSON.pretty_generate(@revdoc))
       rescue StandardError => e
         log&.debug e
-        warn log_message(Logger::WARN, e, pass: true) if warning?
+        warn log_message(Logger::WARN, e, pass: true) if warning
       ensure
         @revlock = false
       end
@@ -674,7 +674,7 @@ module Squared
                         branch(flag, target: target, ref: ref, remote: remote)
                       end
                     when :delete
-                      format_desc action, flag, '(^~)name*,:?'
+                      format_desc action, flag, '[^~]name*,:?'
                       task flag do |_, args|
                         refs = args.to_a
                         if refs.empty? || (r = refs.last == ':')
@@ -1232,7 +1232,7 @@ module Squared
             end
           end
           start = epochtime
-          build(@output, sync: sync, from: :'git:revbuild')
+          build(*@output, sync: sync, from: :'git:revbuild')
         rescue StandardError => e
           print_error(e, pass: true)
         else
@@ -1448,7 +1448,6 @@ module Squared
                 end
                 origin = readline('Enter an upstream', force: true)
               end
-              raise_error('missing remote name', hint: origin) unless origin.include?('/')
               upstream = true
             end
             break
@@ -1697,7 +1696,7 @@ module Squared
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
           when :commit
-            cmd << ((n = size.to_i) > 0 ? basic_option('short', [n, 5].max) : '--verify')
+            cmd << (size.to_i.zero? ? '--verify' : basic_option('short', [size.to_i, 5].max))
             append_commit(ref, head: true)
           when :branch
             cmd << '--abbrev-ref'
@@ -1761,12 +1760,11 @@ module Squared
               grep, list = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !list.empty?
                 grep.map! { |val| Regexp.new(val[1..-2]) }
-                files = [].tap do |out|
-                  status_data.each do |a, b|
-                    next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
+                files = []
+                status_data.each do |a, b|
+                  next if b.strip.empty? || (!grep.empty? && grep.none? { |pat| pat.match?(a) })
 
-                    out << "#{sub_style(b, styles: color(:red))} #{a}"
-                  end
+                  files << "#{sub_style(b, styles: color(:red))} #{a}"
                 end
                 unless files.empty?
                   files = choice_index('Select files', files, multiple: true, force: true, trim: /^\S+\s/,
@@ -1922,7 +1920,7 @@ module Squared
           end
           args = []
           args << quote_option('sort', sort) if sort
-          args << shell_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
+          args << basic_option('count', env('GIT_COUNT', ARG[:CHOICE])) if count
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
@@ -1955,13 +1953,13 @@ module Squared
         end
 
         def status_data(*args)
-          [].tap do |ret|
-            git_spawn('status -z -uall', *args).split("\x0").each do |line|
-              next unless line =~ /^(.)(.) (.+)$/
+          ret = []
+          git_spawn('status -z -uall', *args).split("\x0").each do |line|
+            next unless line =~ /^(.)(.) (.+)$/
 
-              ret << [$3, $2, $1]
-            end
+            ret << [$3, $2, $1]
           end
+          ret
         end
 
         def append_pull(opts, list, target: @session, flag: nil, no: nil, remote: nil, from: nil)
@@ -2038,7 +2036,9 @@ module Squared
 
         def append_message(val = nil, target: @session)
           val = messageopt if val.to_s.empty?
-          target << quote_option('message', val) if val
+          return unless val
+
+          target << quote_option('message', val)
         end
 
         def append_head(val = nil, target: @session)
@@ -2122,7 +2122,9 @@ module Squared
         end
 
         def repotrack(origin, branch, quote: true)
-          i = origin.index('/')
+          unless origin && branch && (i = origin.index('/'))
+            raise_error(ArgumentError, "missing #{origin ? 'branch' : 'remote'} name", hint: origin)
+          end
           branch = "#{branch}:#{origin[(i + 1)..-1]}" unless origin.end_with?("/#{branch}")
           ret = [origin[0..(i - 1)], branch]
           quote ? ret.map! { |val| shell_quote(val) } : ret

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

@@ -6,18 +6,19 @@ module Squared
       class Node < Git
         OPT_NPM = {
           common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
-          install: %w[package-lock-only=!? prefer-dedupe=!? cpu=b libc=b os=b].freeze,
-          install_base: %w[audit=! bin-links=! fund=! ignore-scripts=!? install-links=!? package-lock=!
-                           strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
+          install: %w[package-lock-only=!? prefer-dedupe=!? E|save-exact=!? before=q cpu=b libc=b os=b].freeze,
+          install_base: %w[audit=! bin-links=! foreground-scripts=!? fund=! ignore-scripts=!? install-links=!?
+                           package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
-          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod before=q foreground-scripts=!?
-                         g|global=!? S|save=!? E|save-exact=!?].freeze,
+          install_as: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
+                         S|save=!?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
           pack: %w[ignore-scripts=!? json=!? pack-destination=p].freeze
         }.freeze
         OPT_PNPM = {
-          common: %w[aggregate-output color no-color stream use-stderr C|dir=p loglevel=b w|workspace-root].freeze,
+          common: %w[aggregate-output color ignore-workspace-root-check no-color stream use-stderr C|dir=p loglevel=b
+                     r|recursive w|workspace-root].freeze,
           cpu: %w[cpu=b libc=b os=b].freeze,
           filter: %w[fail-if-no-match changed-files-ignore-pattern=q filter=q filter-prod=q test-pattern=q].freeze,
           install: %w[fix-lockfile force ignore-pnpmfile ignore-workspace lockfile-only merge-git-branch-lockfiles
@@ -28,12 +29,12 @@ module Squared
                       reporter=b].freeze,
           install_base: %w[global-dir ignore-scripts offline prefer-offline store-dir=p virtual-store-dir=p].freeze,
           install_no: %w[frozen-lockfile verify-store-integrity].freeze,
-          install_as: %w[D|dev global-dir no-optional P|prod r|recursive].freeze,
+          install_as: %w[D|dev no-optional P|prod].freeze,
           update: %w[g|global i|interactive L|latest depth=i].freeze,
           dedupe: %w[check].freeze,
-          run: %w[if-present no-bail parallel r|recursive report-summary reporter-hide-prefix resume-from
+          run: %w[if-present no-bail parallel report-summary reporter-hide-prefix resume-from
                   sequential].freeze,
-          exec: %w[no-reporter-hide-prefix parallel r|recursive report-summary resume-from c|shell-mode].freeze,
+          exec: %w[no-reporter-hide-prefix parallel report-summary resume-from c|shell-mode].freeze,
           pack: %w[json pack-destination=p pack-gzip-level=i].freeze
         }.freeze
         OPT_YARN = {
@@ -157,7 +158,8 @@ module Squared
                           elsif exception
                             indexerror n, list
                           else
-                            next log.warn "run script #{n} of #{list.size} (out of range)"
+                            log.warn "run script #{n} of #{list.size} (out of range)"
+                            next
                           end
                           run compose(val, script: true)
                         else
@@ -268,6 +270,8 @@ module Squared
 
         def copy(from: 'build', into: 'node_modules', scope: nil, also: nil, create: nil, files: nil, workspace: false,
                  link: false, force: false, override: false, sync: invoked_sync?('copy'), **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -284,8 +288,6 @@ module Squared
             create = @copy[:create] if @copy.key?(:create)
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
-          elsif @copy == false
-            return
           end
           items = []
           if build? && path != @workspace.home && @workspace.home?
@@ -437,11 +439,12 @@ module Squared
               if flag == :add
                 cmd << 'add' << "--save-#{save}"
                 cmd << '--save-exact' if exact
+                option('allow-build') { |val| cmd << quote_option('allow-build', val) }
               else
                 cmd << 'install'
                 append_platform
               end
-              if (val = option('public-hoist-pattern', ignore: false))
+              if (val = option('public-hoist-pattern'))
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
               end
               cmd << '--ignore-workspace' if env('NODE_WORKSPACES', equals: '0')
@@ -451,7 +454,6 @@ module Squared
               if flag == :add
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
-                cmd.merge(packages.map { |pkg| shell_quote(pkg) })
               else
                 append_platform
               end
@@ -460,7 +462,8 @@ module Squared
               append_nocolor
             end
             append_loglevel
-            run(from: :depend, sync: sync)
+            cmd.merge(packages.map { |pkg| shell_quote(pkg) }) if flag == :add
+            run(from: flag || :depend, sync: sync)
           end
         end
 
@@ -713,7 +716,7 @@ module Squared
             else
               cmd = session 'npm', flag
               list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
-              list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
+              list.concat(OPT_NPM[:install_as]) if flag == :install || flag == :update
               no = OPT_NPM[:install_no]
             end
             op = OptionPartition.new(opts, list, cmd, no: no, project: self)
@@ -733,13 +736,13 @@ module Squared
             append_platform if flag == :install
             append_nocolor
             append_loglevel
-            if flag == :dedupe
+            if flag == :dedupe || pnpm?
               op.clear
             else
               op.append(quote: true)
             end
-            op.clear(errors: true)
           end
+          op.clear(errors: true)
           run(from: from || :"package:#{flag}")
         end
 
@@ -855,7 +858,7 @@ module Squared
         end
 
         def outdated?
-          dependfile.exist?
+          dependfile.exist? && !task_pass?('outdated')
         end
 
         def update?
@@ -1038,7 +1041,7 @@ module Squared
 
         def append_loglevel(target: @session)
           level = env('NODE_LOGLEVEL')
-          silent = !verbose || level == 'silent'
+          silent = verbosetype == 0 || level == 'silent'
           return unless silent || level
 
           if yarn?

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

@@ -602,7 +602,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private
@@ -614,7 +614,7 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\A(?:v+|OO)\z/)
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: singleopt(:python))
           ret = session('python', *op.to_a, *cmd, path: venv.nil?)
           [ret, op.extras]
         end
@@ -712,7 +712,7 @@ module Squared
                         quote_option('cache-dir', basepath(val))
                       end
           end
-          target << shell_option('proxy', val) if (val = option('proxy', target: target))
+          target << quote_option('proxy', val) if (val = option('proxy', target: target))
           target << quote_option('python', basepath(val)) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
@@ -793,7 +793,7 @@ module Squared
         def singleopt(flag = nil)
           case flag
           when :python
-            /\A(?:v+|q+|b+)\z/
+            /\A(?:v+|q+|b+|V+|O+)\z/
           when :twine
             nil
           else

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

@@ -288,6 +288,8 @@ module Squared
         end
 
         def copy(from: gemlib, into: @gemdir, override: false, **kwargs)
+          return if @copy == false
+
           glob = kwargs[:include]
           pass = kwargs[:exclude]
           if @copy && !override
@@ -297,8 +299,6 @@ module Squared
             glob = @copy[:include] if @copy.key?(:include)
             pass = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
-          elsif @copy == false
-            return
           end
           return unless into
 
@@ -462,13 +462,15 @@ module Squared
           case flag
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
-            if file
-              op.unshift(shell_quote(basepath(file)))
-            elsif command
+            if command
               op << quote_option('e', command, option: false)
+            elsif file
+              op.unshift(basepath(file))
+            end
+            unless op.arg?('e')
+              op.push(args) if args
+              op.append(delim: true, escape: false, quote: false) unless op.empty?
             end
-            op.push(args) if args
-            op.append(delim: true, escape: false, quote: false) unless op.empty?
           when :version
             pwd_set do
               out = []
@@ -561,7 +563,6 @@ module Squared
           when :install, :update
             list.concat(OPT_GEM[:install_base])
           end
-          cmd.merge(preopts)
           op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GEM[:no][flag])
           op.each do |opt|
             if !opt.match?(/\A[A-Za-z\d][A-Za-z\d_.-]*\z/) && %i[install uninstall update pristine].include?(flag)
@@ -764,7 +765,7 @@ module Squared
                          else
                            [name[0, n], name[(n + 1)..-1]]
                          end
-              op.adjoin(pre, shell_option('version', ver))
+              op.adjoin(pre, basic_option('version', ver))
                 .clear
             elsif flag == :install
               op.append_any
@@ -829,13 +830,8 @@ module Squared
         end
 
         def gemspec
-          return @gemspec unless @gemspec.nil?
-
-          @gemspec = if gemfile
-                       Gem::Specification.load(gemfile.to_s) rescue false
-                     else
-                       false
-                     end
+          @gemspec = !gemfile.nil? && Gem::Specification.load(gemfile.to_s) rescue false if @gemspec.nil?
+          @gemspec || nil
         end
 
         def gemname
@@ -925,7 +921,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private
@@ -959,18 +955,11 @@ module Squared
         end
 
         def gem_session(*cmd, **kwargs)
-          ret = session('gem', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          ret.merge(preopts)
+          session('gem', *cmd, *preopts, **kwargs)
         end
 
         def bundle_session(*cmd, **kwargs)
-          ret = session('bundle', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          append_nocolor
-          ret.merge(preopts)
+          session('bundle', *cmd, *preopts, **kwargs).tap { append_nocolor }
         end
 
         def rake_session(*cmd, **kwargs)
@@ -994,7 +983,7 @@ module Squared
         end
 
         def preopts
-          verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
+          verbosetype > 1 ? ['--verbose'] : []
         end
 
         def variables
@@ -1002,10 +991,11 @@ module Squared
         end
 
         def rakefile
-          return @rakefile unless @rakefile.nil?
-
-          file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
-          @rakefile = file ? basepath(file) : false
+          if @rakefile.nil?
+            file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? }
+            @rakefile = !file.nil? && basepath(file)
+          end
+          @rakefile || nil
         end
 
         def rakepwd
@@ -1034,11 +1024,12 @@ module Squared
         end
 
         def gemfile
-          return @gemfile unless @gemfile.nil?
-
-          @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
-                                    .concat(Dir.glob(basepath('*.gemspec')))
-                                    .find { |file| File.exist?(file) } || false
+          if @gemfile.nil?
+            @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
+                                      .concat(Dir.glob(basepath('*.gemspec')))
+                                      .find { |file| File.exist?(file) } || false
+          end
+          @gemfile || nil
         end
 
         def gemlib
@@ -1056,7 +1047,9 @@ module Squared
         end
 
         def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+          return false unless @gemdir
+
+          @gemdir.exist? && !@gemdir.empty?
         end
 
         alias read_rakefile raketasks

data/lib/squared/workspace/project/support/class.rb

@@ -10,9 +10,9 @@ module Squared
           include Common::Shell
           extend Forwardable
 
-          OPT_NAME = /\A(?:(--)|-)((?(1)[^\[\]=\s-][^\[\]=\s]*|[^\[\]=\s-]))\z/
-          OPT_VALUE = /\A-{0,2}([^\[\]=\s-][^\[\]=\s]*)(?:\s*=\s*|\s+)(.+)\z/
-          OPT_SINGLE = /\A-([^\[\]=\s-])(.+)\z/
+          OPT_NAME = /\A(?:(--)|-)((?(1)[^=\s-][^=\s]*|[^=\s-]))\z/
+          OPT_VALUE = /\A-{0,2}([^=\s-][^=\s]*)(?:=|\s+)(\S.*)\z/
+          OPT_SINGLE = /\A-([^=\s-])(.+)\z/
           private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
           class << self
@@ -29,15 +29,15 @@ module Squared
                 pat, s = Array(strip)
                 ret.map! { |val| val.is_a?(String) ? val.gsub(pat, s || '') : val }
               end
-              if escape || quote
-                ret.map! do |val|
-                  if opt?(val)
-                    val
-                  elsif escape
-                    shell_escape(val, quote: quote, double: double)
-                  else
-                    shell_quote(val, force: force, double: double)
-                  end
+              ret.map! do |val|
+                next val if opt?(val)
+
+                if quote || val.is_a?(Pathname)
+                  shell_quote(val, force: force, double: double)
+                elsif escape
+                  shell_escape(val, quote: quote, double: double)
+                else
+                  val
                 end
               end
               if target.is_a?(Set)
@@ -103,7 +103,7 @@ module Squared
             end
 
             def pattern?(val)
-              val.match?(/(?:\A\^|\$\z)/) || val.match?(/(?:\.[*+]|\(\?:|\\[dsw]|\[.+\]|\{\d+,?\d*\})/)
+              val.match?(/(?:\A\^|\$\z)/) || val.match?(/(?:\.[*+]|\(\?:|\\[dsw]|\[.+\]|\{\d+,?\d*})/)
             end
 
             private
@@ -134,7 +134,7 @@ module Squared
           attr_reader :target, :extras, :found, :errors, :values, :project, :path
 
           def_delegators :@target, :+, :-, :<<, :any?, :none?, :include?, :add, :add?, :find, :find_all, :find_index,
-                         :merge, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
+                         :merge, :compact, :delete, :delete?, :delete_if, :grep, :grep_v, :inspect, :to_a, :to_s
           def_delegators :@extras, :empty?, :each, :each_with_index, :partition, :dup, :first, :last, :shift, :unshift,
                          :pop, :push, :concat, :index, :join, :map, :map!, :detect, :select, :select!, :reject, :size,
                          :delete_at
@@ -340,7 +340,7 @@ module Squared
 
           def adjoin(*args, with: nil, start: false)
             i = -1
-            temp = to_a
+            temp = compact
             if with
               pat = case with
                     when String, Symbol
@@ -359,11 +359,11 @@ module Squared
             else
               temp.each_with_index do |val, index|
                 if i == 0
-                  next unless val.start_with?('-')
+                  next unless val.is_a?(String) && val.start_with?('-')
 
                   i = index
                   break
-                elsif index > 0 && !val.start_with?('-')
+                elsif index > 0 && !val.to_s.start_with?('-')
                   if start
                     i = index + (start.is_a?(Numeric) ? start : 1)
                     break

data/lib/squared/workspace/repo.rb

@@ -132,20 +132,20 @@ module Squared
           task 'all' do |_, args|
             stage ||= 'all'
             ns['sync'].invoke(*args.to_a)
-            next if (stage = env('REPO_STAGE')) == '1'
+            next if (n = env('REPO_STAGE')) == '1'
 
             @project.select do |_, proj|
               next unless proj.enabled?(proj.workspace.baseref) && proj.global
 
               proj.depend(sync: true) if proj.depend?
-              next if stage == '2'
+              next if n == '2'
 
               proj.build?
             end
             .each_value do |proj|
               proj.build(sync: true)
-              next if stage == '3'
-              next unless proj.copy? && (proj.dev? || stage == '4')
+              next if n == '3'
+              next unless proj.copy? && (proj.dev? || n == '4')
 
               if (ws = proj.workspace).task_defined?(target = task_join(proj.name, 'copy'))
                 task_invoke(target, **ws.invokeargs)
@@ -158,7 +158,7 @@ module Squared
           desc.call("init[manifest?=#{target},groups?,{0}]", target)
           task 'init' do |_, args|
             args = args.to_a
-            u = env('REPO_URL') || manifest_url
+            u = env('REPO_GIT') || manifest_url
             m = args.first && !opts.include?(args.first) ? args.shift : target
             g = args.first && !opts.include?(args.first) ? args.shift : nil
             g = case (val = env('REPO_GROUPS'))
@@ -251,7 +251,9 @@ module Squared
       end
 
       def repo?
-        !manifest_url.nil? && (repo_install? || @repo_override == true)
+        return false unless manifest_url && !windows?
+
+        repo_install? || @repo_override == true
       end
 
       def repo_submodules?(val = false)

data/lib/squared/workspace.rb

@@ -5,12 +5,14 @@ module Squared
     class << self
       include Common
 
-      def resolve(*args)
+      def resolve(*args, base: '..')
+        values = __get__(:project).values
         ret = args.map do |id|
           if id.is_a?(Symbol)
             project id
           else
-            __get__(:project).find { |_, val| File.expand_path(val.path) == File.expand_path(id) }
+            values.find { |proj| proj.name == id } || values.find { |proj| proj.project == id } ||
+              values.find { |proj| proj.path.to_s == File.expand_path(id, base) }
           end
         end
         ret.size == 1 ? ret.first : ret

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.29
+  version: 0.4.31
 platform: ruby
 authors:
 - An Pham