squared 0.8.3 → 0.8.4

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

@@ -225,7 +225,7 @@ module Squared
                      graph ita-invisible-in-index minimal name-only name-status no-color-moved-ws no-prefix no-renames
                      numstat patch-with-raw patch-with-stat patience pickaxe-all pickaxe-regex raw shortstat summary
                      a|text abbrev=i? anchored=q break-rewrites=b? color=b color-moved=b color-moved-ws=b color-words=q?
-                     diff-algorithm=b diff-filter=e? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
+                     diff-algorithm=b diff-filter=q? X|dirstat=b? dirstat-by-file=b? dst-prefix=q find-copies=i?
                      find-object=b find-renames=b? ignore-matching-lines=q ignore-submodules=b? line-prefix=q
                      max-depth=n output=p output-indicator-context=q output-indicator-new=q output-indicator-old=q
                      relative=p rotate-to=p skip-to=p src-prefix=q stat=b? stat-count=i stat-width=i stat-name-width=i
@@ -413,7 +413,8 @@ module Squared
                     if flag == :remote
                       format_desc action, flag, 'remote?,opts*'
                       task flag, [:remote] do |_, args|
-                        args = if (remote = args.remote) && !git_grep('remote', remote).empty?
+                        remote = args.remote
+                        args = if remote && !git_grep('remote', remote).empty?
                                  args.extras
                                else
                                  remote = choice_remote
@@ -449,19 +450,21 @@ module Squared
                       task flag, [:commit] do |_, args|
                         ref = args.commit
                         if !ref || ref == ':'
-                          ref = choice_commit('@{u}..', empty: log_message('No pending commits', hint: remotetrack))
+                          ref = choice_commit(range: '@{u}..',
+                                              empty: log_message('No pending commits', hint: remotetrack))
                         end
                         push(flag, args.extras, ref: ref)
                       end
                     else
                       format_desc(action, flag, 'origin?,opts*', after: ('refs*' unless flag == :all))
-                      task flag do |_, args|
-                        args = args.to_a
-                        if (origin = args.first) && !git_grep('remote', origin).empty?
-                          args.shift
-                        else
-                          origin = nil
-                        end
+                      task flag, [:origin] do |_, args|
+                        origin = args.origin
+                        args = if origin && !git_grep('remote', origin).empty?
+                                 args.extras
+                               else
+                                 origin = nil
+                                 args.to_a
+                               end
                         push(flag, args, origin: origin)
                       end
                     end
@@ -555,7 +558,8 @@ module Squared
                     when :add, :sign
                       format_desc action, flag, 'name,message?,commit?,remote?'
                       task flag, [:name, :message, :commit, :remote] do |_, args|
-                        if (name = args.name)
+                        name = args.name
+                        if name
                           message = args.message
                           commit = commithead args.commit
                           remote = args.remote
@@ -594,9 +598,10 @@ module Squared
                         format_desc action, flag, '(^)commit*|:,opts*,pathspec*'
                         task flag do |_, args|
                           args = args.to_a
-                          if args.empty? || args.first == ':'
-                            args.shift
-                            index = choice_commit(multiple: true)
+                          if choice!(args, empty: true)
+                            index = choice_commit('Choose revision range', multiple: true, series: true)
+                            exclude = choice_commit('With exclusions', multiple: true, force: false)
+                            index.concat(exclude.map { |val| "^#{val}" }) if exclude
                           else
                             index = args.each_with_object([]) do |val, out|
                               if matchhead(val)
@@ -613,33 +618,32 @@ module Squared
                           end
                           log_(flag, args, index: index)
                         end
