squared 0.7.4 → 0.7.5

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

@@ -65,14 +65,14 @@ module Squared
               ret
             end
 
-            def clear(target, opts, pass: true, styles: nil, **kwargs)
+            def clear(target, opts, pass: true, strict: false, styles: nil, **kwargs)
               return if opts.empty?
 
               kwargs[:subject] ||= target.first.stripext
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_warn(opts.join(', '), pass: true, **kwargs)
-              exit 1 unless pass || confirm("Run? [#{sub_style(target, styles)}]", 'N')
+              exit 1 unless !strict && (pass || confirm("Run? [#{sub_style(target, styles)}]", 'N'))
             end
 
             def delete_key(target, *args, value: false, reverse: false, count: -1)
@@ -195,10 +195,12 @@ module Squared
           def_delegator :@extras, :find_all, :detect_all
           def_delegator :@extras, :find_index, :detect_index
 
-          def initialize(opts, list, target = JoinSet.new, project: nil, path: nil, sep: '=', **kwargs, &blk)
+          def initialize(opts, list, target = JoinSet.new, project: nil, path: nil, strict: false, sep: '=', **kwargs,
+                         &blk)
             @target = target.is_a?(Set) ? target : target.to_set
             @project = project
             @path = path || project&.path
+            @strict = strict
             @sep = sep
             @errors = []
             @found = []
@@ -242,42 +244,51 @@ module Squared
               end
               if (n = val.index('='))
                 flag = val[0, n]
+                enum = flag.split(':')
+                mod = if enum.size > 1
+                        pre = enum.shift
+                        enum.map { |s| "#{pre}:#{s}" }
+                      else
+                        [flag]
+                      end
                 case val[n.succ]
                 when 'e'
-                  e << flag
+                  e.concat(mod)
                 when 'b'
-                  b << flag
+                  b.concat(mod)
                 when 'm'
-                  m << flag
+                  m.concat(mod)
                 when 'q'
-                  qq << flag if val[n + 2] == 'q'
-                  q << flag
+                  qq.concat(mod) if val[n + 2] == 'q'
+                  q.concat(mod)
                 when 'p'
-                  p << flag
+                  p.concat(mod)
                 when 'i'
-                  i << flag
+                  i.concat(mod)
                 when 'f'
-                  f << flag
+                  f.concat(mod)
                 when 'n'
-                  si << flag
+                  si.concat(mod)
                 when 'v'
-                  @values << Regexp.escape(flag)
+                  @values.concat(mod.map { |s| Regexp.escape(s) })
                 when '!'
-                  bl << flag
+                  bl.concat(mod)
                 when '+'
-                  ml << flag
-                  bare << flag
+                  ml.concat(mod)
+                  bare.concat(mod)
                 else
                   next
                 end
-                m << flag if val[n + 2] == 'm'
-                bare << flag if val.end_with?('?')
-                val = flag
+                m.concat(mod) if val[n + 2] == 'm'
+                bare.concat(mod) if val.end_with?('?')
               else
                 bare << val
+                mod = [val]
+              end
+              mod.each do |key|
+                sw[key] = op1 if op1
+                se[key] = op2 if op2
               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)
@@ -337,14 +348,18 @@ module Squared
                 if opt =~ OPT_VALUE
                   key = $1
                   val = $2
-                  merge = m.include?(key)
-                  switch = sw[key]
-                  kwargs = { sep: se[key] || sep, merge: merge, switch: switch }
-                  if e.include?(key) || (bl.include?(key) && %w[true false].include?(val))
+                  has = lambda do |a|
+                    return true if a.include?(key)
+                    return false unless (k = a.find { |s| s.end_with?(':*') })
+
+                    key.start_with?(k.chomp('*')) && !key.end_with?(':')
+                  end
+                  kwargs = { sep: se[key] || sep, merge: has.call(m), switch: sw[key] }
+                  if has.call(e) || (has.call(bl) && %w[true false].include?(val))
                     add shell_option(key, val, **kwargs)
-                  elsif q.include?(key)
-                    add quote_option(key, val, double: qq.include?(key), **kwargs)
-                  elsif p.include?(key)
+                  elsif has.call(q)
+                    add quote_option(key, val, double: has.call(qq), **kwargs)
+                  elsif has.call(p)
                     if val.match?(/\A(["']).+\1\z/)
                       add shell_option(key, val, escape: false, **kwargs)
                     elsif path
@@ -352,7 +367,7 @@ module Squared
                     else
                       push opt
                     end
-                  elsif b.include?(key) || numcheck.call(key, val) || se[key] || merge || switch
+                  elsif kwargs[:merge] || has.call(b) || numcheck.call(key, val) || se[key] || sw[key]
                     add basic_option(key, val, **kwargs)
                   else
                     push opt
@@ -380,8 +395,8 @@ module Squared
             self
           end
 
-          def append(*args, **kwargs, &blk)
-            args = extras if args.empty?
+          def append(*args, clear: false, **kwargs, &blk)
+            args = clear ? extras.dup.tap { extras.clear } : extras if args.empty?
             pass = kwargs[:pass] ||= []
             OptionPartition.append(target, *args, **kwargs, &blk)
             errors.concat(pass)
@@ -459,15 +474,15 @@ module Squared
             list.reject { |val| ignore.include?(s = nameonly(val)) || any?(OptionPartition.send(:matchopt, s)) }
           end
 
-          def clear(opts = nil, errors: false, **kwargs)
+          def clear(opts = nil, errors: false, strict: @strict, **kwargs)
             styles = project.theme[:inline] if project
             if errors
-              OptionPartition.clear(target, @errors, styles: styles, **kwargs)
+              OptionPartition.clear(target, @errors, strict: strict, styles: styles, **kwargs)
               @errors.clear
               return self unless opts
             end
             opts ||= extras
-            OptionPartition.clear(target, opts - found, styles: styles, **kwargs)
+            OptionPartition.clear(target, opts - found, strict: strict, styles: styles, **kwargs)
             opts.clear
             self
           end
@@ -641,6 +656,29 @@ module Squared
             self
           end
 
+          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
+            rescue Interrupt
+              exit(force ? 1 : 0)
+            else
+              exit 1 if ret.empty? && !(ret = fallback) && force
+            end
+            return unless ret
+
+            if option
+              add quote_option(option, ret, double: double)
+            elsif quote
+              add shell_quote(ret, option: false, double: double)
+            else
+              add ret
+            end
+            ret
+          end
+
           def reset(errors: false)
             extras.clear
             found.clear

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

@@ -8,12 +8,10 @@ module Squared
           private
 
           def rand_s(size)
-            if RUBY_VERSION >= '3.1'
-              require 'random/formatter'
-              Random.new.alphanumeric(size)
-            else
-              (0...size).map { rand(97..122).chr }.join
-            end
+            require 'random/formatter'
+            Random.new.alphanumeric(size)
+          rescue LoadError
+            (0...size).map { rand(97..122).chr }.join
           end
 
           def merge_list(target, list)

data/lib/squared/workspace/repo.rb

@@ -47,8 +47,8 @@ module Squared
         envargs = name ? { suffix: name.upcase, strict: true } : {}
         data = scriptobj
         if repo?
-          env('REPO_GROUP', **envargs) { |val| group = split_escape(val) }
-          env('REPO_REF', **envargs) { |val| ref = split_escape(val) }
+          env('REPO_GROUP', **envargs) { |s| group = split_escape(s) }
+          env('REPO_REF', **envargs) { |s| ref = split_escape(s) }
           data[:dev] = env_match('REPO_DEV', dev, **envargs)
           data[:prod] = env_match('REPO_PROD', prod, **envargs)
           @warning = env_match('REPO_WARN', @warning && !root?(@root, pass: ['.repo'])) != false unless name
@@ -76,7 +76,7 @@ module Squared
                                 sc
                               end
                             end
-            data[:args] = env('REPO_SCRIPT', **envargs) { |val| shell_split(val, join: true) } || args
+            data[:args] = env('REPO_SCRIPT', **envargs) { |s| shell_split(s, join: true) } || args
             global[:script] = true
           else
             ru ||= sc
@@ -207,7 +207,8 @@ module Squared
               opts = if stage == 'init'
                        []
                      else
-                       raise_error 'repo not initialized' unless branch
+                       raise 'repo not initialized' unless branch
+
                        repo_opts
                      end
               args.to_a.each do |val|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: squared
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 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.3
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []