squared 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3ecf3c0d10f36460a83779df904d378fbca6fa8d5b08e9813f1b5e8d1d91952
-  data.tar.gz: a12c3454145efdb8319d72240f53ccda0eeabbe4779055c0e7c7180a8621e8af
+  metadata.gz: 86709d5961b0a4cf2fd7192ea64d178737ca047b286f5d1888cc9cb58412697a
+  data.tar.gz: e95da9ca85b3e493e20743da05b552840b0a4a77f4afec1b0edd947ec3e27229
 SHA512:
-  metadata.gz: 408330c1da4bec81cb8170ba606001b3491c0d4061a9e32492714f15941d6043a9fa5e0b62e831dc46977e0abf91b9617bd704f4142f66cbb47fb2e69a9f639e
-  data.tar.gz: 3bf4983b1e3cb87a57611f66f6d8a4f6d79f8d056855358d1bf75f43ed6459fa8aef21daf7a8afc3025f89f40a95c5247d8a1a90c9c21991e14cc281bb83ed8e
+  metadata.gz: f2e5eeda8962c5d2e8e0734f0784c2138312e2c6b0c27ccd07e9c7c0a3fde17fe1b32e4c596206696a6c29daf05414c8f5474b141ff604292f18e1a3563d8aa0
+  data.tar.gz: af7771a53f01d2083c5d7ad7832e036aade52441493733a76604b5af884214cf26fb84ef9b7a451a84e1f725f15f396123b6eda9b49560ef7f722a24b4173b71

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [0.3.10] - 2025-04-27
+
+### Fixed
+
+- Git command reset action commit used invalid delimeter.
+- Git single option values were not merged as per specification.
+- Project script task did not fire first and last callbacks.
+- Git task status did not display branch information.
+- Git checkout action commit did not include options.
+
+### Removed
+
+- Git command files action ignored could not be used alone.
+
+## [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.3.9] - 2025-04-17
 
 ### Fixed
@@ -370,6 +401,7 @@
 
 - Changelog was created.
 
+[0.3.10]: https://github.com/anpham6/squared/releases/tag/v0.3.10-ruby
 [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
@@ -380,6 +412,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.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
@@ -390,6 +423,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.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

data/README.ruby.md

@@ -433,7 +433,7 @@ Most project classes will inherit from `Git` which enables these tasks:
 | commit     | commit           | add all amend amend-orig                      |
 | diff       | diff             | head cached branch files between contain      |
 | fetch      | fetch            | origin remote                                 |
-| files      | ls-files         | cached modified deleted others ignored        |
+| files      | ls-files         | cached modified deleted others                |
 | pull       | pull             | origin remote                                 |
 | rebase     | rebase           | branch onto send                              |
 | refs       | ls-remote --refs | heads tags remote                             |

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

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.3.9'
+  VERSION = '0.3.10'
 end

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

@@ -407,6 +407,7 @@ module Squared
             return unless respond_to?(:compose)
 
             cmd = compose(as_get(opts), flags, script: true, args: scr, from: from)
+            from = :script if from == :run && script?
           end
           run(cmd, var, from: from, banner: banner, sync: sync)
         end
@@ -1314,7 +1315,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)

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

