squared 0.5.12 → 0.5.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e711136d645a7a32cb93a09fc7562525a7fd9bc725436c5db5846fa217ac013c
-  data.tar.gz: 9fe647b2d3021fb50a2d4d4a3983d12422ecbbdbcb92324461382faf5efcb4c7
+  metadata.gz: 128dc5736d403e4d43f62cc3a02d1267c7e3f0d96f40f1bc109195ad2b98c723
+  data.tar.gz: 7136af7bd97d0fc6613d1923c9b9c15e1788dcffe56811bc052acbe53eccf0f7
 SHA512:
-  metadata.gz: 58dee7d115025166ad1326dc11e76f9708ce4af715f1d85b53e2d19799b07aab81118eb82283913a2fee9401b005c0eb9c883f1c820d3b7bfadf9eed2a845013
-  data.tar.gz: 2bac7d7f87848d78327542d4be5f5535f4d8ed45e818afa27b5a408f921c90363655de8a88dcf4d49d5da44902b5c87c6628cc75b1afe8875eee5bdecc48e3c6
+  metadata.gz: 88e6c7b1dd96ce81de2432cc17336bca03c3619e9bb8121983daed0134a5fff63292075a22327eafd824c17962a8ef603feaf66c1dc250657c7740de8d0110cb
+  data.tar.gz: 11a2cccda6d069e4b1d7b961fa7c43a7ddbff7562a9754efd26389e26f2f89ee0d232df769e118fd463edb56525d646729eda9c740ec0b774ba577faf3770d89

data/CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [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.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.5.12] - 2025-10-31
 
 ### Changed
@@ -1184,6 +1217,8 @@
 
 - Changelog was created.
 
+[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
@@ -1197,6 +1232,8 @@
 [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.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

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

data/lib/squared/common/shell.rb

@@ -6,11 +6,14 @@ require 'shellwords'
 module Squared
   module Common
     module Shell
+      QUOTE_VALUE = /\A(["'])(.*)\1\z/m.freeze
+      private_constant :QUOTE_VALUE
+
       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 +28,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 +40,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,48 +48,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/m)
-          return val
+        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)
-          "\"#{val.gsub(/(?<!\\)"/, '\\"')}\""
+          "\"#{q.call(base || val).gsub(/(?<!\\)"/, '\\"')}\""
         else
-          "'#{val.gsub("'", "'\\\\''")}'"
+          base ? val : "'#{q.call(val).gsub("'", "'\\\\''")}'"
         end
       end
 
       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/
+        if flag =~ QUOTE_VALUE
           double = $1 == '"'
           flag = $2
           escape = false
           override = true
         end
-        b = if flag[0] == '-'
-              flag[1] == '-' ? '=' : ' '
-            elsif flag.size == 1
-              a = '-'
-              merge ? '' : ' '
-            else
-              a = '--'
-              '='
-            end
-        "#{a}#{flag}#{unless val.nil?
-                        "#{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
-                                 val
-                               end}"
-                      end}"
+        sep = unless flag.empty?
+                if flag[0] == '-'
+                  flag[1] == '-' ? '=' : ' '
+                elsif flag.size == 1
+                  pre = '-'
+                  merge ? '' : ' '
+                else
+                  pre = '--'
+                  '='
+                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: option, force: force, double: double, override: override)
+                                   else
+                                     val
+                                   end}"
+                        end}"
       end
 
       def shell_split(val, join: nil, **kwargs)
@@ -98,8 +109,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)

data/lib/squared/version.rb

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

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

@@ -525,31 +525,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)
+            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).append(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(' && ')
+              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).append(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(' && ')
+              else
+                cmd = [cmd, flags, opts].compact.join(' ') if opts || flags
+              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, from: from, banner: banner)
         end
@@ -568,12 +568,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)
@@ -739,7 +739,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("no content#{data ? ' type' : ''}", hint: uri)
             end
           end
@@ -1307,7 +1307,7 @@ module Squared
           end
           ret = JoinSet.new(cmd.flatten(1))
           if options && (val = env("#{prefix.upcase}_OPTIONS"))
-            split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^ =]+)[ =].+\z/m) }
+            split_escape(val).each { |opt| ret.last(fill_option(opt), /\A(--?[^\[\]=\s-][^\[\]=\s]*)[=\s].+\z/m) }
           end
           main ? @session = ret : ret
         end
@@ -1593,11 +1593,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

data/lib/squared/workspace/project/support/class.rb

@@ -10,9 +10,9 @@ module Squared
           include Common::Shell
           extend Forwardable
 
