squared 0.4.8 → 0.4.10

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

@@ -7,23 +7,23 @@ module Squared
         GEMFILE = %w[Gemfile Gemfile.lock gem.deps.rb Isolate].freeze
         DIR_RUBY = (GEMFILE + Rake::Application::DEFAULT_RAKEFILES + ['README.rdoc']).freeze
         OPT_RUBY = {
-          ruby: %w[a c l n p s S w d|debug jit rjit v|verbose y|yydebug 0=im? backtrace-limit=i crash-report=q
-                   disable=q dump=q e=q enable=q encoding=b external-encoding=b Eex=m? F=qm i=m? internal-encoding=b
-                   I=pm parser=b r=bm W=bm? x=pm?].freeze,
+          ruby: %w[0=im? a c e=q E=bm F=qm i=bm? I=pm l n p r=bm s S w W=bm? x=pm? d|debug jit rjit v|verbose y|yydebug
+                   backtrace-limit=i crash-report=q disable=q dump=q enable=q encoding=b external-encoding=b
+                   internal-encoding=b parser=b].freeze,
           rake: %w[A|all B|build-all comments n|dry-run p|execute-print=q m|multitask P|prereqs q|quiet
                    X|no-deprecation-warnings N|no-search G|no-system nosearch nosystem rules s|silent g|system
-                   v|verbose backtrace=b? D|describe=q? e|execute=q E|execute-continue=q I|libdir=p job-stats=b?
-                   j|jobs=i? R|rakelib=p rakelibdir=p r|require=b suppress-backtrace=q T|tasks=q? t|trace=b?
+                   v|verbose backtrace=b? D|describe=q? e|execute=q E|execute-continue=q job-stats=b? j|jobs=i?
+                   I|libdir=p R|rakelib=p rakelibdir=p r|require=b suppress-backtrace=q T|tasks=q? t|trace=b?
                    W|where=q?].freeze,
-          irb: %w[d f U w E=b I=p r=b W=m? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
-                  inspect multiline no-pager noautocomplete nocolorize noecho noinspect noecho-on-assignment
+          irb: %w[d f U w E=b I=p r=b W=im? autocomplete colorize echo echo-on-assignment extra-doc-dir inf-ruby-mode
+                  inspect multiline no-pager noautocomplete nocolorize noecho noecho-on-assignment noinspect
                   nomultiline noprompt noscript nosingleline noverbose regexp-completor sample-book-mode script
                   simple-prompt single-irb singleline tracer truncate-echo-on-assignment type-completor verbose
                   back-trace-limit=i context-mode=i prompt=b prompt-mode=b].freeze
         }.freeze
         OPT_BUNDLE = {
           common: %w[no-color V|verbose retry=i].freeze,
-          install: %w[frozen no-cache no-prune system path=p binstubs=p? standalone=q? target-rbconfig=p trust-policy=b
+          install: %w[frozen no-cache no-prune system binstubs=p? path=p standalone=q? target-rbconfig=p trust-policy=b
                       with=q without=q].freeze,
           install_base: %w[full-index quiet retry gemfile=p j|jobs=i].freeze,
           update: %w[conservative local pre redownload ruby strict bundler=b? g|group=q source=b].freeze,
@@ -42,18 +42,19 @@ module Squared
                            target-rbconfig=p? P|trust-policy=b without=b].freeze,
           update: %w[system=b?].freeze,
           uninstall: %w[a D I x vendor n|bindir=p i|install-dir=p platform=b v|version=b].freeze,
-          outdated: %w[b|both clear-sources l|local no-http-proxy r|remote B|bulk-threshold=i p|http-proxy=q?
-                       platform=q source=q].freeze,
-          push: %w[no-http-proxy attestation=p host=q key=b otp=b p|http-proxy=q?].freeze,
+          outdated: %w[b|both clear-sources l|local no-http-proxy r|remote B|bulk-threshold=i p|http-proxy=q? platform=q
+                       source=q].freeze,
+          push: %w[no-http-proxy attestation=p host=q p|http-proxy=q? key=b otp=b].freeze,
           build: %w[force strict o|output=p platform=q].freeze,
-          exec: %w[conservative prerelease no-prerelease g|gem=v version=b].freeze,
-          pristine: %w[all env-shebang extensions no-env-shebang no-extensions only-executables only-missing-extensions
-                       only-plugins n|bindir=p i|install-dir=p skip=b v|version=b].freeze,
+          exec: %w[conservative no-prerelease prerelease g|gem=v version=b].freeze,
+          pristine: %w[all only-executables only-missing-extensions only-plugins n|bindir=p i|install-dir=p skip=b
+                       v|version=b].freeze,
           no: {
-            install: %w[env-shebang force format-executable http-proxy lock minimal-deps post-install-message
-                        prerelease suggestions user-install wrappers].freeze,
+            install: %w[env-shebang force format-executable http-proxy lock minimal-deps post-install-message prerelease
+                        suggestions user-install wrappers].freeze,
             uninstall: %w[abort-on-dependent all check-development executables force format-executable
-                          ignore-dependencies user-install].freeze
+                          ignore-dependencies user-install].freeze,
+            pristine: %w[env-shebang extensions].freeze
           }.freeze
         }.freeze
         private_constant :GEMFILE, :DIR_RUBY, :OPT_RUBY, :OPT_BUNDLE, :OPT_GEM
@@ -101,7 +102,7 @@ module Squared
           end
           @autodetect = autodetect
           @dependindex = GEMFILE.index { |file| basepath(file).exist? }
-          @dependfile = basepath(GEMFILE[@dependindex || 0])
+          @dependfile = @path + GEMFILE[@dependindex || 0]
           return if !@output[0].nil? || !@copy.nil? || @version || @autodetect || (file = rakefile).nil?
 
           begin
@@ -160,17 +161,19 @@ module Squared
                   next unless (spec = basepath("#{project}.gemspec") || basepath("#{name}.gemspec"))
                   next unless basepath('lib').join("#{gemname = stripext(spec)}.rb").exist?
 
-                  format_desc action, nil, 'opts*,args*'
+                  format_desc action, nil, 'opts*,args*|:'
                   task action do |_, args|
-                    irb gemname, args.to_a
+                    args = args.to_a
+                    if args.last == ':'
+                      args.pop
+                      load = readline('Enter file and arguments', force: false)
+                    end
+                    irb(gemname, args, load: load)
                   end
                 else
                   format_desc(action, nil, OPT_BUNDLE[action.to_sym], after: case action
-                                                                             when 'cache', 'check'
-                                                                               nil
-                                                                             else
-                                                                               'command+'
-                                                                             end)
+                                                                             when 'cache', 'check' then nil
+                                                                             else 'command+' end)
                   task action do |_, args|
                     bundle(action, *args.to_a)
                   end
@@ -187,7 +190,7 @@ module Squared
                     when 'gem'
                       case flag
                       when :outdated
-                        format_desc action, flag, 'major|minor|patch|(i)nteractive?,opts*'
+                        format_desc action, flag, 'major|minor|patch|interactive?,opts*'
                         task flag, [:semver] do |_, args|
                           case (filter = args.semver)
                           when 'major', 'minor', 'patch', 'interactive', 'i'
@@ -207,8 +210,8 @@ module Squared
                       else
                         format_desc action, flag, "opts*,name+#{flag == :pristine ? '|name?@version' : ''}"
                         task flag do |_, args|
-                          opts = param_guard(action, flag, args: args.to_a)
-                          gem! flag, opts
+                          args = param_guard(action, flag, args: args.to_a)
+                          gem! flag, args
                         end
                       end
                     when 'ruby'
@@ -216,19 +219,21 @@ module Squared
                       when :file
                         format_desc action, flag, 'path,opts*,args*'
                         task flag, [:rb] do |_, args|
-                          file = param_guard(action, flag, args: args, key: :rb)
-                          ruby(flag, args.to_a.drop(1), file: file)
-                        end
-                      when :script
-                        format_desc action, flag, 'command|RUBY_E,opts*,args*'
-                        task flag, [:e] do |_, args|
-                          if (command = ENV['RUBY_E'])
-                            opts = args.to_a
+                          if (file = args.rb)
+                            args = args.to_a.drop(1)
                           else
