squared 0.9.0 → 0.9.2

data/lib/squared/common/format.rb

@@ -301,7 +301,7 @@ module Squared
         if footer
           unless sub.empty? && !right
             footer.map! do |s|
-              s = s.rjust(n + 4) if right
+              s = s.rjust(n + ARG[:TAB]) if right
               sub.each { |h| sub_style!(s, **h) }
               s
             end

data/lib/squared/common/prompt.rb

@@ -5,12 +5,30 @@ require 'timeout'
 module Squared
   module Common
     module Prompt
-      def self.reline
-        require 'reline'
-        Reline
-      rescue LoadError
-        require 'readline'
-        Readline
+      class << self
+        def reline
+          require 'reline'
+          Reline
+        rescue LoadError
+          require 'readline'
+          Readline
+        end
+
+        def multiline=(val)
+          raise NotImplementedError, 'multiline is available only with reline' unless multiline?
+
+          @multiline = case val
+                       when '', '0', 'false' then nil
+                       else
+                         val.split(',').map(&:strip)
+                       end
+        end
+
+        def multiline?
+          reline.respond_to?(:readmultiline)
+        end
+
+        attr_reader :multiline
       end
 
       module_function
@@ -169,8 +187,8 @@ module Squared
         end
       end
 
-      def readline(msg, history = false, force: nil, multiline: nil, &blk)
-        multiline = nil unless Prompt.reline.respond_to?(:readmultiline)
+      def readline(msg, history = false, force: nil, multiline: Prompt.multiline, &blk)
+        multiline = nil unless Prompt.multiline?
         read = lambda do
           if !multiline
             Prompt.reline.readline(msg, history)

data/lib/squared/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Squared
-  VERSION = '0.9.0'
+  VERSION = '0.9.2'
 end

data/lib/squared/workspace/application.rb

@@ -167,6 +167,11 @@ module Squared
         @series.ref_min = app[:series_ref_min] if app.key?(:series_ref_min)
         kwargs[:pattern].concat(app[:build_pattern]) if app.key?(:build_pattern)
         kwargs[:parallel].concat(app[:build_parallel]) if app.key?(:build_parallel)
+        kwargs[:parallel].reject! { |val| app[:build_parallel!].include?(val) } if app.key?(:build_parallel!)
+        app[:build_pattern!]&.each do |pat|
+          kwargs[:pattern].delete(pat)
+          kwargs[:parallel].reject! { |val| pat.match?(val) }
+        end
         self.closed = 'begin'
         pb = @stage.key?('project:begin')
         pe = @stage.key?('project:end')

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

@@ -607,10 +607,10 @@ module Squared
               @clean.each do |val|
                 src = basepath(val = val.to_s)
                 if src.directory? && val.match?(%r{[\\/]\z})
-                  log&.warn "rm -rf #{src}"
+                  log&.info "rm -rf #{src}"
                   rm_rf(src, verbose: !silent?)
                 else
-                  log&.warn "rm #{src}"
+                  log&.info "rm #{src}"
                   (val.include?('*') ? Dir[src] : [src]).each do |file|
                     next unless File.file?(file)
 
@@ -864,7 +864,7 @@ module Squared
               instance_variable_set :"@#{key}", [blk]
             end
           else
-            log&.warn "series: @#{key}".subhint('invalid')
+            log&.debug "series: @#{key}".subhint('invalid')
           end
           self
         end
@@ -876,7 +876,7 @@ module Squared
             return
           end
           cmd = cmd.target if cmd.is_a?(OptionPartition)
-          if interactive && sync && !(@session && option('y'))
+          if interactive && sync && !(@session && option('y', 'yes'))
             print_item(series: true)
             msg, y, h = case interactive
                         when Array
@@ -1019,7 +1019,7 @@ module Squared
               instance_variable_set(:"@#{key}", val)
             end
           else
-            log&.warn "variable_set: @#{key}".subhint('private')
+            log&.debug "variable_set: @#{key}".subhint('private')
           end
           self
         end
@@ -1701,7 +1701,7 @@ module Squared
             ret = case key.downcase
                   when 'force'
                     getarg.call(:FORCE)
-                  when 'y'
+                  when 'y', 'yes'
                     getarg.call(:YES)
                   end
             return yield(ret) if !ret.nil? && block_given?
@@ -2161,7 +2161,7 @@ module Squared
         end
 
         def confirm_basic(msg, hint, accept = 'Y', style: :inline, target: @session, prefix: target&.first, **kwargs)
-          return true if option('y', prefix: prefix)
+          return true if option('y', 'yes', prefix: prefix)
 
           confirm("#{msg} [#{sub_style(hint.to_s, style.is_a?(Symbol) ? theme[style] : style)}]", accept, **kwargs)
         end
@@ -2726,10 +2726,12 @@ module Squared
         end
 
         def checkdir?(val)
-          return true if val.directory? && !val.empty?
-
-          log&.warn "directory \"#{val}\"".subhint(val.directory? ? 'empty' : 'missing')
-          false
+          if val.directory? && !val.empty?
+            true
+          else
+            log&.warn "directory \"#{val}\"".subhint(val.directory? ? 'empty' : 'missing')
+            false
+          end
         end
 
         def printfirst?

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

@@ -422,7 +422,7 @@ module Squared
         def clean(*, sync: invoked_sync?('clean'), **)
           if runnable?(@clean)
             super
-          elsif sync || option('y', prefix: 'docker')
+          elsif sync || option('y', 'yes', prefix: 'docker')
             image :rm
           end
         end
@@ -731,7 +731,7 @@ module Squared
               return
             end
             op << id
-            if option('y')
+            if option('y', 'yes')
               exception = false
               banner = false
             end
@@ -966,7 +966,7 @@ module Squared
           pwd_set(from: from) do
             index = 1
             all = option('all', prefix: 'docker')
-            y = from == :'image:rm' && option('y', prefix: 'docker')
+            y = from == :'image:rm' && option('y', 'yes', prefix: 'docker')
             filter = env('DOCKER_FILTER', filter).to_s
             pat = if OptionPartition.pattern?(filter)
                     Regexp.new(filter)
@@ -1013,7 +1013,7 @@ module Squared
                        end
                 pad = cols.map(&:size).max
                 cols.each { |key| puts "#{g + f} #{key.rjust(pad)}: #{Array(data[key]).join(', ')}" }
-                w = 9 + flag.to_s.size + 4 + ee.size
+                w = 9 + flag.to_s.size + ARG[:TAB] + ee.size
                 puts g + sub_style(ARG[:BORDER][6] + (ARG[:BORDER][1] * w), theme[:inline])
                 index += 1
                 next unless confirm("#{h + b}?", no ? 'N' : 'Y')

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

@@ -363,7 +363,7 @@ module Squared
         subtasks({
           'branch' => %i[create track delete move copy list all current].freeze,
           'checkout' => %i[commit branch track detach path].freeze,
-          'commit' => %i[head add all amend amend-orig fixup].freeze,
+          'commit' => %i[head add all pathspec amend amend-orig fixup].freeze,
           'clone' => %i[branch tag].freeze,
           'diff' => %i[head branch files view between contain].freeze,
           'range-diff' => %i[view between contain].freeze,
@@ -530,7 +530,7 @@ module Squared
                           if flag == :add
                             opts = param_guard(action, flag, args: args.to_a)
                           elsif (refs = args.to_a).empty?
-                            refs = readline('Enter file patterns', force: true).shellsplit
+                            refs = readline('Enter glob patterns', force: true).shellsplit
                           end
                         end
                         commit(flag, opts, refs: refs, ref: ref, squash: squash, pick: pick)
@@ -1773,7 +1773,7 @@ module Squared
             pathspec = false if pick == 'reword'
           end
           if pathspec.nil?
-            pathspec = if (flag == :fixup || amend) && refs.size == 1 && refs.first == '*'
+            pathspec = if (flag == :pathspec || flag == :fixup || amend) && refs.size == 1 && refs.first == '*'
                          '--all'
                        elsif (refs = projectmap(refs)).empty?
                          raise 'no qualified pathspec'
@@ -1847,7 +1847,7 @@ module Squared
             elsif stdout?
               puts log_message('nothing to commit', subject: name, hint: flag)
             end
-            exit 1
+            exit 1 unless pass.nil?
           end
         end
 

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

@@ -11,7 +11,7 @@ module Squared
           install_a: %w[audit=! bin-links=! engine-strict=!? foreground-scripts=!? fund=! ignore-scripts=!?
                         install-links=!? package-lock=! strict-peer-deps=!? include=b install-strategy=b omit=b].freeze,
           install_b: %w[no-save B|save-bundle D|save-dev O|save-optional save-peer P|save-prod g|global=!?
-                        S|save=!?].freeze,
+                        min-release-age=i min-release-age-exclude=q S|save=!?].freeze,
           install_c: %w[allow-directory=b? allow-file=b? allow-git=b? allow-remote=b?].freeze,
           run: %w[foreground-scripts=!? if-present=!? ignore-scripts=!? script-shell=p].freeze,
           exec: %w[c|call=q package=b].freeze,
@@ -230,7 +230,7 @@ module Squared
                           elsif exception?
                             indexerror n, list
                           else
-                            log.warn "run script #{n} of #{list.size}".subhint('out of range')
+                            log.debug "run script #{n} of #{list.size}".subhint('out of range')
                             next
                           end
                         else
@@ -330,26 +330,39 @@ module Squared
                     when 'package'
                       case flag
                       when :approve, :deny
-                        format_desc action, flag, 'name*|:,opts*'
+                        format_desc(action, flag, 'opts*', before: flag == :approve ? 'name*|:' : 'name*|:|::')
                         task flag do |_, args|
                           args = args.to_a
-                          if choice!(args)
+                          if choice!(args) || (flag == :deny && (all = choice!(args, char: '::')))
+                            list = []
+                            pad = 0
+                            size = ->(s) { pad = [pad, s.size].max }
                             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
+                              json = JSON.parse(`#{npm_output('install-scripts ls --json')}`)
+                              json&.fetch('allowScripts', [])&.each do |data|
+                                line = data['changes']&.find { |item| item['change'] == 'pending' }
+                                next unless line && line['key'] =~ /^(.+)@([^@]+)$/
+
+                                size.call($1)
+                                list << [$1, $2]
+                              end
+                              if all
+                                current = read_package 'allowScripts'
+                                current&.each_pair do |key, val|
+                                  next unless val
+
+                                  md = key.match(/^(.+?)(?:@([^@]+))?$/)
+                                  size.call(md[1])
+                                  list << [md[1], sub_style(md[2] || 'any', theme[:inline])]
+                                end
                               end
-                              args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                             end
+                            if list.empty?
+                              puts log_message('no packages to review', subject: name, hint: "#{flag}-scripts")
+                              exit
+                            end
+                            list.map! { |name, ver| name.ljust(pad + ARG[:TAB]) + ver }
+                            args.concat(choice_index('Select packages', list, multiple: true, column: /^(\S+)/))
                           end
                           package flag, args
                         end
@@ -885,9 +898,9 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = width.call(found, 0) + 4
-            col2 = width.call(found, 1) + 4
-            col3 = pad.call(found, found.size).size + 2 + col1 + col2 + width.call(found, 2)
+            col1 = width.call(found, 0) + ARG[:TAB]
+            col2 = width.call(found, 1) + ARG[:TAB]
+            col3 = pad.call(found, found.size).size + (ARG[:TAB] / 2) + col1 + col2 + width.call(found, 2)
             packages = []
             pat = ->(a) { /("#{Regexp.escape(a[0])}"\s*:\s*)"([~^])#{'?' if a[4]}#{Regexp.escape(a[1])}"/ }
             edit = lambda do |a, pkg, mod|
@@ -983,9 +996,9 @@ module Squared
               end
             end
           elsif !avail.empty?
-            col1 = width.call(avail, 0) + 4
+            col1 = width.call(avail, 0) + ARG[:TAB]
             col2 = width.call(avail, 1)
-            col3 = width.call(avail, 2) + 4
+            col3 = width.call(avail, 2) + ARG[:TAB]
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
@@ -1381,7 +1394,7 @@ module Squared
                 op.exist?(add: true)
               end
             end
-            op.append(flags, escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+            op.append(flags, context: kwargs)
               .clear
             print_run(op, banner, **kwargs)
             start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)

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

@@ -7,16 +7,18 @@ module Squared
         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,
+          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={always,default,never}].freeze,
           build: %w[C=bm n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel config-json=q config-setting=q
                     installer=b o|outdir=p].freeze,
           venv: %w[clear copies symlinks system-site-packages upgrade upgrade-deps without-scm-ignore-files without-pip
                    prompt=q].freeze,
           virtualenv: %w[always-copy clear copies download never-download no-download no-periodic-update no-pip no-seed
-                         no-setuptools no-vcs-ignore q|quiet read-only-app-data reset-app-data symlink-app-data symlinks
-                         system-site-packages with-traceback without-pip upgrade-embed-wheels v|verbose=+ activators=q
-                         app-data=p creator=b discovery=b extra-search-dir=p pip=b prompt=q p|python=q seeder=b
-                         setuptools=b try-first-with=q].freeze
+                         no-setuptools no-vcs-ignore no-venv-redirect q|quiet read-only-app-data reset-app-data
+                         symlink-app-data symlinks system-site-packages with-traceback without-pip upgrade-embed-wheels
+                         venv-redirect v|verbose=+ activators={bash,batch,cshell,fish,nushell,powershell,python,xonsh}
+                         app-data=p creator=b discovery={builtin} extra-search-dir=p pip=b prompt=q p|python=q
+                         seeder={app-data,pip} 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
@@ -49,6 +51,13 @@ module Squared
           uninstall: %w[break-system-packages y|yes r|requirement=p root-user-action=b].freeze,
           wheel: %w[no-verify w|wheel-dir=p].freeze
         }.freeze