-                        next
-                      end
-                      format_desc action, flag, 'commit1,commit2,opts*,pathspec*'
-                      task flag, [:commit1, :commit2] do |_, args|
-                        commit1 = commithead args.commit1
-                        if commit1
-                          range = [commit1, commithead(param_guard(action, flag, args: args, key: :commit2))]
-                          opts = args.extras
-                        else
-                          range, opts, refs = choice_commit(multiple: flag == :view ? true : 2,
-                                                            values: %w[Options Pathspec])
-                          range.reverse!
-                          opts = OptionPartition.strip(opts)
-                          opts.concat(refs.shellsplit) if refs
-                        end
-                        if action == 'log'
-                          log_(flag, opts, range: range)
-                        else
-                          diff(flag, opts, range: range, from: action.to_sym)
+                      else
+                        format_desc action, flag, 'commit1,commit2,opts*,pathspec*'
+                        task flag, [:commit1, :commit2] do |_, args|
+                          commit1 = commithead args.commit1
+                          if commit1
+                            range = [commit1, commithead(param_guard(action, flag, args: args, key: :commit2))]
+                            opts = args.extras
+                          else
+                            range, opts, refs = choice_commit(multiple: flag == :view ? true : 2,
+                                                              values: %w[Options Pathspec])
+                            range.reverse!
+                            opts = OptionPartition.strip(opts)
+                            opts.concat(refs.shellsplit) if refs
+                          end
+                          if action == 'log'
+                            log_(flag, opts, range: range)
+                          else
+                            diff(flag, opts, range: range, from: action.to_sym)
+                          end
                         end
                       end
                     when :head
                       format_desc action, flag, 'commit*|:,opts*,pathspec*'
                       task flag do |_, args|
                         args = args.to_a
-                        if args.empty? || args.first == ':'
-                          args.shift
+                        if choice!(args, empty: true)
                           index = choice_commit(multiple: true)
                         else
                           index = args.each_with_object([]) do |val, out|
@@ -681,10 +685,10 @@ module Squared
                           when 'i', 'E', 'F', 'P'
                             opts << last
                           else
-                            if last =~ /^(f(-ormat)?)=(.+)$/
+                            if last =~ /^f(?:-ormat)?=(.+)$/
                               opts.shift
                               opts << "format=#{$1}"
-                            elsif last =~ /^(max(-count)?)=(\d+)$/
+                            elsif last =~ /^max(?:-count)?=(\d+)$/
                               opts << "max-count=#{$1}"
                             else
                               grep << last
@@ -699,9 +703,10 @@ module Squared
                   when 'checkout'
                     case flag
                     when :branch
-                      format_desc action, flag, 'name,create?=[bB],commit?,d/etach?'
-                      task flag, [:name, :create, :commit, :detach] do |_, args|
-                        if (branch = args.name)
+                      format_desc action, flag, 'branch,create?=[bB],commit?,d/etach?'
+                      task flag, [:branch, :create, :commit, :detach] do |_, args|
+                        branch = args.branch
+                        if branch
                           create = args.create
                           detach = if args.commit == 'd'
                                      commit = nil
@@ -725,9 +730,10 @@ module Squared
                         checkout(flag, branch: branch, create: create, commit: commit, detach: detach)
                       end
                     when :track
-                      format_desc action, flag, 'origin,(^)name?'
-                      task flag, [:origin, :name] do |_, args|
-                        if (origin = args.origin)
+                      format_desc action, flag, 'remote,(^)name?'
+                      task flag, [:remote, :name] do |_, args|
+                        origin = args.remote
+                        if origin
                           branch = args.name
                         else
                           origin, branch = choice_refs('Choose a remote', 'remotes', values: 'Enter branch name')
@@ -778,7 +784,8 @@ module Squared
                     when :track
                       format_desc action, flag, '(^~)upstream?,name?'
                       task flag, [:upstream, :name] do |_, args|
-                        if (ref = args.upstream)
+                        ref = args.upstream
+                        if ref
                           target = args.name
                           remote = true if ref.delete_prefix!('~')
                         else
@@ -791,12 +798,12 @@ module Squared
                       format_desc action, flag, '[^~]name*,:?'
                       task flag do |_, args|
                         refs = args.to_a
