squared 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 41bec81d0daef581416b2c3c7a6cefc66da439794df530c5b2e9c65f7feba6ae
-  data.tar.gz: 8b74836f62055cc6d173148753420ac2bb621e951f1d339cae60ed35357c6f5f
+  metadata.gz: e853dbba49cb1383e99d6d2c1cc7a4dbe9a62a3c3af22eefdb1980cb4d541a59
+  data.tar.gz: 7beece13d36c4f8269c4172f94e83f0237c122bd582a78c47b4085ca3e337bbb
 SHA512:
-  metadata.gz: f042541b80121e9ef547066105a6148a21c790cf50ef0931097ee1506f75fd0a154323671585ec4c86fce33ac2c4c3d8d52d380550091d88932992fc79491466
-  data.tar.gz: 3fc67865ab3499416cac65f06652206af9dd762f898c561924b19f7c50c5430f640da0e03249ac1cdc39c0a2de1b0ba4125b8e2813805fa65259e5d285d44f79
+  metadata.gz: afc95be4880369baca382127c313baf9e561ce5b44ec9bcaa2069226e2774350ae037b22b1f0b1a4fe3b11efd3ac4e109154e0d78ee50b07ebfc2949ffdebfc9
+  data.tar.gz: 56380157773696be7f6430259d4f6d63e3ef3b198abdea4d7433419252c742d10b50c6b3374c824acfce130ef06f30e13b4f045f89d2c7528d47738a1ca9e670

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.4.3] - 2025-04-01
+
+### Added
+
+- Git global command branch shows ahead and behind values.
+- Workspace theme style label warn was created.
+
+### Fixed
+
+- Git and Docker did not order common options first.
+
+### Changed
+
+- Git commit amend uses flag --force-with-lease.
+
 ## [0.4.2] - 2025-03-28
 
 ### Added
@@ -390,6 +405,7 @@
 
 - Changelog was created.
 
+[0.4.3]: https://github.com/anpham6/squared/releases/tag/v0.4.3-ruby
 [0.4.2]: https://github.com/anpham6/squared/releases/tag/v0.4.2-ruby
 [0.4.1]: https://github.com/anpham6/squared/releases/tag/v0.4.1-ruby
 [0.4.0]: https://github.com/anpham6/squared/releases/tag/v0.4.0-ruby

data/README.ruby.md

@@ -409,6 +409,7 @@ Non-task:
 * active
 * inline
 * subject
+* warn
 * caution
 * current
 * extra

data/lib/squared/common/base.rb

@@ -45,7 +45,8 @@ module Squared
           active: [:bold],
           inline: [:bold],
           subject: [:bold],
-          caution: [:red],
+          warn: %i[white red!],
+          caution: %i[black yellow!],
           current: nil,
           extra: nil,
           major: [:bold]

data/lib/squared/version.rb

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

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

@@ -492,11 +492,14 @@ module Squared
         private
 
         def docker_session(*cmd, opts: nil)
-          return session('docker', *cmd) unless opts
-
-          ret = session 'docker'
-          opts = option_sanitize(opts, OPT_DOCKER[:common]).first
-          [ret.merge(cmd), opts]
+          if opts
+            out = []
+            opts = option_sanitize(opts, OPT_DOCKER[:common], target: out).first
+            ret = session('docker', *out, *cmd)
+            [ret, opts]
+          else
+            session('docker', *cmd)
+          end
         end
 
         def docker_output(*cmd, **kwargs)

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

@@ -698,7 +698,9 @@ module Squared
 
         def pull(flag = nil, opts = [], sync: invoked_sync?('pull', flag), remote: nil)
           cmd, opts = git_session('pull', flag && "--#{flag}", opts: opts)
-          if (val = option('rebase', ignore: false))
+          if flag == :rebase
+            cmd << '--autostash' if option('autostash')
+          elsif (val = option('rebase', ignore: false))
             cmd << case val
                    when '0'
                      '--no-rebase'
@@ -1111,7 +1113,7 @@ module Squared
             b << '--dry-run'
           end
           a << pathspec
-          b << '--force' if amend
+          b << '--force-with-lease' if amend
           b << origin << branch
           puts if pass
           source a
@@ -1215,7 +1217,16 @@ module Squared
                 a = sub_style(data[0], styles: theme[:inline])
                 b = sub_style(data[1], styles: theme[:extra])
                 r = /\A(?:\[(.+?)(?=\]\s)\]\s)?(.+)\z/m.match(data[2..-1].join(' '))
-                [" Branch: #{a + (r[1] ? " (#{r[1]})" : '')}", " Commit: #{b}", "Message: #{r[2]}"].compact.join("\n")
+                if (r1 = r[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
+                  write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, styles: theme[:warn])}" }
+                  r1 = $1
+                  r2 = $2 && write.($2, $3)
+                  r3 = write.($4, $5)
+                end
+                r1 = nil if r1 == "origin/#{data[0]}"
+                [" Branch: #{a + (r1 ? " (#{r1})" : '')}", r2, r3, " Commit: #{b}", "Message: #{r[2]}"]
+                  .compact
+                  .join("\n")
               end
               on :last, from
             end
@@ -1577,11 +1588,13 @@ module Squared
 
         def git_session(*cmd, opts: nil, worktree: true, **kwargs)
           dir = worktree ? ["--work-tree=#{shell_quote(path)}", "--git-dir=#{shell_quote(gitpath)}"] : []
-          ret = session('git', *dir, **kwargs)
-          return ret.merge(cmd) unless opts
-
-          opts = option_sanitize(opts, OPT_GIT[:common]).first
-          [ret.merge(cmd), opts]
+          if opts
+            opts = option_sanitize(opts, OPT_GIT[:common], target: dir).first
+            ret = session('git', *dir, *cmd, **kwargs)
+            [ret, opts]
+          else
+            session('git', *dir, *cmd, **kwargs)
+          end
         end
 
         def git_output(*cmd, **kwargs)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - An Pham
 bindir: exe
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake