squared 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6a70feacca1b87fbe9d6da4e71045212f5dc5e9add78e93e8223a5f73b6f6d9
-  data.tar.gz: b73756bef57213d92fe4ed5f0763945645315a06a8d084bb32e40105ce78d64e
+  metadata.gz: f0ee3da01c8f4091c2363f6c8b0821cbc742d7dd95a4fda4e6a26e949ce0c61f
+  data.tar.gz: 4642f0e308608a80077cddb81ecc3c03ff58a6baaa066b644c1ae8b922d13668
 SHA512:
-  metadata.gz: 34c45acd9506ad1bc7018c0b0f73e1e2db7623d6b42b7b3199ee7cb7394716a1ec13484d15a71d343415ccd4090a1217579416fba8010b5977cbc324bbf7b849
-  data.tar.gz: 62ac8c5ea8289fcb08dbf1c5e2cca60e06ea5470eb1f8ec1ce667bcce5cc0eec5d67448ac1b2642a7b5af0c2f3e30530f6513374d2642baa2993aca3ad769608
+  metadata.gz: 33f08fcd47d1ac5896a5cc231e8466de17f2edbd2d987fb411c21b8db8cf734b880fefbb4454a69e610a35aa86609e94bac4dc44264e3a10a3cd69efd6429186
+  data.tar.gz: 5e424cb159c5a00512eca6ea9d8a0328082ecb85a30c9e769cd67bbd21d95b16a5d6f906a22a2f2c2d9fecbad5da2721ee1cc4b09722ffbdcbbcbb0a39d0c985

data/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## [0.4.1] - 2025-03-20
+
+### Added
+
+- Status logger messages are written to file.
+- Docker command image action push was implemented.
+- Git command show action textconv was implemented.
+- Docker mounts for container command run is supported.
+
+### Removed
+
+- Git batch commands pull+s and rebase+s were removed.
+
+## [0.3.6] - 2025-03-12
+
+### Added
+
+- Git command stash action clear was implemented.
+
+### Fixed
+
+- Git command stash did not validate index argument.
+- Project graph command does not require arguments.
+- Ruby gem command exec did not add project name.
+
 ## [0.4.0] - 2025-03-06
 
 ### Added
@@ -37,13 +62,16 @@
 
 - Node copy method will only override when key exists.
 - Base command copy and clean can accept a hash.
-- Character methods in Shell common module were removed.
 - ENV build options are merged with base options.
-- Git command diff action cached was removed.
 - Git log and diff uses H0 alias for HEAD~n commit.
 - Project events support multiple associated routines.
 - Git command restore was relocated to "git" task namespace.
 
+### Removed
+
+- Character methods in Shell common module were removed.
+- Git command diff action cached was removed.
+
 ### Fixed
 
 - Git base class did not check for null Logger instance.
@@ -352,7 +380,9 @@
 
 - Changelog was created.
 
