squared 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0ee3da01c8f4091c2363f6c8b0821cbc742d7dd95a4fda4e6a26e949ce0c61f
-  data.tar.gz: 4642f0e308608a80077cddb81ecc3c03ff58a6baaa066b644c1ae8b922d13668
+  metadata.gz: e853dbba49cb1383e99d6d2c1cc7a4dbe9a62a3c3af22eefdb1980cb4d541a59
+  data.tar.gz: 7beece13d36c4f8269c4172f94e83f0237c122bd582a78c47b4085ca3e337bbb
 SHA512:
-  metadata.gz: 33f08fcd47d1ac5896a5cc231e8466de17f2edbd2d987fb411c21b8db8cf734b880fefbb4454a69e610a35aa86609e94bac4dc44264e3a10a3cd69efd6429186
-  data.tar.gz: 5e424cb159c5a00512eca6ea9d8a0328082ecb85a30c9e769cd67bbd21d95b16a5d6f906a22a2f2c2d9fecbad5da2721ee1cc4b09722ffbdcbbcbb0a39d0c985
+  metadata.gz: afc95be4880369baca382127c313baf9e561ce5b44ec9bcaa2069226e2774350ae037b22b1f0b1a4fe3b11efd3ac4e109154e0d78ee50b07ebfc2949ffdebfc9
+  data.tar.gz: 56380157773696be7f6430259d4f6d63e3ef3b198abdea4d7433419252c742d10b50c6b3374c824acfce130ef06f30e13b4f045f89d2c7528d47738a1ca9e670

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # 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
+
+- Python command build and publish with Poetry was implemented.
+
+### Fixed
+
+- Docker image command list did not display ID when empty.
+
 ## [0.4.1] - 2025-03-20
 
 ### Added
@@ -380,6 +405,8 @@
 
 - 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
 [0.3.6]: https://github.com/anpham6/squared/releases/tag/v0.3.6-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/common/format.rb

@@ -231,7 +231,7 @@ module Squared
         if val.is_a?(::Array)
           lines = val.map(&:to_s)
         else
-          lines = val.to_s.lines.map(&:chomp)
+          lines = val.to_s.lines(chomp: true)
           lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(StandardError))
         end
         n = cols || max.(lines)

data/lib/squared/version.rb

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

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

@@ -639,7 +639,7 @@ module Squared
 
               dest = target.join(File.basename(file.path))
               FileUtils.mv(entry, dest)
-              dest.children.each { |file| FileUtils.mv(file, target) }
+              dest.children.each { |child| FileUtils.mv(child, target) }
               dest.rmdir
               target = entry
               depth -= 1

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

@@ -400,8 +400,8 @@ module Squared
                 status = %w[created exited dead]
               end
               ps.merge(status.map { |s| "--filter=\"status=#{s}\"" })
-              list_image(flag, ps, no: no, hint: "status: #{status.join(', ')}", from: from) do |id|
-                run(cmd.temp(id), from: from)
+              list_image(flag, ps, no: no, hint: "status: #{status.join(', ')}", from: from) do |img|
+                run(cmd.temp(img), from: from)
               end
               return
             else
@@ -426,9 +426,8 @@ module Squared
                   break
                 end
               end
-              flag = :run if flag == :list
               list_image(flag, cmd << '-a', from: from) do |val|
