squared 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cf1642a52eeb080a0aa4dadb9c7fb5a3060612904bd06a8161ab18b4e333a9a
-  data.tar.gz: 7bad82be155782b37036cc2d447395a37585ed33b4d37c5281e3ccd3f902ea33
+  metadata.gz: 483002a469a23461dcee07ded3610011d831f2c737142cd4b464899fbdf70cde
+  data.tar.gz: 4601b03b61f6270e8b3841777effd420b47c752ddbe96924ca329ee92c98ee4c
 SHA512:
-  metadata.gz: 77fda3077ec4c929fad3003d7255d5aeb7b0f7fa2d14a717678772572a3a972214247aabc6911d8e717103b855ae1109c81c118ca5564f46fd4e79ecfc62cf6a
-  data.tar.gz: 29e84ae67dc2aad4ac61c99407443d65210f96af60649784c9264a75c686473b919328a9ea6d97b6bda6e4fd61aeaa97df4e196bdf87f6e32819dfea1306c76a
+  metadata.gz: 5767519e7f0150a753c0cbf97aa59292ad59a29b4f78c6e7596e5bd369b035258339d062b896c59d37496ccdcd4224179a745065f1dc41a35f876a507f30e171
+  data.tar.gz: c457cbd60b4865aea1e218ce9609c4094f618cc4b404eac309c8235b3bc116599487d1c641151cd99bceab6d28a03b48abd1774e447017afb2d28439aca40298

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [0.4.8] - 2025-04-21
+
+### Added
+
+- Workspace project tasks can be executed with a block.
+- Gem command outdated supports semantic version upgrades.
+- Project task unpack supports "gem" extension.
+- Ruby command version was implemented.
+- Ruby command file and script were implemented.
+- Git global command autostash was created.
+- Workspace static method exclude for global tasks was created.
+- Git command checkout action branch and track are interactive.
+- Git command branch action set and delete are interactive.
+- Git command tag action delete is interactive.
+- Docker command image run and container exec are interactive.
+- Docker command network connect and disconnect are interactive.
+
+### Changed
+
+- Project methods with conflicting names were given "!" suffix.
+- Docker exec args are run without escape protection.
+- Format method enable_aixterm no longer accepts a block.
+
+### Fixed
+
+- Git command log action view did not parse options.
+- Project task unpack did not use custom extensions.
+- Docker did not append secrets when given a string.
+
 ## [0.4.7] - 2025-04-17
 
 ### Added
@@ -533,6 +562,7 @@
 
 - Changelog was created.
 
+[0.4.8]: https://github.com/anpham6/squared/releases/tag/v0.4.8-ruby
 [0.4.7]: https://github.com/anpham6/squared/releases/tag/v0.4.7-ruby
 [0.4.6]: https://github.com/anpham6/squared/releases/tag/v0.4.6-ruby
 [0.4.5]: https://github.com/anpham6/squared/releases/tag/v0.4.5-ruby

data/README.ruby.md

@@ -278,6 +278,10 @@ Workspace::Application
   .with(:ruby) do
     run("gem build")                                                           # gem build
     # OR
