squared 0.3.1 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73841385e6cf27c4865e2e1ff419fb6b2c7a4364fb2dbc45ea6be3e160fa4a8a
-  data.tar.gz: 49182d71ec996c4e0404e91ceb286ff0c51ef27c128ce4797951f613bedcd97d
+  metadata.gz: a43b1a5fec18ebf3523f1c1c2ddfb231cd9ad45bf355b0859430c7a6ca530be3
+  data.tar.gz: cc18478c20b2c20265db59b5e73ee5587139cc27925fd438a5897e5440736b82
 SHA512:
-  metadata.gz: 0ff95d1a348a9755d2cc80a7797be77cb693e5381923a83e29c2952d240b8ecae9f047c4cd18257ab6a4d7c5b3716a03574a4ddbad81263d4fb1a5231a9a6ab1
-  data.tar.gz: 00fea0a58cebde46cae1b67c1a58b6f7e8cd5f685e28220910d5a3c768be76a931cae175806e050b5fa3ef48b40cf8945ae69ef2d2896dec512727a52793a68f
+  metadata.gz: 13dfb9fbeb271d9b8dceb8f7558e777bb9bee68fb2f898725340791c484fb4b37c3f5666c9b48f01d7518e722ad24660309f24f5e26980527e20fbe7a0d6beb2
+  data.tar.gz: c89f3475e9cbd5d794b3920e7e8cd628708c07247a720ed7ba83df505f350e4d568ec6fdc412df4257ae33c67b5132a1699ed2e83c132068d399cd1471a23b88

data/CHANGELOG.md

@@ -1,5 +1,37 @@
 # Changelog
 
+## [0.3.3] - 2024-03-02
+
+### Fixed
+
+- Project exceptions were hard coded preventing override.
+- Project clean events were called twice.
+- Git events were fired for internal background tasks.
+- Git list display did not support single grep pattern.
+- Gem outdated did not pass -C option for PWD.
+
+## [0.3.2] - 2024-02-25
+
+### Fixed
+
+- Task program command options used unrecognized symbol.
+
+## [0.2.5] - 2024-02-25
+
+### Fixed
+
+- See `0.1.5`.
+
+## [0.1.5] - 2024-02-25
+
+### Fixed
+
+- Node copy method ignored include argument when called directly.
+- Logger is not initialized when using only Git base class.
+- Hide warnings about readline during execution.
+- Logger is not initialized when using only base class.
+- Merging ENV build options were double escaped.
+
 ## [0.3.1] - 2025-02-12
 
 ### Fixed
@@ -73,7 +105,7 @@
 
 ### Fixed
 
- - Project hash options duplicated dash prefix.
+- Project hash options duplicated dash prefix.
 
 ## [0.1.4] - 2024-02-05
 
@@ -251,13 +283,17 @@
 
 - Changelog was created.
 
+[0.3.3]: https://github.com/anpham6/squared/releases/tag/v0.3.3-ruby
+[0.3.2]: https://github.com/anpham6/squared/releases/tag/v0.3.2-ruby
 [0.3.1]: https://github.com/anpham6/squared/releases/tag/v0.3.1-ruby
 [0.3.0]: https://github.com/anpham6/squared/releases/tag/v0.3.0-ruby
+[0.2.5]: https://github.com/anpham6/squared/releases/tag/v0.2.5-ruby
 [0.2.4]: https://github.com/anpham6/squared/releases/tag/v0.2.4-ruby
 [0.2.3]: https://github.com/anpham6/squared/releases/tag/v0.2.3-ruby
 [0.2.2]: https://github.com/anpham6/squared/releases/tag/v0.2.2-ruby
 [0.2.1]: https://github.com/anpham6/squared/releases/tag/v0.2.1-ruby
 [0.2.0]: https://github.com/anpham6/squared/releases/tag/v0.2.0-ruby
