squared 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9df30ac582767f0c30d058c5b3bf72ebbf51f926bb67b648c206d076b2525bc1
-  data.tar.gz: 2a1dcc43352eb74a8c1b94434916a28cb7579fde20a466bc5fdba81b14956d11
+  metadata.gz: b8b2e8a394034cfe323c5997a02b1e7c3f9ea0e2c9df925a87801fc8b9a61061
+  data.tar.gz: c30e2dcd5d3cea0526eea68f47ae8740949a4eb3b32ff1e76f9a15fc5e115f85
 SHA512:
-  metadata.gz: 614b1a06a725ce69a54573f4c0ab2718c5aae60442ba0f75b87f105bb60212032295beff46ac9a2cd2cbf921eb05632cb7d6391a39d0ee21679224d0b1623748
-  data.tar.gz: ec15f7265c437e5bb8d042eb1730e6499ecfd81a893a4456514a4b1ab6f2c0917d560f4a94285e4c982c0f6cd42d5eca8a9b474728830753461c7f78668d2b5c
+  metadata.gz: 4ec98cbf7dd9a4f0c63d316650fd3163cc0ec78934c30f638bbc531c31c8bfec075c8911c28a3af1b5f74ae1b5cdb92721f5f17e4e0973e3a7ecdbd326664a0b
+  data.tar.gz: 4b4f4270e87a1a427c30ed8c2f1fadeea9aad227592bd2268117f303919c27ec14adb596fb7668f611bbad20000376cf936050537f202533613ba333330b48c5

data/CHANGELOG.md

@@ -1,5 +1,40 @@
 # Changelog
 
+## [0.2.10] - 2025-04-27
+
+### Fixed
+
+- Project run and script tasks did not fire first and last callbacks.
+- Git command clone did not read booleans for recurse-submodules.
+
+## [0.1.7] - 2025-04-27
+
+### Fixed
+
+- Project directory context method option pass was inverted.
+- Shell options with spaces and without quotes were not escaped.
+- Git task status did not display branch information.
+- Ruby copy method argument include was ignored when used directly.
+- Git commit could not push branch without same name as remote.
+
+## [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 +269,8 @@
 
 - Changelog was created.
 
+[0.2.10]: https://github.com/anpham6/squared/releases/tag/v0.2.10-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
@@ -243,6 +280,8 @@
 [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.7]: https://github.com/anpham6/squared/releases/tag/v0.1.7-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

@@ -53,7 +53,7 @@ module Squared
         end
         wrap = ->(s, n) { "\x1B[#{n.join(';')}m#{s}\x1B[0m" }
         code = []
-        args.concat(as_a(styles)).each_with_index do |type, i|
+        args.concat(as_a(styles)).flatten.each_with_index do |type, i|
           next unless type
 
           if index == -1
@@ -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/common/prompt.rb

@@ -21,7 +21,7 @@ module Squared
                 return false
               end
               attempts -= 1
-              exit 1 unless attempts >= 0
+              exit 1 unless attempts > 0
             end
           rescue Interrupt
             puts

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 if !data[2] || (!data[4] && data[5] =~ /\s/)
+          return val if !data[2] || (!data[4] && !data[5].match?(/\s/))
 
           join = ->(opt) { data[1] + data[3] + shell_quote(opt) }
           if data[4] == data[6]
@@ -21,7 +21,7 @@ module Squared
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, force: force) : val
         else
-          Shellwords.escape(val)
+          val.empty? ? '' : Shellwords.escape(val)
         end
       end
 

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.2.8'
+  VERSION = '0.2.10'
 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
@@ -347,10 +352,10 @@ module Squared
           self
         end
 
-        def build(*args, from: :build, sync: invoked_sync?('build'), **)
+        def build(*args, from: :run, sync: invoked_sync?('build'), **)
           banner = verbose
           if args.empty?
-            return unless from == :build
+            return unless from == :run
 
             cmd, opts, var, flags = @output
             banner = verbose == 1 if task_invoked?('build', 'build:sync')
@@ -371,6 +376,7 @@ module Squared
             return unless respond_to?(:compose)
 
             cmd = compose(opts, flags, from: from, script: true)
+            from = :script if from == :run && script?
           end
           run(cmd, var, from: from, banner: banner, sync: sync)
         end
@@ -777,7 +783,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 +804,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 +1017,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 +1030,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)
@@ -1114,7 +1119,7 @@ module Squared
           pwd = Pathname.pwd
           if block_given?
             begin
-              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join >= RUBY_VERSION)
+              if path == pwd || pass == true || (pass.is_a?(String) && semscan(pass).join <= RUBY_VERSION)
                 ret = instance_eval(&blk)
               else
                 Dir.chdir(path)
@@ -1193,7 +1198,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'
@@ -540,6 +543,7 @@ module Squared
         def status(*, sync: invoked_sync?('status'), **)
           cmd = git_session 'status'
           cmd << (option('long') ? '--long' : '--short')