+[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
 [0.3.5]: https://github.com/anpham6/squared/releases/tag/v0.3.5-ruby
 [0.3.4]: https://github.com/anpham6/squared/releases/tag/v0.3.4-ruby
 [0.3.3]: https://github.com/anpham6/squared/releases/tag/v0.3.3-ruby

data/README.ruby.md

@@ -105,8 +105,11 @@ Workspace::Application
     variable_set :clean, ["build/sqd/"]
   end
   .with(:docker, pass: ["unpack"]) do
-    .add("squared", "docker", file: "Dockerfile", context: ".", tag: "latest", args: "--ssh=default", secrets: ["id=github,env=GITHUB_TOKEN"]) do # Docker
-      series(:clean) do                                                                                                                           # run | depend | doc | lint | test | copy | clean
+    .add("squared", "docker", file: "Dockerfile", context: ".", tag: "latest", registry: "localhost:5000", username: "squared",
+                              args: "--ssh=default",
+                              secrets: ["id=github,env=GITHUB_TOKEN"],
+                              mounts: ["src=.,dst=/project,ro,bind-propagation=rshared"]) do # Docker
+      series(:clean) do                                                                      # run | depend | doc | lint | test | copy | clean
         File.read(basepath("docker-bake.hcl"))
             .scan(/\btags\s+=\s+\["([^"]+)"\]/)
             .each { |val| image(:rm, tag: val.first) }

data/lib/squared/common/format.rb

@@ -118,7 +118,7 @@ module Squared
           if !val.is_a?(::Numeric)
             val = val.to_sym
             ret << val if colors.key?(val) || TEXT_STYLE.include?(val)
-          elsif val >= 0 && val <= 256
+          elsif val.between?(0, 256)
             ret << val
           elsif val < 0 && (b = val.to_s.split('.')[1])
             b = b[0, 3]
@@ -170,10 +170,15 @@ module Squared
         color ? sub_style(ret, *styles) : ret
       end
 
-      def log_message(level, *args, subject: nil, hint: nil, color: ARG[:COLOR], pass: false)
-        return false if !pass && level.is_a?(::Numeric) && level < ARG[:LEVEL]
-
+      def log_message(level, *args, subject: nil, hint: nil, color: ARG[:COLOR], append: true, pass: false)
         args = args.map(&:to_s)
+        if level.is_a?(::Numeric)
+          if append && respond_to?(:log)
+            ref = log rescue nil
+            ref.add(level, message(subject, *args, hint: hint, space: ', ')) if ref.is_a?(Logger)
+          end
+          return false if !pass && level < ARG[:LEVEL]
+        end
         if args.size > 1 && !hint
           title = log_title(level, color: false)
           sub = { pat: /^(#{title})(.+)$/, styles: __get__(:theme)[:logger][log_sym(level)] } if color
@@ -209,8 +214,8 @@ module Squared
 
       module_function
 
-      def message(*args, hint: nil, empty: false)
-        (empty ? args.reject { |val| val.nil? || val.empty? } : args).join(ARG[:SPACE]) + (hint ? " (#{hint})" : '')
+      def message(*args, hint: nil, empty: false, space: ARG[:SPACE])
+        (empty ? args.reject { |val| val.nil? || val.empty? } : args).join(space) + (hint ? " (#{hint})" : '')
       end
 
       def emphasize(val, title: nil, footer: nil, right: false, cols: nil, sub: nil, border: nil, pipe: nil)

data/lib/squared/common/utils.rb

@@ -12,6 +12,19 @@ module Squared
         val.split(/\s*(?<!\\)#{char}\s*/o)
       end
 
+      def split_option(val)
+        val = val.strip
+        return [val, '', ''] unless (i = val.index('='))
+
+        last = val[i + 1..-1].strip
+        quote = ''
+        if last =~ /^(["'])(.+)\1$/
+          last = $2
+          quote = $1
+        end
+        [val[0..i - 1], last, quote]
+      end
+
       def task_invoke(*cmd, args: [], exception: true, warning: true)
         cmd.each { |name| Rake::Task[name].invoke(*args) }
       rescue StandardError => e
@@ -141,7 +154,7 @@ module Squared
             return ret.to_i
           end
         when ::Numeric
-          return key if key >= 0 && key <= 2
+          return key if key.between?(0, 2)
         end
         default
       end

data/lib/squared/version.rb

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

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

@@ -264,7 +264,7 @@ module Squared
 
                     format_desc action, flag, '(-)project*'
                     task flag do |_, args|
-                      args = param_guard(action, flag, args: args.to_a.reject { |val| name == val.to_s })
+                      args = args.to_a.reject { |val| name == val.to_s }
                       if flag == :run
                         graph args
                       else
@@ -871,7 +871,7 @@ module Squared
               log&.warn "ENV was discarded: #{var}" if var
               task_invoke(cmd, exception: exception, warning: warning?)
             else
-              print_item format_banner(cmd, banner: banner) if sync
+              print_item format_banner(cmd, banner: banner) if sync && !env('BANNER', equals: '0')
               args = var.is_a?(Hash) ? [var, cmd] : [cmd]
               shell(*args, chdir: chdir, exception: exception)
             end
@@ -970,7 +970,13 @@ module Squared
                 next if pass.include?(meth)
 
                 if workspace.task_defined?(cmd = task_join(proj.name, meth))
+                  if ENV.key?(key = "BANNER_#{proj.name.upcase}")
+                    key = nil
+                  else
+                    ENV[key] = '0'
+                  end
                   run(cmd, sync: false, banner: false)
+                  ENV.delete(key) if key
                 elsif proj.has?(meth, tasks || group ? nil : workspace.baseref)
                   proj.__send__(meth.to_sym, sync: sync)
                 end

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

@@ -42,7 +42,7 @@ module Squared
                     env-file=p expose=e gpus=q group-add=b health-cmd=q health-interval=b health-retries=i
                     health-start-interval=b health-start-period=b health-timeout=b h|hostname=e io-maxbandwidth=b
                     io-maxiops=b ip=b ip6=e ipc=b isolation=b kernel-memory=b l|label=q label-file=p link=b
-                    link-local-ip=b log-driver=b log-opt=q mac-address=e memory-swappiness=b mount=q name=b network=b
+                    link-local-ip=b log-driver=b log-opt=q mac-address=e memory-swappiness=b mount=qq name=b network=b
                     network-alias=b oom-score-adj=b pid=b platform=b p|publish=e pull=b restart=b runtime=b
                     security-opt=q shm-size=b sig-proxy=b? stop-signal=b stop-timeout=i storage-opt=q sysctl=q tmpfs=q
                     ulimit=q user=e userns=b uts=b v|volume=q volume-driver=b volumes-from=b w|workdir=q].freeze,
@@ -61,11 +61,17 @@ module Squared
           }.freeze,
           image: {
             list: %w[a|all digests no-trunc f|filter=q format=q].freeze,
-            push: %w[disable-content-trust=b? platform=b q|quiet].freeze,
+            push: %w[a|all-tags disable-content-trust=b? platform=b q|quiet].freeze,
             rm: %w[f|force no-prune].freeze
           }.freeze
         }.freeze
-        private_constant :COMPOSEFILE, :BAKEFILE, :OPT_DOCKER
+        VAL_DOCKER = {
+          run: {
+            bind: %w[type source src destination dst target readonly ro bind-propagation].freeze,
+            tmpfs: %w[type destination dst target tmpfs-size tmpfs-mode].freeze
+          }.freeze
+        }.freeze
+        private_constant :COMPOSEFILE, :BAKEFILE, :OPT_DOCKER, :VAL_DOCKER
 
         class << self
           def tasks
@@ -82,7 +88,7 @@ module Squared
         @@tasks[ref] = {
           'build' => %i[tag context bake].freeze,
           'compose' => %i[build run exec up].freeze,
-          'image' => %i[list rm].freeze,
+          'image' => %i[list rm push].freeze,
           'container' => %i[run exec update commit inspect diff start stop restart pause unpause top stats kill
                             rm].freeze
         }.freeze
@@ -90,14 +96,15 @@ module Squared
         attr_reader :context
         attr_accessor :tag
 
-        def initialize(*, file: nil, context: nil, tag: nil, secrets: nil, registry: nil, **kwargs)
+        def initialize(*, file: nil, context: nil, tag: nil, secrets: nil, mounts: [], registry: nil, **kwargs)
           super
           return unless dockerfile(file).exist?
 
           @context = context
           @tag = tag || "#{@project}:latest"
+          @mounts = mounts
           @secrets = secrets
-          @registry = registry
+          @registry = [registry, kwargs[:username]].compact.join('/')
           initialize_ref Docker.ref
           initialize_logger(**kwargs)
           initialize_env(**kwargs)
@@ -169,9 +176,18 @@ module Squared
                       end
                     end
                   when 'image'
-                    format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
-                    task flag do |_, args|
-                      image flag, args.to_a
+                    case flag
+                    when :push
+                      format_desc action, flag, 'tag,registry/username?,opts*'
+                      task flag, [:tag] do |_, args|
+                        tag = param_guard(action, flag, args: args, key: :tag)
+                        image(flag, args.to_a.drop(1), id: tag)
+                      end
+                    else
+                      format_desc(action, flag, flag == :rm ? 'id*,opts*' : 'opts*,args*')
+                      task flag do |_, args|
+                        image flag, args.to_a
+                      end
                     end
                   end
                 end
@@ -299,7 +315,39 @@ module Squared
           out = option_sanitize(opts, list, first: flag == :exec).first
           from = :"container:#{flag}"
           case flag
-          when :exec, :run
+          when :run, :exec
+            if flag == :run && !session_arg?('mount')
+              run = VAL_DOCKER[:run]
+              both = run[:bind] + run[:tmpfs]
+              diff = run[:bind].reject { |val| run[:tmpfs].include?(val) }
+              delim = Regexp.new(",\\s*(?=#{both.join('|')})")
+              as_a(@mounts).each do |val|
+                args = []
+                tmpfs = true
+                val.split(delim).each do |opt|
+                  k, v, q = split_option(opt)
+                  next unless both.include?(k)
+
+                  if k == 'type'
+                    tmpfs = false if v == 'bind'
+                    next
+                  elsif diff.include?(k)
+                    tmpfs = false
+                  end
+                  case k
+                  when 'readonly', 'ro'
+                    args << k
+                    next
+                  when 'source', 'src', 'destination', 'dst', 'target'
+                    v = basepath(v)
+                    v = shell_quote(v, option: false, force: false) if q == ''
+                    tmpfs = false if k[0] == 's'
+                  end
+                  args << "#{k}=#{q + v + q}"
+                end
+                cmd << "--mount type=#{tmpfs ? 'tmpfs' : 'bind'},#{args.join(',')}"
+              end
+            end
             append_command(flag, id.to_s.empty? ? tag : id, out, target: cmd, from: from)
           when :update
             raise_error('missing container', hint: from) if out.empty?
@@ -405,12 +453,14 @@ module Squared
             end
           when :push
             id ||= tag
+            registry ||= out.shift || @registry
             raise_error(id ? "unknown args: #{out.join(', ')}" : 'no id/tag given', hint: from) unless id && out.empty?
-            reg = (registry || @registry).chomp('/')
-            uri = shell_quote("#{reg}/#{id}")
+            raise_error('username/registry not provided', hint: from) unless registry
+            registry.chomp!('/')
+            uri = shell_quote("#{registry}/#{id}")
             cmd << uri
             img = docker_output 'image', 'tag', id, uri
-            return unless confirm_command(img.to_s, cmd.to_s, target: id, as: reg, title: from)
+            return unless confirm_command(img.to_s, cmd.to_s, target: id, as: registry, title: from)
 
             run(img, exception: true, sync: false, banner: false)
           end

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

@@ -145,6 +145,8 @@ module Squared
 
     module Project
       class Git < Base
+        include Prompt
+
         OPT_GIT = {
           common: %w[bare p|paginate P|no-pager glob-pathspecs icase-pathspecs literal-pathspecs no-optional-locks
                      no-replace-objects noglob-pathspecs c=q config-env=q exec-path=p namespace=p].freeze,
@@ -300,10 +302,6 @@ module Squared
             %i[pull rebase fetch clone stash status branch revbuild].freeze
           end
 
-          def batchargs
-            [ref, { 'pull+s': %i[stash pull], 'rebase+s': %i[stash rebase] }]
-          end
-
           def config?(val)
             return false unless (val = as_path(val))
 
@@ -326,8 +324,8 @@ module Squared
           'refs' => %i[heads tags remote].freeze,
           'reset' => %i[commit index patch mode].freeze,
           'rev' => %i[commit branch output parseopt build].freeze,
-          'show' => %i[format oneline].freeze,
-          'stash' => %i[push pop apply drop list].freeze,
+          'show' => %i[format oneline textconv].freeze,
+          'stash' => %i[push pop apply drop clear list].freeze,
           'tag' => %i[add delete list].freeze
         }.freeze
 
@@ -579,12 +577,18 @@ module Squared
                     when :oneline
                       format_desc action, flag, 'opts*,object*'
                       task flag do |_, args|
-                        show 'oneline', args.to_a.push('abbrev-commit')
+                        show flag, args.to_a.push('abbrev-commit')
                       end
                     when :format
                       format_desc action, flag, 'format?,opts*,object*'
                       task flag, [:format] do |_, args|
-                        show args.format, args.extras
+                        show(flag, args.extras, format: args.format)
+                      end
+                    when :textconv
+                      format_desc action, flag, 'files+'
+                      task flag do |_, args|
+                        files = param_guard(action, flag, args: args.to_a)
+                        show(flag, files: files)
                       end
                     end
                   when 'rebase', 'merge'
@@ -783,8 +787,15 @@ module Squared
             when :push
               append_pathspec refs
             when :pop, :apply, :drop
-              cmd << shell_quote(refs.pop)
-              option_clear refs
+              unless refs.empty?
+                cmd << shell_escape(refs.pop)
+                option_clear refs
+              end
+            when :clear
+              if confirm("Remove #{sub_style('all', styles: theme[:active])} the stash entries? [y/N] ", 'N')
+                source(stdout: true)
+              end
+              return
             when :list
               out, banner, from = source(io: true)
               print_item banner
@@ -1218,8 +1229,21 @@ module Squared
           source(stdout: stdout)
         end
 
-        def show(format, opts = [])
+        def show(flag, opts = [], format: nil, files: [])
           cmd, opts = git_session('show', opts: opts)
+          case flag
+          when :textconv
+            cmd << '--textconv'
+            files = files.map { |val| Dir[val] }
+                         .flatten
+                         .select { |val| projectpath?(val) }
+                         .map { |val| shell_quote("HEAD:#{val}") }
+            append_value files
+            source(banner: false)
+            return
+          when :oneline
+            format = flag.to_s
+          end
           if format
             case (val = format.downcase)
             when 'oneline', 'short', 'medium', 'full', 'fuller', 'reference', 'email', 'raw'

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

@@ -4,8 +4,6 @@ module Squared
   module Workspace
     module Project
       class Node < Git
-        include Prompt
-
         OPT_NPM = {
           common: %w[dry-run include-workspace-root workspaces=b? w|workspace=b].freeze,
           install: %w[prefer-dedupe package-lock-only cpu=b libc=b os=b].freeze,

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

@@ -40,7 +40,6 @@ module Squared
 
         class << self
           def populate(*); end
-          def batchargs(*); end
 
           def tasks
             [:outdated].freeze

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

@@ -39,7 +39,6 @@ module Squared
 
         class << self
           def populate(*); end
-          def batchargs(*); end
 
           def tasks
             [:outdated].freeze
@@ -155,7 +154,7 @@ module Squared
                     when 'gem'
                       case flag
                       when :outdated, :build, :push, :exec
-                        format_desc action, flag, 'opts*'
+                        format_desc(action, flag, 'opts*', before: flag == :exec ? 'command+' : nil)
                         task flag do |_, args|
                           gemx flag, args.to_a
                         end
@@ -471,7 +470,7 @@ module Squared
             end
           when :exec
             raise_error('no command given', hint: flag) if out.empty?
-            cmd << out.join(' ')
+            cmd << project << out.join(' ')
           else
             raise_error('no gemname given', hint: flag) if out.empty? && !session_arg?('system')
             if flag == :pristine

metadata

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