squared 0.8.2 → 0.8.4

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
@@ -1529,8 +1561,7 @@ module Squared
                     next if yarntype(exist: true) == 0
                   when /^pnpm/
                     next if pnpmtype(exist: true) == 0
-                  when /^npm/
-                    nil
+                  when /^npm/ then nil
                   else
                     next
                   end
@@ -1584,8 +1615,8 @@ module Squared
         end
 
         def remove_modules(prefix: dependbin)
-          modules = basepath 'node_modules'
-          return false unless modules.directory? && confirm_basic('Remove?', modules, prefix: prefix)
+          modules = basepath!('node_modules', type: 'd')
+          return false unless modules && confirm_basic('Remove?', modules, prefix: prefix)
 
           modules.rmtree
         rescue Timeout::Error => e
@@ -1640,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

@@ -36,9 +36,9 @@ module Squared
                       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].freeze,
-          install_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps require-hashes
-                        use-pep517 c|constraint=p group=q progress-bar=b r|requirement=p requirements-from-script=p
-                        src=p].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 uploaded-prior-to=q].freeze,
           hash: %w[a|algorithm].freeze,
@@ -181,8 +181,8 @@ module Squared
                   format_desc action, nil, "script+|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     found = 0
-                    %w[tool.poetry.scripts tool.pdm.scripts project.scripts].each_with_index do |table, i|
-                      next if (list = read_pyproject(table)).empty?
+                    %w[tool.poetry tool.pdm project].each_with_index do |table, i|
+                      next if (list = read_pyproject("#{table}.scripts")).empty?
 
                       if args.command == '#'
                         format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: pyprojectfile)
@@ -208,7 +208,7 @@ module Squared
                               log.warn "run script #{n} of #{list.size}".subhint('out of range')
                             end
                           else
-                            case i
+                            case (i > 1 && poetry? ? 0 : i)
                             when 0
                               found |= 1
                               run(session_output('poetry', 'run', val), from: :run)
@@ -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)
@@ -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/uninstall,opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/ninstall?,opts*"
                         task flag do |_, args|
                           opts = args.to_a
                           if has_value!(opts, 'u', 'uninstall')
@@ -312,7 +312,7 @@ module Squared
                           end
                           file = pip(flag, opts: opts, banner: requirement.nil?, requirement: requirement)
                           puts File.read(file) unless silent?
-                          if requirement && confirm_basic('Uninstall?', file)
+                          if requirement && confirm_basic('Uninstall?', file, prefix: 'pip')
                             pip(:uninstall, opts: ['y', "r=#{shell_quote(file)}"])
                           end
                         end
@@ -482,7 +482,7 @@ module Squared
                               :patch
                             end
                    end
-                   '--not-required' if option('not-required', notequals: '0') && !env('PYTHON_DEFAULT')
+                   '--not-required' if option('not-required', notequals: '0')
                  end
           cmd << '--local' if option('l', 'local')
           append_global
@@ -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)
@@ -607,18 +607,18 @@ module Squared
                                 project: self, strict: strict?, single: singleopt(flag))
           else
             op = append_pip(flag, opts, pipopts(:install), target: pip_session('install'))
-          end
-          case flag
-          when :editable
-            op << quote_option('e', op.pop || editable || '.')
-            op.clear
-          when :user, :upgrade
-            op.concat(packages)
-            raise ArgumentError, message('no packages listed', hint: flag) if op.empty?
+            case flag
+            when :editable
+              op << quote_option('e', op.pop || editable || '.')
+              op.clear
+            when :user, :upgrade
+              op.concat(packages)
+              raise ArgumentError, message('no packages listed', hint: flag) if op.empty?
 
-            op << "--#{flag}"
-            op.append
-            python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
+              op << "--#{flag}"
+              op.append
+              python_session('-m pip', *op.to_a.drop(1)) if windows?
+            end
           end
           run(banner: banner, from: :install)
         end
@@ -723,7 +723,7 @@ module Squared
             op.clear(pass: false)
           else
             if op.empty?
-              op << "#{dist.call}/*"
+              op.add_path(dist.call, '*')
             else
               op.add_path
             end
@@ -796,8 +796,7 @@ module Squared
 
             op << (action = op.shift)
             case action
-            when 'dir', 'info', 'purge'
-              nil
+            when 'dir', 'info', 'purge' then nil
             when 'list', 'remove'
               op.add_first(quote: true)
             else
@@ -811,8 +810,7 @@ module Squared
             action = op.shift
             op << action
             case action
-            when 'list', 'edit', 'debug'
-              nil
+            when 'list', 'edit', 'debug' then nil
             when 'get', 'unset', 'set'
               op.add_first
               op.add_first(quote: true, expect: true) if action == 'set'
@@ -923,6 +921,7 @@ module Squared
           if (target = append_nocolor('no-color', target: [], prefix: 'hatch'))
             (opts ||= []).concat(target)
           end
+          ENV['HATCH_ENV_TYPE_VIRTUAL_PATH'] ||= venv if venv?
           create_session('hatch', *cmd, common: OPT_HATCH[:common], opts: opts)
         end
 
@@ -1010,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]
@@ -1075,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
@@ -1089,8 +1092,7 @@ module Squared
             /\A(?:v+|q+|b+|V+|O+)\z/
           when :pdm, :poetry
             /\Av+\z/
-          when :twine, :meson
-            nil
+          when :twine, :meson then nil
           else
             /\A(?:v+|q+)\z/
           end
@@ -1134,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)
@@ -1214,7 +1216,22 @@ module Squared
             args << 'setuptools' << 'wheel'
           end
           pip(:install, *args, banner: false) unless args.empty?
-          success?(ret, banner, !status) { |out| puts(out && dir.directory? ? "Success: #{dir}" : 'Failed') }
+          success?(ret, banner, !status) do |out|
+            if out && dir.directory?
+              if poetry?
+                dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
+                cmd = poetry_session 'env use'
+              else
+                puts "Success: #{dir}"
+                return
+              end
+              cmd << shell_quote(dir)
+              print_run cmd, silent?
+              run(banner: false)
+            else
+              puts 'Failed'
+            end
+          end
         end
 
         def venv_package?(val)

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

@@ -26,14 +26,14 @@ module Squared
           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 disable-pending-cops
                       display-only-correctable display-only-fail-level-offenses display-only-failed
-                      display-only-safe-correctable S|display-style-guide display-time editor-mode enable-pending-cops
-                      E|extra-details F|fail-fast force-default-config force-exclusion x|fix-layout
+                      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
-                      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,
+                      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: {
@@ -511,8 +511,7 @@ module Squared
                           opts << 'redownload' if has_value!(opts, 'f', 'force')
                           if (lock = basepath!('Gemfile.lock'))
                             case (val = ENV['BUNDLE_FROZEN'])
-                            when '0', 'false'
-                              nil
+                            when '0', 'false' then nil
                             else
                               if val
                                 print_error("BUNDLE_FROZEN: #{val}", loglevel: Logger::INFO, subject: name, hint: flag)
@@ -542,8 +541,9 @@ module Squared
                       when :file
                         format_desc action, flag, 'path,opts*,args*'
                         task flag, [:rb] do |_, args|
+                          file = args.rb
                           opts = args.extras
-                          args = Array(if (file = args.rb) && !file.include?('*')
+                          args = Array(if file && !file.include?('*')
                                          ENV['RUBY_ARGS']
                                        else
                                          a, b, c = choice_index('Select a file', Dir.glob(file || '*.rb', base: path),
@@ -651,7 +651,7 @@ module Squared
                                                ver = nil
                                                `ruby --version`
                                              end)
-                            unless workspace.windows?
+                            unless windows?
                               if vm
                                 out << trim.call(case vm
                                                  when 'chruby'
@@ -783,8 +783,7 @@ module Squared
                 next if val == '0' || val == 'false'
 
                 run(bundle_output('binstubs --all', case val
-                                                    when '1', 'true'
-                                                      nil
+                                                    when '1', 'true' then nil
                                                     else
                                                       if val.start_with?('~')
                                                         val = File.join(Dir.home, val == '~' ? '.bundle' : val[1..-1])
@@ -1076,6 +1075,7 @@ module Squared
             filter = kwargs.fetch(:filter, {})
             semver = filter[:semver]
             equals = filter[:equals]
+            dryrun = filter[:dryrun] || dryrun?(prefix: 'gem')
             update = if sync && filter[:select]
                        semver ||= 'major'
                        items = []
@@ -1232,7 +1232,7 @@ module Squared
                             'user-install'
                           end
                 end
-                if filter[:dryrun]
+                if dryrun
                   print_run gem_output('update -f', *update.quote!(escape: true)), false
                 else
                   gem(:update, *update, opts: opts)
@@ -1275,9 +1275,9 @@ module Squared
                 .clear(pass: false)
             end
           when :push
-            target = gemname
-            if op.empty? || (n = op.index(':'))
-              file = basepath(if !n && (spec = gemspec)
+            target = nil
+            if op.empty? || ia
+              file = basepath(if !ia && (spec = gemspec)
                                 "#{spec.name}-#{spec.version}.gem"
                               else
                                 choice_index 'Select a file', Dir.glob('*.gem', base: path)
@@ -1296,7 +1296,7 @@ module Squared
 
               op.add_path(file)
             end
-            return run(from: from, interactive: ['Push', 'N', target]) unless with || !banner
+            return run(from: from, interactive: ['Push', 'N', target || gemname]) unless with || !banner
           when :exec
             min = if op.arg?('g', 'gem')
                     1
@@ -1582,12 +1582,12 @@ module Squared
         def rdbg(*args, banner: verbose?, with: nil, pass: PASS_RUBY[:rdbg], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
           cmd = session 'rdbg'
-          args.each_with_index do |val, index|
+          args.each_with_index do |val, i|
             break if val == '--'
             next unless exist?(val, type: 'f')
 
-            args[index] = shell_quote basepath(val)
-            cmd.merge(args.slice!(0, index + 1))
+            args[i] = shell_quote basepath(val)
+            cmd.merge(args.slice!(0, i.succ))
             break
           end
           op = OptionPartition.new(opts, OPT_RUBY[:rdbg], cmd, project: self, strict: strict?, first: [/\.rb$/])
@@ -1686,11 +1686,11 @@ module Squared
 
         def vmname(bin: false)
           order = { 'rbenv' => -1, 'rvm' => -1, 'chruby' => -1, 'asdf' => -1, 'mise' => -1 }
-          ENV.fetch('PATH', '').split(':').each_with_index do |val, index|
+          ENV.fetch('PATH', '').split(':').each_with_index do |val, i|
             order.each_key do |key|
               next unless val.match?(%r{[/.]#{key}/})
 
-              order[key] = index
+              order[key] = i
               break
             end
           end
@@ -1939,8 +1939,7 @@ module Squared
               val = case (val = $2)
                     when 'true'
                       true
-                    when '', '[]'
-                      nil
+                    when '', '[]' then nil
                     else
                       if val =~ /\A\[:(.+)\]\z/
                         $1.split(', :').map { |s| (s[/\A"(.+)"\z/, 1] || s).to_sym }