+        OPT_PY = {
+          common: %w[q|quiet=+ v|verbose=+ y|yes config=p].freeze,
+          exec: %w[3=/^\.\d+(\.\d+)?$/m? V=/^:./m?].freeze,
+          install: %w[by-id configure dry-run f|force refresh u|update d|download=p s|source=q t|target=p].freeze,
+          list: %w[1|one online only-managed format={table,json,jsonl,csv,exe,prefix,url,formats} s|source=q].freeze,
+          uninstall: %w[by-id cleanup purge].freeze
+        }.freeze
         OPT_POETRY = {
           common: %w[ansi no-ansi no-cache n|no-interaction no-plugins q|quiet v|verbose=+ P|project=p].freeze,
           install: %w[all-extras all-groups compile dry-run no-directory no-root only-root E|extras=q only=q with=q
@@ -99,7 +108,8 @@ module Squared
             install: %w[C config-settings c constraint extra-index-url no-binary only-binary platform
                         r requirement].freeze,
             list: %w[exclude extra-index-url no-binary only-binary].freeze
-          }.freeze
+          }.freeze,
+          py: %w[q v quiet verbose].freeze
         }.freeze
         private_constant :DEP_PYTHON, :DIR_PYTHON, :OPT_PYTHON, :OPT_PIP, :OPT_POETRY, :OPT_PDM, :OPT_HATCH, :OPT_TWINE,
                          :PASS_PYTHON
@@ -149,6 +159,7 @@ module Squared
           'outdated' => %i[major minor patch].freeze,
           'build' => %i[poetry pdm hatch meson python].freeze,
           'publish' => %i[twine poetry pdm hatch].freeze,
+          'py' => %i[exec install list uninstall].freeze,
           'run' => nil,
           'exec' => nil
         })
@@ -210,7 +221,7 @@ module Squared
                               indexerror n, list
                             else
                               found |= 2
-                              log.warn "run script #{n} of #{list.size}".subhint('out of range')
+                              log.debug "run script #{n} of #{list.size}".subhint('out of range')
                             end
                           else
                             case (i > 1 && poetry? ? 0 : i)
@@ -224,7 +235,7 @@ module Squared
                               raise message('script', val) if exception?
 
                               found |= 2
-                              log.warn "run script \"#{val}\"".subhint('not indexed')
+                              log.debug "run script \"#{val}\"".subhint('not indexed')
                             end
                           end
                         end
@@ -242,7 +253,7 @@ module Squared
                   task action do |_, args|
                     args = args.to_a
                     cmd = if (i = args.delete(':')) && !windows?
