squared 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 671df38fde0cf8e19a5edf52d76aedba0d3eb294e7eaeed1bc32e63ca50b5e37
-  data.tar.gz: 1f87dfbe1fb9881d0d5a2ae023a4e4f14e353bd30368afcc0b45e6cd7e5c3beb
+  metadata.gz: dabd702e6d76fec691fb926ac596d794146c3eaa6688d2c65c8506525ef18d56
+  data.tar.gz: 0fa0f20be1f5b9fba992764320d07336b827f46178920a0ff7070efff269d997
 SHA512:
-  metadata.gz: ea1eda6ca2addd9593a414c453eaa7450e31309f91ce56077732e0bc24297d23901a177ec8fd3740ccbdf92e19ec0c4473720e344508ba365fb44a745deda65f
-  data.tar.gz: bf9ac431a644fa2fd532bf33aff3bba1a1b9a52a0e8e2ec7b724df2bcfec41760aa00378034a099e0da60a47b21778581bae5a31700c9a5c9d7e0a816d715a6d
+  metadata.gz: 2c5afc38add70c38951a8b30f92d6d205c354a6d8b1e59ea8d7bc47f789b7c180ec4e71b90ecec91ca69e5126f8570f6e34cbce0bca3ffc3d8191a705be85f6a
+  data.tar.gz: 5db957c61a34ea75e1ed09e8d2c0fb4b6a7832bf08c9e10254013645408598b59dd75eeb3c49cba40f5f51dd6ac7ca22f64108a71fea44a1ede192e4e74250bb

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [0.8.8] - 2026-11-04
+
+- See `0.7.15`.
+
+## [0.7.15]
+
+### Added
+
+- Git command commit action pathspec was implemented.
+- Common base argument TAB for column alignment was created.
+- Node command package action deny can modify currently approved scripts.
+
+### Changed
+
+- Node command package action [approve|deny] uses install-scripts ls.
+
+### Fixed
+
+- Bundle exec wrapper as a Hash did not support using alternate Gemfile.
+- Common base ARG data objects were not frozen with __freeze__.
+
 ## [0.8.7] - 2026-10-22
 
 ### Added
@@ -2181,6 +2202,7 @@
 
 - Changelog was created.
 