+          cmd << '--branch' if option('branch')
           if (val = option('ignore-submodules', ignore: false))
             cmd << basic_option('ignore-submodules', case val
                                                      when '0', 'none'
@@ -719,53 +723,39 @@ module Squared
                        raise_error('commit', 'pathspec', hint: 'missing') if (files = projectmap(files)).empty?
                        "-- #{files.join(' ')}"
                      end
-          origin = nil
+          format = '%(if)%(HEAD)%(then)%(refname:short)...%(upstream:short)...%(upstream:track)%(end)'
           branch = nil
-          upstream = nil
-          source(git_output('fetch --no-tags --quiet'), io: true, banner: false)
-          source(git_output('branch -vv --list'), io: true, banner: false).first.each do |val|
-            next unless (data = /^\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
-
-            branch = data[1]
-            sha = data[2]
-            if !data[3]
-              unless (origin = option('repository', prefix: 'git', ignore: false))
-                out = source(git_output('log -n1 --format=%h%d'), io: true, stdout: true, banner: false).first
-                if (data = /^#{sha} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/.match(out))
-                  split_escape(data[1]).each do |s|
-                    next unless s.end_with?("/#{branch}")
-
-                    origin = s[0..s.size - branch.size - 2]
-                    break
-                  end
-                end
-              end
-              upstream = true if origin
-            elsif (data = Regexp.new("^(.+)/#{Regexp.escape(branch)}$").match(data[3]))
-              origin = data[1]
+          origin = nil
+          source(git_output('fetch --no-tags --quiet'), io: true, banner: false, stdout: true)
+          cmd = git_output("for-each-ref --format=\"#{format}\" refs/heads")
+          source(cmd, io: true, banner: false).first.each do |line|
+            next if (line = line.chomp).empty?
+
+            branch, origin, hint = line.split('...')
+            if hint && !hint.match?(/^\[(\D+0,\D+0)\]$/)
+              raise_error('work tree is not usable', hint: hint[1..-2])
+            elsif origin.empty?
+              return nil if pass
+
+              raise_error('no remote upstream', hint: branch)
             end
             break
           end
-          raise_error('commit', 'work tree is not usable') unless origin && branch
+          i = origin.index('/')
+          branch = "#{branch}:#{origin[i + 1..-1]}" unless origin.end_with?("/#{branch}")
+          origin = origin[0..i - 1]
           cmd = git_session('commit', option('dry-run') && '--dry-run', options: false)
-          if amend
-            cmd << '--amend'
-          else
-            cmd.delete('--amend')
-          end
+          cmd << '--amend' if amend
           if message
             append_message message
           elsif flag == :'amend-orig' || option('no-edit')
             cmd << '--no-edit'
           end
           a = git_output 'add', '--verbose'
-          b = git_output 'push', upstream && '--set-upstream'
-          if dryrun?
-            a << '--dry-run'
-            b << '--dry-run'
-          end
+          b = git_output 'push'
+          b << '--dry-run' if dryrun?
           a << pathspec
-          b << '--force' if amend
+          b << '--force-with-lease' if amend
           b << origin << branch
           puts if pass
           source a
@@ -1019,7 +1009,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 +1040,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 +1059,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,19 +1081,25 @@ 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|
-              target << basic_option('recurse-submodules', path)
+            case val
+            when '0', 'false'
+              target << '--no-recurse-submodules'
+            when '1', 'true'
+              target << '--recurse-submodules'
+            else
+              projectmap(split_escape(val)).each do |path|
+                target << basic_option('recurse-submodules', path)
+              end
             end
-            target
           else
             target << case val
                       when 'no', '0'
                         '--no-recurse-submodules'
                       when 'yes', 'on-demand'
-                        "--recurse-submodules#{from == :reset ? '' : "=#{val}"}"
+                        "--recurse-submodules=#{val}"
                       else
                         '--recurse-submodules'
                       end

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

@@ -577,8 +577,8 @@ module Squared
           run
         end
 
-        def compose(opts, flags = nil, script: false, from: :build)
-          return unless opts && script && from == :build
+        def compose(opts, flags = nil, script: false, from: nil)
+          return unless opts && script
 
           ret = session dependbin, 'run', flags
           append_loglevel
@@ -588,7 +588,7 @@ module Squared
           when String
             ret << opts
           else
-            raise_error("#{dependbin} script name", hint: opts.nil? ? 'missing' : 'invalid')
+            raise_error("#{dependbin} script name: given #{opts}", hint: from)
           end
           ret
         end

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

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

@@ -192,13 +192,15 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', include: nil, exclude: nil, into: @gemdir, override: false)
+        def copy(from: 'lib', into: @gemdir, override: false, **kwargs)
+          glob = kwargs[:include]
+          pass = kwargs[:exclude]
           if @copy && !override
             return super if runnable?(@copy)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:include] if @copy.key?(:include)
-            exclude = @copy[:exclude] if @copy.key?(:exclude)
+            pass = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
           end
           return unless into
@@ -210,10 +212,10 @@ module Squared
           as_a(from).each_with_index do |val, i|
             a = basepath(val)
             b = dest.join(val)
-            c = glob[i] || glob[0]
+            c = glob[i] || glob.first
             log.info "cp #{a.join(c)} #{b}"
             begin
-              copy_dir(a, b, c, pass: exclude, verbose: verbose)
+              copy_dir(a, b, c, pass: pass, verbose: verbose)
             rescue StandardError => e
               log.error e
               ret = on(:error, :copy, e)

data/lib/squared/workspace/repo.rb

@@ -3,8 +3,6 @@
 module Squared
   module Workspace
     module Repo
-      include Common::Format
-
       class << self
         def read_manifest(path)
           require 'rexml/document'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2025-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -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.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []