squared 0.7.1 → 0.7.3

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

@@ -49,10 +49,10 @@ module Squared
               ret.map! do |val|
                 next val if opt?(val)
 
-                if quote || val.is_a?(Pathname)
-                  shell_quote(val, force: force, double: double)
-                elsif escape
+                if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
+                elsif quote || pa
+                  shell_quote(val, force: force, double: double)
                 else
                   val
                 end
@@ -153,7 +153,7 @@ module Squared
 
             def pattern?(val)
               val.start_with?('\A', '^') || val.end_with?('\z', '$') ||
-              val.match?(/[.)][*+?]|\(\?:|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
+              val.match?(/[.)][*+?]|\(\?[:=!><]|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
             end
 
             private
@@ -221,6 +221,8 @@ module Squared
             si = []
             bl = []
             ml = []
+            sw = {}
+            se = {}
             list.flat_map do |val|
               x, y = val.split('|', 2)
               if y
@@ -233,6 +235,11 @@ module Squared
               end
             end
             .each do |val|
+              if val.size > 1 && val =~ /^\{([^},]*)(?:,([^}]+))?\}(.+)$/
+                op1 = $1 unless $1.empty?
+                op2 = $2
+                val = $3
+              end
               if (n = val.index('='))
                 flag = val[0, n]
                 case val[n.succ]
@@ -265,9 +272,12 @@ module Squared
                 end
                 m << flag if val[n + 2] == 'm'
                 bare << flag if val.end_with?('?')
+                val = flag
               else
                 bare << val
               end
+              sw[val] = op1 if op1
+              se[val] = op2 if op2
             end
             no = (no || []).map { |val| (n = val.index('=')) ? val[0, n] : val }
             bare.concat(no)
@@ -316,30 +326,34 @@ module Squared
               if single&.match?(opt)
                 add "-#{opt}"
               elsif bare.include?(opt)
-                add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
-              elsif opt.start_with?(/no[-_]/) && no.include?(name = opt[3..-1])
-                add "--no-#{name}"
+                if sw[opt]
+                  add "#{sw[opt]}#{opt}"
+                else
+                  add(opt.size == 1 ? "-#{opt}" : "--#{opt}")
+                end
+              elsif opt.start_with?(/no[-_]/) && no.include?(s = opt[3..-1])
+                add "--no-#{s}"
               else
                 if opt =~ OPT_VALUE
                   key = $1
                   val = $2
                   merge = m.include?(key)
-                  if e.include?(key)
-                    add shell_option(key, val, merge: merge, sep: sep)
+                  switch = sw[key]
+                  kwargs = { sep: se[key] || sep, merge: merge, switch: switch }
+                  if e.include?(key) || (bl.include?(key) && %w[true false].include?(val))
+                    add shell_option(key, val, **kwargs)
                   elsif q.include?(key)
-                    add quote_option(key, val, double: qq.include?(key), merge: merge, sep: sep)
+                    add quote_option(key, val, double: qq.include?(key), **kwargs)
                   elsif p.include?(key)
                     if val.match?(/\A(["']).+\1\z/)
-                      add shell_option(key, val, escape: false, merge: merge, sep: sep)
+                      add shell_option(key, val, escape: false, **kwargs)
                     elsif path
-                      add quote_option(key, path + val, merge: merge, sep: sep)
+                      add quote_option(key, path + val, **kwargs)
                     else
                       push opt
                     end
-                  elsif b.include?(key) || (bl.include?(key) && %w[true false].include?(val)) || numcheck.call(key, val)
-                    add basic_option(key, val, merge: merge, sep: sep)
-                  elsif merge
-                    add basic_option(key, val, merge: true, sep: sep)
+                  elsif b.include?(key) || numcheck.call(key, val) || se[key] || merge || switch
+                    add basic_option(key, val, **kwargs)
                   else
                     push opt
                   end
@@ -348,7 +362,7 @@ module Squared
                   push opt
                   skip = true if args
                 end
-                skip = true if first&.any? { |s| s.is_a?(Regexp) ? opt.match?(s) : !opt.include?(s) }
+                skip = true if first&.any? { |pat| pat.is_a?(Regexp) ? opt.match?(pat) : !opt.include?(pat) }
               end
             end
             @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})#{sep}(.+)\z/m
@@ -374,7 +388,8 @@ module Squared
             self
           end
 
-          def append_any(*args, escape: false, quote: true, **kwargs)
+          def append_any(*args, escape: false, **kwargs)
+            quote = kwargs.fetch(:quote, true)
             (args.empty? ? extras : args.flatten(1)).each do |val|
               if block_given?
                 temp = val
@@ -382,7 +397,7 @@ module Squared
                 if val.is_a?(Array)
                   found << temp
                   k, v, q = val
-                  add_option(k, v, escape: escape, quote: quote, double: q == '"', merge: q == true, **kwargs)
+                  add_option(k, v, escape: escape, double: q == '"', merge: q == true, **kwargs)
                   next
                 end
               end
@@ -390,10 +405,10 @@ module Squared
 
               if exist?(val)
                 add_path(val, **kwargs)
-              elsif quote
-                add_quote(val, **kwargs)
               elsif escape
                 add shell_escape(val, **kwargs)
+              elsif quote
+                add_quote(val, **kwargs)
               else
                 add val
               end
@@ -507,7 +522,7 @@ module Squared
 
           def add_path(*args, option: nil, force: true, double: false, **kwargs)
             if args.empty?
-              list = select { |val| val.is_a?(String) }
+              list = grep(String)
               found.concat(list)
               list.map! { |val| path + val } if path
               append(list, force: force, **kwargs)
@@ -523,6 +538,7 @@ module Squared
           end
 
           def add_quote(*args, **kwargs)
+            kwargs.delete(:quote)
             merge(args.compact.map { |s| s == '--' || OptionPartition.opt?(s) ? s : shell_quote(s, **kwargs) })
             self
           end
@@ -532,8 +548,8 @@ module Squared
             self
           end
 
-          def add_first(fallback = nil, prefix: nil, path: false, escape: false, quote: false, reverse: false,
-                        expect: false, **kwargs)
+          def add_first(fallback = nil, prefix: nil, path: false, escape: false, reverse: false, expect: false,
+                        **kwargs)
             val = (reverse ? pop : shift) || fallback
             if val
               temp = val
@@ -541,10 +557,10 @@ module Squared
               unless block_given? && !(val = yield val).is_a?(String)
                 if path
                   add_path(val, **kwargs)
-                elsif quote
-                  add_quote(val, **kwargs)
                 elsif escape
                   add shell_escape(val, **kwargs)
+                elsif kwargs[:quote]
+                  add_quote(val, **kwargs)
                 else
                   add val
                 end
@@ -655,7 +671,7 @@ module Squared
           end
 
           def exist?(*args, add: false, first: false, last: false, glob: false)
-            return with_glob?(File.join(*args), glob) unless args.empty?
+            return !args.first.nil? && with_glob?(File.join(*args), glob) unless args.empty?
 
             if first || last
               return false unless (val = first ? self.first : self.last)

metadata

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