+[0.1.5]: https://github.com/anpham6/squared/releases/tag/v0.1.5-ruby
 [0.1.4]: https://github.com/anpham6/squared/releases/tag/v0.1.4-ruby
 [0.1.3]: https://github.com/anpham6/squared/releases/tag/v0.1.3-ruby
 [0.1.2]: https://github.com/anpham6/squared/releases/tag/v0.1.2-ruby

data/lib/squared/common/shell.rb

@@ -10,7 +10,7 @@ module Squared
 
       def shell_escape(val, quote: false, force: false)
         if (data = /\A(--?[^= ]+)((=|\s+)(["'])?(.+?)(["'])?)?\z/m.match(val = val.to_s))
-          return val unless data[2]
+          return val if !data[2] || (!data[4] && data[5] =~ /\s/)
 
           join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
           if data[4] == data[6]
@@ -32,8 +32,9 @@ module Squared
         Rake::Win32.windows? || ARG[:QUOTE] == '"' ? "\"#{double_quote(val)}\"" : "'#{single_quote(val)}'"
       end
 
-      def shell_split(val, quote: false, join: nil)
-        val = Shellwords.split(val).map { |opt| shell_escape(opt, quote: quote) }
+      def shell_split(val, escape: true, quote: false, join: nil)
+        val = Shellwords.split(val)
+        val = val.map { |opt| shell_escape(opt, quote: quote) } if escape
         return val unless join
 
         val.join(join.is_a?(::String) ? join : ' ')

data/lib/squared/version.rb

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

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

@@ -59,7 +59,7 @@ module Squared
         attr_reader :name, :project, :workspace, :path, :theme, :exception, :pipe, :verbose,
                     :group, :parent, :dependfile
 
-        def initialize(workspace, path, name, *, group: nil, graph: nil, pass: nil, exclude: nil,
+        def initialize(workspace, path, name, *, group: nil, graph: nil, pass: nil, exclude: nil, verbose: nil,
                        first: {}, last: {}, error: {}, common: ARG[:COMMON], **kwargs)
           @path = path
           @workspace = workspace
@@ -74,14 +74,16 @@ module Squared
           @clean = kwargs[:clean]
           @version = kwargs[:version]
           @envname = @name.gsub(/[^\w]+/, '_').upcase.freeze
-          kwargs[:exception] = 'PIPE_FAIL'
-          @exception = if kwargs.key?(:exception)
-                         env_bool(kwargs[:exception], workspace.exception, strict: true)
-                       else
-                         workspace.exception
-                       end
-          @pipe = kwargs.key?(:pipe) ? env_pipe(kwargs[:pipe], workspace.pipe, strict: true) : workspace.pipe
-          @verbose = kwargs.key?(:verbose) ? kwargs[:verbose] : workspace.verbose
+          @exception = env_bool(kwargs[:exception], workspace.exception, strict: true)
+          @pipe = env_pipe(kwargs[:pipe], workspace.pipe, strict: true)
+          @verbose = case verbose
+                     when nil
+                       workspace.verbose
+                     when String
+                       env_pipe(verbose, workspace.verbose, strict: true, index: true)
+                     else
+                       verbose
+                     end
           @theme = if !@verbose
                      {}
                    elsif common
@@ -210,14 +212,14 @@ module Squared
               data = JSON.parse(val)
               raise_error('invalid JSON object', val, hint: "BUILD_#{@envname}_ENV") unless data.is_a?(Hash)
             rescue StandardError => e
-              log.warn e
+              log&.warn e
             else
               @output[2] = data
             end
           end
           if cmd != false && !cmd.is_a?(Array)
-            @output[cmd ? 1 : 3] = shell_split(val, join: true) if (val = env('BUILD', suffix: 'OPTS'))
-            @output[4] = shell_split(val, join: true) if cmd.nil? && (val = env('SCRIPT', suffix: 'OPTS'))
+            @output[cmd ? 1 : 3] = shell_split(val, escape: false, join: true) if (val = env('BUILD', suffix: 'OPTS'))
+            @output[4] = shell_split(val, escape: false, join: true) if !cmd && (val = env('SCRIPT', suffix: 'OPTS'))
           end
           @version = val if (val = env('BUILD', suffix: 'VERSION'))
           return unless (val = env('BUILD', strict: true))
@@ -298,7 +300,7 @@ module Squared
             if val.directory? && !val.empty?
               true
             else
-              log.warn "workspace \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
+              log&.warn "workspace \"#{val}\" (#{val.empty? ? 'empty' : 'not found'})"
               false
             end
           end
@@ -430,12 +432,12 @@ module Squared
           on :first, :clean
           case @clean
           when String
-            run_s(@clean, from: :clean, sync: sync)
+            run_s(@clean, sync: sync)
           when Hash
             begin
               @clean.each { |cmd, opts| build(cmd.to_s, opts, sync: sync) }
             rescue StandardError => e
-              log.error e
+              log&.error e
               ret = on(:error, from, e)
               raise if @exception && ret != true
             end
@@ -444,17 +446,17 @@ module Squared
               val = val.to_s
               path = basepath(val)
               if path.directory? && val =~ %r{[\\/]\z}
-                log.warn "rm -rf #{path}"
+                log&.warn "rm -rf #{path}"
                 path.rmtree(verbose: verbose)
               else
-                log.warn "rm #{path}"
+                log&.warn "rm #{path}"
                 (val.include?('*') ? Dir[path] : [path]).each do |file|
                   next unless File.file?(file)
 
                   begin
                     File.delete(file)
                   rescue StandardError => e
-                    log.error e
+                    log&.error e
                   end
                 end
               end
@@ -540,7 +542,7 @@ module Squared
               instance_variable_set :"@#{key}", val.first
             end
           else
-            log.warn "variable_set: @#{key} (private)"
+            log&.warn "variable_set: @#{key} (private)"
           end
         end
 
@@ -675,11 +677,11 @@ module Squared
             return
           end
           cmd = session_done(cmd)
-          log.info cmd
+          log&.info cmd
           on :first, from
           begin
             if cmd.match?(/\A[^:]+:[^:]/) && workspace.task_defined?(cmd)
-              log.warn "ENV was discarded: #{var}" if var
+              log&.warn "ENV was discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
               print_item format_banner(cmd, banner: banner) if sync
@@ -687,7 +689,7 @@ module Squared
               shell(*args, chdir: chdir, exception: exception)
             end
           rescue StandardError => e
-            log.error e
+            log&.error e
             ret = on(:error, from, e)
             raise unless ret == true
           else
@@ -976,7 +978,7 @@ module Squared
           puts val unless val.empty? || (val.size == 1 && val.first.nil?)
         end
 
-        def print_banner(*lines, styles: theme[:banner], border: theme[:border], client: false)
+        def print_banner(*lines, styles: theme[:banner], border: borderstyle, client: false)
           pad = 0
           if styles
             if styles.any? { |s| s.to_s.end_with?('!') }
@@ -1002,7 +1004,6 @@ module Squared
         end
 
         def print_footer(*lines, sub: nil, reverse: false, right: false, **kwargs)
-          border = kwargs.key?(:border) ? kwargs[:border] : borderstyle
           n = Project.max_width(lines)
           sub = as_a(sub)
           lines.map! do |val|
@@ -1010,7 +1011,7 @@ module Squared
             sub.each { |h| s = sub_style(s, **h) }
             s
           end
-          ret = [sub_style('-' * n, styles: border || theme[:border]), *lines]
+          ret = [sub_style('-' * n, styles: kwargs.key?(:border) ? kwargs[:border] : borderstyle), *lines]
           ret.reverse! if reverse
           ret.join("\n")
         end
@@ -1303,7 +1304,7 @@ module Squared
                 Dir.chdir(pwd)
               end
             rescue StandardError => e
-              log.error e
+              log&.error e
               unless dryrun
                 ret = on(:error, from, e)
                 raise if exception && ret != true
@@ -1443,9 +1444,7 @@ module Squared
         end
 
         def borderstyle
-          return unless (data = workspace.banner_get(*@ref, group: group))
-
-          data[:border]
+          ((data = workspace.banner_get(*@ref, group: group)) && data[:border]) || theme[:border]
         end
 
         def headerstyle

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

@@ -84,11 +84,11 @@ module Squared
             show: %w[s exit-code histogram].freeze
           }.freeze,
           fetch: {
-            base: %w[multiple progress P|prune-tags refetch stdin u|update-head-ok recurse-submodules=s
+            base: %w[multiple progress P|prune-tags refetch stdin u|update-head-ok recurse-submodules=b
                      recurse-submodules-default=b].freeze,
             pull: %w[4 6 n t a|append atomic dry-run f|force k|keep n|negotiate-only prefetch p|prune q|quiet
                      set-upstream unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q
-                     refmap=q o|server-option=e shallow-exclude=e shallow-since=s upload-pack=e].freeze
+                     refmap=q o|server-option=e shallow-exclude=e shallow-since=b upload-pack=e].freeze
           }.freeze,
           log: {
             base: %w[all all-match alternate-refs author-date-order basic-regexp bisect boundary cherry cherry-mark
@@ -119,7 +119,7 @@ module Squared
                        no-empty-directory recurse-submodules sparse s|stage u|unmerged abbrev=i x|exclude=q
                        X|exclude-from=p exclude-per-directory=p format=q with-tree=q].freeze,
           ls_remote: %w[exit-code get-url q|quiet o|server-option=e symref sort=q upload-pack=e].freeze,
-          pull: %w[e n allow-unrelated-histories ff-only S|gpg-sign=e log=i rebase=s s|strategy=b
+          pull: %w[e n allow-unrelated-histories ff-only S|gpg-sign=e log=i r|rebase=b? s|strategy=b
                    X|strategy-option=e].freeze,
           rebase: %w[n C=i allow-empty-message apply committer-date-is-author-date edit-todo f|force-rebase ignore-date
                      ignore-whitespace i|interactive keep-base m merge no-ff q|quiet quit r|rebase-merges=b?
@@ -1115,13 +1115,15 @@ module Squared
                    multiple: false, sub: nil)
           banner = nil if multiple && banner
           if cmd.respond_to?(:done)
-            if !(io && banner == false) && (from = cmd.drop(1).find { |val| val =~ /^[a-z][a-z\-]{2,}$/ })
+            if io && banner == false
+              from = nil
+            elsif !from && (from = cmd.drop(1).find { |val| val =~ /^[a-z][a-z\-]{2,}$/ })
               from = :"git:#{from}"
             end
             banner &&= cmd.temp { |val| val.start_with?('--work-tree') || val.start_with?('--git-dir') }
           end
           cmd = session_done(cmd)
-          log.info cmd
+          log&.info cmd
           on :first, from
           banner = if banner
                      format_banner((banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), ''), banner: true)
@@ -1157,7 +1159,7 @@ module Squared
               end
             end
           rescue StandardError => e
-            log.error e
+            log&.error e
             ret = on(:error, from, e)
             raise if exception && ret != true
 
@@ -1168,13 +1170,12 @@ module Squared
         end
 
         def write_lines(data, banner: nil, loglevel: nil, grep: nil, sub: nil, pass: false)
-          grep = if grep && !grep.empty?
-                   as_a(grep).map do |val|
-                     next val if val.is_a?(Regexp)
+          grep = as_a(grep).map do |val|
+            next val if val.is_a?(Regexp)
 
-                     Regexp.new(val == '*' ? '.+' : val.to_s)
-                   end
-                 end
+            Regexp.new(val == '*' ? '.+' : val.to_s)
+          end
+          grep = nil if grep.empty?
           sub = nil if stdin?
           ret = 0
           out = []
@@ -1182,7 +1183,7 @@ module Squared
             next if grep&.none? { |pat| pat.match?(line) }
 
             if loglevel
-              log.add loglevel, line
+              log&.add loglevel, line
             else
               sub&.each { |h| line = sub_style(line, **h) }
               if banner
@@ -1221,7 +1222,7 @@ module Squared
           rsm = append_submodules(target: target)
           out = []
           refspec = []
-          opts, pat = option_sanitize(opts, remote ? list + ['refspec=s'] : list, target: target, no: no)
+          opts, pat = option_sanitize(opts, remote ? list + ['refspec=b'] : list, target: target, no: no)
           opts.each do |opt|
             if opt =~ pat
               case $1

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=s].freeze,
+          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=b].freeze,
           install: %w[prefer-dedupe package-lock-only cpu=q libc=e os=q].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,
@@ -218,8 +218,8 @@ module Squared
           end
         end
 
-        def copy(from: 'build', into: 'node_modules', workspace: false, include: nil, exclude: nil, scope: nil,
-                 also: nil, create: nil, link: false, force: false, override: false)
+        def copy(from: 'build', into: 'node_modules', workspace: false, scope: nil, also: nil, create: nil,
+                 link: false, force: false, override: false, **kwargs)
           return if @copy == false
 
           if @copy && !override
@@ -235,6 +235,9 @@ module Squared
             scope = @copy[:scope]
             also = @copy[:also]
             create = @copy[:create]
+          else
+            glob = kwargs[:include]
+            exclude = kwargs[:exclude]
           end
           items = []
           items << @workspace.home if build? && path != @workspace.home && @workspace.home?

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

@@ -14,7 +14,7 @@ module Squared
           install: %w[break-system-packages check-build-dependencies compile dry-run force-reinstall I|ignore-installed
                       ignore-requires-python no-build-isolation no-clean no-compile no-deps no-index no-warn-conflicts
                       no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=e
-                      config-settings=q c|constraint=p e|editable=s? extra-index-url=q f|find-links=q global-option=q
+                      config-settings=q c|constraint=p e|editable=b? extra-index-url=q f|find-links=q global-option=q
                       implementation=b i|index-url=q no-binary=q only-binary=q platform=q prefix=p progress-bar=b
                       python-version=q report=p r|requirement=p root=p root-user-action=e src=p t|target=p
                       upgrade-strategy=b].freeze

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

@@ -25,7 +25,7 @@ module Squared
                        platform=q source=q].freeze,
           push: %w[no-http-proxy attestation=p host=q key=e otp=e p|http-proxy=q?].freeze,
           build: %w[force strict o|output=p platform=q].freeze,
-          exec: %w[conservative prerelease no-prerelease g|gem=s version=e].freeze,
+          exec: %w[conservative prerelease no-prerelease g|gem=b version=e].freeze,
           pristine: %w[all env-shebang extensions no-env-shebang no-extensions only-executables only-missing-extensions
                        only-plugins n|bindir=p i|install-dir=p skip=e v|version=e].freeze,
           shared: %w[f b|both clear-sources conservative default development development-all E|explain
@@ -350,7 +350,9 @@ module Squared
           cmd = gem_session
           case flag
           when :outdated
-            cmd << pwd if (pwd = gempwd)
+            if (pwd = gempwd)
+              cmd << pwd
+            end
             cmd << flag
           when :push
             cmd << flag << project

data/squared.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rake"
   spec.add_dependency "logger"
   spec.add_dependency "rexml"
+  spec.add_dependency "readline"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.3
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-02-13 00:00:00.000000000 Z
+date: 2025-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -51,6 +51,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rake task generator for managing multi-language workspaces.
 email:
 - anpham6@gmail.com