squared 0.4.28 → 0.4.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a433a8034032658be9c9ce5068904a993c964f01d63ca4ec4a017a742a6802e
-  data.tar.gz: 805ef86bf61d4da1854a766402377b67cc129dca8537a87ffea966019516f17b
+  metadata.gz: ec34e9b4cff5c76d921c742e1d3f476814756fee0a4766b7433c0cef64987826
+  data.tar.gz: d1dacfbcc7293efc614a220d7476ce63a641adaf6863c4dec0ba29575182b56b
 SHA512:
-  metadata.gz: c7e2e78c6040f77f509419580938f3b501171bded0454eff7b3e2fb9317dacd402cb610b76d513399af23c05c935ad1cd4baffaaa1c601058d808881bb606774
-  data.tar.gz: b2c810eccf3fb6cdb614dad59ee846dafb13f223ab8b37b612ab0eacdc443f2383679905e697ffc54415355eafcad71e81586f635618960d6414904361ada790
+  metadata.gz: aaef815c281e7fb8ac3dae919218ca38e0a4af7815db58315e0221baf35cffbfb28ee8398d8ccabd16ef3888030b825055b1b69ee96d0c1b6632bca41ef60b59
+  data.tar.gz: e4934cf825627079d4f6f536b4b86b96b51724415fe316af4b2c900268e284b98600224263faa090c4249db3fafca6eebcb3390fd27a0f0d94c027b616fbcd78

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [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
+
+- OptionPartition was created by mistake and is unreliable in every way.
+
 ## [0.4.28] - 2025-11-08
 
 ### Fixed
@@ -1085,6 +1103,8 @@
 
 - Changelog was created.
 
+[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
 [0.4.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.26

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

data/lib/squared/common/format.rb

@@ -223,7 +223,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 +288,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("'\\\\''", "'") }
@@ -112,6 +112,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.28'
+  VERSION = '0.4.30'
 end

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

@@ -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
@@ -2122,7 +2121,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 = {
@@ -437,11 +438,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 +453,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 +461,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 +715,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 +735,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
 
@@ -1038,7 +1040,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/ruby.rb

@@ -561,7 +561,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)
@@ -959,18 +958,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 +986,7 @@ module Squared
         end
 
         def preopts
-          verbosetype > 1 && !session_arg?('quiet') ? ['--verbose'] : []
+          verbosetype > 1 ? ['--verbose'] : []
         end
 
         def variables
@@ -1056,7 +1048,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
@@ -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
@@ -121,12 +121,12 @@ module Squared
             end
 
             def shortopt(*group)
-              group.map! { |s| s.sub(/\A-/, '') }
+              group.map! { |s| Regexp.escape(s.sub(/\A-/, '')) }
               "-(?:#{Regexp.escape(group.join('|'))})(?:\\z|[^ =]| +[^ -])"
             end
 
             def longopt(*group, value)
-              group.map! { |s| s.sub(/\A--/, '') }
+              group.map! { |s| Regexp.escape(s.sub(/\A--/, '')) }
               "--(?:#{Regexp.escape(group.join('|'))})(?:#{value ? '=[^ ]| +[^ -]' : '[= ]|\z'})"
             end
           end
@@ -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)
@@ -251,7 +251,9 @@ module Squared
       end
 
       def repo?
-        !manifest_url.nil? && (repo_install? || @repo_override == true)
+        return false unless manifest_url
+
+        repo_install? || @repo_override == true
       end
 
       def repo_submodules?(val = false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.28
+  version: 0.4.30
 platform: ruby
 authors:
 - An Pham
@@ -125,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []