squared 0.7.4 → 0.7.6

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

@@ -578,9 +578,6 @@ module Squared
                           if s && (%w[system latest].include?(s) || SEM_VER.match?(s) || s.start_with?(/(path|ref):/))
                             rbvm = exist?(ver.last) && !exist?(ver.first)
                             case vmname
-                            when nil
-                              print_error('no version manager detected', subject: name)
-                              next
                             when 'asdf'
                               unless rbvm
                                 asdf(:set, **{ name: args.name, version: s, banner: verbose? }.compact)
@@ -596,24 +593,25 @@ module Squared
                                 run(banner: verbose?)
                                 next
                               end
+                            when nil
+                              print_error('no version manager detected', subject: name)
+                              next
                             end
                             File.write(basepath(ver.last), "#{s}\n") if SEM_VER.match?(s)
                             next
                           end
                           pwd_set do
                             out = []
-                            tool = args.name || (args.local && !SEM_VER.match?(args.local) ? args.local : 'ruby')
-                            trim = ->(s) { s[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
-                            out << trim.call(case (vm, bin = vmname(bin: true))
+                            tool = args.name || (s && !SEM_VER.match?(s) ? s : 'ruby')
+                            trim = ->(val) { val[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
+                            vm, bin = vmname(bin: true)
+                            out << trim.call(case vm
                                              when 'rvm'
-                                               ver.shift
                                                `rvm current`[/^\S+/, 0]
                                              when 'rbenv'
-                                               ver.shift
                                                name = `rbenv version-name`
                                                (name =~ SEM_VER) == 0 ? "ruby #{name}" : name
                                              when 'chruby'
-                                               ver.shift
                                                chruby = session_output 'source', bin
                                                `#{chruby.with('ruby --version')}`
                                              when 'mise'
@@ -673,26 +671,53 @@ module Squared
                                 log.debug e
                               end
                               if ver
-                                ver = mise + ver if vm == 'mise'
+                                if vm == 'mise'
+                                  ver = mise + ver
+                                  pat = /^\s*#{tool}\s*=\s*\[?(.+?)\]?\s*$/
+                                elsif vm != 'asdf'
+                                  ver.shift
+                                end
+                                append = ->(file, hint) { out << message("found #{file}", hint: hint) }
                                 catch :found do
                                   path.ascend do |dir|
-                                    ver.filter { |val| dir.join(val).exist? }.each do |val|
-                                      dir += val
-                                      file = File.read(dir)
+                                    ver.select { |val| dir.join(val).exist? }.each do |val|
+                                      file = dir + val
                                       hint = if val.include?('mise')
-                                               line = file[/^\s*#{tool}\s*=\s*\[?(.+?)\]?\s*$/, 1]
-                                               line&.gsub(/["']/, '')
+                                               file.read[pat, 1]&.gsub(/["']/, '')
                                              else
-                                               file.lines
+                                               file.read
+                                                   .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
+                                                   .yield_self do |data|
+                                                     target = data.find { |line| line.include?(tool) }
+                                                     target ? [target] : data
+                                                   end
                                                    .join(', ')
                                              end
-                                      out << message("found #{dir}", hint: hint)
-                                      throw :found if hint&.include?(out.first[/^(?:j|truffle)?ruby ([\d.]+)/, 1])
+                                      append.call(file, hint)
+                                      if hint&.include?(out.first[/^(?:(?:j|truffle)?ruby|#{tool}) ([\d.]+)/, 1])
+                                        throw :found
+                                      end
                                     rescue
                                       nil
                                     end
+                                    file = case vm
+                                           when 'rbenv'
+                                             '.rbenv/version'
+                                           when 'rvm'
+                                             '.rvm/config/default'
+                                           when 'mise'
+                                             '.config/mise/config.toml'
+                                           else
+                                             next
+                                           end
+                                    if File.exist?(file = dir.join(file))
+                                      hint = out.first.split(' ', 2).last
+                                      pat ||= SEM_VER
+                                      append.call(file, file.read[/^(.*(?:#{Regexp.escape(hint)}|#{pat}).*)$/, 1])
+                                      throw :found
+                                    end
                                   end
                                 end
                               end
@@ -714,7 +739,7 @@ module Squared
                           when 'mise'
                             cmd = session('mise', 'reshim', args.name || 'ruby')
                           else
-                            print_error('not supported by version manager', subject: args.name)
+                            print_error('reshim not supported by version manager', subject: args.name)
                           end
                           success?(run(banner: verbose?), verbose?) if cmd
                         end
@@ -821,7 +846,7 @@ module Squared
             elsif se || ia || up
               items = []
             end
-            OptionPartition.new(opts, bundleopts(:outdated), cmd << "--#{flag}", project: self)
+            OptionPartition.new(opts, bundleopts(:outdated), cmd << "--#{flag}", project: self, strict: strict?)
                            .clear
           elsif (up = option('u', 'update', prefix: 'bundle'))
             flag = case up
@@ -892,7 +917,7 @@ module Squared
                       when '~>'
                         if c < v && cur[0] == val[0] && !semmajor?(cur, val)
                           styles[0] = :yellow
-                        else 
+                        else
                           styles[1] = semmajor?(val, lat) ? :underline : :bold
                         end
                       end
@@ -982,8 +1007,8 @@ module Squared
             from = symjoin 'ruby', flag
           end
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, multiple: [/^-e/], args: true,
-                                                                        stdin: true)
+          op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, strict: strict?,
+                                                                        multiple: [/^-e/], args: true, stdin: true)
           if kwargs[:command]
             op << quote_option('e', kwargs[:command])
           elsif kwargs[:file]
@@ -1026,7 +1051,7 @@ module Squared
             opts.concat(args)
           end
           op = OptionPartition.new(opts, gemopts(flag), gem_session(flag),
-                                   project: self, no: OPT_GEM[:no][flag == :update ? :install : flag])
+                                   project: self, strict: strict?, no: OPT_GEM[:no][flag == :update ? :install : flag])
           from = symjoin 'gem', flag
           if flag == :outdated
             op.adjoin(gempwd, start: 0) if gempwd
@@ -1380,7 +1405,7 @@ module Squared
           end
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
           invalid = ->(a) { raise_error ArgumentError, "unrecognized args: #{a.join(', ')}", hint: flag }
-          cmd = bundle_session(flag)
+          cmd = bundle_session flag
           case flag
           when :cache, :check, :clean, :init, :install, :lock, :pack, :package, :platform
             pre = true
@@ -1426,7 +1451,8 @@ module Squared
                                                       flag
                                                     end),
                                    cmd,
-                                   project: self, no: OPT_BUNDLE[:no][flag], args: flag == :exec || flag == :config)
+                                   project: self, strict: strict?, no: OPT_BUNDLE[:no][flag],
+                                   args: flag == :exec || flag == :config)
           op.concat(args) unless pre
           output = false
           case flag
@@ -1437,7 +1463,7 @@ module Squared
               a = op.dup
               b, c = op.slice!(0, 2)
               d = op.arg?('global', 'local')
-              getname = -> { op << (b || readline('Enter name', force: true)) }
+              getname = -> { b ? op << b : op.readline('Enter name') }
               case pre
               when 'get'
                 getname.call
@@ -1448,7 +1474,7 @@ module Squared
                   c = op.shift
                 end
                 getname.call
-                op << (c || readline('Enter value', force: true))
+                c ? op << c : op.readline('Enter value', quote: true)
                 output = true
               when 'unset'
                 if d
@@ -1472,9 +1498,8 @@ module Squared
               end
               op.clear
             else
-              val = readline('Enter arguments', force: false)
-              op << (val.empty? ? 'list' : val)
-              output = val.start_with?('set', 'unset')
+              output = op.readline('Enter arguments', 'list')
+                         .start_with?('set', 'unset')
             end
           when :plugin
             case plu
@@ -1485,7 +1510,7 @@ module Squared
             end
           when :exec
             if op.empty? || (op.remove(':') && op.append(quote: false))
-              op << readline('Enter arguments', force: true)
+              op.readline('Enter arguments')
             else
               op.append(quote: false)
             end
@@ -1509,7 +1534,7 @@ module Squared
 
         def rake(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rake], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:rake], rake_session, project: self)
+          op = OptionPartition.new(opts, OPT_RUBY[:rake], rake_session, project: self, strict: strict?)
           op.adjoin(quote_option('f', rakefile)) if rakefile && !op.arg?('f', 'rakefile')
           op.concat(args)
           op.append(escape: true)
@@ -1535,11 +1560,11 @@ module Squared
             break if val == '--'
             next unless exist?(val, type: 'f')
 
-            args[index] = shell_quote(basepath(val))
+            args[index] = shell_quote basepath(val)
             cmd.merge(args.slice!(0, index + 1))
             break
           end
-          op = OptionPartition.new(opts, OPT_RUBY[:rdbg], cmd, project: self, first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[:rdbg], cmd, project: self, strict: strict?, first: [/\.rb$/])
           op.concat(args)
           op.append(quote: false, delim: true)
           print_run(op, banner, **kwargs)
@@ -1555,7 +1580,7 @@ module Squared
           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)
+          op = OptionPartition.new(opts, [], cmd << flag, project: self, strict: strict?)
           case flag
           when :prototype
             sig = args.shift
@@ -1598,7 +1623,7 @@ module Squared
 
         def rubocop(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rubocop], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self,
+          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self, strict: strict?,
                                                                                  no: OPT_RUBY[:no][:rubocop])
           if @rubocopfile && !op.arg?('c', 'config') && !rootpath('.rubocop.yml', ascend: true).exist?
             op.add_path(@rubocopfile, option: 'c')
@@ -1620,6 +1645,9 @@ module Squared
 
         def serve(root, *, bind: nil, port: 3000, **kwargs)
           require 'webrick'
+        rescue LoadError => e
+          print_error(e, pass: true)
+        else
           config = kwargs.merge({ DocumentRoot: root })
           config[:BindAddress] = bind if bind
           config[:Port] = port if port
@@ -1773,7 +1801,7 @@ module Squared
               parse.call(target.resolve_feature_path(gemname)&.last)
             end
             unless gemdir || pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
-              raise_error Errno::ENOENT, 'gems home'
+              raise Errno::ENOENT, 'gems home'
             end
           end
         rescue => e
@@ -1792,7 +1820,8 @@ module Squared
         private
 
         def run_repl(*args, opts:, banner:, from:, delim: true, **kwargs)
-          op = OptionPartition.new(opts, OPT_RUBY[from], session(from), project: self, first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[from], session(from), project: self, strict: strict?,
+                                                                        first: [/\.rb$/])
           r = []
           r << 'bundler/setup' if !op.arg?('r') && bundle_load
           r.concat(Array(kwargs[:name])) if kwargs[:name]
@@ -1825,7 +1854,7 @@ module Squared
         def rbs_session(*cmd, opts: nil)
           return session('rbs', *cmd) unless opts
 
-          op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self)
+          op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self, strict: strict?)
           [session('rbs', *op.to_a, *cmd), op.extras]
         end
 

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.6
 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.11
 specification_version: 4
 summary: Rake task generator for managing multi-language workspaces.
 test_files: []