squared 0.5.8 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec0306a0e60a4854a3c3be267b5c66577702dee8908bf36eb7c4ccfb98b2b4ff
-  data.tar.gz: 3463f8bce9cfe67a18a2e09d9d7358a4f8c8bebcddc9037612bfc1cb2b213d93
+  metadata.gz: fb4a8d7a97fde66c49f38e36f6f4ae0325f7bf54b7e73e6c14febb5b01814cc4
+  data.tar.gz: 64385a46e4260b50fd1a7dbc4c69558cb9ba15324b3263a2f3d7fd4c48a23322
 SHA512:
-  metadata.gz: 1f47734d5f11de8e4106ab249a276b3e42ca9d70de61863a24f51e65b579a187a27cfad2b21593d9a79bb0aeb9a6a192775e3753d3ff02d546fee06057cf7cd1
-  data.tar.gz: 01b1520fe506cdb8d8e08213794aaa72d8a55e7ddb51b139573d67ee46e613d9ee600809799972b57a1f3435e8672f0b3ea3d8398e381cc72bdf955d9e330c58
+  metadata.gz: b8a6195350bf86b98c5dda0509b57304e69f7f2d04ebb2d16b4bc7a59f26bedd1d0f53adca066768101273270f10dac31f90c069ea9379f30ca437acaa73a134
+  data.tar.gz: dad1693756f55833558187af4a8d51864ca2b6387c51955720146425c58f2416102f3d0e119269c095dd159801c8a9d850a9b5c879016ba44fbd7d1766ce5cee

data/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [0.5.9] - 2025-10-08
+
+### Fixed
+
+- Git command commit did not always show files being pushed.
+
+## [0.4.22] - 2025-10-08
+
+### Added
+
+- Node package managers support ENV platform options.
+
+### Changed
+
+- User installed Ruby is detected before system installed Ruby.
+
+### Fixed
+
+- Yarn classic package installs did not recognize dedupe flag.
+- Node command outdated option prune called undefined method.
+- OptionPartition method exist? called undefined method.
+- Ruby method copy? did not perform Hash property override check.
+- OptionPartition static method arg? did not detect single values.
+
 ## [0.5.8] - 2025-10-01
 
 ### Fixed
@@ -1083,6 +1107,7 @@
 
 - Changelog was created.
 
+[0.5.9]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.9
 [0.5.8]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.8
 [0.5.7]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.7
 [0.5.6]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.6
@@ -1092,6 +1117,7 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.22]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.22
 [0.4.21]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.21
 [0.4.20]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.20
 [0.4.19]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.19

data/lib/squared/version.rb

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

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

@@ -1355,7 +1355,7 @@ module Squared
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
 
-        def print_banner(*lines, styles: theme[:banner], border: borderstyle, client: false)
+        def print_banner(*lines, client: false, styles: theme[:banner], border: borderstyle, **)
           pad = 0
           if styles
             if styles.any? { |s| s.to_s.end_with?('!') }
@@ -1379,14 +1379,14 @@ module Squared
           (lines << sub_style(ARG[:BORDER][1] * n, styles: border)).join("\n")
         end
 
-        def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
+        def print_footer(*lines, sub: nil, reverse: false, right: false, border: borderstyle, **)
           n = line_width lines
           lines.map! do |val|
             s = right ? val.rjust(n) : val.ljust(n)
             sub&.each { |h| s = sub_style(s, **h) }
             s
           end
-          ret = [sub_style(ARG[:BORDER][1] * n, styles: kwargs.key?(:border) ? kwargs[:border] : borderstyle), *lines]
+          ret = [sub_style(ARG[:BORDER][1] * n, styles: border), *lines]
           ret.reverse! if reverse
           ret.join("\n")
         end

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

@@ -251,9 +251,11 @@ module Squared
         end
 
         def clean(*, sync: invoked_sync?('clean'), **)
-          return super unless @clean.nil?
-
-          image(:rm, sync: sync)
+          if runnable?(@clean)
+            super
+          else
+            image(:rm, sync: sync)
+          end
         end
 
         def compose(opts, flags = nil, script: false, args: nil, from: :run, **)

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