-                        if refs.empty? || (i = refs.last == ':')
+                        if refs.empty? || (ia = refs.last == ':')
                           accept = ['Delete?']
-                          accept << accept_b('Force?') unless i
-                          remote = choice_refs('Choose a branch', i ? 'remotes' : 'heads', multiple: true,
-                                                                                           accept: accept)
-                          if i
+                          accept << accept_b('Force?') unless ia
+                          remote = choice_refs('Choose a branch', ia ? 'remotes' : 'heads', multiple: true,
+                                                                                            accept: accept)
+                          if ia
                             refs.pop
                           else
                             refs = remote.first
@@ -814,7 +821,8 @@ module Squared
                     when :move, :copy
                       format_desc action, flag, 'branch,oldbranch?'
                       task flag, [:branch, :oldbranch] do |_, args|
-                        if (branch = args.branch)
+                        branch = args.branch
+                        if branch
                           oldbranch = args.oldbranch
                         else
                           oldbranch, branch = choice_refs("Choose a branch to #{flag}",
@@ -831,18 +839,19 @@ module Squared
                   when 'clone'
                     format_desc(action, flag, flag == :tag ? 'dir,tag/:' : 'dir,branch/:', after: 'opts*')
                     task flag, [:dir, :ref] do |_, args|
-                      dir = emptypath(param_guard(action, flag, args: args, key: :dir), create: false)
-                      unless (ref = args.ref) && ref != ':'
+                      dir = param_guard(action, flag, args: args, key: :dir)
+                      ref = args.ref
+                      if !ref || ref == ':'
                         ref = flag == :tag ? choice_refs('Choose a tag', 'tags') : choice_refs('Choose a branch')
                       end
-                      clone(flag, args.extras, dir: dir, ref: ref)
+                      clone(flag, args.extras, dir: emptypath(dir, create: false), ref: ref)
                     end
                   when 'switch'
                     case flag
                     when :create
-                      format_desc action, flag, '(^)name,commit?|:'
-                      task flag, [:name, :commit] do |_, args|
-                        branch = param_guard(action, flag, args: args, key: :name)
+                      format_desc action, flag, '(^)branch,commit?|:'
+                      task flag, [:branch, :commit] do |_, args|
+                        branch = param_guard(action, flag, args: args, key: :branch)
                         commit = commithead args.commit
                         commit, track = choice_commit(force: false, values: 'Track? [Y/n]') if commit == ':'
                         switch(flag, branch: branch, commit: commit, track: track)
@@ -855,15 +864,11 @@ module Squared
                         switch(flag, commit: commit)
                       end
                     when :branch
-                      format_desc action, flag, 'name/:,opts*'
-                      task flag, [:name] do |_, args|
-                        args = if (branch = args.name)
-                                 branch = nil if branch == ':'
-                                 args.extras
-                               else
-                                 []
-                               end
-                        switch(flag, args, branch: branch || choice_refs('Choose a branch'))
+                      format_desc action, flag, 'branch/:,opts*'
+                      task flag, [:branch] do |_, args|
+                        branch = args.branch
+                        branch = nil if branch == ':'
+                        switch(flag, args.extras, branch: branch || choice_refs('Choose a branch'))
                       end
                     end
                   when 'reset'
@@ -872,17 +877,16 @@ module Squared
                       format_desc action, flag, 'commit?|:,opts*'
                       task flag, [:commit] do |_, args|
                         commit = commithead args.commit
-                        args = if commit && commit != ':'
-                                 args.extras
-                               else
-                                 commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
-                                 args.extras.concat(case mode&.downcase
-                                                    when 'h', 'hard' then ['hard']
-                                                    when 's', 'soft' then ['soft']
-                                                    when 'n', 'N' then %w[mixed N]
-                                                    else ['mixed']
-                                                    end)
-                               end
+                        args = args.extras
+                        if !commit || commit == ':'
+                          commit, mode = choice_commit(values: ['Mode [mixed|soft|hard|N]'])
+                          args.concat(case mode&.downcase
+                                      when 'h', 'hard' then ['hard']
+                                      when 's', 'soft' then ['soft']
+                                      when 'n', 'N' then %w[mixed N]
+                                      else ['mixed']
+                                      end)
+                        end
                         success?(reset(flag, args, commit: commit))
                       end
                     when :index
@@ -931,9 +935,11 @@ module Squared
                   when 'rebase', 'merge'
                     case flag
                     when :branch
-                      format_desc action, flag, 'upstream?,opts*'
+                      format_desc action, flag, 'upstream?|:,opts*'
                       task flag, [:upstream] do |_, args|
-                        args = if (upstream = args.upstream)
+                        upstream = args.upstream
+                        args = if upstream
+                                 upstream = choice_refs 'Choose upstream branch' if upstream == ':'
                                  args.extras
                                else
                                  upstream, opts = choice_refs('Choose upstream branch', values: 'Options')
@@ -961,8 +967,9 @@ module Squared
                     when :commit, :'no-commit'
                       format_desc action, flag, 'branch|:,ours|theirs?,opts*'
                       task flag, [:branch] do |_, args|
-                        current = `#{git_output('branch --show-current')}`.chomp
-                        if (branch = args.branch)
+                        branch = args.branch
+                        current = git_spawn('branch --show-current').chomp
+                        if branch
                           branch = choice_refs('Choose a branch', accept: "#{action.capitalize}?") if branch == ':'
                           opts = args.extras
                           if has_value!(opts, 'ours')
@@ -975,9 +982,11 @@ module Squared
                                                                         accept: "Merge with #{current}?")
                           opts = OptionPartition.strip(opts)
                         end
-                        raise ArgumentError, 'nothing to merge' if current == branch
-
-                        merge(flag, opts, branch: branch)
+                        if current == branch
+                          puts log_message('nothing to merge', subject: name, hint: branch)
+                        else
+                          merge(flag, opts, branch: branch)
+                        end
                       end
                     when :send
                       format_desc(action, flag, VAL_GIT[action.to_sym][:send], arg: nil)
@@ -994,7 +1003,7 @@ module Squared
                       task flag, [:ref, :size] do |_, args|
                         ref = commithead args.ref
                         size = args.size
-                        if !size && ref.to_i.between?(1, 40)
+                        if !size && ref.to_i.between?(4, 40)
                           size = ref
                           ref = nil
                         end
@@ -1023,7 +1032,8 @@ module Squared
                     if flag == :remote
                       format_desc action, flag, 'remote?|:,opts*,pattern*'
                       task flag, [:remote] do |_, args|
-                        args = if (remote = args.remote) && (remote == ':' || !git_grep('remote', remote).empty?)
+                        remote = args.remote
+                        args = if remote && (remote == ':' || !git_grep('remote', remote).empty?)
                                  remote = choice_remote(force: true) if remote == ':'
                                  args.extras
                                else
@@ -1568,7 +1578,7 @@ module Squared
               unless force
                 i = -1
                 op.each do |val|
-                  if !val.include?(':') && repofetch(origin, branch: val, sync: (i += 1).zero?).first.nil?
+                  if !val.include?(':') && repofetch(origin, branch: val, sync: (i += 1) == 0).first.nil?
                     op.errors << val
                   else
                     op.found << val
@@ -1624,7 +1634,7 @@ module Squared
           append_option 'f', 'force', 'merge'
           case flag
           when :branch
-            cmd << '--detach' if detach == 'd' || option('detach')
+            cmd << '--detach' if detach == 'd' || option('d', 'detach')
             append_option('track', equals: true)
             cmd << (create ? quote_option(create, branch) : branch) << commit
           when :track
@@ -1652,7 +1662,7 @@ module Squared
           cmd, opts = git_session('tag', opts: opts)
           case flag
           when :add, :sign
