squared 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed078210213186745643650b4a73f7f376b5aba7033643c850b48d555c198501
-  data.tar.gz: d4d8c0e6308f3bdc3aca66891980259ad52ce11f3a53112c7a22ae4de9e31f40
+  metadata.gz: c638ae780897008e5115630f70db5a8ce7e1930fd31e7d1984b16d775218e16b
+  data.tar.gz: 231f5fc087b0b3dfcff0289f5601b0c70f0a9e6db63ff7309b7c86d96ae0a1ef
 SHA512:
-  metadata.gz: fcf308f894ee49566103575561b74459afc1aa7e03af8d5c5397c7bb7432dfce996cbb1291f4f81af792d5b1dd8ed6a9075ce7b2fab6f41dca0c56431e38b78c
-  data.tar.gz: 19f25542363b33fa567cbfcb0267c79fbc55a313ce0fba8ab25ec17dd43f276b004b00304e8bfe38dba1338a2e554170a8f1535d1bdc5981407fae6e9bff2bf8
+  metadata.gz: 175e72f4f5821922928b2b95a7f831dc42e91bbc41f093686cd253a68794b4b34db8af2bb9d103871cd19dfdf4d21ddd1d2bf30efdd8a8b4f5a7475be77b9988
+  data.tar.gz: 7c619485cf6d8046ba0e2acd99afcb698137e6342fd68b454c1195f9f32517d133aada79783813c15978eb1af132113aa94c422d425ae76b36a033345c81a4e3

data/CHANGELOG.md

@@ -1,5 +1,79 @@
 # Changelog
 
+## [0.6.2] - 2025-11-08
+
+### Added
+
+- JoinSet methods [add|merge] were aliased to [push|concat].
+- JoinSet supports values that can be used multiple times.
+
+### Changed
+
+- Ruby command rake can multiple indexed tasks with separate options.
+
+### Fixed
+
+- Session global program options were untested and worthless upon draft.
+
+## [0.5.15] - 2025-11-08
+
+### Fixed
+
+- See `0.4.29`.
+
+## [0.4.29] - 2025-11-08
+
+### Fixed
+
+- OptionPartition was created by mistake and is unreliable in every way.
+
+## [0.5.14] - 2025-11-08
+
+### Fixed
+
+- See `0.4.28`.
+
+## [0.4.28] - 2025-11-08
+
+### Fixed
+
+- Project base method build as arrays parsed unrelated arguments.
+- OptionPartition method arg? does not check after "--" delimiter.
+- OptionPartition did not support duplicate values after "--" delimiter.
+- OptionPartition method opt? did not type check for String.
+
+## [0.6.1] - 2025-11-05
+
+### Added
+
+- Ruby method rbs supports stored command options.
+- Ruby command rbs with Steep target was created.
+- Common shell defined String instance method stripquote.
+
+### Fixed
+
+- Project base method run argument series was backwards.
+- Project base choice range did not detect empty list result.
+- Project base method build as arrays parsed unrelated arguments.
+
+## [0.5.13] - 2025-11-05
+
+### Fixed
+
+- See `0.4.27`.
+
+## [0.4.27] - 2025-11-05
+
+### Changed
+
+- OptionPartition does not add quotes when an option flag is detected.
+- Common shell method argument option only parses options with values.
+- Shell options with empty flags are treated as quoted strings.
+
+### Fixed
+
+- OptionPartition did not detect flags with middle dashes.
+
 ## [0.6.0] - 2025-10-31
 
 ### Added
@@ -1277,7 +1351,12 @@
 
 - Changelog was created.
 