+    run("gem build", on: { first: -> { p "2" }, last: -> { p "4" } }) do       # run | depend | graph | clean | doc | lint | test
+      p "1"
+    end
+    # OR
     run(["gem build", "--force", { "RUBY_VERSION" => "3.4.0" }])               # RUBY_VERSION="3.4.0" gem build --force
     # OR
     run({                                                                      #
@@ -448,6 +452,8 @@ Most project classes will inherit from `Git` which enables these tasks:
 You can disable all of them at once using the `exclude` property.
 
 ```ruby
+Workspace::Application.exclude('autostash', 'rebase')
+
 Workspace::Application
   .new
   .add("squared", exclude: :git)
@@ -462,6 +468,15 @@ Workspace::Application
   .pass("pull", ref: :node) { read_packagemanager(:private) }
 ```
 
+### Commit Hash
+
+Commands which use commit hashes are parsed using string interpolation format as to not be confused for an option.
+
+```sh
+rake squared:log:view[#{af012345}]             # git log af012345
+rake squared:log:view[H1,H5,all,lib,./H12345]  # git log --all HEAD~1 HEAD~5 -- 'lib' 'H12345'
+```
+
 ## Environment
 
 ### Path
@@ -592,6 +607,7 @@ DOCKER_OPTIONS=q,no-cache                # all
 DOCKER_OPTIONS_${NAME}=v,no-cache=false  # project only (override)
 DOCKER_TAG=latest                        # all
 DOCKER_TAG_${NAME}=v0.1.0                # project only (override)
+DOCKER_ALL=1                             # list every image/container
 ```
 
 | Command    | Flag              |  ENV                                            |

data/lib/squared/common/base.rb

@@ -11,6 +11,7 @@ module Squared
       COMMON: true,
       VERBOSE: nil,
       BANNER: true,
+      CHOICE: 25,
       QUOTE: "'",
       SPACE: ' => ',
       GRAPH: ['|', '-', '|', '\\', '-'].freeze,

data/lib/squared/common/class.rb

@@ -12,7 +12,7 @@ module Squared
         super[/[^:]+\z/, 0]
       end
 
-      def_delegators :@data, :+, :each, :each_with_index, :entries, :merge, :to_a, :include?
+      def_delegators :@data, :+, :each, :each_with_index, :entries, :merge, :include?
 
       def initialize(data = [])
         @data = Set.new(data)
@@ -22,6 +22,10 @@ module Squared
         @data.add(val.to_sym)
       end
 
+      def to_a
+        @data.to_a.freeze
+      end
+
       def to_s
         @data.to_s.sub('Set', SymSet.to_s)
       end
@@ -71,6 +75,20 @@ module Squared
         block_given? ? ret.reject(&blk) : ret
       end
 
+      def and(*args)
+        self << '&&'
+        merge(args)
+      end
+
+      def or(*args)
+        self << '||'
+        merge(args)
+      end
+
+      def with(*args, &blk)
+        temp('&&', *args, &blk)
+      end
+
       def temp(*args, &blk)
         args.compact!
         ret = pass(&blk)

data/lib/squared/common/format.rb

@@ -28,18 +28,22 @@ module Squared
         bright_cyan!: '106',
         bright_white!: '107'
       }.freeze
-      AIX_GRAPH = ['│', '─', '├', '└', '┬'].freeze
-      AIX_BORDER = ['│', '─', '╭', '╮', '╯', '╰', '├', '┤', '┬', '┴'].freeze
+      BOX_GRAPH = ['│', '─', '├', '└', '┬'].freeze
+      BOX_BORDER = ['│', '─', '╭', '╮', '╯', '╰', '├', '┤', '┬', '┴'].freeze
       TEXT_STYLE = [:bold, :dim, :italic, :underline, :blinking, nil, :inverse, :hidden, :strikethrough].freeze
-      private_constant :AIX_TERM, :AIX_GRAPH, :AIX_BORDER, :TEXT_STYLE
+      private_constant :AIX_TERM, :BOX_GRAPH, :BOX_BORDER, :TEXT_STYLE
 
       def enable_aixterm
         unless (colors = __get__(:colors)).frozen?
           colors.merge!(AIX_TERM)
-          ARG[:GRAPH] = AIX_GRAPH
-          ARG[:BORDER] = AIX_BORDER
         end
-        block_given? ? yield(self) : self
+        self
+      end
+
+      def enable_drawing
+        ARG[:GRAPH] = BOX_GRAPH
+        ARG[:BORDER] = BOX_BORDER
+        self
       end
 
       private
@@ -68,16 +72,16 @@ module Squared
           end
           if type.is_a?(::Numeric)
             f, b = type.to_s.split('.')
-            s = wrap.(s, ['38', '5', f]) if f[0] != '-' && f.to_i <= 255
+            s = wrap.call(s, ['38', '5', f]) if f[0] != '-' && f.to_i <= 255
             if b
               b = b[0, 3]
-              s = wrap.(s, ['48', '5', b]) unless b.to_i > 255
+              s = wrap.call(s, ['48', '5', b]) unless b.to_i > 255
             end
           else
             t = type.to_sym
             if (c = __get__(:colors)[t])
               if index == -1
-                s = wrap.(s, [c])
+                s = wrap.call(s, [c])
               else
                 code << c
               end
@@ -95,7 +99,7 @@ module Squared
         end
         return ret.join if index == -1
 
-        ret = wrap.(ret, code) unless code.empty?
+        ret = wrap.call(ret, code) unless code.empty?
         return ret unless data
 
         out = ''.dup
@@ -133,9 +137,9 @@ module Squared
 
         set = ->(k, v) { data[k] = check_style(v, empty: empty) }
         if key.is_a?(::Hash)
-          key.each { |k, v| set.(k, v || args) }
+          key.each { |k, v| set.call(k, v || args) }
         else
-          set.(key.to_sym, args)
+          set.call(key.to_sym, args)
         end
       end
 
@@ -219,18 +223,18 @@ module Squared
         max = ->(v) { n = [n, v.max_by(&:size).size].max }
         set = lambda do |v|
           ret = as_a(v, :to_s)
-          max.(ret)
+          max.call(ret)
           ret
         end
-        title &&= set.(title)
-        footer &&= set.(footer)
+        title &&= set.call(title)
+        footer &&= set.call(footer)
         if val.is_a?(::Array)
           lines = val.map(&:to_s)
         else
           lines = val.to_s.lines(chomp: true)
           lines[0] = "#{val.class}: #{lines.first}" if (err = val.is_a?(StandardError))
         end
-        n = cols || max.(lines)
+        n = cols || max.call(lines)
         if $stdout.tty?
           require 'io/console'
           (n = [n, $stdout.winsize[1] - 4].min) rescue nil
@@ -253,13 +257,13 @@ module Squared
           end
           s
         end
-        out << draw.(b2, b3)
+        out << draw.call(b2, b3)
         if title
-          out.concat(title.map { |t| pr.(t) })
-          out << draw.(b6, b7)
+          out.concat(title.map { |t| pr.call(t) })
+          out << draw.call(b6, b7)
         end
-        lines.each { |line| out << pr.(line) }
-        out << draw.(b5, b4)
+        lines.each { |line| out << pr.call(line) }
+        out << draw.call(b5, b4)
         if footer
           unless sub.empty? && !right
             footer.map! do |s|

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
@@ -31,6 +31,44 @@ module Squared
           end
         end
       end
+
+      def choice(msg, list = nil, min: 1, max: 1, multiple: false, attempts: 5, timeout: 60)
+        require 'readline'
+        require 'timeout'
+        if list
+          items = []
+          list.each_with_index do |val, index|
+            puts "#{index.succ.to_s.rjust(2)}. #{val}"
+            items << val.chomp
+          end
+          max = items.size
+          msg = "#{msg}: [1-#{max}#{multiple ? '|,' : ''}] "
+        end
+        return unless max >= min
+
+        valid = ->(s) { s.match?(/^-?\d+$/) && s.to_i.between?(min, max) }
+        Timeout.timeout(timeout) do
+          begin
+            while (ch = Readline.readline(msg, true))
+              ch = ch.strip
+              if multiple
+                a = ch.split(/\s*,\s*/)
+                b = a.select { |s| valid.call(s) }.map!(&:to_i)
+                return items ? b.map! { |i| items[i - 1] } : b if a.size == b.size
+              elsif valid.call(ch)
+                return items ? items[ch.to_i - 1] : ch.to_i
+              end
+              attempts -= 1
+              exit 1 unless attempts > 0
+            end
+          rescue Interrupt
+            puts
+            exit 0
+          else
+            multiple ? [] : nil
+          end
+        end
+      end
     end
   end
 end

data/lib/squared/common/shell.rb

@@ -21,11 +21,13 @@ module Squared
             r[1] + r[2] + r[4] + shell_quote(opt, double: double, force: force, override: override)
           end
           if r[5] == r[7]
-            r[5] ? val : combine.(r[6])
+            r[5] ? val : combine.call(r[6])
           else
             force = true
-            combine.(r[5] + r[6] + r[7])
+            combine.call(r[5] + r[6] + r[7])
           end
+        elsif val.empty?
+          ''
         elsif Rake::Win32.windows?
           quote ? shell_quote(val, double: double, force: force) : val
         else
@@ -35,7 +37,7 @@ module Squared
 
       def shell_quote(val, option: true, force: true, double: false, override: false)
         val = val.to_s
-        return val if !force && !val.include?(' ')
+        return val if val.empty? || (!force && !val.include?(' '))
         return val if option && val.match?(/(?:\A|\S=|[^=]\s+|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/m)
 
         if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
@@ -45,8 +47,8 @@ module Squared
         end
       end
 
-      def shell_option(flag, val = nil, escape: true, quote: true, force: true, double: false, override: false,
-                       merge: false)
+      def shell_option(flag, val = nil, escape: true, quote: true, option: true, force: true, double: false,
+                       merge: false, override: false)
         flag = flag.to_s
         if flag =~ /\A(["'])(.+)\1\z/
           double = $1 == '"'
@@ -66,8 +68,10 @@ module Squared
         "#{a}#{flag}#{if val
                         "#{b}#{if escape
                                  shell_escape(val, quote: quote, double: double, override: override)
+                               elsif quote
+                                 shell_quote(val, option: option, force: force, double: double, override: override)
                                else
-                                 quote ? shell_quote(val, force: force, double: double, override: override) : val
+                                 val
                                end}"
                       end}"
       end
@@ -88,8 +92,8 @@ module Squared
         shell_escape(val.start_with?('-') ? val : "--#{val}", double: double)
       end
 
-      def quote_option(flag, val, double: false)
-        shell_option(flag, val, escape: false, double: double)
+      def quote_option(flag, val, option: true, double: false, merge: false)
+        shell_option(flag, val, escape: false, option: option, double: double, merge: merge)
       end
 
       def basic_option(flag, val, merge: false)

data/lib/squared/common/system.rb

@@ -89,7 +89,7 @@ module Squared
         case link
         when 'hard', 1
           FileUtils.ln(src, dest, force: force, verbose: verbose)
-        when true, 'soft', 0
+        when TrueClass, 'soft', 0
           FileUtils.ln_s(src, dest, force: force, verbose: verbose)
         else
           FileUtils.cp(src, dest, verbose: verbose)

data/lib/squared/common/utils.rb

@@ -131,7 +131,7 @@ module Squared
 
       def env_bool(key, default = false, suffix: nil, strict: false, index: false)
         case key
-        when nil
+        when ::NilClass
           default
         when ::String
           case (val = env_value(key, suffix: suffix, strict: strict))
@@ -148,14 +148,6 @@ module Squared
       end
 
       def env_pipe(key, default = 1, suffix: nil, strict: false, root: nil)
-        if default.is_a?(::String)
-          begin
-            default = (root ? Pathname.new(root).join(default) : Pathname.new(default)).realdirpath
-          rescue StandardError => e
-            default = 1
-            warn e
-          end
-        end
         case key
         when ::String
           case (ret = env_value(key, suffix: suffix, strict: strict))
@@ -165,7 +157,16 @@ module Squared
         when ::Numeric
           return key if key.between?(0, 2)
         end
-        default
+        begin
+          if default.is_a?(::String)
+            default = (root ? Pathname.new(root).join(default) : Pathname.new(default)).realdirpath
+          end
+        rescue StandardError => e
+          warn e
+          1
+        else
+          default
+        end
       end
 
       def env_match(key, default = nil, suffix: nil, strict: false, options: 0, timeout: nil)

data/lib/squared/config.rb

@@ -38,7 +38,6 @@ module Squared
       end
 
       @@mime_obj = {}
-      @@task_desc = Rake::TaskManager.record_task_metadata
 
       attr_reader :main, :name, :project, :theme
       attr_accessor :pipe
@@ -306,7 +305,7 @@ module Squared
       end
 
       def task_desc(command, *ext, target: nil)
-        return unless @@task_desc
+        return unless Rake::TaskManager.record_task_metadata
 
         val = "#{ext.first}[#{target ? '' : "file?=#{File.basename(main)}.#{ext.last},"}keys+]"
         args = *name.split(':').push(command, val)

data/lib/squared/version.rb

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

data/lib/squared/workspace/application.rb

@@ -15,7 +15,8 @@ module Squared
         global: false,
         env: false
       }.freeze
-      private_constant :SCRIPT_OBJ
+      TASK_METADATA = Rake::TaskManager.record_task_metadata
+      private_constant :SCRIPT_OBJ, :TASK_METADATA
 
       class << self
         def implement(*objs, base: false)
@@ -51,6 +52,14 @@ module Squared
           end
         end
 
+        def exclude(*args)
+          @task_exclude.merge(args.map!(&:to_sym))
+        end
+
+        def series_wrap(app)
+          impl_series.new(app, exclude: @task_exclude.to_a)
+        end
+
         def baseref
           impl_project.ref
         end
@@ -64,7 +73,7 @@ module Squared
       end
 
       @kind_project = []
-      @@task_desc = Rake::TaskManager.record_task_metadata
+      @task_exclude = SymSet.new
 
       attr_reader :root, :home, :main, :prefix, :exception, :warning, :pipe, :verbose, :theme, :series, :closed
 
@@ -81,7 +90,7 @@ module Squared
         @home.mkpath rescue nil
         @root = @home.parent
         @prefix = prefix
-        @series = Application.impl_series.new(self)
+        @series = Application.series_wrap(self)
         @project = {}
         @kind = {}
         @extensions = []
@@ -184,36 +193,36 @@ module Squared
         self
       end
 
-      def run(script, group: @group, ref: @ref, on: nil)
-        script_command :run, script, group, ref, on
+      def run(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :run, script, group, ref, on, &blk
       end
 
       def script(script, group: @group, ref: @ref, on: nil)
         script_command :script, script, group, ref, on
       end
 
-      def depend(script, group: @group, ref: @ref, on: nil)
-        script_command :depend, script, group, ref, on
+      def depend(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :depend, script, group, ref, on, &blk
       end
 
       def graph(script, group: @group, ref: @ref, on: nil)
         script_command :graph, as_a(script, :to_s).freeze, group, ref, on
       end
 
-      def clean(script, group: @group, ref: @ref, on: nil)
-        script_command :clean, script, group, ref, on
+      def clean(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :clean, script, group, ref, on, &blk
       end
 
-      def doc(script, group: @group, ref: @ref, on: nil)
-        script_command :doc, script, group, ref, on
+      def doc(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :doc, script, group, ref, on, &blk
       end
 
-      def lint(script, group: @group, ref: @ref, on: nil)
-        script_command :lint, script, group, ref, on
+      def lint(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :lint, script, group, ref, on, &blk
       end
 
-      def test(script, group: @group, ref: @ref, on: nil)
-        script_command :test, script, group, ref, on
+      def test(script = nil, group: @group, ref: @ref, on: nil, &blk)
+        script_command :test, script, group, ref, on, &blk
       end
 
       def log(script, group: @group, ref: @ref)
@@ -408,7 +417,7 @@ module Squared
       end
 
       def task_desc(*args, **kwargs)
-        return unless @@task_desc
+        return unless TASK_METADATA
 
         name = kwargs.delete(:name)
         if @describe
@@ -422,7 +431,7 @@ module Squared
           @describe[:replace].each do |pat, tmpl|
             next unless val =~ pat
 
-            val = replace.($~, tmpl.dup)
+            val = replace.call($~, tmpl.dup)
             found = true
           end
           if (out = @describe[:alias][val])
@@ -432,7 +441,7 @@ module Squared
             @describe[:pattern].each do |key, pat|
               next unless val =~ pat
 
-              val = replace.($~, key.dup)
+              val = replace.call($~, key.dup)
               found = true
               break
             end
@@ -495,7 +504,7 @@ module Squared
       end
 
       def format_desc(val, opts = nil, arg: 'opts*', before: nil, after: nil, out: false)
-        return unless @@task_desc || out
+        return unless TASK_METADATA || out
 
         val = val.to_s.split(':') if val.is_a?(String)
         if before || after || opts
@@ -552,6 +561,8 @@ module Squared
       end
 
       def task_include?(obj, key, ref = nil)
+        return false if @series.exclude.include?(key)
+
         task_base?(key) ? obj.has?(key, ref || baseref) : task_extend?(obj, key)
       end
 
@@ -643,7 +654,12 @@ module Squared
         puts_oe(*args, pipe: pipe)
       end
 
-      def script_command(task, val, group, ref, on)
+      def script_command(task, val, group, ref, on, &blk)
+        if block_given?
+          val = Struct.new(:run, :block).new(val, blk)
+        elsif !val
+          return self
+        end
         if group
           label = :group
           items = as_a(group, :to_sym)