squared 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9df30ac582767f0c30d058c5b3bf72ebbf51f926bb67b648c206d076b2525bc1
-  data.tar.gz: 2a1dcc43352eb74a8c1b94434916a28cb7579fde20a466bc5fdba81b14956d11
+  metadata.gz: da84184d479e255a0a9916bfa33d081259b3965fb61ab40f32f7417fad7751b5
+  data.tar.gz: 9dceba3df95cf08e724c13f0ab63c7ba607f7253e2cefe5f5ebab78858c58c78
 SHA512:
-  metadata.gz: 614b1a06a725ce69a54573f4c0ab2718c5aae60442ba0f75b87f105bb60212032295beff46ac9a2cd2cbf921eb05632cb7d6391a39d0ee21679224d0b1623748
-  data.tar.gz: ec15f7265c437e5bb8d042eb1730e6499ecfd81a893a4456514a4b1ab6f2c0917d560f4a94285e4c982c0f6cd42d5eca8a9b474728830753461c7f78668d2b5c
+  metadata.gz: bed08c89a0f41d484b8d18d951abbd1386b1138365ab0f9add293ec81865303c3e6861ec6cb8a6326e3e91c1b2692fad6ceb64b11410c5f4df8015f3da1226d7
+  data.tar.gz: fc545d2ecb6a324d3a1d4869d73223d5122b15517268e248d5cbda19be39e4ddcfb5fb07627d090c9010334e7747f7121c8e6b8dbce7c2ca08f44131263a6681

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [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
+
+- Project path validation did not include separator.
+
 ## [0.2.8] - 2025-04-12
 
 ### Fixed
@@ -234,6 +252,7 @@
 
 - Changelog was created.
 
+[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
@@ -243,6 +262,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.2.8'
+  VERSION = '0.2.9'
 end

data/lib/squared/workspace/application.rb

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

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

@@ -163,19 +163,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
+          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 ||= log[:file]
-            file = Date.today.strftime(file)
-            file = (dir = env('LOG_DIR')) ? @workspace.home.join(dir, file) : @workspace.home.join(file)
+          if file
+            file = (val = env('LOG_DIR')) ? @workspace.home.join(val, file) : @workspace.home.join(file)
             begin
               file = file.realdirpath
             rescue StandardError => e
@@ -777,7 +782,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
@@ -798,11 +803,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
@@ -1012,7 +1016,7 @@ module Squared
 
         def append_first(list, target: @session, flag: true, equals: false, quote: false, escape: true, **kwargs)
           list.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)
@@ -1025,14 +1029,14 @@ module Squared
 
         def append_option(list, target: @session, equals: false, quote: false, escape: true, **kwargs)
           list.each do |flag|
-            next unless (val = option(flag, **kwargs))
+            next unless (val = option(flag, target: target, **kwargs))
 
             target << shell_option(flag, equals ? val : nil, quote: quote, escape: escape)
           end
         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 param_guard(action, flag, args: nil, key: nil, pat: nil)
@@ -1193,7 +1197,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

@@ -72,13 +72,13 @@ module Squared
 
     module Project
       class Git < Base
-        FOR_FETCH = %w[atomic multiple negotiate-only prefetch progress prune-tags refetch recurse-submodules=s].freeze
+        FOR_FETCH = %w[atomic multiple negotiate-only prefetch progress prune-tags refetch].freeze
         NO_FETCH = %w[all ipv4 ipv6 recurse-submodules show-forced-updates tags].freeze
         FNO_FETCH = %w[auto-gc auto-maintenance write-commit-graph write-fetch-head].freeze
         OPT_FETCH = (FOR_FETCH + NO_FETCH + FNO_FETCH +
                      %w[append dry-run force keep prune quiet set-upstream unshallow update-shallow verbose
-                        deepen=i depth=i jobs=i negotiation-tip=s refmap=s server-option=s shallow-exclude=s
-                        shallow-since=d upload-pack=s]).freeze
+                        deepen=i depth=i jobs=i negotiation-tip=s refmap=s recurse-submodules=s server-option=s
+                        shallow-exclude=s shallow-since=d upload-pack=s]).freeze
         NO_PULL = %w[allow-unrelated-histories autostash commit edit ff signoff squash stat verify verify-signatures
                      gpg-sign=? log=? rebase=?].freeze
         OPT_PULL = (NO_PULL + %w[ff-only signoff=s strategy=s strategy-option=s]).freeze
@@ -439,8 +439,11 @@ module Squared
         end
 
         def pull(flag = nil, sync: invoked_sync?('pull', flag), remote: nil, opts: [])
-          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'
@@ -1019,7 +1022,7 @@ module Squared
         end
 
         def append_pull(opts, list, no = [], target: @session, flag: nil, remote: nil)
-          cmd << '--force' if option('force')
+          target << '--force' if option('force', target: target)
           modules = append_submodules(target: target)
           out = []
           refspec = []
@@ -1050,7 +1053,7 @@ module Squared
           end
           if remote
             append_value(remote, target: target, delim: true, quote: true)
-            if (val = option('refspec', strict: true))
+            if (val = option('refspec', target: target, strict: true))
               append_value(split_escape(val), target: target, escape: false)
             else
               target.merge(refspec)
@@ -1069,7 +1072,7 @@ module Squared
         end
 
         def append_pathspec(files = [], target: @session, expect: false, parent: false)
-          if files.empty? && (val = option('pathspec'))
+          if files.empty? && (val = option('pathspec', target: target))
             files = split_escape(val)
           end
           files = projectmap(files, parent: parent)
@@ -1091,7 +1094,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|

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

@@ -246,7 +246,6 @@ module Squared
             append_global(target: target)
             return
           end
-
           out = []
           opts, pat = option_partition(opts, OPT_INSTALL + OPT_GENERAL, target: target)
           append_global(target: target)
@@ -281,7 +280,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'
@@ -289,8 +288,8 @@ module Squared
                         quote_option('cache-dir', basepath(val))
                       end
           end
-          target << quote_option('proxy', val) if (val = option('proxy'))
-          target << quote_option('python', basepath(val)) if (val = option('python'))
+          target << quote_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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.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: []