squared 0.8.6 → 0.9.0.pre1

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

@@ -4,7 +4,7 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
+        DEP_PYTHON = %w[poetry.lock pdm.lock pylock.toml setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[meson.build README.rst]).freeze
         OPT_PYTHON = {
           common: %w[b=+ B d E h i I O P q=+ s S u v=+ V=+ x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
@@ -19,10 +19,10 @@ module Squared
                          setuptools=b try-first-with=q].freeze
         }.freeze
         OPT_PIP = {
-          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input no-proxy-env
-                     require-virtualenv q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b
-                     keyring-provider=b log=p proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b
-                     use-deprecated=b use-feature=b].freeze,
+          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input require-virtualenv
+                     q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b keyring-provider=b log=p
+                     proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b use-deprecated=b
+                     use-feature=b].freeze,
           cache: %w[format=b].freeze,
           completion: %w[b|bash f|fish p|powershell z|zsh].freeze,
           config: %w[global user site editor=p].freeze,
@@ -35,12 +35,12 @@ module Squared
                       no-warn-conflicts no-warn-script-location U|upgrade user prefix=p report=p root=p
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
           install_a: %w[no-index pre prefer-binary all-releases=b extra-index-url=q f|find-links=q i|index-url=q
-                        no-binary=q only-binary=q only-final=b refresh-package=q uploaded-prior-to=q].freeze,
-          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps no-require-hashes only-deps
-                        require-hashes use-pep517 build-constraint=p c|constraint=p group=q progress-bar=b
-                        r|requirement=p requirements-from-script=p src=p].freeze,
+                        no-binary=q only-binary=q only-final=b].freeze,
+          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps require-hashes use-pep517
+                        build-constraint=p c|constraint=p group=q progress-bar=b r|requirement=p
+                        requirements-from-script=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
-          install_d: %w[ignore-requires-python].freeze,
+          install_d: %w[ignore-requires-python uploaded-prior-to=q].freeze,
           hash: %w[a|algorithm].freeze,
           list: %w[e|editable exclude-editable include-editable l|local not-required o|outdated u|uptodate user
                    exclude=b format=b path=p].freeze,
@@ -58,8 +58,8 @@ module Squared
                       u|username=qq].freeze
         }.freeze
         OPT_PDM = {
-          common: %w[I|ignore-python no-cache n|non-interactive].freeze,
-          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=q d|dest=p
+          common: %w[c|config I|ignore-python no-cache n|non-interactive].freeze,
+          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=qq d|dest=p
                     p|project=p k|skip=b].freeze,
           publish: %w[no-build no-very-ssl q|quiet S|sign skip-existing v|verbose=+ ca-certs=p c|comment=q d|dest=p
                       i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=qq].freeze
@@ -131,7 +131,7 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          dependfile_set(DEP_PYTHON, default: 2)
+          dependfile_set(DEP_PYTHON, default: 4)
           serve_set kwargs[:serve]
           editable_set editable
           venv_set kwargs[:venv]
@@ -297,7 +297,7 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/ninstall?,opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[6]},u/ninstall?,opts*"
                         task flag do |_, args|
                           opts = args.to_a
                           if has_value!(opts, 'u', 'uninstall')
@@ -351,7 +351,7 @@ module Squared
                                            'eager'
                                          when /^only-if|needed$/
                                            'only-if-needed'
-                                         end.yield_self do |val|
+                                         end.then do |val|
                                            if val
                                              args.extras << "upgrade-strategy=#{val}"
                                            else
@@ -430,7 +430,17 @@ module Squared
             workspace.rev_clear(name, sync: sync)
             if !flag && poetry?
               cmd = poetry_session 'install -n'
+              if prod?
+                cmd << '--only=main'
+              else
+                option('with') { |val| cmd << basic_option('with', val) }
+                option('without') { |val| cmd << basic_option('without', val) }
+              end
               cmd << '--no-root' if option('no-root')
+            elsif !flag && pdm?
+              cmd = pdm_session 'install'
+              cmd << '--prod' if prod?
+              option('G', 'group') { |val| cmd << basic_option('G', val) }
             else
               cmd = pip_session 'install'
               cmd << '--upgrade-strategy=eager' if env('UPDATE') || env('PYTHON_UPDATE')
@@ -447,9 +457,13 @@ module Squared
               else
                 append_global
               end
