squared 0.4.19 → 0.4.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7768e317ba03b32b5b8efeede15034c9c1c6bff1e6bca94e48119236a9647de4
-  data.tar.gz: 592bca71ea7b863bfdbd8896e429688b1d7b38941e7eee14388eb868f6065486
+  metadata.gz: f1b0859a60110d19550ba8436a184dbf5475d9103cc844d4bcab7850f2065dc5
+  data.tar.gz: 887a31b94a66e59b0981f6dcbe64544e1f721b07cb5d82d9a71b8bbbc209820e
 SHA512:
-  metadata.gz: 2eb5c090afe6a6514fa4f579e41f2f3136720cf4279d4d0464df8828e88b150e15245e5b69395abfe5af2b33f5850ca6ca9c379bd8970c4fd1e54125688e365e
-  data.tar.gz: 5f537d9f3eb00dcfe5786092cf6752393a80b8caba758152a53e65e05f6222b89fd87959d094f2b9b1677cc4a65380ac3ade95dd204239fb5c51ab789bf1d6b4
+  metadata.gz: 5936f90594961c71af2f1420607ed9c739bd0f182a440aff4c2d474a8bcc9bbb3e0db1c2bfa6ba27052823414d2f6db981f4251a32c09769595b89a561ecfc84
+  data.tar.gz: 19cc6e69dda54b8d0a3f2cb43606bfb23e25f1f20c071b8e47421156af30d5763162f4a5b14df5f8787a465e53bbabf18b0a9943e7a3c809c31a9825e885e32a

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.4.20] - 2025-09-14
+
+### Changed
+
+- Project banners when requested return consistent arguments.
+
+### Fixed
+
+- Workspace global as command alias used undefined parameter.
+- Python did not separate dependency manager and build backend.
+- Gem command build did not validate gemspec was located.
+- Project class Ruby used glob methods not available in Ruby 2.4.
+- Shell options support using boolean as values.
+- Git command merge action commit failed when using interactive menu.
+- NPM command line options did not support boolean flags.
+
 ## [0.4.19] - 2025-08-30
 
 ### Added
@@ -946,6 +962,7 @@
 
 - Changelog was created.
 
+[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
 [0.4.18]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.18
 [0.4.17]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.17-ruby

data/lib/squared/common/shell.rb

@@ -74,7 +74,7 @@ module Squared
           a = '--'
           b = '='
         end
-        "#{a}#{flag}#{if val
+        "#{a}#{flag}#{unless val.nil?
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote, double: double, override: override)
                                elsif quote
@@ -94,8 +94,8 @@ module Squared
 
       def shell_bin(name, env: true)
         key = name.upcase
-        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,
-                    option: false, force: false)
+        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name, option: false, force: false,
+                                                                                          double: true)
       end
 
       def fill_option(val, **kwargs)

data/lib/squared/common/system.rb

@@ -61,10 +61,9 @@ module Squared
               files.clear
               items.each do |file|
                 if file.exist?
-                  if file.symlink?
-                    next unless force
-                  else
+                  if !file.symlink?
                     files << file
+                  elsif !force
                     next
                   end
                 end

data/lib/squared/version.rb

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

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

@@ -98,6 +98,7 @@ module Squared
           @ref = []
           @children = []
           @events = hashobj.update({ first: first, last: last, error: error })
+          @as = hashobj
           @envname = env_key(@name).freeze
           @desc = (@name.include?(':') ? @name.split(':').join(ARG[:SPACE]) : @name).freeze
           @parent = nil
@@ -476,7 +477,7 @@ module Squared
               else
                 next unless respond_to?(:compose)
 
-                cmd << a if (a = compose(as_get(b), d, script: true, args: e, from: from))
+                cmd << a if (a = compose(as_get(b, from), d, script: true, args: e, from: from))
               end
               var.merge!(c) if c.is_a?(Hash)
             end
@@ -485,7 +486,7 @@ module Squared
             cmd, opts, var, flags, extra = args
           end
           if cmd
-            cmd = as_get cmd
+            cmd = as_get(cmd, from)
             opts = compose(opts, script: false) if opts && respond_to?(:compose)
             flags = append_hash(flags).join(' ') if flags.is_a?(Hash)
             case opts
@@ -502,7 +503,7 @@ module Squared
           else
             return unless (opts || extra) && respond_to?(:compose)
 