-            if flag == :sign || option('sign')
+            if flag == :sign
               cmd << '--sign'
             elsif !session_arg?('s', 'sign', 'u', 'local-user')
               cmd << '--annotate'
@@ -1812,8 +1822,10 @@ module Squared
             return if pass
 
             upstream = true
-            unless (origin = option('origin', 'upstream', prefix: 'git', ignore: false))
-              if (origin = choice_refs('Choose an upstream', 'remotes', attempts: 1, force: false))
+            origin = option('origin', 'upstream', prefix: 'git', ignore: false)
+            unless origin
+              origin = choice_refs('Choose an upstream', 'remotes', attempts: 1, force: false)
+              if origin
                 git_spawn 'branch', quote_option('set-upstream-to', origin)
                 upstream = false
               else
@@ -1963,7 +1975,7 @@ module Squared
               out, banner, from = source(io: true)
               first = from_base?('branch')
               grep = first ? [/^\*\s+#{Regexp.escape(head)}\s/] : []
-              ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, index|
+              ret = write_lines(out, grep: grep, banner: banner, first: first) do |line, i|
                 next line if stdin?
 
                 data = line.sub(/^\*?\s+/, '').split(/\s+/, 3)
@@ -1977,7 +1989,7 @@ module Squared
                   r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[0]}"
-                ["#{"\n" unless index == 0} Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{md[2]}"]
+                ["#{"\n" unless i == 0} Branch: #{a.subhint(r1)}", r2, r3, " Commit: #{b}", "Message: #{md[2]}"]
                   .compact
                   .join("\n")
               end
@@ -2073,7 +2085,7 @@ module Squared
           cmd, opts = git_session('rev-parse', opts: opts)
           case flag
           when :commit
