squared 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed078210213186745643650b4a73f7f376b5aba7033643c850b48d555c198501
-  data.tar.gz: d4d8c0e6308f3bdc3aca66891980259ad52ce11f3a53112c7a22ae4de9e31f40
+  metadata.gz: 6a3b6e4109938a7ee4ddc9d778c798ad412cd2941a6b887cc62f9bd39779b4ad
+  data.tar.gz: 6912a295b0e64223d3130d8793bce44e954c0903fd74b65eb0f420726a41f82d
 SHA512:
-  metadata.gz: fcf308f894ee49566103575561b74459afc1aa7e03af8d5c5397c7bb7432dfce996cbb1291f4f81af792d5b1dd8ed6a9075ce7b2fab6f41dca0c56431e38b78c
-  data.tar.gz: 19f25542363b33fa567cbfcb0267c79fbc55a313ce0fba8ab25ec17dd43f276b004b00304e8bfe38dba1338a2e554170a8f1535d1bdc5981407fae6e9bff2bf8
+  metadata.gz: 137851028240806e553b125ec638df63cb20c25b6f73328a1c08f7af7603d666a1b61ff04dde1da27995a13d0bf2a6c28e644d20b6e8beb6e26fba061191d908
+  data.tar.gz: 21c7fce48d7638aa90b9c0ef40282b30557205065f6117e0602248771cee9e628910f90125295dac4a831615adda43296112809b437f31b4db0aa9d3f03de437

data/CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+## [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.
+
+## [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 +1308,9 @@
 
 - Changelog was created.
 
+[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.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 +1324,7 @@
 [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.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,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)

data/lib/squared/version.rb

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

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

@@ -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)
@@ -1468,9 +1468,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
 
@@ -1841,7 +1841,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.empty?
 
             exit 1 if force
             return nil
@@ -1853,7 +1853,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

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

@@ -462,15 +462,18 @@ module Squared
                     when :add, :sign
                       format_desc action, flag, 'name,message?,commit?,remote?'
                       task flag, [:name, :message, :commit, :remote] do |_, args|
-                        if (name = args.name)
-                          message = args.message
-                          commit = commithead args.commit
-                          remote = args.remote
-                        else
-                          commit, name, message = choice_commit(reflog: false, series: true,
-                                                                values: [['Enter tag name', true], 'Enter message'])
-                          remote = choice_remote
-                        end
+                        remote = if (name = args.name)
+                                   message = args.message
+                                   commit = commithead args.commit
+                                   args.remote
+                                 else
+                                   commit, name, message = choice_commit(reflog: false, series: true,
+                                                                         values: [
+                                                                           ['Enter tag name', true],
+                                                                           'Enter message'
+                                                                         ])
+                                   choice_remote
+                                 end
                         tag(flag, refs: [name], message: message, commit: commit, remote: remote).tap do |ret|
                           success?(ret, !remote)
                         end
@@ -996,7 +999,7 @@ module Squared
             end
           end
           append_pull(opts, OPT_GIT[:pull] + OPT_GIT[:fetch][:pull],
-                      no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull], remote: remote, flag: flag, from: :pull)
+                      flag: flag, from: :pull, remote: remote, no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull])
           source(sync: sync, sub: if stdout?
                                     [
                                       opt_style(color(:red), /^(.+)(\|\s+\d+\s+)([^-]*)(-+)(.*)$/, 4),
@@ -1044,8 +1047,8 @@ module Squared
         def fetch(flag = nil, opts = [], sync: invoked_sync?('fetch', flag), remote: nil)
           opts = git_session('fetch', opts: opts).last
           opts << 'all' if flag == :all || option('all')
-          append_pull(opts, collect_hash(OPT_GIT[:fetch]), no: collect_hash(OPT_GIT[:no][:fetch]),
-                                                           remote: remote, flag: flag, from: :fetch)
+          append_pull(opts, collect_hash(OPT_GIT[:fetch]), flag: flag, from: :fetch, remote: remote,
+                                                           no: collect_hash(OPT_GIT[:no][:fetch]))
           source(sync: sync, **threadargs)
         end
 
@@ -1427,7 +1430,7 @@ module Squared
             return ret
           end
           message ||= messageopt
-          if !message && !amend
+          unless message || amend
             return if pass
 
             message = readline('Enter message', force: true)
@@ -1638,10 +1641,10 @@ module Squared
             case flag
             when :create
               cmd << quote_option(branch.delete_prefix!('^') ? 'C' : 'c', branch)
-              cmd << case (track ||= option('track', ignore: false))
-                     when 'n', 'N', '0', 'false'
+              cmd << case (track ||= option('track', ignore: false))&.downcase
+                     when 'n', '0', 'false'
                        '--no-track'
-                     when 'y', 'Y', '1', 'true'
+                     when 'y', '1', 'true'
                        '--track'
                      when 'direct', 'inherit'
                        basic_option 'track', track
@@ -1844,9 +1847,10 @@ module Squared
             end
             if from.nil? && (from = cmd.drop(1).find { |val| val.match?(/\A[a-z]{1,2}[a-z-]*\z/) })
               from = :"git:#{from}"
+            elsif from == false
+              from = nil
             end
             banner &&= cmd.temp { |val| val.start_with?(/--(?:work-tree|git-dir)/) } if cmd.respond_to?(:temp)
-            from = nil if from == false
           end
           cmd = session_done cmd
           log&.info cmd
@@ -1969,7 +1973,7 @@ module Squared
           ret = {}
           status_data(*args).each do |file,|
             next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
-            next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
+            next if pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
 
             ret[file] = algorithm.hexdigest(File.read(basepath(file)))
           end
@@ -1986,7 +1990,7 @@ module Squared
           end
         end
 
-        def append_pull(opts, list, target: @session, flag: nil, no: nil, remote: nil, from: nil)
+        def append_pull(opts, list, flag:, from:, target: @session, no: nil, remote: nil)
           target << '--force' if option('f', 'force', target: target)
           append_submodules(target: target, from: from)
           return if !remote && opts.empty?

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

@@ -31,8 +31,8 @@ module Squared
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
           install_a: %w[ignore-requires-python no-index pre extra-index-url=q f|find-links=q i|index-url=q no-binary=q
                         only-binary=q].freeze,
-          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps prefer-binary require-hashes
-                        use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p src=p].freeze,
+          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps prefer-binary
+                        require-hashes use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
           hash: %w[a|algorithm].freeze,
           list: %w[e|editable exclude-editable include-editable l|local no-index not-required o|outdated pre u|uptodate

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

@@ -20,7 +20,8 @@ module Squared
                   inspect multiline no-pager noautocomplete nocolorize noecho noecho-on-assignment noinspect
                   nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
                   simple-prompt single-irb singleline tracer truncate-echo-on-assignment type-completor verbose
-                  back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze
+                  back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze,
+          rbs: %w[I=pm r=bm no-stdlib no-collection collection=p log-level=b log-output=p repo=p].freeze
         }.freeze
         OPT_BUNDLE = {
           common: %w[no-color V|verbose r|retry=i].freeze,
@@ -124,6 +125,7 @@ module Squared
           ruby: %w[I disable enable dump r s].freeze,
           rake: %w[I libdir r require].freeze,
           irb: %w[I r].freeze,
+          rbs: %w[I r repo].freeze,
           gem: {
             contents: %w[s spec-dir].freeze,
             dependency: %w[s source].freeze,
@@ -159,11 +161,12 @@ module Squared
           'ruby' => %i[file script version].freeze,
           'gem' => %i[install uninstall outdated update pristine build push exec command].freeze,
           'bundle' => %i[install update cache exec config reinstall command].freeze,
+          'rbs' => nil,
           'rake' => nil,
           'irb' => nil
         })
 
-        def initialize(*, autodetect: false, gemspec: nil, asdf: 'ruby', **kwargs)
+        def initialize(*, autodetect: false, gemspec: nil, steep: 'Steepfile', asdf: 'ruby', **kwargs)
           super
           if @pass.include?(Ruby.ref)
             initialize_ref Ruby.ref
@@ -179,6 +182,7 @@ module Squared
                      elsif gemspec
                        basepath(gemspec.include?('.') ? gemspec : "#{gemspec}.gemspec")
                      end
+          @steepfile = basepath(steep).yield_self { |file| file if file.exist? }
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !@autodetect
 
           begin
@@ -250,6 +254,72 @@ module Squared
                     name = gemname if gemlib.any? { |file| exist?(file, "#{gemname}.rb") }
                     irb(*args, opts: opts, name: name, verbose: false)
                   end
+                when 'rbs'
+                  next unless @steepfile
+
+                  data = {}
+                  target = nil
+                  File.foreach(@steepfile) do |line|
+                    if line =~ /^\s*target(?:\s+|\(\s*)(?::(\S+)|(["'])(.+)\2)/
+                      target = [[], []]
+                      data[$1 || $3.gsub(/[: ]/, '-')] = target
+                      next
+                    end
+                    next unless target && line =~ /^\s*(check|signature)\s+(["'])(.+)\2/
+
+                    target[$1 == 'check' ? 1 : 0] << $3
+                  end
+                  next if data.empty?
+
+                  namespace 'rbs' do
+                    data.each do |key, item|
+                      sig, lib = item
+                      next if sig.empty? || lib.empty?
+
+                      format_desc action, key, 'sig?,path*'
+                      task key do |_, args|
+                        args = args.to_a
+                        list = []
+                        lib.each do |val|
+                          val = File.join(val, '**/*.rb') unless val.include?('*') || val.end_with?('.rb')
+                          list.concat(Dir.glob(val, base: path))
+                        end
+                        if args.empty?
+                          files = choice_index('Select files', list, multiple: true, force: true, series: true,
+                                                                     accept: [accept_y('Generate?')])
+                        else
+                          files = []
+                          args.each do |val|
+                            if val.include?('*')
+                              files.concat(Dir.glob(val, base: path))
+                            elsif !(file = basepath(val)).exist?
+                              print_error(val, hint: 'not found')
+                            elsif file.directory?
+                              files.concat(file.glob('**/*.rb'))
+                            else
+                              files << val
+                            end
+                          end
+                          list.map! { |val| basepath(val).to_s }
+                          files = files.select { |val| list.include?(basepath(val).to_s) }
+                          if files.empty?
+                            print_error('steep', 'no files matched', hint: "#{key}:check")
+                            exit 1
+                          end
+                          files.uniq!
+                        end
+                        sig = if (n = sig.index(args.first))
+                                args.shift
+                                sig[n]
+                              elsif sig.size > 1
+                                choice_index('Select a sig', sig, force: true, series: true)
+                              else
+                                sig.first
+                              end
+                        rbs(:prototype, sig, *files)
+                      end
+                    end
+                  end
                 end
               else
                 namespace action do
@@ -1161,6 +1231,56 @@ module Squared
           run(banner: false, from: :irb)
         end
 
+        def rbs(flag, *args, banner: verbose?, with: nil, pass: nil, **kwargs)
+          case pass
+          when NilClass
+            pass = PASS_RUBY[:rbs]
+          when Array
+            pass += PASS_RUBY[:rbs]
+          end
+          opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
+          cmd, opts = rbs_session(opts: opts)
+          op = OptionPartition.new(opts, [], cmd << flag, project: self)
+          case flag
+          when :prototype
+            sig = args.shift
+            y = option('y', ignore: false)
+            i = 1
+            args.map { |val| basepath(val).relative_path_from(path) }.each do |file|
+              dir = basepath sig, file.dirname
+              dir.mkpath unless dir.exist?
+              base = file.basename.to_s
+              rbs = dir.join(base.stripext + '.rbs')
+              status = if rbs.exist?
+                         case y
+                         when '0', 'false'
+                           'ignored'
+                         else
+                           next unless y || confirm_basic('Overwrite?', rbs, 'N')
+
+                           'overwrite'
+                         end
+                       end
+              unless status == 'ignored'
+                ret = run(op.target.temp(File.extname(base) == '.rbi' ? 'rbi' : 'rb', file, '>', rbs), banner: false,
+                                                                                                       series: true)
+                if !ret
+                  status = 'FAIL'
+                elsif File.empty?(rbs)
+                  status = 'empty'
+                end
+              end
+              puts "#{i.to_s.rjust(2)}. #{rbs.relative_path_from(path)}".subhint(status)
+              i += 1
+            end
+          else
+            op.clear
+              .append(*args)
+            print_run(op, banner, **kwargs)
+            run(banner: false, from: :"rbs:#{flag}")
+          end
+        end
+
         def gemspec
           return @gemspec || nil unless @gemspec.nil?
 
@@ -1285,6 +1405,13 @@ module Squared
           session('rake', *preopts, *cmd, **kwargs)
         end
 
+        def rbs_session(*cmd, opts: nil)
+          return session('rbs', *cmd) unless opts
+
+          op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self)
+          [session('rbs', *op.to_a, *cmd), op.extras]
+        end
+
         def gem_output(*cmd, **kwargs)
           session_output('gem', *cmd, **kwargs)
         end
@@ -1320,7 +1447,7 @@ module Squared
         end
 
         def config_set(key, *val)
-          run(bundle_output('config set', key, *val), banner: false, series: false)
+          run(bundle_output('config set', key, *val), banner: false, series: true)
         end
 
         def preopts

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
@@ -47,7 +47,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)
@@ -121,6 +123,10 @@ module Squared
               r.any? { |pat| s.any?(pat) }
             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
@@ -442,7 +448,7 @@ module Squared
 
           def add_path(*args, force: true, double: false, **kwargs)
             if args.empty?
-              args = select { |s| s.is_a?(String) }
+              args = select { |val| val.is_a?(String) }
               args.map! { |val| path + val } if path
               append(args, force: force, **kwargs)
             else
@@ -452,7 +458,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
 

metadata

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