squared 0.7.13 → 0.8.0

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

@@ -20,8 +20,8 @@ module Squared
             include Shell
             include Prompt
 
-            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, force: true, double: false,
-                       filter: nil, pass: nil, preserve: true, **)
+            def append(target, *args, delim: false, escape: false, quote: true, strip: nil, double: false, filter: nil,
+                       pass: nil, **kwargs)
               return if (ret = args.flatten(1)).empty?
 
               target << '--' if delim && !target.include?('--')
@@ -52,7 +52,7 @@ module Squared
                 if !(pa = val.is_a?(Pathname)) && escape
                   shell_escape(val, quote: quote, double: double)
                 elsif quote || pa
-                  shell_quote(val, force: force, double: double, preserve: preserve)
+                  shell_quote(val, double: double, **kwargs)
                 else
                   val
                 end
@@ -87,25 +87,8 @@ module Squared
 
             def strip(val)
               val = shell_split val if val.is_a?(String)
-              ret = []
-              pass = -1
-              (args = Array(val)).each_with_index do |s, i|
-                next if s.empty? || pass == i
-
-                if s == '--'
-                  ret << s << args[i.succ..-1].join(' ')
-                  break
-                end
-                next ret << s unless s.start_with?('-')
-
-                if !s.include?('=') && (j = args[i.succ]) && !j.start_with?('-')
-                  ret << "#{s.sub(/^-{1,2}/, '')}=#{j}"
-                  pass = i.succ
-                else
-                  ret << s.sub(OPT_SINGLE, '\1=\2').sub(OPT_VALUE, '\1=\2').sub(OPT_NAME, '\2')
-                end
-              end
-              ret
+              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)
@@ -152,7 +135,7 @@ module Squared
               [name, $3, $2 || (name.size == 1 && $1.empty? ? true : '')]
             end
 
-            def arg?(target, *args, value: false, **)
+            def arg?(target, *args, value: false)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               r << matchopts(s, value) unless s.empty?
               a = target.to_a
@@ -169,11 +152,8 @@ module Squared
             end
 
             def pattern?(val)
-              Regexp.new(val)
               val.start_with?('\A', '^') || val.end_with?('\z', '$') ||
               val.match?(/[.)][*+?]|\(\?[:=!><]|\\[dsw\d]|\[.+\]|\{\d+,?\d*\}/i)
-            rescue RegexpError
-              false
             end
 
             private
@@ -271,13 +251,13 @@ module Squared
                       else
                         [flag]
                       end
-                bare.concat(mod) if val.chomp!('?')
-                m.concat(mod) if val.chomp!('m')
                 case val[n.succ]
                 when 'e'
                   e.concat(mod)
                 when 'b'
                   b.concat(mod)
+                when 'm'
+                  m.concat(mod)
                 when 'q'
                   qq.concat(mod) if val[n + 2] == 'q'
                   q.concat(mod)
@@ -296,7 +276,11 @@ module Squared
                 when '+'
                   ml.concat(mod)
                   bare.concat(mod)
+                else
+                  next
                 end
+                m.concat(mod) if val[n + 2] == 'm'
+                bare.concat(mod) if val.end_with?('?')
               else
                 bare << val
                 mod = [val]
@@ -331,7 +315,7 @@ module Squared
             end
             numtype = [
               [i, /\A\d+\z/],
-              [f, /\A(\d+(\.\d*)?|\d*\.\d+)\z/],
+              [f, /\A\d*(\.\d+)?\z/],
               [si, /\A-?\d+\z/]
             ].freeze
             numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && v.match?(pat) } }
@@ -364,10 +348,6 @@ module Squared
                 if opt =~ OPT_VALUE
                   key = $1
                   val = $2
-                  if val =~ /\A(["'])(.+)\1\z/
-                    val = $2
-                    double = $1 == '"'
-                  end
                   has = lambda do |a|
                     return true if a.include?(key)
                     return false unless (k = a.find { |s| s.end_with?(':*') })
@@ -375,14 +355,12 @@ module Squared
                     key.start_with?(k.chomp('*')) && !key.end_with?(':')
                   end
                   kwargs = { sep: se[key] || sep, merge: has.call(m), switch: sw[key] }
-                  kwargs[:double] = double unless double.nil?
                   if has.call(e) || (has.call(bl) && %w[true false].include?(val))
                     add shell_option(key, val, **kwargs)
                   elsif has.call(q)
-                    kwargs[:double] = true if has.call(qq)
-                    add quote_option(key, val, **kwargs)
+                    add quote_option(key, val, double: has.call(qq), **kwargs)
                   elsif has.call(p)
-                    if !double.nil?
+                    if val.match?(/\A(["']).+\1\z/)
                       add shell_option(key, val, escape: false, **kwargs)
                     elsif path
                       add quote_option(key, path + val, **kwargs)
@@ -631,7 +609,7 @@ module Squared
                 val = OptionPartition.send(:matchopts, val) unless val.is_a?(Regexp)
                 blk = proc { |s| s&.match?(val) }
               else
-                raise TypeError, "unknown: #{val}"
+                raise TypeError, Common::Format.message('unknown', val, hint: target.first)
               end
             end
             ret = find_all(&blk)
@@ -680,10 +658,7 @@ module Squared
 
           def readline(msg, fallback = nil, option: nil, quote: false, force: true, double: false)
             begin
-              require 'readline' unless defined?(Readline)
-              ret = Readline.readline("#{msg}#{force ? ':' : '?'} ", false).strip
-            rescue LoadError
-              raise unless (ret = fallback) || !force
+              ret = Common::Prompt.reline.readline("#{msg}#{force ? ':' : '?'} ", false).strip
             rescue Interrupt
               exit(force ? 1 : 0)
             else

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

@@ -7,6 +7,15 @@ module Squared
         module Utils
           private
 
+          def symjoin(*args, char: ':')
+            args.flatten.join(char).to_sym
+          end
+
+          def collect_hash(data, pass: [])
+            data = data.reject { |key,| pass.include?(key) } unless pass.empty?
+            data.values.flatten
+          end
+
           def rand_s(size)
             require 'random/formatter'
             Random.new.alphanumeric(size)
@@ -26,29 +35,13 @@ module Squared
             end
           end
 
-          def matchmap(list, prefix = nil, negate: false)
-            ret = negate ? [[], []] : []
-            list.each do |val|
-              unless val.is_a?(Regexp)
-                val = val.dup
-                n = 1 if negate && val.delete_prefix!('!')
-                if prefix
-                  a = nil
-                  val.sub!(/\A(\^|\\A)/) do |s|
-                    a = s
-                    nil
-                  end
-                  val = ".*#{val}" unless a
-                end
-              end
-              pat = Regexp.new("#{a}#{prefix}#{val == '*' ? '.+' : val}")
-              if negate
-                ret[n || 0] << pat
-              else
-                ret << pat
-              end
+          def matchmap(list, prefix: nil)
+            list.map do |val|
+              next val if val.is_a?(Regexp)
+
+              val = ".*#{val}" if prefix && !val.sub!(/\A(\^|\\A)/, '')
+              Regexp.new("#{prefix}#{val == '*' ? '.+' : val}")
             end
-            ret
           end
 
           def matchany?(list, *args, empty: true)

data/lib/squared/workspace/repo.rb

@@ -20,7 +20,7 @@ module Squared
                           elsif !repo_install? && !repo_confirm
                             @root = nil
                           end
-                          raise_error Errno::EEXIST, path.cleanpath, hint: 'REPO_HOME' unless @root
+                          raise Errno::EEXIST, message(path.cleanpath, hint: 'REPO_HOME') unless @root
                         end
                         path.realdirpath
                       elsif (val = env('REPO_ROOT'))
@@ -28,7 +28,7 @@ module Squared
                         if !@root.exist?
                           @root.mkpath
                         elsif !repo_install?(parent: true) && !repo_confirm
-                          raise_error Errno::EEXIST, @root, hint: 'REPO_ROOT'
+                          raise Errno::EEXIST, message(@root, hint: 'REPO_ROOT')
                         end
                         @root.join(main).realdirpath
                       elsif repo_install?(parent: true) && (!home.exist? || @root + main == home)
@@ -157,6 +157,8 @@ module Squared
                   [proj, proj.build? && (script || run), doc && proj.doc?, lint && proj.lint?, test && proj.test?]
                 end
                 .select do |proj, run, doc, lint, test|
+                  next unless proj
+
                   proj.doc(sync: true) if doc
                   proj.build(sync: true) if run
                   next if n.anybits?(4)
@@ -184,7 +186,8 @@ module Squared
               end
               env('REPO_GROUPS', **envargs) do |val|
                 g = case val
-                    when '0', 'false' then nil
+                    when '0', 'false'
+                      nil
                     else
                       val
                     end
@@ -274,13 +277,13 @@ module Squared
                          end
       end
 
-      def repo_run(cmd, opts = [], exception: false, options: true, **kwargs)
+      def repo_run(cmd, opts = [], exception: exception?, options: true, **kwargs)
         cmd = [repo_bin, cmd]
         cmd << opts.uniq.join(' ') unless opts.empty?
         env('REPO_OPTIONS', **kwargs) { |val| cmd << val } if options
         cmd = cmd.join(' ')
         puts log_message(cmd, subject: main, hint: root) if verbose
-        Common::System.shell(cmd, chdir: root, exception: exception || env('REPO_FAIL', equals: %w[1 true]))
+        Common::System.shell(cmd, chdir: root, exception: exception)
       end
 
       def repo_bin
@@ -307,7 +310,7 @@ module Squared
         r = r.keys
         pass = g.empty? && r.empty?
         select do |proj|
-          next unless proj.enabled?(baseref)
+          next unless proj.enabled?(ref: baseref)
 
           proj.global_set(name)
           i = -1
@@ -338,7 +341,7 @@ module Squared
           task_invoke(name, **proj.workspace.invokeargs)
         end
       rescue => e
-        raise if exception
+        raise if exception?
 
         warn log_warn(e, pass: true) if warning
       end

data/lib/squared/workspace/series.rb

@@ -38,10 +38,18 @@ module Squared
             end
           end
           if (args = obj.batchargs)
-            batch_set(*args)
+            if args.first.is_a?(Hash)
+              batch_set(obj.ref, *args)
+            else
+              batch_set(*args)
+            end
           end
           if (args = obj.aliasargs)
-            alias_set(*args)
+            if args.first.is_a?(Hash)
+              alias_set(obj.ref, *args)
+            else
+              alias_set(*args)
+            end
           end
         end
         workspace.config_get(:batch)&.each { |args| batch_set(*args) }
@@ -209,9 +217,8 @@ module Squared
         already_invoked? parallel, val
       end
 
-      def exclude?(key, fallback = false, empty: nil)
-        fallback = empty unless empty.nil?
-        @exclude.include?(key) || (fallback && (!key?(key) || self[key].empty?))
+      def exclude?(key, empty = false)
+        @exclude.include?(key) || (empty && (!key?(key) || self[key].empty?))
       end
 
       private

metadata

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