@@ -162,7 +162,7 @@ module Squared
           add: %w[A|all e|edit f|force ignore-errors ignore-missing ignore-removal i|interactive no-all
                   no-ignore-removal n|dry-run p|patch pathspec-file-nul renormalize sparse u|update v|verbose
                   chmod=b pathspec-from-file=p].freeze,
-          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose vv abbrev=i color=b
+          branch: %w[a|all create-reflog i|ignore-case omit-empty q|quiet r|remotes v|verbose abbrev=i color=b
                      column=b contains=b format=q merged=b no-contains=b no-merged=b points-at=b u|set-upstream-to=b
                      sort=q t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
@@ -1472,8 +1472,11 @@ module Squared
           pu << '--force-with-lease' if amend
           pu.merge(repotrack(origin, branch))
           puts if pass
+          adding = git_spawn 'diff --name-only --no-color'
           source op
-          if amend || !git_spawn('diff --cached --name-only --no-color').empty? || dryrun?
+          cached = git_spawn 'diff --cached --name-only --no-color'
+          if amend || !cached.empty? || dryrun?
+            puts cached if adding.empty? && !cached.empty? && banner?
             source co
             source pu
           elsif banner?
@@ -1755,7 +1758,7 @@ module Squared
             else
               append_commit(*op.extras)
             end
-          when :add, :clean
+          when :add
             if flag == :add && !op.arg?('pathspec-from-file')
               grep, list = op.partition { |val| OptionPartition.pattern?(val) }
               unless grep.empty? && !list.empty?
@@ -1782,8 +1785,8 @@ module Squared
             refs = projectmap op.extras
             raise_error 'no source/destination' unless refs.size > 1
             op.merge(refs)
-          when :rm
-            append_pathspec(op.extras, expect: true)
+          when :rm, :clean
+            append_pathspec(op.extras, expect: flag == :rm)
           end
           source(sync: false, stderr: true)
         end
@@ -2139,7 +2142,7 @@ module Squared
         end
 
         def matchpathspec
-          [/\A[^a-z\d-]+/i, %r{\A[^=\\/*]*[\\/*]}]
+          [/\A[^a-z\d-]+/i, %r{\A[^=\\/*]*[\\/*]}, /\A--\z/]
         end
 
         def messageopt

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

@@ -6,33 +6,33 @@ module Squared
       class Node < Git
         OPT_NPM = {
           common: %w[dry-run=!? include-workspace-root=!? loglevel=b workspaces=!? w|workspace=v].freeze,
-          install: %w[prefer-dedupe=!? package-lock-only=!? audit=! bin-links=! cpu=b fund=! libc=b os=b
-                      package-lock=!].freeze,
-          install_base: %w[ignore-scripts=!? install-links=!? strict-peer-deps=!? include=b omit=b
-                           install-strategy=b].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_no: %w[audit bin-links fund package-lock].freeze,
-          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod foreground-scripts=!?
+          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,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
-          pack: %w[json=!? pack-destination=p].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,
+          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
-                      no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only shamefully-hoist
-                      side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
+                      optimistic-repeat-install no-hoist no-lockfile no-optional prefer-frozen-lockfile resolution-only
+                      shamefully-hoist side-effects-cache side-effects-cache-readonly s|silent strict-peer-dependencies
                       use-running-store-server use-store-server child-concurrency=i hoist-pattern=q lockfile-dir=p
                       modules-dir=p network-concurrency=i package-import-method=b public-hoist-pattern=q
                       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,
-          update: %w[global interactive latest depth=i].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 sequential
-                  stream use-stderr].freeze,
+          run: %w[if-present no-bail parallel r|recursive 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,
           pack: %w[json pack-destination=p pack-gzip-level=i].freeze
         }.freeze
@@ -232,7 +232,7 @@ module Squared
                   flags.each do |flag|
                     case action
                     when 'outdated'
-                      format_desc(action, flag, %w[prune interactive dry-run].freeze, arg: 'opts?')
+                      format_desc(action, flag, %w[update interactive dry-run], arg: 'opts?')
                       task flag do |_, args|
                         outdated flag, args.to_a
                       end
@@ -460,6 +460,7 @@ module Squared
                 cmd << '--save-exact' if exact
               else
                 cmd << 'install'
+                append_platform
               end
               option('public-hoist-pattern', ignore: false) do |val|
                 split_escape(val).each { |opt| cmd << shell_option('public-hoist-pattern', opt) }
@@ -472,6 +473,8 @@ module Squared
                 cmd << "--save-#{save}"
                 cmd << '--save-exact' if exact
                 cmd.merge(packages.map { |pkg| shell_quote(pkg) })
+              else
+                append_platform
               end
               cmd << '--workspaces=false' if env('NODE_WORKSPACES', equals: '0')
               cmd << '--package-lock=false' if option('package-lock', equals: '0')
@@ -621,10 +624,13 @@ module Squared
               footer.call(modified, found.size)
             elsif modified > 0
               modified = -1
-              footer.call(0, found.size)
               File.write(dependfile, doc)
+              if opts.include?('update') || opts.include?('u') || option('update')
+                update
+              else
+                footer.call(0, found.size)
+              end
               commit(:add, refs: ['package.json'], pass: true)
-              install if opts.include?('prune') || opts.include?('p')
             end
           elsif !avail.empty?
             col1 = size_col.call(avail, 0) + 4
@@ -650,7 +656,7 @@ module Squared
         end
 
         def update(*)
-          package('update', from: :update)
+          package(:update, from: :update)
         end
 
         def publish(flag = nil, *, sync: invoked_sync?('publish', flag), otp: nil, tag: nil, access: nil, dryrun: nil)
@@ -694,15 +700,16 @@ module Squared
           workspace.rev_clear(name)
           if (yarn = dependtype(:yarn)) > 0
             cmd = session 'yarn', if flag == :update
-                                    flag = yarn == 1 ? 'upgrade' : 'up'
+                                    yarn == 1 ? 'upgrade' : 'up'
                                   else
-                                    flag
+                                    yarn == 1 && flag == :dedupe ? 'install' : flag
                                   end
             op = OptionPartition.new(opts, if yarn == 1
-                                             OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
+                                             OPT_YARN.fetch(flag == :dedupe ? :install : flag, []) + OPT_YARN[:common]
                                            else
                                              OPT_BERRY[flag]
                                            end, cmd, project: self)
+            op << '--ignore-engines' if yarn == 1 && !option('ignore-engines', equals: '0')
             op.clear
             append_loglevel
           else
@@ -710,13 +717,13 @@ module Squared
               cmd = session 'pnpm', flag
               list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
               list.concat(OPT_PNPM[:install_as] + OPT_PNPM[:filter]) unless flag == :dedupe
+              list.concat(OPT_PNPM[:cpu]) unless flag == :update
               no = OPT_PNPM[:"#{flag}_no"]
             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
               no = OPT_NPM[:install_no]
-              cmd << '--save=true' if option('save')
             end
             op = OptionPartition.new(opts, list, cmd, no: no, project: self)
             op.each do |opt|
@@ -732,12 +739,13 @@ module Squared
               end
             end
             op.swap
+            append_platform if flag == :install
             append_nocolor
             append_loglevel
             if flag == :dedupe
               op.clear
             else
-              op.append(escape: true)
+              op.append(quote: true)
             end
             op.clear(errors: true)
           end
@@ -933,6 +941,14 @@ module Squared
           respond_to?(meth) && __send__(meth) ? @pm[prog] : 0
         end
 
+        def dependbin
+          if yarn?
+            'yarn'
+          else
+            pnpm? ? 'pnpm' : 'npm'
+          end
+        end
+
         def version
           @version ||= read_packagemanager(:version)
         end
@@ -1008,12 +1024,8 @@ module Squared
           end
         end
 
-        def dependbin
-          if yarn?
-            'yarn'
-          else
-            pnpm? ? 'pnpm' : 'npm'
-          end
+        def append_platform(target: @session)
+          %w[cpu os libc].each { |name| option(name) { |val| target << basic_option(name, val) } }
         end
 
         def dependext

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

@@ -7,8 +7,8 @@ module Squared
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb gems.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
-          ruby: %w[0=im? a c e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit verbose y|yydebug
-                   backtrace-limit=i crash-report=q disable=q dump=q enable=q encoding=b external-encoding=b
+          ruby: %w[0=im? a c C=pm e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit verbose
+                   y|yydebug backtrace-limit=i crash-report=q disable=q dump=q enable=q encoding=b external-encoding=b
                    internal-encoding=b parser=b].freeze,
           rake: %w[A|all B|build-all comments n|dry-run m|multitask P|prereqs q|quiet X|no-deprecation-warnings
                    N|no-search G|no-system nosearch nosystem rules s|silent g|system v|verbose backtrace=b?
@@ -472,7 +472,7 @@ module Squared
           when :version
             pwd_set do
               out = []
-              order = { 'rvm' => -1, 'rbenv' => -1, 'chruby' => -1, 'asdf' => -1 }
+              order = { 'rbenv' => -1, 'rvm' => -1, 'asdf' => -1, 'chruby' => -1 }
               ENV.fetch('PATH', '').split(':').each_with_index do |val, index|
                 order.each_key do |key|
                   if val.match?(%r{[/.]#{key}/})
@@ -482,14 +482,14 @@ module Squared
                 end
               end
               paths = [
+                "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
                 '$HOME/.rvm/bin/rvm',
+                @asdf ? "#{ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf')}/installs/#{@asdf.first}" : nil,
+                '/usr/bin/rbenv',
                 '/usr/local/rvm/bin/rvm',
                 '/usr/share/rvm/bin/rvm',
-                "#{ENV.fetch('RBENV_ROOT', '$HOME/.rbenv')}/bin/rbenv",
-                '/usr/bin/rbenv',
                 '/usr/local/share/chruby/chruby.sh'
-              ]
-              paths << "#{ENV.fetch('ASDF_DATA_DIR', '$HOME/.asdf')}/installs/#{@asdf.first}" if @asdf
+              ].compact
               paths.sort do |a, b|
                 c = -1
                 d = -1
@@ -877,7 +877,7 @@ module Squared
         end
 
         def copy?
-          return true if super || (@copy.is_a?(Hash) && copy.fetch(:into, nil))
+          return true if @copy.is_a?(Hash) ? copy[:into] : super
           return gemdir? if @gemdir
 
           if version
@@ -1069,7 +1069,7 @@ module Squared
 
           @gemfile = [project, name].map! { |val| basepath("#{val}.gemspec") }
                                     .concat(path.glob('*.gemspec'))
-                                    .find { |file| File.exist?(file) } || false
+                                    .find(&:exist?) || false
         end
 
         def gemlib

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

@@ -19,7 +19,8 @@ module Squared
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, **)
+            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, force: true, double: false,
+                       **)
               return if (ret = args.flatten).empty?
 
               target << '--' if delim && !target.include?('--')
@@ -27,7 +28,15 @@ module Squared
                 pat, s = Array(strip)
                 ret.map! { |val| val.gsub(pat, s || '') }
               end
-              ret.map! { |val| escape ? shell_escape(val, quote: quote) : shell_quote(val) } if escape || quote
+              if escape || quote
+                ret.map! do |val|
+                  if escape
+                    shell_escape(val, quote: quote, double: double)
+                  else
+                    shell_quote(val, force: force, double: double)
+                  end
+                end
+              end
               if target.is_a?(Set)
                 target.merge(ret)
               else
@@ -92,7 +101,10 @@ module Squared
             end
 
             def matchopts(list, value = false)
-              a, b = list.partition { |val| val.size == 1 || val.match?(OPT_SINGLE) }
+              a, b = Array(list).partition { |val| val.size == 1 || val.match?(OPT_SINGLE) }
+              return /\A#{shortopt(*a)}}/ if b.empty?
+              return /\A#{longopt(*b, value)}/ if a.empty?
+
               /\A(?:#{shortopt(*a)}|#{longopt(*b, value)})/
             end
 
@@ -471,7 +483,7 @@ module Squared
               path.join(val).exist?.tap do |ret|
                 next unless add && ret
 
-                add_first(path: true, reverse: !first)
+                add_path(first ? shift : pop)
               end
             else
               each_with_index do |val, index|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.5.9
 platform: ruby
 authors:
 - An Pham
@@ -124,7 +124,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: []