squared 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa6a0925852c1485cd33d015135c405cd857444be25e52a07a3f3b99e4fdb9c1
-  data.tar.gz: 1f1007675d785192b7f28800e1bb3be1e6fa42a62afb0cd4a6dd0527cbcdcc80
+  metadata.gz: c3ecf3c0d10f36460a83779df904d378fbca6fa8d5b08e9813f1b5e8d1d91952
+  data.tar.gz: a12c3454145efdb8319d72240f53ccda0eeabbe4779055c0e7c7180a8621e8af
 SHA512:
-  metadata.gz: c8cb9d7a36b8a0b5e7769c0b847670f20abb02a74cb7000caeb36a99d114c6b84aa8b3025bcbe6cd1d1e7922e0fcdd5804796f9a2f606f81fc8d9997b90ced44
-  data.tar.gz: bc241dfbb6b61cbd210a47b6bdf56d566b163aaf525b101fa507ef3ad721a022b1c5d1e2d4a78aded5613be994c784366ed1e49fef3b2430f8192917af62f3ab
+  metadata.gz: 408330c1da4bec81cb8170ba606001b3491c0d4061a9e32492714f15941d6043a9fa5e0b62e831dc46977e0abf91b9617bd704f4142f66cbb47fb2e69a9f639e
+  data.tar.gz: 3bf4983b1e3cb87a57611f66f6d8a4f6d79f8d056855358d1bf75f43ed6459fa8aef21daf7a8afc3025f89f40a95c5247d8a1a90c9c21991e14cc281bb83ed8e

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.3.9] - 2025-04-17
+
+### Fixed
+
+- Project option parser did not separate custom values.
+
+## [0.2.9] - 2025-04-17
+
+### Changed
+
+- Project log file naming supports more date formats.
+
+### Fixed
+
+- Environment options did not always pass session object.
+- Git command pull actions used unknown flags.
+- Workspace describe did not merge multiple invocations.
+
+## [0.1.6] - 2025-04-17
+
+### Fixed
+
+- User-defined program paths were not reduced to bare name.
+- Project path validation did not include separator.
+
 ## [0.3.8] - 2025-04-12
 
 ### Fixed
@@ -345,6 +370,7 @@
 
 - Changelog was created.
 
+[0.3.9]: https://github.com/anpham6/squared/releases/tag/v0.3.9-ruby
 [0.3.8]: https://github.com/anpham6/squared/releases/tag/v0.3.8-ruby
 [0.3.7]: https://github.com/anpham6/squared/releases/tag/v0.3.7-ruby
 [0.3.6]: https://github.com/anpham6/squared/releases/tag/v0.3.6-ruby
@@ -354,6 +380,7 @@
 [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.9]: https://github.com/anpham6/squared/releases/tag/v0.2.9-ruby
 [0.2.8]: https://github.com/anpham6/squared/releases/tag/v0.2.8-ruby
 [0.2.7]: https://github.com/anpham6/squared/releases/tag/v0.2.7-ruby
 [0.2.6]: https://github.com/anpham6/squared/releases/tag/v0.2.6-ruby
@@ -363,6 +390,7 @@
 [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.6]: https://github.com/anpham6/squared/releases/tag/v0.1.6-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

data/lib/squared/common/format.rb