-                            readline('Enter script', force: true, multiline: %w[## ;])
+                            readline('Enter script', force: true, multiline: Prompt.multiline || %w[## ;])
                           elsif i || args.empty?
                             readline('Enter command', force: true)
                           else
@@ -281,7 +292,7 @@ module Squared
                             args = args.to_a
                             if args.empty?
                               args = readline('Enter command', force: true).split(' ', 2)
-                            elsif args.size == 1 && option('interactive', notequals: '0', prefix: ref)
+                            elsif args.size == 1 && option('interactive', notequals: '0', prefix: 'python')
                               args << readline('Enter arguments', force: false) unless args.first.include?(' ')
                             end
                             venv_init
@@ -351,18 +362,18 @@ module Squared
                       case flag
                       when :upgrade
                         task flag, [:strategy] do |_, args|
-                          install flag, (case args.strategy
-                                         when 'eager'
-                                           'eager'
-                                         when /^only-if|needed$/
-                                           'only-if-needed'
-                                         end.then do |val|
-                                           if val
-                                             args.extras << "upgrade-strategy=#{val}"
-                                           else
-                                             args.to_a
-                                           end
-                                         end)
+                          val = case args.strategy
+                                when 'eager'
+                                  'eager'
+                                when /^only-if/, /needed$/
+                                  'only-if-needed'
+                                end
+                          args = if val
+                                   args.extras << "upgrade-strategy=#{val}"
+                                 else
+                                   args.to_a
+                                 end
+                          install flag, args
                         end
                       when :requirement, :target
                         task flag, [:path] do |_, args|
@@ -419,6 +430,26 @@ module Squared
                                                   end)
                       end
                       break if be
+                    when 'py'
+                      break unless windows?
+
+                      case flag
+                      when :exec
+                        format_desc action, flag, 'opts*'
+                        task flag do |_, args|
+                          opts = args.to_a
+                          if (n = opts.index { |val| val.start_with?('3.') }) && (opts[n] =~ SEM_VER)
+                            opts[n] = $3.to_i >= 5 ? "3=.#{$3}.#{$5 || '0'}" : '3'
+                          end
+                          command = ENV['PY_EXEC'] || readline('Enter command', force: true)
+                          py(flag, command, opts: opts)
+                        end
+                      else
+                        format_desc(action, flag, 'opts*', after: flag == :list ? 'filter*' : 'tag*')
+                        task flag do |_, args|
+                          py(flag, opts: args.to_a, banner: true)
+                        end
+                      end
                     end
                   end
                 end
@@ -751,10 +782,17 @@ module Squared
           run(from: symjoin(flag, 'publish'), interactive: ['Publish', 'N', project])
         end
 
-        def python(*args, sync: true, banner: verbose?, with: nil, pass: PASS_PYTHON[:python], **kwargs)
-          op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_PYTHON[:common],
-                                   session('python', path: !venv?),
-                                   project: self, strict: strict?, auto: %w[help V|version],
+        def python(*args, sync: true, banner: verbose?, with: nil, pass: PASS_PYTHON[:python], from: :python, **kwargs)
+          py = from == :py && windows?
+          list = OPT_PYTHON[:common]
+          if py
+            list += OPT_PY[:exec]
+            list.delete('V=+')
+            from = :'py:exec'
+          end
+          op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), list,
+                                   py ? session('py', 'exec') : session('python', path: !venv?),
+                                   project: self, strict: strict?, auto: %w[help V|version], sep: ' ',
                                    multiple: [/^-c/], single: singleopt(:python), args: true, stdin: true)
           op.concat(args)
           if op.include?('-')
@@ -765,11 +803,17 @@ module Squared
               op.clear
             else
               op.exist?(add: true, first: true) unless op.arg?('m')
-              op.append(escape: kwargs.fetch(:escape, false), quote: kwargs.fetch(:quote, false))
+              op.append(context: kwargs)
             end
           end
+          var = kwargs[:env]
+          if var == true
+            var = nil
+          elsif py && var.nil?
+            var = false
+          end
           print_run(op, banner, **kwargs) unless op.stdout
-          run(sync: sync, banner: op.style?(banner), exception: exception?(**kwargs), from: :python)
+          run(op, var, sync: sync, banner: op.style?(banner), exception: exception?(**kwargs), from: from)
         end
 
         def pip(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
@@ -855,6 +899,28 @@ module Squared
             .then { |val| ret || val }
         end
 
+        def py(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
+          flag = flag.to_sym
+          if flag == :exec
+            pass = PASS_PYTHON[:python] if pass.nil?
+            python(*args, sync: sync, banner: banner, with: with, pass: pass, from: :py, **kwargs)
+          else
+            pass = PASS_PYTHON[:py] if pass.nil?
+            opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
+            list = OPT_PY[:common] + OPT_PY[flag]
+            op = OptionPartition.new(opts, list, session('py', flag), project: self, strict: strict?,
+                                                                      single: singleopt(:py))
+            case flag
+            when :install, :uninstall
+              raise ArgumentError, message('no tags listed', hint: flag) if op.empty?
+            end
+            op << '-y' if option('y', 'yes')
+            op.append
+            print_run(op, banner, **kwargs)
+            run(sync: sync, banner: banner, exception: exception?(**kwargs), from: symjoin('py', flag))
+          end
+        end
+
         def serve(root, opts = [], bind: 'localhost', port: nil, **)
           shell(python_session('-m http.server', port, basic_option('b', bind), opts: opts).first.done, chdir: root)
         end
@@ -886,7 +952,7 @@ module Squared
                 @dependindex = index
                 @dependfile = val
               else
-                log.warn "variable_set: @dependfile=#{val}".subhint('not supported')
+                log.debug "variable_set: @dependfile=#{val}".subhint('not supported')
               end
             end
           when :venv
@@ -956,7 +1022,8 @@ module Squared
           pre = preopts(quiet: quiet)
           return session(name, *pre, *cmd, path: !venv?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, strict: strict?, single: singleopt(name.to_sym))
+          op = OptionPartition.new(opts, common, project: self, strict: strict?, sep: name == 'python' ? ' ' : '=',
+                                                 single: singleopt(name.to_sym))
           [session(name, *pre, *op.to_a, *cmd, path: !venv?), op.extras]
         end
 
@@ -1131,6 +1198,8 @@ module Squared
           when :pdm, :poetry
             /\Av+\z/
           when :twine, :meson then nil
+          when :py
+            /\A(vv|qq)\z/
           else
             /\A(v+|q+)\z/
           end
@@ -1235,6 +1304,7 @@ module Squared
                    status = true
                    :virtualenv
                  else
+                   status = !banner
                    :venv
                  end
           cmd, opts = python_session('-m', flag, opts: opts)
@@ -1242,34 +1312,31 @@ module Squared
           op.append(dir, delim: true)
             .clear(pass: false)
           status ||= op.arg?(/\A-v+\z/)
-          ret = run(op, env, exception: true, banner: banner)
-          args = []
-          requires = read_pyproject 'build-system', 'requires'
-          args.concat(requires) if requires.is_a?(Array)
-          if poetry?
-            requires = read_pyproject 'tool.poetry', 'requires-poetry'
-            args << "poetry#{requires}"
-          elsif setuptools? && !virtualenv?
-            args << 'setuptools' << 'wheel'
-          end
-          pip(:install, *args, banner: false) unless args.empty?
-          success?(ret, banner, !status) do |out|
-            if out && dir.directory?
-              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
-              end
-              cmd << shell_quote(dir)
-              print_run cmd, silent?
-              run(banner: false)
+          if run(op, env, exception: true, banner: banner) && dir.directory?
+            args = []
+            requires = read_pyproject 'build-system', 'requires'
+            args.concat(requires) if requires.is_a?(Array)
+            if poetry?
+              requires = read_pyproject 'tool.poetry', 'requires-poetry'
+              args << "poetry#{requires}"
+            elsif setuptools? && !virtualenv?
+              args << 'setuptools' << 'wheel'
+            end
+            pip(:install, *args, banner: false) unless args.empty?
+            if poetry?
+              dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
+              poetry_session 'env use'
+            elsif pdm?
+              pdm_session 'use -f'
             else
-              puts 'Failed'
+              puts "Success: #{dir}" unless status
+              return
             end
+            cmd << shell_quote(dir)
+            print_run cmd, silent?
+            run(banner: false)
+          elsif !status
+            puts 'Failed'
           end
         end