-                            command = param_guard(action, flag, args: args, key: :e)
-                            opts = args.to_a.drop(1)
+                            file, opts, extra = choice_index('Select a file', Dir.glob('*.rb', base: path),
+                                                             values: %w[Options Arguments], force: true, series: true)
+                            args = OptionPartition.strip(opts)
+                            ENV['RUBY_ARGS'] = extra if extra
                           end
-                          ruby(flag, opts, command: command)
+                          ruby(flag, args, file: file)
+                        end
+                      when :script
+                        format_desc action, flag, 'opts*,args*'
+                        task flag do |_, args|
+                          command = ENV['RUBY_E'] || readline('Enter script', force: true, multiline: ['##', ';'])
+                          ruby(flag, args.to_a, command: command)
                         end
                       when :version
                         format_desc action, flag
@@ -248,8 +253,9 @@ module Squared
           if @depend
             super
           elsif outdated?
-            workspace.rev_clear(name)
+            workspace.rev_clear(name, sync: sync)
             cmd = bundle_session 'install'
+            cmd << '--without=development' if prod?
             if (n = option('jobs')).to_i > 0
               cmd << "-j#{n}"
             end
@@ -257,14 +263,18 @@ module Squared
           end
         end
 
-        def copy(from: 'lib', include: nil, exclude: nil, into: @gemdir, override: false)
+        def copy(from: 'lib', into: @gemdir, override: false, **kwargs)
+          glob = kwargs[:include]
+          pass = kwargs[:exclude]
           if @copy && !override
             return super unless @copy.is_a?(Hash)
 
             from = @copy[:from] if @copy.key?(:from)
             glob = @copy[:include] if @copy.key?(:include)
-            exclude = @copy[:exclude] if @copy.key?(:exclude)
+            pass = @copy[:exclude] if @copy.key?(:exclude)
             into = @copy[:into] if @copy.key?(:into)
+          elsif @copy == false
+            return
           end
           return unless into
 
@@ -273,12 +283,12 @@ module Squared
           print_item unless @output[0] || task_invoked?(/^copy(?::#{Ruby.ref}|$)/)
           glob = as_a(glob || '**/*')
           as_a(from).each_with_index do |val, i|
-            a = basepath(val)
-            b = dest.join(val)
-            c = glob[i] || glob[0]
-            log.info "cp #{a.join(c)} #{b}"
+            a = path + val
+            b = dest + val
+            c = glob[i] || glob.first
+            log.info "cp #{a + c} #{b}"
             begin
-              copy_dir(a, b, c, pass: exclude, verbose: verbose)
+              copy_dir(a, b, c, pass: pass, verbose: verbose)
             rescue StandardError => e
               log.error e
               ret = on(:error, :copy, e)
@@ -310,8 +320,8 @@ module Squared
                   data = line.scan(SEM_VER)
                   next unless (cur = data.shift) && (lat = data.shift)
 
-                  semver(cur)
-                  semver(lat)
+                  semver cur
+                  semver lat
                   c = cur.join
                   l = lat.join
                   styles = []
@@ -414,7 +424,7 @@ module Squared
         def update(flag, opts = [])
           bundle_session 'update', "--#{flag}"
           append_bundle(opts, OPT_BUNDLE[:install_base] + OPT_BUNDLE[:update] + OPT_BUNDLE[:common],
-                        append: flag == :all ? nil : /^\w+=/)
+                        append: flag == :all ? nil : /\A\w+=/)
           run_rb(from: :update)
         end
 
@@ -423,7 +433,7 @@ module Squared
           when :file, :script
             op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, args: true)
             if file
-              op.extras.unshift(shell_quote(basepath(file)))
+              op.extras.unshift(shell_quote(path + file))
             elsif command
               op << quote_option('e', command, option: false)
             end