-          OPT_NAME = /\A(?:(--)|-)((?(1)[A-Za-z\d]+|[A-Za-z\d]))\z/
-          OPT_VALUE = /\A-{0,2}([^= ]+)(?: *= *| +)(.+)\z/
-          OPT_SINGLE = /\A-([A-Za-z\d])(.+)\z/
+          OPT_NAME = /\A(?:(--)|-)((?(1)[^\[\]=\s-][^\[\]=\s]*|[^\[\]=\s-]))\z/
+          OPT_VALUE = /\A-{0,2}([^\[\]=\s-][^\[\]=\s]*)(?:=|\s+)(\S.*)\z/
+          OPT_SINGLE = /\A-([^\[\]=\s-])(.+)\z/
           private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
           class << self
@@ -27,11 +27,13 @@ module Squared
               target << '--' if delim && !target.include?('--')
               if strip
                 pat, s = Array(strip)
-                ret.map! { |val| val.gsub(pat, s || '') }
+                ret.map! { |val| val.is_a?(String) ? val.gsub(pat, s || '') : val }
               end
               if escape || quote
                 ret.map! do |val|
-                  if escape
+                  if opt?(val)
+                    val
+                  elsif escape
                     shell_escape(val, quote: quote, double: double)
                   else
                     shell_quote(val, force: force, double: double)
@@ -87,8 +89,17 @@ module Squared
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
-              s = target.to_a.compact
-              r.any? { |pat| s.any?(pat) }
+              a = target.to_a
+              if (n = a.index('--'))
+                a = a[0..n]
+              end
+              r.any? { |pat| a.any?(pat) }
+            end
+
+            def opt?(val)
+              return false unless val.is_a?(String)
+
+              val.start_with?('-') && (OPT_NAME.match?(val) || OPT_VALUE.match?(val) || OPT_SINGLE.match?(val))
             end
 
             def pattern?(val)
@@ -415,7 +426,8 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
-            merge(args.compact.map! { |val| val == '--' ? val : shell_quote(val, **kwargs) })
+            args.compact!
+            merge(args.map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
           end
 
@@ -523,11 +535,16 @@ module Squared
             super[/[^:]+\z/, 0]
           end
 
-          attr_reader :delim
+          alias to_ary to_a
 
-          def initialize(data = [], delim: ' ')
-            super(data.compact)
+          attr_reader :delim, :extras
+
+          def initialize(data = [], delim: ' ', partition: '--', uniq: /\A--?[^\[\]=\s-][^\[\]=\s]*(?:=|\s+)\S/)
             @delim = delim
+            @partition = partition
+            @uniq = uniq
+            @extras = []
+            super(data.compact)
           end
 
           def last(val, pat)
@@ -536,7 +553,7 @@ module Squared
           end
 
           def pass(&blk)
-            ret = to_a.map!(&:to_s).reject(&:empty?)
+            ret = to_ary.map!(&:to_s).reject(&:empty?)
             @last&.each do |val, pat, key|
               i = []
               j = nil
@@ -557,6 +574,7 @@ module Squared
               end
               ret[i.last] = val
             end
+            ret.concat(extras.map(&:to_s).reject(&:empty?)) unless extras.empty?
             return ret unless block_given?
 
             ret.reject(&blk)
@@ -578,18 +596,73 @@ module Squared
 
           def temp(*args, &blk)
             args.compact!
-            ret = pass(&blk)
-            ret = Set.new(ret.concat(args)).to_a unless args.empty?
-            ret.join(@delim)
+            pass(&blk)
+              .concat(args)
+              .join(@delim)
           end
 
           def done
             to_s.tap { clear }
           end
 
+          def merge(enum)
+            if !extras.empty?
+              extras.concat(enum.to_a)
+              self
+            elsif (n = enum.find_index { |val| extras?(val) })
+              data = enum.to_a
+              @extras = if n == 0
+                          data
+                        else
+                          super(data[0...n])
+                          data[n..-1]
+                        end
+              self
+            else
+              super
+            end
+          end
+
+          def <<(obj)
+            extras!(obj) || super
+          end
+
+          def add?(obj)
+            extras!(obj) || super
+          end
+
+          def to_a
+            pass
+          end
+
           def to_s
             pass.join(@delim)
           end
+
+          def to_enum(*args)
+            pass.to_enum(*args)
+          end
+
+          def to_json(*args)
+            pass.to_json(*args)
+          end
+
+          def to_yaml(*args)
+            pass.to_yaml(*args)
+          end
+
+          private
+
+          def extras!(obj)
+            return if extras.empty? && !extras?(obj)
+
+            extras << obj unless !extras.include?(@partition) && include?(obj) && @uniq.match?(obj.to_s)
+            self
+          end
+
+          def extras?(obj)
+            obj == @partition || (include?(obj) && !@uniq.match?(obj.to_s))
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.14
 platform: ruby
 authors:
 - An Pham
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []