squared 0.8.3 → 0.8.5

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
@@ -362,7 +394,7 @@ module Squared
                                      elsif has_value!(args, 'p', 'public')
                                        'public'
                                      end
-                            dryrun = has_value!(args, 'd', 'dry-run')
+                            dryrun = has_value! args, 'd', 'dry-run'
                           end
                           case flag
                           when :stage
@@ -379,7 +411,7 @@ module Squared
                                 [ver, tag, item['id'], item['actor']]
                               end
                               if data.empty?
-                                print_error('no staged releases', loglevel: Logger::INFO, subject: npmname)
+                                print_error(Logger::INFO, 'no staged releases', subject: npmname)
                                 exit 1
                               end
                               data.each do |item|
@@ -424,7 +456,7 @@ module Squared
                                       @tsfile
                                     end
                         end
-                        watch = has_value!(args, 'w', 'watch')
+                        watch = has_value! args, 'w', 'watch'
                         tsc(*args, banner: true, project: project, build: flag == :build, watch: !watch.nil?)
                       end
                     end
@@ -630,7 +662,7 @@ module Squared
                 end
                 if nolockfile?(prefix: 'yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci')
+                elsif option('ci') || (ci? && exist?('yarn.lock'))
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -666,13 +698,14 @@ module Squared
                        '--force'
                      elsif nolockfile?(prefix: 'pnpm')
                        '--no-lockfile'
-                     elsif option('ci')
+                     elsif option('ci') || (ci? && exist?('pnpm-lock.yaml'))
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session('npm', (ci = option('ci', prefix: 'npm')) ? 'ci' : 'install')
+              ci = option('ci', prefix: 'npm') || (ci? && exist?('package-lock.json'))
+              cmd = session('npm', ci ? 'ci' : 'install')
               option('approve-scripts') do |val|
                 cmd = npm_output 'approve-scripts'
                 cmd << case val
@@ -841,7 +874,7 @@ module Squared
           pending = 0
           modified = 0
           width = ->(a, i) { a.map { |aa| aa[i] }.max_by(&:size).size }
-          pad = ->(val, ord) { val.succ.to_s.rjust([ord.size.to_s.size, 2].max) }
+          pad = ->(a, n) { n.succ.to_s.rjust([a.size.to_s.size, 2].max) }
           footer = lambda do |val, size|
             return unless verbose
 
@@ -857,7 +890,7 @@ module Squared
           if !found.empty?
             col1 = width.call(found, 0) + 4
             col2 = width.call(found, 1) + 4
-            col3 = pad.call(found.size, found).size + 2 + col1 + col2 + width.call(found, 2)
+            col3 = pad.call(found, found.size).size + 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|
@@ -879,21 +912,21 @@ module Squared
               end
               a = a.ljust(col1)
               b = b.ljust(col2)
-              sub_style! b, theme[:current] if theme[:current] && !stdin?
+              b = sub_style b, theme[:current] if theme[:current] && !stdin?
               if cur == -1
                 c = 'SKIP'
               elsif modified == cur
                 c = 'FAIL'
               elsif !stdin?
                 if d == 1
-                  sub_style! a, theme[:major]
-                  sub_style! c, :bold, color(:green)
+                  a = sub_style a, theme[:major]
+                  c = sub_style c, :bold, color(:green)
                 else
-                  sub_style!(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
+                  c = sub_style(c, **opt_style(color(d == 3 ? :green : :yellow), SEM_VER, d))
                 end
                 g = item
               end
-              s = "#{pad.call(i, found)}. #{a}#{b}#{c}"
+              s = "#{pad.call(found, i)}. #{a}#{b}#{c}"
               if se
                 items << [s, g]
                 next
@@ -962,11 +995,11 @@ module Squared
               b = sub_style b.ljust(col2), color(d ? :red : :yellow)
               c = c.ljust(col3)
               unless d
-                sub_style! a, theme[:active]
-                sub_style! c, color(:green)
+                a = sub_style a, theme[:active]
+                c = sub_style c, color(:green)
                 pending += 1
               end
-              puts "#{pad.call(i, avail)}. #{(a + c + b).subhint(d ? 'locked' : 'latest')}"
+              puts "#{pad.call(avail, i)}. #{(a + c + b).subhint(d ? 'locked' : 'latest')}"
             end
             footer.call(0, avail.size)
           else
@@ -1589,10 +1622,10 @@ module Squared
           modules.rmtree
         rescue Timeout::Error => e
           puts
-          print_error(e, hint: modules, pass: true)
+          print_error(e, subject: name, hint: modules, pass: true)
           exit 1
         rescue => e
-          print_error(e, pass: true)
+          print_error(e, subject: name, pass: true)
           false
         else
           true
@@ -1639,7 +1672,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}"

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

@@ -541,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),
@@ -564,7 +565,7 @@ module Squared
                         task flag do |_, args|
                           args = args.to_a
                           multiline = case args.first
-                                      when ';', '#'
+                                      when ';', /^#+$/
                                         args.shift
                                       else
                                         %w[## ;]
@@ -650,7 +651,7 @@ module Squared
                                                ver = nil
                                                `ruby --version`
                                              end)
-                            unless workspace.windows?
+                            unless windows?
                               if vm
                                 out << trim.call(case vm
                                                  when 'chruby'
@@ -843,11 +844,11 @@ module Squared
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = bundle_output 'outdated'
           if flag
-            se = has_value!(opts, 's', 'select')
+            se = has_value! opts, 's', 'select'
             ia = has_value!(opts, 'i', 'interactive') && !se
-            up = has_value!(opts, 'u', 'update')
+            up = has_value! opts, 'u', 'update'
             opts << 'only-explicit' if has_value!(opts, 'e', 'explicit')
-            dryrun = has_value!(opts, 'd', 'dry-run')
+            dryrun = has_value! opts, 'd', 'dry-run'
             if !sync || stdin?
               se = false
               ia = false
@@ -1581,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$/])
@@ -1671,7 +1672,7 @@ module Squared
         def serve(root, *, bind: nil, port: 3000, **kwargs)
           require 'webrick'
         rescue LoadError => e
-          print_error(e, pass: true)
+          print_error(e, subject: name, hint: 'webrick', pass: true)
         else
           config = kwargs.merge({ DocumentRoot: root })
           config[:BindAddress] = bind if bind
@@ -1685,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