-            cmd << (size.to_i.zero? ? '--verify' : basic_option('short', [size.to_i, 5].max))
+            cmd << (size.to_i == 0 ? '--verify' : basic_option('short', [size.to_i, 5].max))
             append_commit(ref, head: true)
           when :branch
             cmd << '--abbrev-ref' << '--symbolic-full-name' << shell_quote(case ref
@@ -2329,12 +2341,12 @@ module Squared
           choice_index(msg, foreachref(type, *args, format: format), trim: trim, **kwargs)
         end
 
-        def choice_commit(range = nil, count: true, reflog: true, force: true, **kwargs)
+        def choice_commit(msg = 'Choose a commit', range: nil, count: true, reflog: true, force: true, **kwargs)
           kwargs[:attempts] ||= 1 unless force
           cmd = git_output(reflog && env('GIT_REFLOG') ? 'reflog' : 'log', range)
           cmd << quote_option('format', "#{commitstyle('%h')} %s")
           cmd << basic_option('max-count', env('GIT_COUNT', ARG[:CHOICE])) if count
-          ret = choice_index('Choose a commit', git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
+          ret = choice_index(msg, git_spawn(cmd, stdout: false), column: /^(\S+)/, force: force, **kwargs)
           case ret
           when Array
             ret.map { |val| val&.stripstyle }
@@ -2480,7 +2492,7 @@ module Squared
         def foreachref(path, *args, format: nil, chomp: true)
           format &&= quote_option('format', format)
           ret = git_spawn('for-each-ref', format, *args.concat(Array(path).map { |val| "refs/#{val}" }),
-                          stdout: workspace.windows?)
+                          stdout: windows?)
           if ret.is_a?(String)
             ret.lines(chomp: chomp)
           elsif chomp
@@ -2565,7 +2577,7 @@ module Squared
         end
 
         def remotetrack
-          git_spawn('rev-parse --abbrev-ref @{u}').split('/', 2).first
+          git_spawn('rev-parse --abbrev-ref @{u}').split('/').first
         end
 
         def commithash(val)

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

@@ -18,6 +18,7 @@ module Squared
           pack: %w[ignore-scripts=!? json=!? pack-destination=p].freeze,
           rebuild: %w[bin-links=! foreground-scripts=!? global=!? ignore-scripts=!? install-links=!?].freeze,
           'approve-scripts': %w[a|all allow-scripts-pending allow-scripts-pin=!? no-allow-scripts-pin json].freeze,
+          'deny-scripts': %w[a|all json].freeze,
           no: {
             install: %w[audit bin-links fund package-lock].freeze
           }.freeze
@@ -254,7 +255,8 @@ module Squared
                 when 'exec'
                   format_desc action, nil, 'pkg/cmd,opts*,args*'
                   task action, [:package] do |_, args|
-                    if (package = args.package)
+                    package = args.package
+                    if package
                       args = args.extras
                       cmd = if pnpm?
                               pre = ->(ch) { "-#{ch}" if args.delete(ch) }
@@ -267,9 +269,10 @@ module Squared
                       op = OptionPartition.new(args, list, cmd, project: self, strict: strict?)
                       if op.empty?
                         op << package
-                        if (args = readline('Enter arguments', force: false))
+                        s = readline('Enter arguments', force: false)
+                        if s
                           op.delim unless pnpm?
-                          op << args
+                          op << s
                         end
                       else
                         op.delim unless pnpm?
@@ -281,20 +284,21 @@ module Squared
                     run(from: :exec)
                   end
                 when 'nvm'
-                  next unless ENV['NVM_DIR'] && !workspace.windows?
+                  next unless ENV['NVM_DIR'] && !windows?
 
                   format_desc action, nil, 'version?,args*'
                   task action, [:version] do |_, args|
-                    path = ->(s) { File.join(ENV['NVM_DIR'], s) }
-                    unless (version = args.version)
-                      cmd = ". #{path.call('nvm.sh')} && nvm list --no-colors --no-alias"
+                    version = args.version
+                    args = args.extras
+                    append = ->(s) { shell_quote(File.join(ENV['NVM_DIR'], s)) }
+                    unless version
+                      cmd = ". #{append.call('nvm.sh')} && nvm list --no-colors --no-alias"
                       version = pwd_set(from: :nvm) do
                         choice_index('Select a version', IO.popen(cmd).map { |line| line[/\s(v\S+)/, 1] }, series: true)
                       end
                     end
-                    args = args.extras
                     args << readline('Enter command', force: true) if args.empty?
-                    args.unshift(path.call('nvm-exec'))
+                    args.unshift(append.call('nvm-exec'))
                     run(args.join(' '), { 'NODE_VERSION' => version }, banner: false, from: :nvm)
                   end
                 when 'bump'
@@ -325,20 +329,48 @@ module Squared
                         outdated flag, args.to_a
                       end
                     when 'package'
-                      format_desc(action, flag, 'opts*', before: case flag
-                                                                 when :dedupe, :rebuild then nil
-                                                                 when :reinstall then 'f/orce?'
-                                                                 else 'name*'
-                                                                 end)
-                      task flag do |_, args|
-                        package flag, args.to_a
+                      case flag
+                      when :approve, :deny
+                        format_desc action, flag, 'name*|:,opts*'
+                        task flag do |_, args|
+                          args = args.to_a
+                          if choice!(args)
+                            pwd_set do
+                              pad = 0
+                              list = IO.popen(npm_output('approve-scripts --allow-scripts-pending').to_s)
+                                       .each_with_object([]) do |line, out|
+                                         next unless line =~ /^\s+([a-z\d@][^@]*)@(\S+)/
+
+                                         pad = [pad, $1.size].max
+                                         out << [$1, $2]
+                                       end
+                                       .map { |name, ver| name.ljust(pad + 4) + ver }
+                              if list.empty?
+                                puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
+                                exit 0
+                              end
+                              args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
+                            end
+                          end
+                          package flag, args
+                        end
+                      else
+                        format_desc(action, flag, 'opts*', before: case flag
+                                                                   when :dedupe, :rebuild then nil
+                                                                   when :reinstall then 'f/orce?'
+                                                                   else 'name*'
+                                                                   end)
+                        task flag do |_, args|
+                          package flag, args.to_a
+                        end
                       end
                     when 'publish'
                       if flag == :verify
                         format_desc action, flag, 'version?,ext*'
                         task flag, [:version] do |_, args|
+                          version = args.version
                           ext = args.extras
-                          if (version = args.version)&.match?(/^\.?[a-z]+$/i)
+                          if version&.match?(/^\.?[a-z]+$/i)
                             ext.unshift(version)
                             version = nil
                           end
@@ -1639,7 +1671,7 @@ module Squared
         end
 
         def quotepath(name, val)
-          if $2.include?(File::SEPARATOR) || (workspace.windows? && val.match?(%r{[\\/]}))
+          if $2.include?(File::SEPARATOR) || (windows? && val.match?(%r{[\\/]}))
             quote_option name, basepath(val)
           else
             shell_option name, val

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

@@ -236,7 +236,7 @@ module Squared
                   format_desc action, nil, 'command|:,args*'
                   task action do |_, args|
                     args = args.to_a
-                    cmd = if (i = args.delete(':')) && !workspace.windows?
+                    cmd = if (i = args.delete(':')) && !windows?
                             readline('Enter script', force: true, multiline: %w[## ;])
                           elsif i || args.empty?
                             readline('Enter command', force: true)
@@ -502,7 +502,7 @@ module Squared
             patch = []
             buffer = []
             out = ->(val) { sync ? puts(val) : buffer << val }
-            if workspace.windows?
+            if windows?
               (venv ? command(runenv, cmd) : `#{cmd}`).lines(chomp: true)
             else
               IO.popen(runenv || {}, cmd).readlines(chomp: true)
@@ -617,7 +617,7 @@ module Squared
 
               op << "--#{flag}"
               op.append
-              python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
+              python_session('-m pip', *op.to_a.drop(1)) if windows?
             end
           end
           run(banner: banner, from: :install)
@@ -1009,7 +1009,7 @@ module Squared
           @build_backend ||= read_pyproject('build-system', 'build-backend') || ''
         end
 
-        def read_pyproject(table, key = nil)
+        def read_pyproject(table, *keys)
           return [] unless (file = pyprojectfile)
 
           ret = (@pyproject ||= {})[table]
@@ -1074,7 +1074,11 @@ module Squared
             end
             @pyproject[table] = ret
           end
-          key ? ret.find { |val| val.first == key }&.last : ret
+          unless keys.empty?
+            ret.select! { |key,| keys.include?(key) }
+            return ret.first&.last if keys.size == 1
+          end
+          ret
         end
 
         def pyprojectfile
@@ -1132,15 +1136,15 @@ module Squared
         def runenv
           return unless venv
 
-          if workspace.windows?
-            shell_quote(venvbin.join(workspace.powershell? ? 'Activate.ps1' : 'activate.bat'), option: false)
+          if windows?
+            shell_quote(venvbin.join(powershell? ? 'Activate.ps1' : 'activate.bat'), option: false)
           else
             { 'VIRTUAL_ENV' => venv.to_s, 'PATH' => "#{venvbin}:#{ENV['PATH']}" }
           end
         end
 
         def venvbin
-          @venv&.join(workspace.windows? ? 'Scripts' : 'bin')
+          @venv&.join(windows? ? 'Scripts' : 'bin')
         end
 
         def editable_set(val)
@@ -1215,7 +1219,7 @@ module Squared
           success?(ret, banner, !status) do |out|
             if out && dir.directory?
               if poetry?
-                dir += (workspace.windows? ? 'Scripts/python.exe' : 'bin/python')
+                dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
                 cmd = poetry_session 'env use'
               else
                 puts "Success: #{dir}"