squared 0.4.26 → 0.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31cca2889400b4e4b51df7249ac426d782a9905cc69e731d0766ef1012002651
-  data.tar.gz: 4353d4d765dc14916e6db6c9605cc0b02fe48b353adc0ed274c08f01e0cc6f25
+  metadata.gz: 570209d462189db6296821f539a7b2a3a088c627fa890b25144bbc3c92e1b197
+  data.tar.gz: d92b3f063d0504a2a1962c0a2b096e8ebe8062da8c33e1a16799edf0c806e1a1
 SHA512:
-  metadata.gz: 6fda0932de949193edfc82bb533c3b21b39624b2d1d8fc3b1762b0c8e93ce47807e9a34c8b378896d6f4f92c18d06ae82b217dfd42539667cb0df3de5d98cd5c
-  data.tar.gz: 411bba4daeb35c641b67306bba13502a78cab65c09e94d3a5fcef0f7ad213f5a8a75886b641a32d4e1dce83b6c697784ca438d4c570a30dd3d331ae8b25541c0
+  metadata.gz: 6c1f4387eafc98bd80390bc284127fd1018bd191b65dde56666941094609743e44bf82247cc9a3ac39b192ae72f89adf4ef93a9d06ede529fa4201237e74be97
+  data.tar.gz: 1d1117d69bd95cf81964b52b7cf0c7c67d9a693bc3716767da0daeb5b1a1a6d8f9016c0d0e01f74dac392aee66af74b7e85a67528d06f99c99d6e2921384e155

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [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.4.26] - 2025-10-31
 
 ### Added
@@ -1064,6 +1076,7 @@
 
 - Changelog was created.
 
+[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/shell.rb

@@ -6,11 +6,14 @@ require 'rake'
 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)
@@ -35,54 +38,64 @@ module Squared
                          Rake::Win32.windows? ? $2 : 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
-          val.empty? ? '' : Shellwords.escape(val)
+          Shellwords.escape(val)
         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, quote: false, force: false, join: nil)
@@ -94,8 +107,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 fill_option(val, **kwargs)

data/lib/squared/version.rb

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

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

@@ -697,7 +697,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

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*|\s+)(.+)\z/
+          OPT_SINGLE = /\A-([^\[\]=\s-])(.+)\z/
           private_constant :OPT_NAME, :OPT_VALUE, :OPT_SINGLE
 
           class << self
@@ -31,7 +31,9 @@ module Squared
               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)
@@ -90,6 +92,10 @@ module Squared
               Array(target).compact.any? { |val| r.any? { |pat| pat.match?(val.to_s) } }
             end
 
+            def opt?(val)
+              val.start_with?('-') && (OPT_NAME.match?(val) || OPT_VALUE.match?(val) || OPT_SINGLE.match?(val))
+            end
+
             def pattern?(val)
               val.match?(/(?:\A\^|\$\z)/) || val.match?(/(?:\.[*+]|\(\?:|\\[dsw]|\[.+\]|\{\d+,?\d*\})/)
             end
@@ -380,7 +386,8 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
-            merge(args.map! { |val| shell_quote(val, **kwargs) })
+            args.compact!
+            merge(args.map! { |val| val == '--' || OptionPartition.opt?(val) ? val : shell_quote(val, **kwargs) })
             self
           end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.4.26
+  version: 0.4.27
 platform: ruby
 authors:
 - An Pham