@@ -446,7 +456,7 @@ module Squared
               ].each do |val|
                 next unless val.empty? || File.exist?(val.sub('$HOME', Dir.home))
 
-                trim = ->(s) { s[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
+                trim = ->(s) { s[/\A\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/\A([a-z]+)-/i, '\1 ') }
                 ver = '.ruby-version'
                 out << trim.call(case (cmd = File.basename(val))
                                  when 'rvm'
@@ -490,7 +500,7 @@ module Squared
                 end
                 if ver
                   path.ascend do |ent|
-                    next unless (ent = ent.join(ver)).exist?
+                    next unless (ent += ver).exist?
 
                     hint = File.read(ent).lines(chomp: true).reject(&:empty?).join(', ') rescue nil
                     out << message("found #{ent}", hint: hint)
@@ -522,21 +532,17 @@ module Squared
           case flag
           when :install, :update
             list.concat(OPT_GEM[:install_base])
-            no = OPT_GEM[:no][:install]
-            first = true
-          when :uninstall
-            no = OPT_GEM[:no][:uninstall]
-            first = true
-          when :pristine
-            first = true
+            first = ['=']
+          when :uninstall, :pristine
+            first = ['=']
           end
           cmd.merge(preopts)
-          op = OptionPartition.new(opts, list, cmd, project: self, no: no, first: first)
+          op = OptionPartition.new(opts, list, cmd, project: self, no: OPT_GEM[:no][flag], first: first)
           op.each do |opt|
             if opt =~ op.values
               case $1
               when 'g', 'gem'
-                op << (flag == :exec ? shell_option($1, $2) : quote_option($1, basepath($2)))
+                op << (flag == :exec ? shell_option($1, $2) : quote_option($1, path + $2))
               end
             elsif opt.include?('=') && !%i[outdated build push exec].include?(flag)
               op.errors << opt
@@ -559,8 +565,8 @@ module Squared
               items = [[%w[Gem Current Latest], nil]]
               IO.popen(cmd.done).each do |line|
                 if line =~ /^(\S+) \((\S+) < ([^)]+)\)$/
-                  cur = semscan($2)
-                  lat = semscan($3)
+                  cur = semscan $2
+                  lat = semscan $3
                   items << [$~.to_a.drop(1), if semmajor?(cur, lat)
                                                1
                                              else
@@ -570,20 +576,19 @@ module Squared
                   puts line
                 end
               end
-              if items.size == 1
-                puts 'No updates were found'
-              else
+              if items.size > 1
                 pad = [items.size.to_s.size + 1, 3].max
                 d = 0
                 e = 0
                 f = 0
+                j = 0
+                queue = nil
                 items.each do |item|
                   a, b, c = item.first
                   d = a.size if a.size > d
                   e = b.size if b.size > e
                   f = c.size if c.size > f
                 end
-                j = 0
                 items.each_with_index do |item, i|
                   next if i == 0 && stdin?
 
@@ -594,11 +599,10 @@ module Squared
                     2.times do
                       line = sub_style(line, pat: /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, styles: theme[:header], index: 2)
                     end
-                    puts line
-                    puts sub_style(ARG[:BORDER][1] * n, styles: borderstyle)
+                    queue = [line, sub_style(ARG[:BORDER][1] * n, styles: borderstyle)]
                   else
                     g = a.ljust(d)
-                    pat = [/\A([^.]+\.)([^.]+\..+)\z/, /\A([^.]+\.[^.]+\.)(.+)\z/]
+                    pat = [/^([^.]+\.)([^.]+\..+)$/, /^([^.]+\.[^.]+\.)(.+)$/]
                     pre = b.start_with?('0.')
                     latest = [theme[:current]]
                     case item.last
@@ -638,50 +642,58 @@ module Squared
                     b = sub_style(b, *colormap(styles), pat: pat, index: 2)
                     h = sub_style(c.rjust(f), styles: latest.flatten.compact, pat: pat, index: 2)
                     j += 1
+                    if queue
+                      puts queue
+                      queue = nil
+                    end
                     puts "#{"#{j}.".rjust(pad)} #{g}    #{b}  #{h}"
                     update << a if filter == 'interactive' && confirm_outdated(a, c, item.last)
                   end
                 end
               end
             end
-            unless update.empty?
-              cmd = gem_output 'update', '-f'
-              if (val = option('document', prefix: 'gem', ignore: false))
-                cmd << case val
-                       when '0', 'false'
-                         '--no-document'
-                       else
-                         basic_option('document', val)
-                       end
+            if major + minor + patch == 0
+              puts 'No updates were found'
+            else
+              unless update.empty?
+                cmd = gem_output 'update', '-f'
+                if (val = option('document', prefix: 'gem', ignore: false))
+                  cmd << case val
+                         when '0', 'false'
+                           '--no-document'
+                         else
+                           basic_option('document', val)
+                         end
+                end
+                if (val = option('user-install', prefix: 'gem', ignore: false))
+                  cmd << case val
+                         when '0', 'false'
+                           '--no-user-install'
+                         else
+                           '--user-install'
+                         end
+                end
+                cmd.merge(update)
+                run(cmd, banner: false, from: :'gem:update')
               end
-              if (val = option('user-install', prefix: 'gem', ignore: false))
-                cmd << case val
-                       when '0', 'false'
-                         '--no-user-install'
-                       else
-                         '--user-install'
-                       end
+              unless stdin?
+                status = print_footer("major #{major} / minor #{minor} / patch #{patch}", right: true).split("\n")
+                status[1] = sub_style(status[1], pat: /^( +major )(\d+)(.+)$/, styles: theme[:major], index: 2)
+                status[1] = sub_style(status[1], pat: /^(.+)(minor )(\d+)(.+)$/, styles: theme[:active], index: 3)
+                puts status
               end
-              cmd.merge(update)
-              run(cmd, banner: false, from: :'gem:update')
-            end
-            unless stdin?
-              status = print_footer("major #{major} / minor #{minor} / patch #{patch}", right: true).split("\n")
-              status[1] = sub_style(status[1], pat: /^( +major )(\d+)(.+)$/, styles: theme[:major], index: 2)
-              status[1] = sub_style(status[1], pat: /^(.+)(minor )(\d+)(.+)$/, styles: theme[:active], index: 3)
-              puts status
             end
             on :last, from
             return
           when :build, :push
             if !op.empty?
               if flag == :build && op.size == 1
-                op << shell_quote(basepath(op.first))
+                op << shell_quote(path + op.first)
               else
                 raise_error("unknown args: #{op.join(', ')}", hint: flag)
               end
             elsif flag == :build
-              spec = [basepath("#{project}.gemspec"), basepath("#{name}.gemspec"), *Dir.glob(basepath('*.gemspec'))]
+              spec = [path + "#{project}.gemspec", path + "#{name}.gemspec", *Dir.glob(path + '*.gemspec')]
               op << File.basename(spec) if (spec = spec.find { |file| File.exist?(file) })
             end
           when :exec
@@ -692,7 +704,7 @@ module Squared
             if flag == :pristine
               if op.arg?('all')
                 append_repeat 'skip', op.extras
-                op.clear
+                op.extras.clear
               elsif (n = op.first.index('@'))
                 name = op.shift
                 if n == 0
@@ -743,11 +755,16 @@ module Squared
           run_s(args, banner: false, from: :rake)
         end
 
-        def irb(name, opts = [], path: basepath('lib'))
-          op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: true)
-          as_a(name).each { |val| op << shell_option('r', val) }
-          as_a(path).each { |val| op << quote_option('I', val) }
-          op.merge(op.extras)
+        def irb(name, opts = [], path: @path + 'lib', load: nil)
+          op = OptionPartition.new(opts, OPT_RUBY[:irb], session('irb'), project: self, first: [/\.rb$/])
+          as_a(name).each { |val| op << shell_option('r', val, merge: true) }
+          as_a(path).each { |val| op << quote_option('I', val, merge: true) }
+          if load
+            op << '--' << load
+            op.clear
+          else
+            op.append(delim: true)
+          end
           run(banner: false)
         end
 
@@ -759,8 +776,26 @@ module Squared
           return true if super || (@copy.is_a?(Hash) && copy.fetch(:into, nil))
           return gemdir? if @gemdir
 
-          if @version && (home = ENV['GEM_HOME'])
-            @gemdir = Pathname.new(home).join(gempath)
+          if @version
+            begin
+              case @autodetect
+              when 'rvm'
+                @gemdir = pwd_set { `rvm info homes` }[/^\s+gem:\s+"(.+)"$/, 1]
+              when 'rbenv'
+                if pwd_set { `rbenv which ruby` } =~ %r{^(.+[\\/]versions[\\/](\d\.\d)\.[^\\/]+)[\\/]bin[\\/]ruby$}
+                  @gemdir = File.join($1, 'lib/ruby/gems', "#{$2}.0")
+                end
+              when 'asdf'
+                @gemdir = pwd_set { `asdf where ruby` }
+                @gemdir = @gemdir =~ /(\d\.\d)\.[^.]+$/ && File.join(@gemdir, 'lib/ruby/gems', "#{$1}.0")
+              when /bundler?/
+                @gemdir = pwd_set { `bundle env` }[/^\s+Gem Home\s+(.+)$/, 1]
+              end
+            rescue StandardError => e
+              log.debug e
+            else
+              @gemdir = Pathname.new(@gemdir) if @gemdir
+            end
             return true if gemdir?
           end
           return false unless @autodetect
@@ -768,7 +803,7 @@ module Squared
           set = lambda do |val, path|
             log.warn "using version #{val} (given #{@version})" if @version && @version != val
             @version = val
-            @gemdir = Pathname.new(path.strip).join(gempath)
+            @gemdir = Pathname.new(path.strip) + gempath
           end
           if @version
             pwd = gempwd
@@ -899,7 +934,7 @@ module Squared
         end
 
         def gemdir?
-          @gemdir.exist? && !@gemdir.empty?
+          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
         end
 
         def variables
@@ -909,7 +944,7 @@ module Squared
         def rakefile
           return unless (file = Rake::Application::DEFAULT_RAKEFILES.find { |val| basepath(val).exist? })
 
-          basepath file
+          path + file
         end
 
         def rakepwd

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

@@ -35,18 +35,25 @@ module Squared
               kwargs[:hint] ||= 'unrecognized'
               append(target, opts, delim: true) if kwargs.delete(:append)
               warn log_message(Logger::WARN, opts.join(', '), pass: true, **kwargs)
-              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N', timeout: 30)
+              return if pass || confirm("Run? [#{sub_style(target, styles: styles)}] [y/N] ", 'N')
 
               raise_error 'user cancelled'
             end
 
+            def strip(val)
+              return [] unless val
+
+              val = shell_split(val) if val.is_a?(String)
+              val.map { |s| s.sub(/\A-([a-z\d])(.+)\z/mi, '\1=\2').sub(/\A--?/, '') }.reject(&:empty?)
+            end
+
             def arg?(target, *args, value: false)
               r, s = args.partition { |val| val.is_a?(Regexp) }
               unless s.empty?
                 s.map! { |val| Regexp.escape(shell_option(val)) }
                 r << /\A(?:#{s.join('|')})#{value ? '[ =].' : '(?: |=|\z)'}/
               end
-              target.any? { |opt| r.any? { |val| opt.match?(val) } }
+              target.any? { |opt| r.any? { |val| opt&.match?(val) } }
             end
           end
 
@@ -66,7 +73,7 @@ module Squared
             parse(list, opts, **kwargs, &blk)
           end
 
-          def parse(list, opts = extras, no: nil, single: nil, args: false, first: false, pass: ['='], &blk)
+          def parse(list, opts = extras, no: nil, single: nil, args: false, first: nil, &blk)
             @extras = []
             @values = []
             bare = []
@@ -79,8 +86,8 @@ module Squared
             i = []
             f = []
             si = []
-            list.map do |val|
-              x, y = val.split('|')
+            list.flat_map do |val|
+              x, y = val.split('|', 2)
               if y
                 if (n = val.index('='))
                   x += val[n..-1]
@@ -90,7 +97,6 @@ module Squared
                 x
               end
             end
-            .flatten
             .each do |val|
               if (n = val.index('='))
                 flag = val[0, n]
@@ -125,6 +131,12 @@ module Squared
             end
             no = (no || []).map { |val| (n = val.index('=')) ? val[0, n] : val }
             bare.concat(no)
+            numtype = [
+              [i, /\A\d+\z/],
+              [f, /\A\d*(?:\.\d+)?\z/],
+              [si, /\A-?\d+\z/]
+            ].freeze
+            numcheck = ->(k, v) { numtype.any? { |flag, pat| flag.include?(k) && pat.match?(v) } }
             skip = false
             opts.each do |opt|
               next @extras << opt if skip
@@ -140,14 +152,13 @@ module Squared
                   key = $1
                   val = $2
                   merge = m.include?(key)
-                  r = ->(flag, pat) { flag.include?(key) && pat.match?(val) }
                   if e.include?(key)
                     target << shell_option(key, val, merge: merge)
                   elsif q.include?(key)
                     target << quote_option(key, val, double: qq.include?(key), merge: merge)
                   elsif p.include?(key) && path
-                    target << quote_option(key, path.join(val), merge: merge)
-                  elsif b.include?(key) || r.call(i, /^\d+$/) || r.call(f, /^\d*(?:\.\d+)?$/) || r.call(si, /^-?\d+$/)
+                    target << quote_option(key, path + val, merge: merge)
+                  elsif b.include?(key) || numcheck.call(key, val)
                     target << basic_option(key, val, merge: merge)
                   elsif merge
                     target << basic_option(key, val, merge: true)
@@ -159,10 +170,10 @@ module Squared
                   @extras << opt
                   skip = true if args
                 end
-                skip = true if first && pass.none? { |s| opt.include?(s) }
+                skip = true if first&.any? { |s| s.is_a?(Regexp) ? opt.match?(s) : !opt.include?(s) }
               end
             end
-            @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})=(.+)\z/
+            @values = @values.empty? ? /\A\s+\z/ : /\A(#{@values.join('|')})=(.+)\z/m
             @extras.each_with_index(&blk) if block_given?
             self
           end
@@ -181,9 +192,14 @@ module Squared
             self
           end
 
-          def clear(opts = nil, **kwargs)
-            opts ||= (kwargs[:errors] ? errors : extras)
+          def clear(opts = nil, errors: false, **kwargs)
             styles = project.theme[:inline] if project
+            if !opts
+              opts = errors ? @errors : @extras
+            elsif errors
+              OptionPartition.clear(target, @errors, styles: styles, **kwargs)
+              @errors.clear
+            end
             OptionPartition.clear(target, opts.reject { |val| found.include?(val) }, styles: styles, **kwargs)
             opts.clear
             self

data/lib/squared/workspace/repo.rb

@@ -6,7 +6,7 @@ module Squared
       class << self
         def read_manifest(path)
           require 'rexml/document'
-          return unless (file = path.join('.repo/manifest.xml')).exist?
+          return unless (file = path + '.repo/manifest.xml').exist?
 
           doc = REXML::Document.new(file.read)
           doc.elements['manifest/include'].attributes['name']&.sub('.xml', '')
@@ -39,12 +39,12 @@ module Squared
                     raise_error("path does not exist: #{val}", hint: 'REPO_ROOT') unless repo_confirm
                   end
                   @root.join(main).realdirpath
-                elsif repo_install?(parent: true) && (!@home.exist? || @root.join(main) == @home)
+                elsif repo_install?(parent: true) && (!@home.exist? || @root + main == @home)
                   @home
                 elsif repo_install?(@home)
-                  @home.join(main)
+                  @home + main
                 else
-                  (path = pwd) == @home || !repo_install?(path) ? @home : path.join(main)
+                  (path = pwd) == @home || !repo_install?(path) ? @home : path + main
                 end
         @root = @home.parent
         @manifest_url = url