-                container(flag, if name
+                container(:run, if name
                                   opts.dup << "name=#{index == 0 ? name : "#{name}-#{index}"}"
                                 else
                                   opts
@@ -493,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)
@@ -528,20 +530,22 @@ module Squared
             found = false
             IO.popen(session_done(cmd << '--format=json')).each_with_index do |line, index|
               data = JSON.parse(line)
+              id = data['ID']
               rt = [data['Repository'], data['Tag']].reject { |val| val == '<none>' }.join(':')
-              rt = nil if tag.empty?
+              rt = nil if rt.empty?
               aa = if data['Names']
                      as_a(data['Names']).join(', ')
-                   elsif tag
+                   elsif rt
                      dd = true
                      data['Repository']
                    else
-                     data['ID']
+                     id
                    end
               bb = index.succ.to_s
               cc = bb.size + 1
-              a = sub_style(data['Image'] || rt || aa, styles: theme[:inline])
-              b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a} (#{data['ID']})"
+              ee = data['Image'] || rt || aa
+              a = sub_style(ee, styles: theme[:inline])
+              b = "Execute #{sub_style(flag, styles: theme[:active])} on #{a}#{ee == id ? '' : " (#{id})"}"
               c, d = no ? ['y/N', 'N'] : ['Y/n', 'Y']
               e = time_format(time_offset(data['CreatedAt']), pass: ['ms'])
               f = sub_style(ARG[:BORDER][0], styles: theme[:inline])
@@ -560,7 +564,7 @@ module Squared
               next unless confirm("#{h + b}? [#{c}] ", d, timeout: 60)
 
               puts if @@print_order == 0
-              blk.call data['ID']
+              blk.call id
             end
             puts log_message(Logger::INFO, 'none detected', subject: "#{name}:#{from}", hint: hint) unless found
           end

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'
@@ -1080,10 +1082,10 @@ module Squared
               unless (origin = option('repository', prefix: 'git', ignore: false))
                 out = source(git_output('log -n1 --format=%h%d'), io: true, banner: false, stdout: true).first
                 if out =~ /^#{r[2]} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/
-                  split_escape($1).each do |val|
-                    next unless val.end_with?("/#{branch}")
+                  split_escape($1).each do |s|
+                    next unless s.end_with?("/#{branch}")
 
-                    origin = val[0, val.size - branch.size - 1]
+                    origin = s[0, s.size - branch.size - 1]
                     break
                   end
                 end
@@ -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)

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        REQUIREMENTS = %w[requirements.txt pyproject.toml setup.cfg].freeze
+        REQUIREMENTS = %w[requirements.txt pyproject.toml setup.cfg poetry.lock].freeze
         SETUPTOOLS = %w[setup.py pyproject.toml].freeze
         DIR_PYTHON = (REQUIREMENTS + SETUPTOOLS).freeze
         OPT_PYTHON = {
@@ -24,6 +24,12 @@ module Squared
                       python-version=q report=p r|requirement=p root=p root-user-action=b src=p t|target=p
                       upgrade-strategy=b].freeze
         }.freeze
+        OPT_POETRY = {
+          common: %w[ansi no-ansi no-cache n|no-interaction no-plugins P|project=p q|quiet v|verbose].freeze,
+          build: %w[clean config-settings=qq f|format=b o|output=p].freeze,
+          publish: %w[build dry-run client-cert=p cert=p dist-dir=p p|password=b r|repository=b skip-existing
+                      u|username=b].freeze
+        }.freeze
         OPT_HATCH = {
           common: %w[color interactive no-color no-interactive cache-dir=p config=p data-dir=p e|env=b p|project=e
                      q|quiet v|verbose].freeze,
@@ -36,7 +42,8 @@ module Squared
                       config-file=p cert=p client-cert=p i|identity=b p|password=q r|repository=b repository-url=q
                       sign-with=b u|username=q].freeze
         }.freeze
-        private_constant :REQUIREMENTS, :SETUPTOOLS, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_HATCH, :OPT_TWINE
+        private_constant :REQUIREMENTS, :SETUPTOOLS, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_HATCH,
+                         :OPT_TWINE
 
         class << self
           def populate(*); end
@@ -75,8 +82,8 @@ module Squared
 
         @@tasks[ref] = {
           'install' => %i[user force upgrade target editable].freeze,
-          'build' => %i[python hatch].freeze,
-          'publish' => %i[twine hatch].freeze
+          'build' => %i[python poetry hatch].freeze,
+          'publish' => %i[poetry twine hatch].freeze
         }.freeze
 
         def ref
@@ -130,12 +137,22 @@ module Squared
                       end
                     end
                   when 'build'
-                    format_desc(action, flag, 'opts*', after: flag == :hatch ? 'location?' : 'srcdir?')
+                    format_desc(action, flag, 'opts*', after: case flag
+                                                              when :python
+                                                                'srcdir?'
+                                                              when :hatch
+                                                                'location?'
+                                                              end)
                     task flag do |_, args|
                       buildx flag, args.to_a
                     end
                   when 'publish'
-                    format_desc(action, flag, 'opts*', after: flag == :hatch ? 'artifacts?' : 'dist?')
+                    format_desc(action, flag, 'opts*', after: case flag
+                                                              when :hatch
+                                                                'artifacts?'
+                                                              when :twine
+                                                                'dist?'
+                                                              end)
                     task flag do |_, args|
                       publish flag, args.to_a
                     end
@@ -151,22 +168,27 @@ module Squared
             super
           elsif outdated?
             workspace.rev_clear name
-            cmd = pip_session 'install'
-            case flag
-            when :user
-              cmd << "--#{flag}"
-            when :target
-              cmd << quote_option('target', basepath(target))
-            when :force
-              cmd << '--force-reinstall'
+            if !flag && dependtype == 4
+              cmd = session 'poetry', 'install'
+              cmd << '--no-root' if option('no-root')
             else
-              append_global
-            end
-            append_pip(flag, opts, from: :install) if flag
-            if dependtype == 1 && !session_arg?('e', 'editable')
-              cmd << '-r requirements.txt' unless session_arg?('r', 'requirement')
-            elsif !session_arg?('e', 'editable', value: true)
-              cmd << '.'
+              cmd = pip_session 'install'
+              case flag
+              when :user
+                cmd << "--#{flag}"
+              when :target
+                cmd << quote_option('target', basepath(target))
+              when :force
+                cmd << '--force-reinstall'
+              else
+                append_global
+              end
+              append_pip(flag, opts, from: :install) if flag
+              if dependtype == 1 && !session_arg?('e', 'editable')
+                cmd << '-r requirements.txt' unless session_arg?('r', 'requirement')
+              elsif !session_arg?('e', 'editable', value: true)
+                cmd << '.'
+              end
             end
             run(from: :depend, sync: sync)
           end
@@ -268,6 +290,9 @@ module Squared
           when :python
             cmd << shell_option('m', 'build')
             list = OPT_PYTHON[:build] + OPT_PYTHON[:common]
+          when :poetry
+            cmd << 'build'
+            list = OPT_POETRY[:build] + OPT_POETRY[:common]
           when :hatch
             cmd << 'build'
             list = OPT_HATCH[:build] + OPT_HATCH[:common]
@@ -281,7 +306,17 @@ module Squared
               out << opt
             end
           end
-          if flag == :hatch
+          case flag
+          when :poetry
+            if srcdir
+              if session_arg?('o', 'output')
+                out << srcdir
+              else
+                cmd << quote_option('output', basepath(srcdir))
+              end
+              srcdir = nil
+            end
+          when :hatch
             if ENV['HATCH_BUILD_LOCATION']
               srcdir = nil
             else
@@ -298,6 +333,9 @@ module Squared
           cmd = session flag
           out = []
           case flag
+          when :poetry
+            cmd << 'publish'
+            list = OPT_POETRY[:publish] + OPT_POETRY[:common]
           when :twine
             cmd << 'upload'
             list = OPT_TWINE[:publish]
@@ -306,7 +344,7 @@ module Squared
             list = OPT_HATCH[:publish] + OPT_HATCH[:common]
           end
           option_sanitize(opts, list).first.each do |opt|
-            if flag == :hatch && opt =~ /^(v+|q+)$/
+            if flag != :twine && opt =~ /^(v+|q+)$/
               cmd << "-#{$1}"
             else
               out << opt
@@ -315,7 +353,7 @@ module Squared
           if out.empty?
             dist = basepath.join('dist')
             raise_error('no source files given', hint: dist) unless dist.directory? && !dist.empty?
-            out << "#{dist}/*"
+            out << "#{dist}/*" unless flag == :poetry
           end
           append_value out
           run(from: :"#{flag}:publish")

metadata

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