squared 0.6.5 → 0.6.6

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

@@ -45,15 +45,15 @@ module Squared
                 end
                 ret = out
               end
-              if escape || quote
-                ret.map! do |val|
-                  if opt?(val)
-                    val
-                  elsif escape
-                    shell_escape(val, quote: quote, double: double)
-                  else
-                    shell_quote(val, force: force, double: double)
-                  end
+              ret.map! do |val|
+                next val if opt?(val)
+
+                if quote || val.is_a?(Pathname)
+                  shell_quote(val, force: force, double: double)
+                elsif escape
+                  shell_escape(val, quote: quote, double: double)
+                else
+                  val
                 end
               end
               if target.is_a?(Set)
@@ -70,7 +70,7 @@ module Squared
               kwargs[:subject] ||= target.first.stripext
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
-              warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
+              warn log_warn(opts.join(', '), pass: true, **kwargs)
               exit 1 unless pass || confirm("Run? [#{sub_style(target, styles)}]", 'N')
             end
 
@@ -87,10 +87,9 @@ module Squared
             end
 
             def strip(val)
-              return [] unless val
-
               val = shell_split val if val.is_a?(String)
-              val.map { |s| s.sub(OPT_SINGLE, '\1=\2').sub(OPT_VALUE, '\1=\2').sub(OPT_NAME, '\2') }.reject(&:empty?)
+              Array(val).map { |s| s.sub(OPT_SINGLE, '\1=\2').sub(OPT_VALUE, '\1=\2').sub(OPT_NAME, '\2') }
+                        .reject(&:empty?)
             end
 
             def select(list, bare: true, no: true, single: false, double: false)
@@ -116,6 +115,15 @@ module Squared
               list
             end
 
+            def parse_arg!(name, val)
+              return unless val.is_a?(String)
+
+              a, b = name.size == 1 ? %w[- *] : %w[(?:--) +]
+              return unless val =~ /\A#{a}?#{Regexp.escape(name)}(=|\s#{b})(["'])?(.+)(?(2)\2\z|\z)/m
+
+              [name, $3, $2 || (name.size == 1 && $1.empty? ? true : '')]
+            end
+
             def arg?(target, *args, value: false, **)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
@@ -133,7 +141,7 @@ module Squared
             end
 
             def pattern?(val)
-              val.match?(/(?:\A\^|\$\z)/) || val.match?(/(?:\.[*+]|\(\?:|\\[dsw]|\[.+\]|\{\d+,?\d*})/)
+              val.match?(/\A\^|\$\z/) || val.match?(/[.)][*+?]|\(\?:|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
             end
 
             private
@@ -144,7 +152,7 @@ module Squared
 
             def matchopts(list, value = false)
               a, b = Array(list).partition { |val| val.size == 1 || val.match?(OPT_SINGLE) }
-              return /\A#{shortopt(*a)}}/ if b.empty?
+              return /\A#{shortopt(*a)}/ if b.empty?
               return /\A#{longopt(*b, value)}/ if a.empty?
 
               /\A(?:#{shortopt(*a)}|#{longopt(*b, value)})/
@@ -175,7 +183,7 @@ module Squared
           def_delegator :@extras, :find_all, :detect_all
           def_delegator :@extras, :find_index, :detect_index
 
-          def initialize(opts, list, target = Set.new, project: nil, path: nil, sep: '=', **kwargs, &blk)
+          def initialize(opts, list, target = JoinSet.new, project: nil, path: nil, sep: '=', **kwargs, &blk)
             @target = target.is_a?(Set) ? target : target.to_set
             @project = project
             @path = path || project&.path
@@ -185,7 +193,8 @@ module Squared
             parse(list, opts, **kwargs, &blk)
           end
 
-          def parse(list, opts = extras, no: nil, single: nil, args: false, first: nil, underscore: nil, &blk)
+          def parse(list, opts = extras, no: nil, single: nil, args: false, multiple: nil, first: nil, underscore: nil,
+                    stdin: false, &blk)
             @extras = []
             @values = []
             bare = []
@@ -267,7 +276,10 @@ module Squared
               ml.concat(tr.call(ml))
               no.concat(tr.call(no))
             end
-            target.multiple = ml.map { |val| val.size == 1 ? "-#{val}" : "--#{val}" } if target.is_a?(JoinSet)
+            if target.is_a?(JoinSet)
+              target.multiple = multiple if multiple
+              target.multiple = ml.map { |val| val.size == 1 ? "-#{val}" : "--#{val}" }
+            end
             numtype = [
               [i, /\A\d+\z/],
               [f, /\A\d*(?:\.\d+)?\z/],
@@ -276,6 +288,16 @@ module Squared
             numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && v.match?(pat) } }
             skip = false
             opts.each do |opt|
+              if stdin
+                if stdin == -1
+                  add_path opt if exist?(opt)
+                  next
+                elsif opt == '-'
+                  add '-'
+                  stdin = -1
+                  next
+                end
+              end
               next skip = true if opt == '--'
               next push opt if skip
 
@@ -339,18 +361,30 @@ module Squared
             self
           end
 
-          def append_any(*args, quote: true, **kwargs)
+          def append_any(*args, escape: false, quote: true, **kwargs)
             (args.empty? ? extras : args.flatten).each do |val|
-              val = yield val if block_given?
+              if block_given?
+                temp = val
+                val = yield val
+                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)
+                  next
+                end
+              end
               next unless val.is_a?(String)
 
               if exist?(val)
                 add_path(val, **kwargs)
               elsif quote
                 add_quote(val, **kwargs)
+              elsif escape
+                add shell_escape(val, **kwargs)
               else
                 add val
               end
+              found << (temp || val) if args.empty?
             end
             self
           end
@@ -451,20 +485,26 @@ module Squared
               else
                 args.each { |val| remove val }
               end
-              args = temp[0...index] + args + temp[index..-1]
+              args = temp[0, index] + args + temp[index..-1]
               target.clear
             end
             merge args
             self
           end
 
-          def add_path(*args, force: true, double: false, **kwargs)
+          def add_path(*args, option: nil, force: true, double: false, **kwargs)
             if args.empty?
               args = select { |val| val.is_a?(String) }
+              found.concat(args)
               args.map! { |val| path + val } if path
               append(args, force: force, **kwargs)
             else
-              add shell_quote(path ? path.join(*args) : File.join(*args), option: false, force: force, double: double)
+              val = path ? path.join(*args) : File.join(*args)
+              if option
+                add quote_option(option, val, double: double)
+              else
+                add shell_quote(val, option: false, force: force, double: double)
+              end
             end
             self
           end
@@ -480,25 +520,35 @@ module Squared
             self
           end
 
-          def add_first(fallback = nil, prefix: nil, path: false, quote: false, reverse: false, expect: false, **kwargs)
+          def add_first(fallback = nil, prefix: nil, path: false, escape: false, quote: false, reverse: false,
+                        expect: false, **kwargs)
             val = (reverse ? pop : shift) || fallback
             if val
-              val.delete_prefix!(prefix) if prefix && val.is_a?(String)
+              temp = val
+              val = val.delete_prefix(prefix) if prefix && val.is_a?(String)
               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)
                 else
                   add val
                 end
+                found << temp unless temp == fallback
               end
             elsif expect
-              raise(expect.is_a?(String) ? expect : 'no value to add')
+              raise(expect.is_a?(String) ? expect : 'no value queued')
             end
             self
           end
 
+          def delim
+            add '--'
+            self
+          end
+
           def last(val = nil, &blk)
             unless block_given?
               case val
@@ -532,26 +582,26 @@ module Squared
           end
 
           def splice(*exclude, quote: true, delim: true, path: false, pattern: false, &blk)
-            found, other = if block_given?
-                             partition(&blk)
-                           elsif exclude.first.is_a?(Symbol)
-                             partition(&exclude.first)
-                           else
-                             partition do |val|
-                               next false if pattern && OptionPartition.pattern?(val)
-
-                               exclude.none? { |pat| val.match?(Regexp.new(pat)) }
-                             end
-                           end
-            unless found.empty?
+            temp, other = if block_given?
+                            partition(&blk)
+                          elsif exclude.first.is_a?(Symbol)
+                            partition(&exclude.first)
+                          else
+                            partition do |val|
+                              next false if pattern && OptionPartition.pattern?(val)
+
+                              exclude.none? { |pat| val.match?(Regexp.new(pat)) }
+                            end
+                          end
+            unless temp.empty?
               add '--' if delim
               extras.clear
               concat other
               if path
-                found.each { |val| add_path(val) }
+                temp.each { |val| add_path(val) }
               else
-                found.quote! if quote
-                merge found
+                temp.quote! if quote
+                merge temp
               end
             end
             self
@@ -625,7 +675,8 @@ module Squared
           end
 
           def with_glob?(val, glob = true)
-            return false unless path && val.is_a?(String) && !val.empty?
+            return false unless val.is_a?(String) && !val.empty?
+            return File.exist?(val) unless path
 
             path.join(val).exist? || (glob && !path.glob(val).empty?)
           end

data/lib/squared/workspace/series.rb

@@ -162,7 +162,9 @@ module Squared
       end
 
       def reset
-        @data = {}.tap { |data| (TASK_BASE + TASK_KEYS).each { |key| data[key] = [] } }
+        @data = {}
+        (TASK_BASE + TASK_KEYS).each { |key| @data[key] = [] }
+        @data
       end
 
       def name_get(key)

data/lib/squared/workspace.rb

@@ -11,8 +11,9 @@ module Squared
           if id.is_a?(Symbol)
             project id
           else
-            values.find { |proj| proj.name == id } || values.find { |proj| proj.project == id } ||
-              values.find { |proj| proj.path.to_s == File.expand_path(id, base) }
+            values.find { |proj| proj.name == id } ||
+            values.find { |proj| proj.project == id } ||
+            values.find { |proj| proj.path.to_s == File.expand_path(id, base) }
           end
         end
         ret.size == 1 ? ret.first : ret
@@ -20,7 +21,7 @@ module Squared
 
       def expect(name)
         ret = project name
-        return ret if ret&.path&.directory?
+        return ret if ret&.path&.directory? && !ret.path.empty?
 
         raise NoMethodError, "project is not initialized (#{name})"
       end

metadata

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