+[0.8.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.8
 [0.8.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.7
 [0.8.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.6
 [0.8.5]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.5
@@ -2189,6 +2211,7 @@
 [0.8.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.2
 [0.8.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.1
 [0.8.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.8.0
+[0.7.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.15
 [0.7.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.14
 [0.7.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.13
 [0.7.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.7.12

data/README.md

@@ -10,11 +10,11 @@
 | 2024-12-07 |   0.1.0 |  2.4.0 |  3.3.6 |     |
 | 2025-01-07 |   0.2.0 |        |  3.4.0 |     |
 | 2025-02-07 |   0.3.0 |        |  3.4.1 |     |
-| 2025-03-06 |   0.4.0 |        |  3.4.2 |  *  |
+| 2025-03-06 |   0.4.0 |        |  3.4.2 |     |
 | 2025-06-16 |   0.5.0 |  2.5.0 |  3.4.4 |     |
 | ---------- |   ----- |  ----- |  ----- | --- |
 | 2025-08-23 |   0.5.5 |        |  3.4.5 |     |
-| 2025-10-31 |   0.6.0 |        |  3.4.7 |  *  |
+| 2025-10-31 |   0.6.0 |        |  3.4.7 |     |
 | 2026-01-07 |   0.7.0 |  2.5.0 |  4.0.0 |  *  |
 | 2026-06-16 |   0.8.0 |        |  4.0.5 |  *  |
 

data/lib/squared/common/base.rb

@@ -13,6 +13,7 @@ module Squared
       STRICT: false,
       BANNER: true,
       CHOICE: 25,
+      TAB: 4,
       QUOTE: "'",
       SPACE: ' => ',
       SUCCESS: 'Success',
@@ -101,6 +102,7 @@ module Squared
 
     def __freeze__
       PATH.freeze
+      ARG.each_value { |val| val.freeze if val.is_a?(::Hash) || val.is_a?(::Array) }
       ARG.freeze
       VAR.each_value(&:freeze)
       VAR[:theme].each_value { |val| val.freeze.each_value(&:freeze) }

data/lib/squared/common/format.rb

@@ -296,7 +296,7 @@ module Squared
         if footer
           unless sub.empty? && !right
             footer.map! do |s|
-              s = s.rjust(n + 4) if right
+              s = s.rjust(n + ARG[:TAB]) if right
               sub.each { |h| sub_style!(s, **h) }
               s
             end

data/lib/squared/version.rb

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

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

@@ -974,7 +974,7 @@ module Squared
                        end
                 pad = cols.map(&:size).max
                 cols.each { |key| puts "#{g + f} #{key.rjust(pad)}: #{Array(data[key]).join(', ')}" }
-                w = 9 + flag.to_s.size + 4 + ee.size
+                w = 9 + flag.to_s.size + ARG[:TAB] + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), theme[:inline])
                 index += 1
                 next unless confirm("#{h + b}?", no ? 'N' : 'Y')

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

@@ -364,7 +364,7 @@ module Squared
         subtasks({
           'branch' => %i[create track delete move copy list all current].freeze,
           'checkout' => %i[commit branch track detach path].freeze,
-          'commit' => %i[head add all amend amend-orig fixup].freeze,
+          'commit' => %i[head add all pathspec amend amend-orig fixup].freeze,
           'clone' => %i[branch tag].freeze,
           'diff' => %i[head branch files view between contain].freeze,
           'range-diff' => %i[view between contain].freeze,
@@ -533,7 +533,7 @@ module Squared
                           if flag == :add
                             opts = param_guard(action, flag, args: args.to_a)
                           elsif (refs = args.to_a).empty?
-                            refs = readline('Enter file patterns', force: true).shellsplit
+                            refs = readline('Enter glob patterns', force: true).shellsplit
                           end
                         end
                         commit(flag, opts, refs: refs, ref: ref, squash: squash, pick: pick)
@@ -1798,7 +1798,7 @@ module Squared
             pathspec = false if pick == 'reword'
           end
           if pathspec.nil?
-            pathspec = if (flag == :fixup || amend) && refs.size == 1 && refs.first == '*'
+            pathspec = if (flag == :pathspec || flag == :fixup || amend) && refs.size == 1 && refs.first == '*'
                          '--all'
                        elsif (refs = projectmap(refs)).empty?
                          raise 'no qualified pathspec'

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

@@ -11,7 +11,7 @@ module Squared
           install_a: %w[audit=! bin-links=! engine-strict=!? foreground-scripts=!? fund=! ignore-scripts=!?
                         install-links=!? package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
-                        S|save=!?].freeze,
+                        min-release-age=i min-release-age-exclude=q S|save=!?].freeze,
           install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
@@ -329,26 +329,39 @@ module Squared
                     when 'package'
                       case flag
                       when :approve, :deny
-                        format_desc action, flag, 'name*|:,opts*'
+                        format_desc(action, flag, 'opts*', before: flag == :approve ? 'name*|:' : 'name*|:|::')
                         task flag do |_, args|
                           args = args.to_a
-                          if choice!(args)
+                          if choice!(args) || (flag == :deny && (all = choice!(args, char: '::')))
+                            list = []
+                            pad = 0
+                            size = ->(s) { pad = [pad, s.size].max }
                             pwd_set do
-                              pad = 0
-                              list = IO.popen(npm_output('approve-scripts --allow-scripts-pending').to_s)
-                                       .each_with_object([]) do |line, out|
-                                         next unless line =~ /^\s+([a-z\d@][^@]*)@(\S+)/
-
-                                         pad = [pad, $1.size].max
-                                         out << [$1, $2]
-                                       end
-                                       .map { |name, ver| name.ljust(pad + 4) + ver }
-                              if list.empty?
-                                puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
-                                exit 0
+                              json = JSON.parse(`#{npm_output('install-scripts ls --json')}`)
+                              json&.fetch('allowScripts', [])&.each do |data|
+                                line = data['changes']&.find { |item| item['change'] == 'pending' }
+                                next unless line && line['key'] =~ /^(.+)@([^@]+)$/
+
+                                size.call($1)
+                                list << [$1, $2]
+                              end
+                              if all
+                                current = read_package 'allowScripts'
+                                current&.each_pair do |key, val|
+                                  next unless val
+
+                                  md = key.match(/^(.+?)(?:@([^@]+))?$/)
+                                  size.call(md[1])
+                                  list << [md[1], sub_style(md[2] || 'any', theme[:inline])]
+                                end
                               end
-                              args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                             end
+                            if list.empty?
+                              puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
+                              exit 0
+                            end
+                            list.map! { |name, ver| name.ljust(pad + ARG[:TAB]) + ver }
+                            args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                           end
                           package flag, args
                         end
@@ -886,9 +899,9 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = width.call(found, 0) + 4
-            col2 = width.call(found, 1) + 4
-            col3 = pad.call(found, found.size).size + 2 + col1 + col2 + width.call(found, 2)
+            col1 = width.call(found, 0) + ARG[:TAB]
+            col2 = width.call(found, 1) + ARG[:TAB]
+            col3 = pad.call(found, found.size).size + (ARG[:TAB] / 2) + col1 + col2 + width.call(found, 2)
             packages = []
             pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
@@ -984,9 +997,9 @@ module Squared
               end
             end
           elsif !avail.empty?
-            col1 = width.call(avail, 0) + 4
+            col1 = width.call(avail, 0) + ARG[:TAB]
             col2 = width.call(avail, 1)
-            col3 = width.call(avail, 2) + 4
+            col3 = width.call(avail, 2) + ARG[:TAB]
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)

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

@@ -752,7 +752,7 @@ module Squared
               op.clear
             else
               op.exist?(add: true, first: true) unless op.arg?('m')
-              op.append(escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+              op.append(context: kwargs)
             end
           end
           print_run(op, banner, **kwargs)

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

@@ -949,7 +949,7 @@ module Squared
                 end
                 s = '%2d. %s' % [start, line]
                 if ia
-                  unless confirm_semver(s.ljust(col + 4 + line.size - n), type)
+                  unless confirm_semver(s.ljust(col + ARG[:TAB] + line.size - n), type)
                     start += 1
                     next
                   end
@@ -1037,7 +1037,7 @@ module Squared
             if op.arg?('e')
               op.clear
             else
-              op.append(delim: true, escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+              op.append(delim: true, context: kwargs)
             end
           end
           print_run(op, banner, **kwargs) unless flag
@@ -1376,10 +1376,10 @@ module Squared
             end
             if flag == :install
               op.append_any(escape: true)
+              op.delim << post if post
             else
               op.append(escape: true)
             end
-            op.delim << post if post
           when :check, :cleanup, :contents, :fetch, :list, :lock, :rdoc
             op.append
           when :dependency, :info, :search
@@ -1907,24 +1907,20 @@ module Squared
         end
 
         def bundle_args(*args)
-          if (val = @bundle[:exec])
-            app = args.first
-            if val.is_a?(Hash)
-              env = val[app.to_s] || val[app.to_sym]
-              return args unless env
-
-              val = env.is_a?(String) ? basepath!(env) : true
-            elsif app == 'ruby'
-              return args
-            end
-            if val.is_a?(String)
-              return args unless (val = basepath!(val))
+          return args unless (val = @bundle[:exec])
 
-              args.unshift("--gemfile=#{shell_escape(val.relative_path_from(path), quote: true)}")
-            end
-            args.unshift('bundle', 'exec')
+          app = args.first
+          if val.is_a?(Hash)
+            val = val[app.to_s] || val[app.to_sym]
+          elsif app == 'ruby'
+            return args
+          end
+          case val
+          when String, Pathname
+            val = basepath!(val, type: 'f')
+            args.unshift("--gemfile=#{shell_escape(val.relative_path_from(path), quote: true)}") if val
           end
-          args
+          val ? args.unshift('bundle', 'exec') : args
         end
 
         def bundle_load

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

@@ -59,10 +59,10 @@ module Squared
               ret.map! do |val|
                 next val if opt?(val)
 
-                if !(pa = val.is_a?(Pathname)) && escape
-                  shell_escape(val, quote: quote, double: double)
-                elsif quote || pa
+                if (quote && !escape) || val.is_a?(Pathname)
                   shell_quote(val, double: double, **kwargs)
+                elsif escape
+                  shell_escape(val, quote: quote, double: double)
                 else
                   val
                 end
@@ -486,7 +486,11 @@ module Squared
             self
           end
 
-          def append(*args, clear: false, preserve: '"', **kwargs, &blk)
+          def append(*args, clear: false, preserve: '"', context: nil, **kwargs, &blk)
+            if context
+              kwargs[:escape] = context.fetch(:escape, false) unless kwargs.key?(:escape)
+              kwargs[:quote] = context.fetch(:quote, false) unless kwargs.key?(:quote)
+            end
             args = clear ? extras.dup.tap { extras.clear } : extras if args.empty?
             pass = kwargs[:pass] ||= []
             OptionPartition.append(target, *args, preserve: preserve, **kwargs, &blk)

metadata

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