-              if exist?(DEP_PYTHON[4]) && !session_arg?('r', 'requirement')
-                cmd << basic_option('r', DEP_PYTHON[4])
-                cmd << basic_option('c', 'constraints.txt') if exist?('constraints.txt')
+              unless session_arg?('r', 'requirement')
+                if exist?(DEP_PYTHON[2])
+                  cmd << basic_option('r', DEP_PYTHON[2])
+                elsif exist?(DEP_PYTHON[6])
+                  cmd << basic_option('r', DEP_PYTHON[6])
+                  cmd << basic_option('c', 'constraints.txt') if exist?('constraints.txt')
+                end
               end
               append_editable
             end
@@ -569,8 +583,9 @@ module Squared
             end
             if found > 0
               items = if se
-                        choice('Select a package', items.map(&:first),
-                               multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                        choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                       border: true, **parse_select)
+                          .map { |n| items[n.pred].last }
                       elsif ia
                         items.map(&:last)
                       else
@@ -749,7 +764,7 @@ module Squared
             end
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: :python)
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: :python)
         end
 
         def pip(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -786,7 +801,7 @@ module Squared
             ret = kwargs[:requirement] || begin
               file = op.detect { |val| op.exist?(val) }
               op.remove(file) if file
-              basepath(file || DEP_PYTHON[4])
+              basepath(file || DEP_PYTHON[6])
             end
             op.add_quote(ret)
               .clear
@@ -831,8 +846,8 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: symjoin('pip', flag))
-            .yield_self { |val| ret || val }
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: symjoin('pip', flag))
+            .then { |val| ret || val }
         end
 
         def serve(root, opts = [], bind: 'localhost', port: nil, **)
@@ -1039,7 +1054,15 @@ module Squared
                     end
                   end
                   ret.last[1] += val
-                elsif line.strip =~ /^(\S+)\s*=\s*([+-]?[\d.]+|true|false|("""|'''|["'\[{])(.*))$/
+                elsif line.strip =~ /^(\S+)\s*=\s*
+                  (
+                    [+-]?(?:[\d._]+(?:[eE].+)?|0x[\dA-Fa-f]+|0[ob]\d+|nan|inf)
+                    |true|false
+                    |\d{4}-\d{2}-\d{2}.*
+                    |\d{2}:\d{2}.*
+                    |("""|'''|["'\[{])(.*)
+                  )$/x
+                  name = $1
                   if (val = $4)
                     case (ch = $3)
                     when '{', '['
@@ -1059,11 +1082,21 @@ module Squared
                             true
                           when 'false'
                             false
+                          when /^\d{4}-/
+                            Time.parse(ch)
+                          when /^\d{2}:/
+                            Time.strptime(ch, '%T')
+                          when /nan$/
+                            Float::NAN
+                          when /inf$/
+                            Float::INFINITY * (ch[0] == '-' ? -1 : 1)
+                          when /^[+-]?0[xob]/
+                            eval ch
                           else
                             ch.include?('.') ? ch.to_f : ch.to_i
                           end
                   end
-                  ret << [$1, val]
+                  ret << [name, val]
                 end
                 if !ch && (val = ret.last[1]).is_a?(String) && (val.match?(/\A\{.+\}\z/m) || val.match?(/\A\[.+\]\z/m))
                   ret.last[1] = JSON.parse(val) rescue nil
@@ -1082,19 +1115,19 @@ module Squared
         end
 
         def pyprojectfile
-          @pyprojectfile = basepath!(DEP_PYTHON[2]) || false if @pyprojectfile.nil?
+          @pyprojectfile = basepath!(DEP_PYTHON[4]) || false if @pyprojectfile.nil?
           @pyprojectfile || nil
         end
 
         def singleopt(flag = nil)
           case flag
           when :python
-            /\A(v+|q+|b+|V+|O+)\z/
+            /\A(?:v+|q+|b+|V+|O+)\z/
           when :pdm, :poetry
             /\Av+\z/
           when :twine, :meson then nil
           else
-            /\A(v+|q+)\z/
+            /\A(?:v+|q+)\z/
           end
         end
 
@@ -1112,18 +1145,19 @@ module Squared
         def pipopts(flag)
           ret = OPT_PIP.fetch(flag, []) + OPT_PIP[:common]
           if pip_install?(flag)
-            ret.concat(OPT_PIP[:install_a], OPT_PIP[:install_d])
+            ret.concat(OPT_PIP[:install_a])
             ret.concat(OPT_PIP[:install_b]) unless flag == :index
+            ret.concat(OPT_PIP[:install_d])
             case flag
             when :install
-              ret.concat(OPT_PIP[:install_c], OPT_PIP[:debug])
+              ret.concat(OPT_PIP[:install_c] + OPT_PIP[:debug])
             when :lock, :wheel
               ret.concat(OPT_PIP[:install_c])
             when :download, :index
               ret.concat(OPT_PIP[:debug])
             end
           elsif flag == :list
-            ret.concat(OPT_PIP[:install_a], OPT_PIP[:install_d])
+            ret.concat(OPT_PIP[:install_a])
           end
           ret
         end
@@ -1138,7 +1172,7 @@ module Squared
           if windows?
             shell_quote(venvbin.join(powershell? ? 'Activate.ps1' : 'activate.bat'), option: false)
           else
-            { 'VIRTUAL_ENV' => venv.to_s, 'PATH' => "#{venvbin}:#{ENV['PATH']}" }
+            { 'VIRTUAL_ENV' => venv.to_s, 'PATH' => task_join(venvbin, ENV['PATH']) }
           end
         end
 
@@ -1220,6 +1254,8 @@ module Squared
               if poetry?
                 dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
                 cmd = poetry_session 'env use'
+              elsif pdm?
+                cmd = pdm_session 'use -f'
               else
                 puts "Success: #{dir}"
                 return
@@ -1263,13 +1299,17 @@ module Squared
         end
 
         def setuptools?
-          dependtype == 2 || dependtype == 4
+          dependtype == 4 || dependtype == 6
         end
 
         def poetry?
           dependtype == 1
         end
 
+        def pdm?
+          dependtype == 2
+        end
+
         def twine?
           venv_package?('twine')
         end
@@ -1279,7 +1319,7 @@ module Squared
         end
 
         def requirements?
-          dependtype == 5
+          dependtype == 7
         end
       end
 

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

@@ -21,25 +21,24 @@ module Squared
                   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,
-          rdbg: %w[e=q no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q host=q x|init-script=p
+          rdbg: %w[no-color no-rc no-sigint-hook c|command n|nonstop stop-at-load cookie=q e=q host=q x|init-script=p
                    O|open=q? port=i port-range=b session-name=q sock-path=q util=q].freeze,
           rbs: %w[I=pm r=bm no-collection no-stdlib collection=p log-level=b log-output=p repo=p].freeze,
-          rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug diff disable-all-cops
-                      disable-pending-cops display-only-correctable display-only-fail-level-offenses display-only-failed
-                      display-only-safe-correctable S|display-style-guide display-suppressed display-time
-                      disable-uncorrectable editor-mode enable-pending-cops E|extra-details F|fail-fast
-                      force-default-config force-exclusion x|fix-layout ignore-disable-comments ignore-parent-exclusion
-                      ignore-unrecognized-cops init l|lint L|list-target-files lsp mcp memory no-detach no-exclude-limit
-                      only-guide-cops only-recognized-file-types profile raise-cop-error regenerate-todo
-                      report-unused-todo-entries restart-server safe server-status start-server stderr stop-server
-                      verbose-version C|cache=b cache-root=p changed=b config=p exclude-limit=i fail-level=b f|format=b
-                      except=q list-enabled-cops-for=p only=q o|out=p plugin=p require=p show-cops=q show-docs-url=q
-                      s|stdin=p].freeze,
+          rubocop: %w[D P r=bm auto-gen-config a|autocorrect A|autocorrect-all d|debug disable-pending-cops
+                      display-only-correctable display-only-fail-level-offenses display-only-failed
+                      display-only-safe-correctable S|display-style-guide display-time disable-uncorrectable editor-mode
+                      enable-pending-cops E|extra-details F|fail-fast force-default-config force-exclusion x|fix-layout
+                      ignore-disable-comments ignore-parent-exclusion ignore-unrecognized-cops init l|lint
+                      list-enabled-cops-for=p L|list-target-files lsp memory no-detach only-guide-cops
+                      only-recognized-file-types no-exclude-limit profile raise-cop-error regenerate-todo
+                      restart-server safe server-status start-server stderr stop-server C|cache=b cache-root=p config=p
+                      exclude-limit=i fail-level=b f|format=b except=q only=q o|out=p plugin=p require=p show-cops=q
+                      show-docs-url=q s|stdin=p].freeze,
           pry: %w[f e=q I=pm no-color no-history no-multiline no-pager no-plugins simple-prompt c|context=q
                   d|disable-plugin=q gem=b r|require=bm s|select-plugin=q].freeze,
           no: {
             rubocop: %w[auto-gen-enforced-style auto-gen-only-exclude auto-gen-timestamp color display-cop-names
-                        offense-counts parallel preview server].freeze
+                        offense-counts parallel server].freeze
           }
         }.freeze
         OPT_BUNDLE = {
@@ -227,10 +226,9 @@ module Squared
           serve_set kwargs[:serve]
           gemfile_set kwargs[:gemspec]
           self.autodetect = autodetect
-          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : exec }
+          @bundle = { exec: exec.is_a?(String) ? basepath!(exec) : false }
           @steepfile = basepath! steep if steep
-          rubocop = rootpath('.rubocop.yml', ascend: Dir.home) if rubocop == true
-          @rubocopfile = basepath! rubocop if rubocop
+          @rubocopfile = Pathname.new(rubocop).realpath rescue basepath!(Dir.home, '.rubocop.yml') if rubocop
           @rubygems = kwargs.fetch(:rubygems, 0)
           return unless rakefile && @output[0].nil? && @copy.nil? && !version && !self.autodetect
 
@@ -238,10 +236,10 @@ module Squared
             File.foreach(rakefile) do |line|
               next unless line.match?(%r{\brequire\s+(["'])bundler/gem_tasks\1})
 
-              cmd = bundle_output('exec rake').to_s
-              @output[0] = "#{cmd} build"
-              @copy = "#{cmd} install"
-              @clean = "#{cmd} clean" if @clean.nil?
+              cmd = "#{bundle_output('exec rake')} %s"
+              @output[0] = cmd % 'build'
+              @copy = cmd % 'install'
+              @clean = cmd % 'clean' if @clean.nil?
               break
             end
           rescue => e
@@ -331,7 +329,7 @@ module Squared
                     opts = args.to_a
                     cmd = opts.delete('::')
                     if (n = opts.index('c'))
-                      args = opts.slice!(n.succ..-1)
+                      args = opts.slice!(n.succ..)
                     else
                       file = opts.shift
                       args = []
@@ -461,11 +459,13 @@ module Squared
                       when :build, :push, :exec, :update
                         format_desc(action, flag, 'opts*', after: case flag
                                                                   when :exec then 'command,args*'
-                                                                  when :push then 'file/:'
+                                                                  when :push then 'file/:,d/dry-run?'
                                                                   when :update then 'name*'
                                                                   end)
                         task flag do |_, args|
-                          gem(flag, opts: args.to_a, banner: true)
+                          opts = args.to_a
+                          filter = { dryrun: true } if flag == :push && has_value!(opts, 'd', 'dry-run')
+                          gem(flag, opts: opts, banner: true, filter: filter)
                         end
                       when :install, :uninstall, :pristine
                         format_desc(action, flag, 'opts*', after: flag == :pristine ? 'name*|name?@version' : 'name*')
@@ -572,13 +572,18 @@ module Squared
                                       else
                                         %w[## ;]
                                       end
-                          msg = if Prompt.reline.respond_to?(:readmultiline)
-                                  'ruby>'
-                                else
-                                  multiline = Array(multiline)
-                                  'Enter script'
-                                end
-                          command = ENV['RUBY_E'] || readline(msg, force: true, multiline: multiline)
+                          unless (command = ENV['RUBY_E'])
+                            command = if Prompt.reline.respond_to?(:readmultiline)
+                                        require 'ripper'
+                                        readline('ruby>', force: true, multiline: multiline) do |code|
+                                          next if code.strip.empty? || !Ripper.sexp(code)
+
+                                          Array(multiline).any? { |s| code.split.last.match?(/(?<!#{s[-1]})#{s}$/) }
+                                        end
+                                      else
+                                        readline('Enter script', force: true, multiline: Array(multiline))
+                                      end
+                          end
                           ruby(flag, opts: args.to_a, command: command)
                         end
                       when :version
@@ -701,7 +706,7 @@ module Squared
                                                    .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
-                                                   .yield_self do |lines|
+                                                   .then do |lines|
                                                      target = lines.find { |line| line.include?(tool) }
                                                      target ? [target] : lines
                                                    end
@@ -788,7 +793,7 @@ module Squared
                                                     when '1', 'true' then nil
                                                     else
                                                       if val.start_with?('~')
-                                                        val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..-1])
+                                                        val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..])
                                                         if prod?
                                                           config_set('binstubs', shell_quote(val), global: true)
                                                           val = nil
@@ -978,8 +983,9 @@ module Squared
             if found > 0
               unless Array(items).empty?
                 gems = if se
-                         choice('Select a package', items.map(&:first),
-                                multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                         choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                        border: true, **parse_select)
+                           .map { |n| items[n.pred].last }
                        else
                          items.map(&:last)
                        end
@@ -1041,7 +1047,7 @@ module Squared
             end
           end
           print_run(op, banner, **kwargs) unless flag
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: from || :ruby)
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: from || :ruby)
         end
 
         def gem(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1213,8 +1219,9 @@ module Squared
               puts 'No updates were found'
             else
               if items
-                update = choice('Select a package', items.map(&:first),
-                                multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                update = choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                        border: true, **parse_select)
+                           .map { |n| items[n.pred].last }
               end
               unless Array(update).empty?
                 opts = ['f']
@@ -1298,7 +1305,12 @@ module Squared
 
               op.add_path(file)
             end
-            return run(from: from, interactive: ['Push', 'N', target || gemname]) unless with || !banner
+            if dryrun? || kwargs[:filter]&.fetch(:dryrun, nil)
+              print_item "> #{op}"
+              exit 0
+            elsif !with && banner
+              return run(from: from, interactive: ['Push', 'N', target || gemname])
+            end
           when :exec
             min = if op.arg?('g', 'gem')
                     1
@@ -1367,9 +1379,9 @@ module Squared
               name = op.remove_at(n)
               n = name.index('@')
               pre, ver = if n == 0
-                           [gemname, name[1..-1]]
+                           [gemname, name[1..]]
                          else
-                           [name[0, n], name[n.succ..-1]]
+                           [name[0, n], name[n.succ..]]
                          end
               op.adjoin(pre, quote_option('version', ver))
                 .clear
@@ -1418,7 +1430,7 @@ module Squared
           op.clear(errors: true) if gems
           print_run(op, banner, **kwargs)
           run(banner: banner && %w[q silent quiet no-verbose].none? { |s| op.include?(shell_option(s)) },
-              exception: exception?(**kwargs), from: from)
+              exception: kwargs.fetch(:exception, exception?), from: from)
         end
 
         def bundle(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1555,7 +1567,7 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          ret = run(sync: sync, banner: banner, exception: exception?(**kwargs),
+          ret = run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?),
                     from: symjoin('bundle', flag))
           success?(ret, banner, output)
         end
@@ -1568,7 +1580,7 @@ module Squared
           op.append(escape: true)
           print_run(op, banner, **kwargs)
           var = { 'BANNER' => '0' } unless banner
-          run(op, var, sync: sync, banner: false, exception: exception?(**kwargs), from: :rake)
+          run(op, var, sync: sync, banner: false, exception: kwargs.fetch(:exception, exception?), from: :rake)
         end
 
         def irb(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:irb], **kwargs)
@@ -1596,7 +1608,7 @@ module Squared
           op.concat(args)
           op.append(quote: false, delim: true)
           print_run(op, banner, **kwargs)
-          run(banner: false, exception: exception?(**kwargs), from: :rdbg)
+          run(banner: false, exception: kwargs.fetch(:exception, exception?), from: :rdbg)
         end
 
         def rbs(flag, *args, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -1645,7 +1657,7 @@ module Squared
             op.clear
               .append(*args)
             print_run(op, banner, **kwargs)
-            run(banner: false, exception: exception?(**kwargs), from: symjoin('rbs', flag))
+            run(banner: false, exception: kwargs.fetch(:exception, exception?), from: symjoin('rbs', flag))
           end
         end
 
@@ -1668,7 +1680,7 @@ module Squared
           op.append(delim: true)
             .clear(errors: true)
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: :rubocop)
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: :rubocop)
         end
 
         def serve(root, *, bind: nil, port: 3000, **kwargs)
@@ -1828,10 +1840,7 @@ module Squared
                 set.call(ver, val)
               end
             end
-            if semgte?('2.6')
-              target = RUBY_VERSION.start_with?('2.6') ? RubyVM : $LOAD_PATH
-              parse.call(target.resolve_feature_path(gemname)&.last)
-            end
+            parse.call($LOAD_PATH.resolve_feature_path(gemname)&.last)
             unless gemdir || pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
               raise Errno::ENOENT, 'gems home'
             end
@@ -1862,7 +1871,7 @@ module Squared
           op.concat(args)
           op.append(delim: delim)
           print_run(op, banner, **kwargs)
-          run(banner: false, exception: exception?(**kwargs), from: from)
+          run(banner: false, exception: kwargs.fetch(:exception, exception?), from: from)
         end
 
         def ruby_session(*cmd, **kwargs)
@@ -2059,7 +2068,7 @@ module Squared
         end
 
         def gemlib
-          @gemlib ||= Set.new(['lib']).yield_self do |lib|
+          @gemlib ||= Set.new(['lib']).then do |lib|
             if (spec = gemspec)
               lib.merge(spec.require_paths || [])
             end

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

@@ -153,7 +153,7 @@ module Squared
             return true if super
             return extras.include?(obj) unless (n = extras.index(@partition))
 
-            extras[0..n].include?(obj)
+            extras[..n].include?(obj)
           end
 
           def multiple?(val)