-            cmd = compose(as_get(opts), flags, script: true, args: extra, from: from)
+            cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
             from = :script if from == :run && script?
           end
           run(cmd, var, sync: sync, from: from, banner: banner)
@@ -788,9 +789,8 @@ module Squared
         end
 
         def as(cmd, script, to = nil)
-          script = { "#{script}": to } if to
-          data = (@as ||= {})[cmd.to_sym] ||= {}
-          script.each { |key, val| data[key.to_s] = val }
+          data = @as[cmd.to_sym]
+          (to ? [[script, to]] : script).each { |key, val| data[key.to_s] = val }
           self
         end
 
@@ -2010,10 +2010,8 @@ module Squared
           end
         end
 
-        def as_get(val)
-          return unless val
-
-          @global && (ret = @as && @as[from] && @as[from][val]) ? ret : val
+        def as_get(val, from)
+          (@global && @as[from][val]) || val
         end
 
         def task_build(keys)

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

@@ -520,7 +520,7 @@ module Squared
             list_image(flag, docker_output('image ls -a'), from: from) do |val|
               op << val
               if flag == :tag
-                op << tagname("#{@project}:#{op.extras.first}")
+                op << tagname("#{@project}:#{op.first}")
                 break
               end
             end

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

@@ -542,7 +542,7 @@ module Squared
                           commit1 = commithead args.commit1
                           if commit1
                             commit2 = commithead param_guard(action, flag, args: args, key: :commit2)
-                            args = args.extras.to_a
+                            args = args.extras
                             range = [commit1, commit2]
                           else
                             range, opts, refs = choice_commit(multiple: view ? true : 2, values: %w[Options Pathspec])
@@ -752,12 +752,12 @@ module Squared
                           args = args.extras
                         else
                           commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
-                          args = args.extras.to_a.concat(case mode&.downcase
-                                                         when 'h', 'hard' then ['hard']
-                                                         when 's', 'soft' then ['soft']
-                                                         when 'n', 'N' then ['mixed', 'N']
-                                                         else ['mixed']
-                                                         end)
+                          args = args.extras.concat(case mode&.downcase
+                                                    when 'h', 'hard' then ['hard']
+                                                    when 's', 'soft' then ['soft']
+                                                    when 'n', 'N' then ['mixed', 'N']
+                                                    else ['mixed']
+                                                    end)
                         end
                         print_success if success?(reset(flag, args, commit: commit))
                       end
@@ -1028,7 +1028,7 @@ module Squared
             return unless upstream
 
             op = OptionPartition.new(opts, OPT_GIT[:rebase], cmd, project: self, no: OPT_GIT[:no][:rebase])
-            cmd << upstream
+            op << upstream
             append_head op.shift
             op.clear(pass: false)
           when :onto
@@ -1110,7 +1110,7 @@ module Squared
                   if op.empty?
                     values = [['Branch name', true]]
                   else
-                    op << op.pop
+                    op << op.shift
                   end
                 end
                 out = choice_index('Choose a stash', git_spawn('stash list', stdout: false),
@@ -1121,7 +1121,7 @@ module Squared
                   op << out
                 end
               elsif !op.empty?
-                op << op.pop
+                op << op.shift
               elsif flag == :branch
                 raise_error 'no branch name'
               end
@@ -1265,7 +1265,6 @@ module Squared
             end
           when :patch
             cmd << '--patch'
-            append_pathspec(refs, pass: false)
           when :undo
             cmd << '--hard HEAD@{1}'
             ref = false
@@ -1486,12 +1485,12 @@ module Squared
           case flag
           when :commit, :'no-commit'
             op = OptionPartition.new(opts, OPT_GIT[:merge], cmd, project: self, no: OPT_GIT[:no][:merge])
-            raise_error 'no branch/commit' if op.empty?
             op << "--#{flag}" << '--'
             if branch
               op << branch
               op.clear(pass: false)
             else
+              raise_error 'no branch/commit' if op.empty?
               append_commit(*op.extras)
             end
           else
@@ -1813,7 +1812,10 @@ module Squared
             from = nil
             banner = nil
           else
-            banner = nil if banner && (multiple || !banner?)
+            if banner
+              banner = nil unless banner? && !multiple
+              args = true
+            end
             if cmd.respond_to?(:done)
               if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) })
                 from = :"git:#{from}"
@@ -1826,17 +1828,14 @@ module Squared
           log&.info cmd
           banner = if banner
                      banner = (banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), '')
-                     format_banner(hint ? "#{banner} (#{hint})" : banner, banner: true)
+                     format_banner(hint ? "#{banner} (#{hint})" : banner)
                    end
           on :first, from
           begin
             if io
-              ret = if stdout
-                      `#{cmd}`
-                    else
-                      banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
-                    end
-              return ret
+              return `#{cmd}` if stdout
+
+              return args ? [IO.popen(cmd), banner || '', from] : IO.popen(cmd)
             elsif stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`

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

@@ -5,15 +5,17 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=v].freeze,
-          install: %w[prefer-dedupe package-lock-only cpu=b libc=b os=b].freeze,
-          install_base: %w[ignore-scripts install-links strict-peer-deps include=b omit=b install-strategy=b].freeze,
+          common: %w[dry-run=!? include-workspace-root=!? 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_no: %w[audit bin-links fund package-lock].freeze,
-          install_as: %w[foreground-scripts g|global no-save save save-bundle save-dev E|save-exact save-optional
-                         save-peer S|save-prod].freeze,
-          run: %w[foreground-scripts if-present ignore-scripts script-shell=p].freeze,
+          install_as: %w[no-save save-bundle save-dev save-optional save-peer save-prod 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 ignore-scripts pack-destination=p].freeze
+          pack: %w[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,
@@ -670,13 +672,13 @@ module Squared
           if sync
             run(from: from, sync: sync, interactive: !dryrun && "Publish #{sub_style(npmname, styles: theme[:active])}")
           else
+            require 'open3'
             on :first, from
             pwd_set(from: from, dryrun: dryrun) do
-              require 'open3'
-              banner = format_banner cmd.to_s
-              Open3.popen2e(cmd.done) do |_, out|
-                write_lines(out, sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:blue), index: 2],
-                                 banner: banner)
+              cmd = session_done cmd
+              Open3.popen2e(cmd) do |_, out|
+                write_lines(out, banner: format_banner(cmd),
+                                 sub: npmnotice + [pat: /^(.+)(Tarball .+)$/, styles: color(:bright_blue), index: 2])
               end
             end
             on :last, from
@@ -1025,9 +1027,9 @@ module Squared
 
         def npmnotice
           [
-            { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:cyan), index: 2 },
-            { pat: /^(npm )(error)(.*)$/, styles: color(:red), index: 2 },
-            { pat: /^(npm )(notice)(.*)$/, styles: color(:cyan), index: 2 },
+            { pat: /^(npm error )(code|\d+)(.+)$/, styles: color(:bright_cyan), index: 2 },
+            { pat: /^(npm )(error)(.*)$/, styles: color(:bright_red), index: 2 },
+            { pat: /^(npm )(notice)(.*)$/, styles: color(:bright_cyan), index: 2 },
             { pat: /^(npm )(.+)$/, styles: :bold }
           ]
         end

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

@@ -37,8 +37,8 @@ module Squared
           common: %w[I|ignore-python no-cache n|non-interactive].freeze,
           build: %w[C=bm no-clean no-isolation no-sdist no-wheel quiet verbose config-setting=q d|dest=p p|project=p
                     k|skip=b].freeze,
-          publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p identity=b
-                      p|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
+          publish: %w[no-build no-very-ssl quiet S|sign skip-existing verbose ca-certs=p c|comment=q d|dest=p
+                      i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=b].freeze
         }.freeze
         OPT_HATCH = {
           common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=b
@@ -303,7 +303,7 @@ module Squared
                     when 'build'
                       case flag
                       when :poetry
-                        next unless poetry?
+                        next unless build_backend == 'poetry.core.masonry.api'
                       when :pdm
                         next unless build_backend == 'pdm.backend'
                       when :hatch
@@ -888,7 +888,7 @@ module Squared
         end
 
         def poetry?
-          build_backend ? build_backend == 'poetry.core.masonry.api' : dependtype == 1
+          dependtype == 1
         end
 
         def requirements?

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

@@ -702,6 +702,7 @@ module Squared
             return
           when :build
             if op.empty?
+              raise_error('gemspec not found', hint: project) unless gemfile
               op.add_path(gemfile)
             else
               op.add_path(op.shift)
@@ -712,7 +713,8 @@ module Squared
               file = path + (if (spec = gemspec)
                                "#{spec.name}-#{spec.version}.gem"
                              else
-                               choice_index('Select a file', Dir.glob('*.gem', base: path), force: true)
+                               gems = Dir.glob(path.join('*.gem')).map { |val| File.basename(val) }
+                               choice_index('Select a file', gems, force: true)
                              end)
             else
               file = path + op.shift
@@ -754,9 +756,8 @@ module Squared
                 else
                   op.clear
                 end
-              elsif (n = op.extras.find_index { |val| val.match?(/(\A|[a-z])@\d/) })
-                items = op.extras.to_a
-                name = items.delete_at(n)
+              elsif (n = op.index { |val| val.match?(/(\A|[a-z])@\d/) })
+                name = op.delete_at(n)
                 if (n = name.index('@')) == 0
                   pre = gemname
                   ver = name[1..-1]
@@ -765,8 +766,7 @@ module Squared
                   ver = name[(n + 1)..-1]
                 end
                 op.adjoin(pre, shell_option('version', ver))
-                  .clear(items)
-                  .reset
+                  .clear
               elsif flag != :install
                 op.adjoin
               end
@@ -831,8 +831,8 @@ module Squared
         def gemspec
           return @gemspec unless @gemspec.nil?
 
-          @gemspec = if (file = gemfile)
-                       Gem::Specification.load(file.to_s) rescue false
+          @gemspec = if gemfile
+                       Gem::Specification.load(gemfile.to_s) rescue false
                      else
                        false
                      end
@@ -1037,7 +1037,7 @@ module Squared
           return @gemfile unless @gemfile.nil?
 
           @gemfile = [project, name].map! { |val| path + "#{val}.gemspec" }
-                                    .concat(path.glob('*.gemspec'))
+                                    .concat(Dir.glob(path.join('*.gemspec')))
                                     .find { |file| File.exist?(file) } || false
         end
 

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

@@ -83,6 +83,7 @@ module Squared
                          :pop, :push, :concat, :index, :delete_at, :join, :map, :map!, :select, :select!, :reject, :size
 
           def_delegator :@extras, :delete, :remove
+          def_delegator :@extras, :delete_at, :remove_at
           def_delegator :@extras, :delete_if, :remove_if
 
           def initialize(opts, list, target = Set.new, project: nil, path: nil, **kwargs, &blk)
@@ -107,6 +108,7 @@ module Squared
             i = []
             f = []
             si = []
+            bl = []
             list.flat_map do |val|
               x, y = val.split('|', 2)
               if y
@@ -141,6 +143,8 @@ module Squared
                   si << flag
                 when 'v'
                   @values << Regexp.escape(flag)
+                when '!'
+                  bl << flag
                 else
                   next
                 end
@@ -180,7 +184,7 @@ module Squared
                     add quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key) && path
                     add quote_option(key, path + val, merge: merge)
-                  elsif b.include?(key) || numcheck.call(key, val)
+                  elsif b.include?(key) || (bl.include?(key) && %w[true false].include?(val)) || numcheck.call(key, val)
                     add basic_option(key, val, merge: merge)
                   elsif merge
                     add basic_option(key, val, merge: true)

data/lib/squared/workspace/repo.rb

@@ -119,7 +119,6 @@ module Squared
           target = branch || manifest
           stage = nil
           opts = %w[force rebase detach submodules fail no-update gc]
-          newline = !ARGV.grep(/^repo:/).empty?
           desc = lambda do |val, alt = nil|
             if (ver = branch || alt)
               val = val.sub('{0}', "opts*=#{opts.join(',')}")
@@ -170,7 +169,6 @@ module Squared
                   val
                 end
             stage = 'init'
-            puts if newline
             opts = repo_opts "-u #{u}", "-m #{m}.xml"
             opts << "-g #{g}" if g
             opts << '--submodules' if repo_submodules?(args.include?('submodules'))
@@ -206,7 +204,6 @@ module Squared
             end
             opts << "-j#{ENV.fetch('REPO_JOBS', Rake::CpuCounter.count)}" unless opts.grep(/^--?j(?:obs)?/).empty?
             opts << '--fetch-submodules' if repo_submodules?
-            puts unless !newline || stage == 'init'
             begin
               repo_run("#{repo_bin} sync #{opts.uniq.join(' ')}", exception: opts.include?('--fail-fast'))
             rescue Errno::ENOENT => e

metadata

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