@@ -274,6 +274,10 @@ module Squared
         val.gsub(/\x1B\[(\d+;?)+m/, '')
       end
 
+      def stripext(val)
+        File.basename(val, File.extname(val))
+      end
+
       def raise_error(*args, hint: nil, kind: ArgumentError)
         raise kind, message(*args, hint: hint, empty: true), caller_locations(1).map(&:to_s)
       end

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -350,7 +350,7 @@ module Squared
       end
 
       def describe(data)
-        @describe = {
+        @describe ||= {
           alias: {},
           replace: [],
           pattern: {}

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

@@ -173,19 +173,24 @@ module Squared
           return if @log
 
           log = log.is_a?(Hash) ? log.dup : { file: log }
-          unless (file = env('LOG_FILE'))
-            file = case env('LOG_AUTO')
-                   when 'y', 'year'
-                     "#{@name}-#{Date.today.year}.log"
-                   when 'm', 'month'
-                     "#{@name}-#{Date.today.strftime('%Y-%m')}.log"
-                   when 'd', 'day', '1'
-                     "#{@name}-#{Date.today}.log"
-                   end
-          end
-          if file ||= log[:file]
-            file = Date.today.strftime(file)
-            file = (dir = env('LOG_DIR')) ? @workspace.home.join(dir, file) : @workspace.home.join(file)
+          if (file = env('LOG_FILE'))
+            file = DateTime.now.strftime(file)
+          elsif (val = env('LOG_AUTO'))
+            file = "#{@name}-%s.log" % [case val
+                                        when 'y', 'year'
+                                          Date.today.year
+                                        when 'm', 'month'
+                                          Date.today.strftime('%Y-%m')
+                                        when 'd', 'day', '1'
+                                          Date.today
+                                        else
+                                          val.include?('%') ? DateTime.now.strftime(val) : DateTime.now.strftime
+                                        end]
+          elsif (val = log[:file])
+            file = val.is_a?(String) ? DateTime.now.strftime(val) : "#{@name}-#{Date.today}.log"
+          end
+          if file
+            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home.join(file)
             begin
               file = file.realdirpath
             rescue StandardError => e
@@ -853,7 +858,7 @@ module Squared
         end
 
         def session(*cmd, prefix: cmd.first, main: true, options: true)
-          prefix = prefix.to_s.upcase
+          prefix = stripext(prefix.to_s).upcase
           if (val = PATH[prefix] || PATH[prefix.to_sym])
             cmd[0] = shell_quote(val, force: false)
           end
@@ -888,11 +893,10 @@ module Squared
           cmd.done
         end
 
-        def option(*args, prefix: @session&.first, **kwargs)
+        def option(*args, target: @session, prefix: target&.first, **kwargs)
           if prefix
-            prefix = File.basename(prefix, File.extname(prefix))
             args.each do |val|
-              ret = env("#{prefix}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
+              ret = env("#{stripext(prefix)}_#{val.gsub(/\W/, '_')}".upcase, **kwargs)
               return ret if ret
             end
           end
@@ -933,8 +937,10 @@ module Squared
                 p << flag
               when 'i'
                 i << flag
-              else
+              when 'v'
                 reg << Regexp.escape(flag)
+              else
+                next
               end
               bare << flag if val.end_with?('?')
             else
@@ -952,7 +958,7 @@ module Squared
             elsif opt.start_with?('no-') && no.include?(name = opt[3..-1])
               target << "--no-#{name}"
             else
-              if opt =~ /^([^=]+)=(.+)$/
+              if opt =~ /\A([^=]+)=(.+)\z/
                 a = $1
                 if e.include?(a)
                   target << shell_option(a, $2)
@@ -973,7 +979,7 @@ module Squared
               found = true if first && pass.none? { |val| opt.include?(val) }
             end
           end
-          [ret, reg.empty? ? /\A\s+\z/ : /^(#{reg.join('|')})=(.+)$/]
+          [ret, reg.empty? ? /\A\s+\z/ : /\A(#{reg.join('|')})=(.+)\z/]
         end
 
         def option_clear(opts, target: @session, **kwargs)
@@ -1191,7 +1197,7 @@ module Squared
           return if (list = list.flatten).empty?
 
           list.flatten.each do |opt|
-            next unless (val = option(opt, **kwargs))
+            next unless (val = option(opt, target: target, **kwargs))
 
             return target << (if flag
                                 shell_option(opt, equals ? val : nil, quote: quote, escape: escape, force: force)
@@ -1220,7 +1226,7 @@ module Squared
         end
 
         def append_nocolor(target: @session)
-          target << '--no-color' if !ARG[:COLOR] || stdin? || option('no-color', ignore: false)
+          target << '--no-color' if !ARG[:COLOR] || stdin? || option('no-color', target: target, ignore: false)
         end
 
         def collect_hash(data, pass: [])
@@ -1397,7 +1403,8 @@ module Squared
         end
 
         def projectpath?(val)
-          Pathname.new(val).absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?('..')
+          val = Pathname.new(val).cleanpath
+          val.absolute? ? val.to_s.start_with?(File.join(path, '')) : !val.to_s.start_with?(File.join('..', ''))
         end
 
         def semmajor?(cur, want)

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

@@ -86,11 +86,12 @@ 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=b
+            base: %w[multiple progress P|prune-tags refetch stdin u|update-head-ok
                      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=b upload-pack=e].freeze
+                     recurse-submodules=v refmap=q o|server-option=e shallow-exclude=e shallow-since=v
+                     upload-pack=e].freeze
           }.freeze,
           log: {
             base: %w[all all-match alternate-refs author-date-order basic-regexp bisect boundary cherry cherry-mark
@@ -121,7 +122,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 r|rebase=b? s|strategy=b
+          pull: %w[e n allow-unrelated-histories ff-only S|gpg-sign=e log=i r|rebase=v? 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?
@@ -567,8 +568,11 @@ module Squared
         end
 
         def pull(flag = nil, opts = [], sync: invoked_sync?('pull', flag), remote: nil)
-          cmd = git_session 'pull', flag && "--#{flag}"
-          if (val = option('rebase', ignore: false))
+          cmd = git_session 'pull'
+          if flag == :rebase
+            cmd << '--rebase'
+            cmd << '--autostash' if option('autostash')
+          elsif (val = option('rebase', ignore: false))
             cmd << case val
                    when '0'
                      '--no-rebase'
@@ -1227,11 +1231,11 @@ module Squared
         end
 
         def append_pull(opts, list, target: @session, no: nil, flag: nil, remote: nil)
-          cmd << '--force' if option('force')
+          target << '--force' if option('force', target: target)
           rsm = append_submodules(target: target)
           out = []
           refspec = []
-          opts, pat = option_sanitize(opts, remote ? list + ['refspec=b'] : list, target: target, no: no)
+          opts, pat = option_sanitize(opts, remote ? list + ['refspec=v'] : list, target: target, no: no)
           opts.each do |opt|
             if opt =~ pat
               case $1
@@ -1252,7 +1256,7 @@ module Squared
           end
           if remote
             append_value(remote, target: target, delim: true)
-            if (val = option('refspec', strict: true))
+            if (val = option('refspec', target: target, strict: true))
               append_value(split_escape(val), target: target)
             else
               target.merge(refspec)
@@ -1271,10 +1275,10 @@ module Squared
         end
 
         def append_pathspec(files = [], target: @session, expect: false, parent: false)
-          if session_arg?('pathspec-from-file')
+          if session_arg?('pathspec-from-file', target: target)
             option_clear files
           else
-            if files.empty? && (val = option('pathspec'))
+            if files.empty? && (val = option('pathspec', target: target))
               files = split_escape(val)
             end
             files = projectmap(files, parent: parent)
@@ -1297,7 +1301,7 @@ module Squared
         end
 
         def append_submodules(from = nil, target: @session)
-          return unless (val = option('recurse-submodules', ignore: false))
+          return unless (val = option('recurse-submodules', target: target, ignore: false))
 
           if from == :clone
             projectmap(split_escape(val)).each do |path|
@@ -1326,7 +1330,9 @@ module Squared
         end
 
         def dryrun?(*, target: @session, **)
-          !!target&.include?('--dry-run')
+          return false unless target
+
+          target.include?('--dry-run')
         end
 
         def quiet?(target: @session)

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=b].freeze,
+          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=v].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,

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=b? extra-index-url=q f|find-links=q global-option=q
+                      config-settings=q c|constraint=p e|editable=v? 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
@@ -305,7 +305,7 @@ module Squared
         end
 
         def append_global(target: @session)
-          if (val = option('cache-dir'))
+          if (val = option('cache-dir', target: target))
             target << case val
                       when '0', 'false'
                         '--no-cache-dir'
@@ -313,8 +313,8 @@ module Squared
                         quote_option('cache-dir', basepath(val))
                       end
           end
-          target << shell_option('proxy', val) if (val = option('proxy'))
-          target << quote_option('python', basepath(val)) if (val = option('python'))
+          target << shell_option('proxy', val) if (val = option('proxy', target: target))
+          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
       end

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=b version=e].freeze,
+          exec: %w[conservative prerelease no-prerelease g|gem=v 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

metadata

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