+[0.6.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.2
+[0.6.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.1
 [0.6.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.6.0
+[0.5.15]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.15
+[0.5.14]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.14
+[0.5.13]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.13
 [0.5.12]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.12
 [0.5.11]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.11
 [0.5.10]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.10
@@ -1291,6 +1370,9 @@
 [0.5.2]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.2-ruby
 [0.5.1]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.1-ruby
 [0.5.0]: https://github.com/anpham6/squared-ruby/releases/tag/v0.5.0-ruby
+[0.4.29]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.29
+[0.4.28]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.28
+[0.4.27]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.27
 [0.4.26]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.26
 [0.4.25]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.25
 [0.4.24]: https://github.com/anpham6/squared-ruby/releases/tag/v0.4.24

data/lib/squared/common/format.rb

@@ -266,8 +266,8 @@ module Squared
           sub.each { |h| s = sub_style(s, **h) }
           s = "#{b0} #{s} #{b0}"
           if border
-            s = sub_style(s, **opt_style(border, /\A(#{Regexp.escape(b0)})(.+)\z/m))
-            s = sub_style(s, **opt_style(border, /\A(.+)(#{Regexp.escape(b0)})\z/m, 2))
+            s = sub_style(s, **opt_style(border, /\A(#{Regexp.escape(b0)})(.+)\z/om))
+            s = sub_style(s, **opt_style(border, /\A(.+)(#{Regexp.escape(b0)})\z/om, 2))
           end
           s
         end

data/lib/squared/common/shell.rb

@@ -6,11 +6,16 @@ require 'shellwords'
 module Squared
   module Common
     module Shell
+      QUOTE_VALUE = /\A(["'])(.*)\1\z/m.freeze
+      private_constant :QUOTE_VALUE
+
+      String.define_method(:stripquote) { sub(QUOTE_VALUE, '\2') }
+
       module_function
 
       def shell_escape(val, quote: false, force: false, double: false, option: false, override: false)
-        if (r = /\A(--?)([^= ]+)((=|\s+)(["'])?(?(5)(.*)\5|(.*)))?\z/m.match(val = val.to_s))
-          if (data = r[2].match(/\A(["'])(.+)\1\z/))
+        if (r = /\A(--?)([^=\s]+)((=|\s+)(["'])?(?(5)(.*)\5|(.*)))?\z/m.match(val = val.to_s))
+          if (data = r[2].match(QUOTE_VALUE))
             double = data[1] == '"'
             override = true
           elsif !r[3] || r[6]
@@ -25,9 +30,9 @@ module Squared
 
                   r[7]
                 end
-          r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, double: double, force: force, override: override)
-        elsif option && val =~ /\A([^=]+)=(.+)\z/m
-          return val if $2.match?(/\A(["']).+\1\z/m)
+          r[1] + (data ? data[2] : r[2]) + r[4] + shell_quote(opt, force: force, double: double, override: override)
+        elsif option && val =~ /\A(-{0,2}[^\[\]=\s-][^\[\]=\s]*)=(.+)\z/m
+          return val if $2.match?(QUOTE_VALUE)
 
           "#{$1}=%s" % if $2.include?(' ')
                          shell_quote($2, option: false)
@@ -37,7 +42,7 @@ module Squared
                          Shellwords.escape($2)
                        end
         elsif Rake::Win32.windows?
-          quote ? shell_quote(val, double: double, force: force) : val
+          quote ? shell_quote(val, force: force, double: double) : val
         elsif val.empty?
           ''
         else
@@ -45,46 +50,56 @@ module Squared
         end
       end
 
-      def shell_quote(val, option: true, force: true, double: false, override: false)
+      def shell_quote(val, option: true, force: true, double: false, preserve: true, override: false)
         val = val.to_s
         return val if (!force && !val.include?(' ')) || val.empty?
 
-        if option && val.match?(/(?:\A|\A[^=\s]+(?:=|\s+)|#{Rake::Win32.windows? ? '[\\\/]' : '\/'})(["']).+\1\z/mo)
-          val
-        elsif double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
-          "\"#{val.gsub(/(?<!\\)"/, '\\"')}\""
+        if option
+          pat = /\A(?:-[^\[\]=\s-](?:=|\s+)?|(--)?[^\[\]=\s-][^\[\]=\s]*(?(1)(?:=|\s+)|=))(["']).+\2\z/m
+          return val if val.match?(pat)
+        end
+        q = ->(s) { s.gsub("'\\\\''", "'") }
+        if val =~ QUOTE_VALUE
+          return val if $1 == '"' && Rake::Win32.windows? && val.match?(/(?:[#{File::SEPARATOR} ]|\\")/o)
+
+          base = $2 unless preserve
+        end
+        if double || Rake::Win32.windows? || (ARG[:QUOTE] == '"' && !override)
+          "\"#{q.call(base || val).gsub(/(?<!\\)"/, '\\"')}\""
         else
-          "'#{val.gsub("'", "'\\\\''")}'"
+          base ? val : "'#{q.call(val).gsub("'", "'\\\\''")}'"
         end
       end
 
       def shell_option(flag, val = nil, sep: '=', escape: true, quote: true, force: true, double: false, merge: false,
                        override: false)
         flag = flag.to_s
-        if flag =~ /\A(["'])(.+)\1\z/
+        if flag =~ QUOTE_VALUE
           double = $1 == '"'
           flag = $2
           escape = false
           override = true
         end
-        b = if flag[0] == '-'
-              flag[1] == '-' ? sep : ' '
-            elsif flag.size == 1
-              a = '-'
-              merge ? '' : ' '
-            else
-              a = '--'
-              sep
-            end
-        "#{a}#{flag}#{unless val.nil?
-                        "#{b}#{if escape
-                                 shell_escape(val, quote: quote, double: double, override: override)
-                               elsif quote
-                                 shell_quote(val, option: false, force: force, double: double, override: override)
-                               else
-                                 val
-                               end}"
-                      end}"
+        sep = unless flag.empty?
+                if flag[0] == '-'
+                  flag[1] == '-' ? sep : ' '
+                elsif flag.size == 1
+                  pre = '-'
+                  merge ? '' : ' '
+                else
+                  pre = '--'
+                  sep
+                end
+              end
+        "#{pre}#{flag}#{unless val.nil?
+                          "#{sep}#{if escape
+                                     shell_escape(val, quote: quote, double: double, override: override)
+                                   elsif quote
+                                     shell_quote(val, option: false, force: force, double: double, override: override)
+                                   else
+                                     val
+                                   end}"
+                        end}"
       end
 
       def shell_split(val, join: nil, **kwargs)
@@ -131,8 +146,8 @@ module Squared
 
       def shell_bin(name, env: true)
         key = name.upcase
-        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name, option: false, force: false,
-                                                                                          double: true)
+        shell_quote((env && ENV["PATH_#{key}"]) || PATH[key] || PATH[key.to_sym] || name,
+                    option: false, force: false, double: true)
       end
 
       def line_width(lines)
@@ -141,6 +156,7 @@ module Squared
       end
 
       def fill_option(val, **kwargs)
+        return val unless val.is_a?(::String)
         return "-#{val}" if val.match?(/\A(?:[a-z]\d*|\d)\z/i)
 
         shell_escape(val.start_with?('-') ? val : "--#{val}", **kwargs)

data/lib/squared/config.rb

@@ -271,7 +271,7 @@ module Squared
               end
             end
           rescue StandardError
-            log&.warn "#{Viewer}(#{type}) => #{file && "#{file} "}{#{key}: undefined}"
+            log&.warn "#{Viewer}(#{type}) => #{"#{file} " if file}{#{key}: undefined}"
             val = Regexp.escape($!.message)
             key = key.sub(/(#{val})\.|\.(#{val})|(#{val})/) do
               s = "<#{$3 || $2 || $1}>"

data/lib/squared/version.rb

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

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

@@ -553,31 +553,31 @@ module Squared
             cmd = cmd.join(' && ')
           else
             cmd, opts, var, flags, extra = args
-          end
-          if cmd
-            return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
-
-            cmd = as_get cmd, from
-            opts = compose(opts, script: false) if opts && respond_to?(:compose)
-            flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
-            case opts
-            when Hash
-              cmd = Array(cmd).push(flags)
-                              .concat(append_hash(opts, target: [], build: true))
-                              .compact
-                              .join(' ')
-            when Enumerable
-              cmd = Array(cmd).concat(opts.to_a)
-              cmd.map! { |val| "#{val} #{flags}" } if flags
-              cmd = cmd.join(' && ')
+            if cmd
+              return run_b(cmd, sync: sync, from: from) if cmd.is_a?(Proc) || cmd.is_a?(Method)
+
+              cmd = as_get cmd, from
+              opts = compose(opts, script: false) if opts && respond_to?(:compose)
+              flags = append_hash(flags, target: []).join(' ') if flags.is_a?(Hash)
+              cmd = case opts
+                    when Hash
+                      Array(cmd).push(flags)
+                                .concat(append_hash(opts, target: [], build: true))
+                                .compact
+                                .join(' ')
+                    when Enumerable
+                      cmd = Array(cmd).concat(opts.to_a)
+                      cmd.map! { |val| "#{val} #{flags}" } if flags
+                      cmd.join(' && ')
+                    else
+                      [cmd, flags, opts].compact.join(' ')
+                    end
             else
-              cmd = [cmd, flags, opts].compact.join(' ') if opts || flags
-            end
-          else
-            return unless (opts || extra) && respond_to?(:compose)
+              return unless (opts || extra) && respond_to?(:compose)
 
-            cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
-            from = :script if from == :run && script?
+              cmd = compose(as_get(opts, from), flags, script: true, args: extra, from: from)
+              from = :script if from == :run && script?
+            end
           end
           run(cmd, var, sync: sync, banner: banner, from: from)
         end
@@ -596,12 +596,12 @@ module Squared
                 if proj.respond_to?(meth.to_sym)
                   begin
                     proj.__send__(meth, sync: sync)
-                    next
                   rescue StandardError => e
                     on_error(e, :prereqs, exception: true)
                   end
+                else
+                  print_error(name, "method: #{meth}", subject: 'prereqs', hint: 'undefined')
                 end
-                print_error(name, 'method not found', subject: 'prereqs', hint: meth)
               end
             elsif proj.build?
               proj.build(sync: sync)
@@ -769,7 +769,7 @@ module Squared
               end
               break uri = url if data
             end
-            unless data && (ext ||= URI.parse(uri).path[/\.(\w+)(?:\?|\z)/, 1])
+            unless data && (ext ||= URI.decode_www_form_component(URI.parse(uri).path[/\.([\w%]+)(?:\?|\z)/, 1]))
               raise_error(data ? TypeError : RuntimeError, "no content#{data ? ' type' : ''}", hint: uri)
             end
           end
@@ -913,7 +913,7 @@ module Squared
         end
 
         def run(cmd = @session, var = nil, exception: self.exception, sync: true, banner: true, from: nil, chdir: path,
-                interactive: nil, hint: nil, series: true, **)
+                interactive: nil, hint: nil, series: false, **)
           return print_error('no command session started', subject: project, hint: from, pass: true) unless cmd
 
           cmd = cmd.target if cmd.is_a?(OptionPartition)
@@ -1023,6 +1023,8 @@ module Squared
         end
 
         def exist?(*args)
+          return false if (args = args.compact).empty?
+
           basepath(*args).exist?
         end
 
@@ -1359,10 +1361,10 @@ module Squared
           ret = JoinSet.new(cmd.flatten(1))
           if options
             env("#{prefix.upcase}_OPTIONS") do |val|
-              if val.start_with('-')
-                ret.concat(shell_parse(val))
+              if val.start_with?('-')
+                ret.merge(shell_parse(val))
               else
-                split_escape(val) { |opt| ret.last(fill_option(opt), /\A(--?[^= ]+)[= ].+\z/m) }
+                split_escape(val) { |opt| ret.last(fill_option(opt), /\A(--?[^\[\]=\s-][^\[\]=\s]*)[=\s].+\z/m) }
               end
             end
           end
@@ -1468,9 +1470,9 @@ module Squared
           printsucc
         end
 
-        def print_item(*val, series: true)
+        def print_item(*val, series: false)
           puts unless printfirst?
-          printsucc if series
+          printsucc unless series
           puts val unless val.empty? || (val.size == 1 && !val.first)
         end
 
@@ -1699,11 +1701,12 @@ module Squared
                           **kwargs)
           return if list.empty?
 
+          kwargs[:ignore] = false if no && !kwargs.key?(:ignore)
           [].tap do |ret|
             list.flatten.each do |flag|
               next unless (val = option(flag, target: target, **kwargs))
 
-              if val == '0' && no
+              if no && val == '0'
                 flag = "no-#{flag}"
                 val = nil
               end
@@ -1804,6 +1807,12 @@ module Squared
           print_error(e, subject: name)
         end
 
+        def parse_env(key)
+          env(key) do |val|
+            val.start_with?('-') ? shell_parse(val) : split_escape(val).map! { |opt| fill_option(opt) }
+          end || []
+        end
+
         def param_guard(action, flag, args:, key: nil, pat: nil, values: nil)
           if args && key
             val = args.fetch(key, nil)
@@ -1841,7 +1850,7 @@ module Squared
                          force: true, **kwargs)
           puts unless series || printfirst?
           ret = choice(msg, list, multiple: multiple, force: force, **kwargs).tap do |val|
-            next unless val.to_s.empty?
+            next unless !val || val.empty?
 
             exit 1 if force
             return nil
@@ -1853,7 +1862,7 @@ module Squared
             ret = ret.first unless multiple
           end
           if accept
-            hint = Array(ret).map { |val| sub_style(val, styles: theme[:inline]) }.join(', ')
+            hint = Array(ret).map { |val| sub_style(val.to_s, styles: theme[:inline]) }.join(', ')
             accept = Array(accept).map { |val| Array(val) }
             ret = Array(ret) if accept.any? { |val| val[1] == true }
             loop do
@@ -2012,7 +2021,7 @@ module Squared
         end
 
         def indexerror(val, list = nil)
-          raise_error IndexError, "requested index #{val}", hint: list && "of #{list.size}"
+          raise_error IndexError, "requested index #{val}", hint: ("of #{list.size}" if list)
         end
 
         def indexchar
@@ -2333,15 +2342,33 @@ module Squared
         end
 
         def has_value?(target, *args)
+          return false unless target.is_a?(Enumerable)
+
           args = args.first if args.size == 1 && args.first.is_a?(Enumerable)
           case target
           when Hash
             args.is_a?(Enumerable) ? args.any? { |obj| target.value?(obj) } : target.value?(args)
-          when Enumerable
-            args.is_a?(Enumerable) ? args.any? { |obj| target.include?(obj) } : target.include?(args)
           else
-            false
+            args.is_a?(Enumerable) ? args.any? { |obj| target.include?(obj) } : target.include?(args)
+          end
+        end
+
+        def has_value!(target, *args, first: false)
+          return unless target.is_a?(Enumerable)
+
+          args = args.first if args.size == 1 && args.first.is_a?(Enumerable)
+          found = false
+          args.each do |val|
+            if target.respond_to?(:delete?)
+              found = true if target.delete?(val)
+            elsif target.respond_to?(:delete)
+              found = true if target.delete(val)
+            elsif target.include?(val)
+              found = true
+            end
+            break if found && first
           end
+          target if found
         end
 
         def variables

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

@@ -154,12 +154,8 @@ module Squared
                   task action, [:command] do |_, args|
                     command = param_guard(action, 'command', args: args, key: :command)
                     args = args.extras
-                    a = args.delete('a') || args.delete('all')
                     ls = case command
-                         when 'network'
-                           a = nil
-                           'ls'
-                         when 'image', 'container'
+                         when 'image', 'container', 'network'
                            'ls'
                          when 'compose'
                            'ps'
@@ -167,7 +163,7 @@ module Squared
                            raise_error ArgumentError, 'unrecognized command', hint: command
                          end
                     data = VAL_DOCKER[:ls][command.to_sym]
-                    if args.delete('s') || args.delete('standard')
+                    if has_value!(args, 's', 'standard')
                       cols = data.first(data.index('CreatedAt'))
                     else
                       cols = []
@@ -184,7 +180,8 @@ module Squared
                         cols = choice_index('Select a column', data, multiple: true, force: true, attempts: 1)
                       end
                     end
-                    cmd = docker_output(command, ls, a && '-a')
+                    cmd = docker_output command, ls
+                    cmd << '-a' unless command == 'network' || !has_value!(args, 'a', 'all')
                     cmd << quote_option('format', "table #{cols.map! { |val| "{{.#{val}}}" }.join("\t")}")
                     run(cmd, banner: false, from: :ls)
                   end
@@ -949,8 +946,7 @@ module Squared
         end
 
         def tagjoin(*args, char: '/')
-          args.compact!
-          args.join(char) unless args.empty?
+          args.join(char) unless (args = args.compact).empty?
         end
 
         def tagname(val)