@@ -75,7 +75,7 @@ module Squared
         include Prompt
 
         OPT_GIT = {
-          branch: %w[a|all create-reflog i|ignore-case q|quiet r|remotes v|verbose abbrev=i color=b column=b
+          branch: %w[a|all create-reflog i|ignore-case q|quiet r|remotes v|verbose vv abbrev=i color=b column=b
                      contains=e format=q merged=e no-contains=e no-merged=e points-at=e u|set-upstream-to=e sort=q
                      t|track=b].freeze,
           checkout: %w[l d|detach f|force ignore-other-worktrees ignore-skip-worktree-bits m|merge p|patch
@@ -88,7 +88,7 @@ module Squared
           fetch: {
             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
+            pull: %w[4 6 n t a|append atomic dry-run f|force k|keep negotiate-only prefetch p|prune q|quiet
                      set-upstream unshallow update-shallow v|verbose deepen=i depth=i j|jobs=i negotiation-tip=q
                      recurse-submodules=v refmap=q o|server-option=e shallow-exclude=e shallow-since=v
                      upload-pack=e].freeze
@@ -104,40 +104,40 @@ module Squared
                      exclude-hidden=b? glob=q grep=q grep-reflog=q L=q n|max-count=i max-parents=i min-parents=i
                      no-walk=b? remotes=q? since=q since-as-filter=q skip=i tags=q? until=q].freeze,
             format: %w[t children combined-all-paths oneline left-right no-diff-merges parents relative-date
-                       show-signature date=q diff-merges=b encoding=b expand-tabs=i format=q notes=q pretty=q?
+                       show-signature date=q diff-merges=b encoding=b expand-tabs=i format=q notes=b pretty=q?
                        show-linear-break=q?].freeze,
             diff: %w[p R u z l=i G=q O=q S=q binary check compact-summary cumulative find-copies-harder full-index
                      W|function-context w|ignore-all-space ignore-blank-lines ignore-cr-at-eol ignore-space-at-eol
                      b|ignore-space-change D|irreversible-delete graph ita-invisible-in-index minimal name-only
                      name-status no-color-moved-ws no-prefix no-renames numstat patch-with-raw patch-with-stat patience
                      pickaxe-all pickaxe-regex raw shortstat summary a|text abbrev=i? anchored=q B|break-rewrites=e?
-                     color=b color-moved=b color-moved-ws=b color-words=q? diff-algorithm=b diff-filter=e? X|dirstat=q?
-                     dirstat-by-file=q? dst-prefix=q C|find-copies=i? find-object=e M|find-renames=i?
+                     color=b color-moved=b color-moved-ws=b color-words=q? diff-algorithm=b diff-filter=e? X|dirstat=b?
+                     dirstat-by-file=q? dst-prefix=q C|find-copies=b? find-object=e M|find-renames=b?
                      I|ignore-matching-lines=q ignore-submodules=b inter-hunk-context=i line-prefix=q output=p
                      output-indicator-context=q output-indicator-new=q output-indicator-old=q relative=p rotate-to=p
                      skip-to=p src-prefix=q stat=q? stat-width=i stat-name-width=i stat-count=i submodule=b? U|unified=i
-                     word-diff=b? word-diff-regex=q ws-error-highligt=q].freeze
+                     word-diff=b? word-diff-regex=q ws-error-highlight=b].freeze
           }.freeze,
-          ls_files: %w[z debug deduplicate directory eol error-unmatch exclude-standard full-name k|killed
-                       no-empty-directory recurse-submodules sparse s|stage u|unmerged abbrev=i x|exclude=q
+          ls_files: %w[f t v z debug deduplicate directory eol error-unmatch exclude-standard full-name i|ignored
+                       k|killed 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=v? s|strategy=b
+          pull: %w[e n allow-unrelated-histories ff-only S|gpg-sign=b? 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?
-                     reset-author-date root show-current-patch signoff v|verbose empty=b S|gpg-sign=b onto=e
+                     ignore-whitespace i|interactive keep-base m|merge no-ff q|quiet quit r|rebase-merges=b?
+                     reset-author-date root show-current-patch signoff v|verbose empty=b S|gpg-sign=b? onto=e
                      s|strategy=b X|strategy-option=b whitespace=e].freeze,
           reset: %w[N pathspec-file-nul q|quiet pathspec-from-file=p].freeze,
           restore: %w[ignore-unmerged ignore-skip-worktree-bits m|merge ours p|patch pathspec-file-nul S|staged theirs
                       W|worktree conflict=b pathspec-from-file=p s|source=q].freeze,
           rev_parse: {
             output: %w[absolute-git-dir all flags git-common-dir git-dir is-bare-repository is-inside-git-dir
-                       is-inside-work-tree is-shallow-repository local-env-vars no-flags no-revs not q|quiet sq
-                       revs-only shared-index-path show-cdup show-prefix show-toplevel show-superproject-working-tree
-                       sq-quote symbolic symbolic-full-name verify abbrev-ref=b? after=q before=q default=e
-                       disambiguate=b exclude=q exclude-hidden=b glob=q git-path=p path-format=b? prefix=q branches=q?
-                       remotes=q? resolve-git-dir=p short=i? show-object-format=b? since=q tags=q? until=q].freeze,
+                       is-inside-work-tree is-shallow-repository local-env-vars no-flags no-revs not q|quiet revs-only
+                       shared-index-path show-cdup show-prefix show-toplevel show-superproject-working-tree sq sq-quote
+                       symbolic symbolic-full-name verify abbrev-ref=b? after=q before=q default=e disambiguate=b
+                       exclude=q exclude-hidden=b glob=q git-path=p path-format=b? prefix=q branches=q? remotes=q?
+                       resolve-git-dir=p short=i? show-object-format=b? since=q tags=q? until=q].freeze,
             parseopt: %w[keep-dashdash stop-at-non-option stuck-long].freeze
           }.freeze,
           show: %w[t combined-all-paths no-diff-merges remerge-diff show-signature diff-merges=b encoding=b
@@ -230,7 +230,7 @@ module Squared
           'commit' => %i[add all amend amend-orig].freeze,
           'diff' => %i[head cached branch files view between contain].freeze,
           'fetch' => %i[origin remote].freeze,
-          'files' => %i[cached modified deleted others ignored].freeze,
+          'files' => %i[cached modified deleted others].freeze,
           'log' => %i[view between contain].freeze,
           'pull' => %i[origin remote].freeze,
           'rebase' => %i[branch onto send].freeze,
@@ -402,7 +402,7 @@ module Squared
                       format_desc action, flag, 'branch/commit,opts*'
                       task flag, [:commit] do |_, args|
                         commit = param_guard(action, flag, args: args, key: :commit)
-                        checkout(flag, commit: commit)
+                        checkout(flag, args.extras, commit: commit)
                       end
                     when :detach
                       format_desc action, flag, 'branch/commit?'
@@ -689,6 +689,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'
@@ -723,13 +724,11 @@ module Squared
           cmd = git_session 'reset'
           case flag
           when :commit, :index
-            out = option_sanitize(opts, OPT_GIT[:reset] + VAL_GIT[:reset], no: OPT_GIT[:no][:reset]).first
+            refs = option_sanitize(opts, OPT_GIT[:reset] + VAL_GIT[:reset], no: OPT_GIT[:no][:reset]).first
             if flag == :commit
-              append_value(commit, delim: true)
-              option_clear out
+              append_value commit
+              option_clear refs
               ref = false
-            else
-              (refs ||= []).concat(out)
             end
           when :mode
             return unless VAL_GIT[:reset].include?(mode)
@@ -780,7 +779,7 @@ module Squared
           else
             out = option_sanitize(opts, OPT_GIT[:checkout], no: OPT_GIT[:no][:checkout]).first
             if flag == :commit
-              append_value(commit, delim: true)
+              append_value commit
               option_clear out
             else
               append_head
@@ -831,7 +830,7 @@ module Squared
             cmd << shell_quote(range.join(flag == :between ? '..' : '...'))
           else
             commit, files = files.partition do |val|
-              val.start_with?('^') || (!%r{^[.\\/]}.match?(val) && !%r{[\\/]$}.match?(val)) || commithash(val)
+              val.start_with?('^') || (!%r{^.(?:[\\/]|$)}.match?(val) && !%r{[\\/]$}.match?(val)) || commithash(val)
             end
             cmd.merge(commit.map { |val| commithash(val) || shell_quote(val) }) unless commit.empty?
           end
@@ -906,52 +905,39 @@ module Squared
                      else
                        "-- #{refs.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]
-            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 out =~ /^#{data[2]} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/
-                  split_escape($1).each do |s|
-                    next unless s.end_with?("/#{branch}")
-
-                    origin = s[0, s.size - branch.size - 1]
-                    break
-                  end
-                end
-              end
-              upstream = true if origin
-            elsif data[3] =~ %r{^(.+)/#{Regexp.escape(branch)}$}
-              origin = $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
@@ -1304,16 +1290,22 @@ module Squared
           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

@@ -699,12 +699,12 @@ module Squared
           run(from: :pack)
         end
 
-        def compose(opts, flags = nil, script: false, args: nil, from: :build, **)
+        def compose(opts, flags = nil, script: false, args: nil, from: nil, **)
           return unless opts
 
           if script
             ret = session dependbin, 'run'
-            raise_error("#{dependbin} run script: #{from}", hint: "given #{opts}") unless append_any(opts)
+            raise_error("#{dependbin} run script: given #{opts}", hint: from) unless append_any(opts)
             append_any flags if flags
             append_loglevel
             append_any(args, delim: true) if args
@@ -718,7 +718,7 @@ module Squared
             when Enumerable
               opts.to_a.join(' ')
             else
-              raise_error("#{project}: #{from}", hint: "given #{opts}")
+              raise_error("#{project}: given #{opts}", hint: from)
             end
           end
         end

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

@@ -186,13 +186,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
@@ -204,10 +206,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.3.9
+  version: 0.3.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.8
+rubygems_version: 3.6.2
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []