squared 0.4.6 → 0.4.8

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

@@ -5,7 +5,7 @@ module Squared
     module Project
       class Node < Git
         OPT_NPM = {
-          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=b].freeze,
+          common: %w[dry-run include-workspace-root workspaces=b? w|workspace=v].freeze,
           install: %w[prefer-dedupe package-lock-only cpu=b libc=b os=b].freeze,
           install_base: %w[ignore-scripts install-links strict-peer-deps include=b omit=b install-strategy=b].freeze,
           install_no: %w[audit bin-links fund package-lock].freeze,
@@ -112,7 +112,7 @@ module Squared
           return unless outdated? && ref?(Node.ref)
 
           namespace name do
-            @@tasks[Node.ref].each do |action, flags|
+            Node.subtasks do |action, flags|
               next if @pass.include?(action)
 
               if flags.nil?
@@ -201,11 +201,11 @@ module Squared
                           tag, otp, dryrun = args
                         end
                         check = ->(val) { val == 'dry-run' || val == 'true' }
-                        if check.(otp)
+                        if check.call(otp)
                           dryrun = true
                           otp = nil
                         elsif dryrun
-                          dryrun = check.(dryrun)
+                          dryrun = check.call(dryrun)
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun)
                       end
@@ -242,7 +242,7 @@ module Squared
             items << @workspace.home
             @workspace.rev_clear(@workspace.find(@workspace.home).name)
           end
-          items += as_a(also) if also
+          items.concat(as_a(also)) if also
           return if items.empty?
 
           on :first, :copy
@@ -280,7 +280,7 @@ module Squared
               dest = dir.path
               @workspace.rev_clear(dir.name)
             else
-              raise_error "copy given: #{dir}"
+              raise_error "copy: given #{dir}"
             end
             next unless from && dest&.directory?
 
@@ -445,14 +445,13 @@ module Squared
               if upgrade && !w[5]
                 next if file == want
 
-                index = if a != c
-                          1
-                        elsif b != d
-                          3
-                        else
-                          5
-                        end
-                found << [key, file, want, index, major, f, w]
+                found << [key, file, want, if a != c
+                                             1
+                                           elsif b != d
+                                             3
+                                           else
+                                             5
+                                           end, major, f, w]
               elsif !major
                 avail << [key, file, latest, latest != current]
               end
@@ -478,11 +477,12 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = size_col.(found, 0) + 4
-            col2 = size_col.(found, 1) + 4
+            col1 = size_col.call(found, 0) + 4
+            col2 = size_col.call(found, 1) + 4
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              if inter && (rev != :major || e || semmajor?(item[5], item[6])) && !confirm_outdated(a, c, d, e)
+              inter &&= rev != :major || e || semmajor?(item[5], item[6])
+              if inter && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
                 cur = -1
               else
                 cur = modified
@@ -510,22 +510,22 @@ module Squared
                   else
                     sub_style(c, pat: SEM_VER, styles: color(:green), index: d)
                   end
-              puts "#{pad_ord.(i, found)}. #{a + b + c}"
+              puts "#{pad_ord.call(i, found)}. #{a + b + c}"
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
             if dryrun || (modified == 0 && pending > 0)
-              footer.(modified, found.size)
+              footer.call(modified, found.size)
             elsif modified > 0
               modified = -1
-              footer.(0, found.size)
+              footer.call(0, found.size)
               File.write(dependfile, doc)
               commit(:add, refs: ['package.json'], pass: true)
               install if opts.include?('prune')
             end
           elsif !avail.empty?
-            col1 = size_col.(avail, 0) + 4
-            col2 = size_col.(avail, 1)
-            col3 = size_col.(avail, 2) + 4
+            col1 = size_col.call(avail, 0) + 4
+            col2 = size_col.call(avail, 1)
+            col3 = size_col.call(avail, 2) + 4
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
@@ -536,9 +536,9 @@ module Squared
                 c = sub_style(c, styles: color(:green))
                 pending += 1
               end
-              puts "#{pad_ord.(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
+              puts "#{pad_ord.call(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
             end
-            footer.(0, avail.size)
+            footer.call(0, avail.size)
           else
             puts 'No updates were found'
           end
@@ -598,48 +598,48 @@ module Squared
                                   else
                                     flag
                                   end
-            out = option_sanitize(opts, if yarn == 1
-                                          OPT_PNPM[:install_base] + OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
-                                        else
-                                          OPT_BERRY[flag]
-                                        end).first
+            op = OptionPartition.new(opts, if yarn == 1
+                                             OPT_PNPM[:install_base] + OPT_YARN.fetch(flag, []) + OPT_YARN[:common]
+                                           else
+                                             OPT_BERRY[flag]
+                                           end, cmd, project: self)
+            op.clear
             append_loglevel
-            option_clear out
             run(from: :"package:#{flag}")
             return
           elsif pnpm?
             cmd = session 'pnpm', flag
             list = OPT_PNPM[:install_base] + OPT_PNPM.fetch(flag, []) + OPT_PNPM[:common]
-            list += OPT_PNPM[:install_as] unless flag == :dedupe
-            opts = option_sanitize(opts, list, no: OPT_PNPM[:"#{flag}_no"]).first
+            list.concat(OPT_PNPM[:install_as]) unless flag == :dedupe
+            no = OPT_PNPM[:"#{flag}_no"]
           else
             cmd = session 'npm', flag
             list = OPT_NPM[:install_base] + OPT_NPM.fetch(flag, []) + OPT_NPM[:common]
-            list += OPT_NPM[:install_as] unless flag == :dedupe
-            opts, pat = option_sanitize(opts, list, no: OPT_NPM[:install_no])
+            list.concat(OPT_NPM[:install_as]) unless flag == :dedupe
+            no = OPT_NPM[:install_no]
           end
-          out = []
-          err = []
-          opts.each do |opt|
-            if pat && opt =~ pat
+          op = OptionPartition.new(opts, list, cmd, no: no, project: self)
+          op.each do |opt|
+            if opt =~ op.values
               case $1
               when 'w', 'workspace'
-                cmd << (%r{[\\/]}.match?($2) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
               end
             elsif opt.include?('=')
-              err << opt
+              op.errors << opt
             else
-              out << opt
+              op.found << opt
             end
           end
+          op.swap
           append_nocolor
           append_loglevel
           if flag == :dedupe
-            option_clear out
+            op.clear
           else
-            append_value(out, escape: true)
+            op.append(escape: true)
           end
-          option_clear err
+          op.clear(errors: true)
           run(from: :"package:#{flag}")
         end
 
@@ -693,7 +693,8 @@ module Squared
             end
           rescue StandardError => e
             log.debug e
-            raise if exception
+            ret = on(:error, :bump, e)
+            raise if exception && ret != true
           end
         end
 
@@ -702,13 +703,25 @@ module Squared
 
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
-            out = option_sanitize(opts, OPT_BERRY[:pack]).first
-            cmd << quote_option('out', Pathname.pwd.join("#{project}-#{version}.tgz")) unless session_arg?('out')
+            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
+            op << quote_option('out', Pathname.pwd.join("#{project}-#{version}.tgz")) unless op.arg?('out')
           else
-            out = option_sanitize(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common]).first
-            cmd << quote_option('pack-destination', Dir.pwd) unless session_arg?('pack-destination')
+            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : OPT_NPM[:pack] + OPT_NPM[:common], cmd,
+                                     project: self)
+            unless pnpm?
+              op.each do |opt|
+                next unless opt =~ op.values
+
+                case $1
+                when 'w', 'workspace'
+                  op << ($2.match?(%r{[\\/]}) ? quote_option($1, basepath($2)) : shell_option($1, $2))
+                  op.found << opt
+                end
+              end
+            end
+            op << quote_option('pack-destination', Dir.pwd) unless op.arg?('pack-destination')
           end
-          option_clear out
+          op.clear
           run(from: :pack)
         end
 
@@ -731,7 +744,7 @@ module Squared
             when Enumerable
               target.to_a.join(' ')
             else
-              raise_error("compose given: #{target}", hint: from)
+              raise_error("compose: given #{target}", hint: from)
             end
           end
         end
@@ -889,21 +902,6 @@ module Squared
           end
         end
 
-        def confirm_outdated(pkg, ver, rev, lock)
-          a = sub_style(case rev
-                        when 1
-                          'MAJOR'
-                        when 3
-                          'MINOR'
-                        else
-                          'PATCH'
-                        end, styles: theme[:header])
-          b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
-          c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
-          e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d, timeout: 60)
-        end
-
         def dryrun?(prefix = dependbin, **)
           super || !option('dry-run', prefix: prefix).nil?
         end

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

@@ -20,7 +20,7 @@ module Squared
           install: %w[break-system-packages check-build-dependencies compile dry-run force-reinstall I|ignore-installed
                       ignore-requires-python no-build-isolation no-clean no-compile no-deps no-index no-warn-conflicts
                       no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=b
-                      config-settings=q c|constraint=p extra-index-url=q f|find-links=q global-option=q
+                      config-settings=q c|constraint=p e|editable=v extra-index-url=q f|find-links=q global-option=q
                       implementation=b i|index-url=q no-binary=q only-binary=q platform=q prefix=p progress-bar=b
                       python-version=q report=p r|requirement=p root=p root-user-action=b src=p t|target=p
                       upgrade-strategy=b].freeze,
@@ -55,7 +55,7 @@ module Squared
           end
 
           def bannerargs
-            [:dependfile].freeze
+            %i[dependfile venv].freeze
           end
 
           def venv?
@@ -109,7 +109,7 @@ module Squared
           return unless outdated? && ref?(Python.ref)
 
           namespace name do
-            @@tasks[Python.ref].each do |action, flags|
+            Python.subtasks do |action, flags|
               next if @pass.include?(action)
 
               namespace action do
@@ -120,12 +120,13 @@ module Squared
                       format_desc action, flag, 'dir,opts*'
                       task flag, [:dir] do |_, args|
                         dir = basepath(param_guard(action, flag, args: args, key: :dir))
-                        opts = python_session('-m venv', opts: args.extras).last
-                        opts = option_sanitize(opts, OPT_PYTHON[:venv]).first
-                        append_value(dir, delim: true)
-                        option_clear(opts, pass: false)
+                        cmd, opts = python_session('-m venv', opts: args.extras)
+                        op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
+                        op.append(dir, delim: true)
+                          .clear(pass: false)
+                        v = op.arg?(/^-v+$/, 'verbose')
                         run(exception: true)
-                        puts(dir.directory? ? "Success: #{dir}" : 'Failed')
+                        puts(dir.directory? ? "Success: #{dir}" : 'Failed') unless v
                       end
                     elsif venv
                       case flag
@@ -134,7 +135,7 @@ module Squared
 
                         format_desc action, flag, 'c|reate?,d|epend?'
                         task flag do |_, args|
-                          FileUtils.rm_rf(venv, verbose: true)
+                          rm_rf(venv, verbose: true)
                           venv_init if has_value?(%w[c create], args.to_a)
                           depend if has_value?(%w[d depend], args.to_a)
                         end
@@ -210,7 +211,7 @@ module Squared
                                                                 'location?'
                                                               end)
                     task flag do |_, args|
-                      buildx flag, args.to_a
+                      build! flag, args.to_a
                     end
                   when 'publish'
                     format_desc(action, flag, 'opts*', after: case flag
@@ -310,12 +311,12 @@ module Squared
                   line = sub_style(line, pat: /^(.+)(#{Regexp.escape(latest)})(.+)$/, styles: styles, index: 2)
                   found += 1
                 end
-                out.("#{start.to_s.rjust(2)}. #{line}")
+                out.call("#{start.to_s.rjust(2)}. #{line}")
                 start += 1
               elsif line.start_with?('Package')
                 unless stdin?
                   sub = { pat: /^(.*)(?<!\dm)(Package|Latest)(.+)$/, styles: theme[:header], index: 2 }
-                  out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
+                  out.call(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
                 end
                 start += 1
               end
@@ -341,6 +342,7 @@ module Squared
             cmd << quote_option('e', out.pop || editable || '.')
             option_clear out
           when :upgrade
+            raise_error('no packages listed', hint: flag) if out.empty?
             cmd << '--upgrade'
             cmd << basic_option('upgrade-strategy', strategy) if strategy
             append_value out
@@ -348,9 +350,7 @@ module Squared
           run(from: :install)
         end
 
-        def buildx(flag, opts = [])
-          out = []
-          srcdir = nil
+        def build!(flag, opts = [])
           case flag
           when :python
             cmd, opts = python_session('-m build', opts: opts)
@@ -362,20 +362,23 @@ module Squared
             cmd, opts = hatch_session('build', opts: opts)
             list = OPT_HATCH[:build]
           end
-          option_sanitize(opts, list, single: flag == :python ? /^(?:v+|q+|b+)$/ : /^(?:v+|q+)$/).first.each do |opt|
+          srcdir = nil
+          op = OptionPartition.new(opts, list, cmd, project: self, single: singleopt(flag))
+          op.each do |opt|
             if !srcdir && basepath(opt).exist? && projectpath?(opt)
               srcdir = opt
             else
-              out << opt
+              op.found << opt
             end
           end
+          op.swap
           case flag
           when :poetry
             if srcdir
-              if session_arg?('o', 'output')
-                out << srcdir
+              if op.arg?('o', 'output')
+                op.extras << srcdir
               else
-                cmd << quote_option('output', basepath(srcdir))
+                op << quote_option('output', basepath(srcdir))
               end
               srcdir = nil
             end
@@ -385,10 +388,10 @@ module Squared
             else
               srcdir ||= path
             end
-            cmd << basic_option('p', project) unless ENV['HATCH_PROJECT'] || session_arg?('p', 'project')
+            op << basic_option('p', project) unless ENV['HATCH_PROJECT'] || op.arg?('p', 'project')
           end
-          cmd << shell_quote(basepath(srcdir)) if srcdir
-          option_clear out
+          op << shell_quote(basepath(srcdir)) if srcdir
+          op.clear
           run(from: :"#{flag}:build")
         end
 
@@ -404,13 +407,13 @@ module Squared
             opts = hatch_session('publish', opts: opts).last
             list = OPT_HATCH[:publish]
           end
-          out = option_sanitize(opts, list, single: flag == :twine ? nil : /^(?:v+|q+)$/).first
-          if out.empty?
+          op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
+          if op.empty?
             dist = basepath.join('dist')
             raise_error('no source files found', hint: dist) unless dist.directory? && !dist.empty?
-            out << "#{dist}/*" unless flag == :poetry
+            op.extras << "#{dist}/*" unless flag == :poetry
           end
-          append_value out
+          op.append
           run(from: :"#{flag}:publish")
         end
 
@@ -419,7 +422,7 @@ module Squared
           out = append_pip(nil, opts, from: flag)
           case flag
           when :uninstall
-            raise_error('no packages listed', subject: name, hint: 'uninstall') if out.empty?
+            raise_error('no packages listed', hint: 'uninstall') if out.empty?
             cmd.merge(out)
           when :freeze
             venv_init
@@ -465,10 +468,9 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          out = []
-          opts = option_sanitize(opts, OPT_PYTHON[:common], target: out, single: /^v+$/).first
-          ret = session('python', *out, *cmd, path: venv.nil?)
-          [ret, opts]
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /^v+$/)
+          ret = session('python', *op.to_a, *cmd, path: venv.nil?)
+          [ret, op.extras]
         end
 
         def poetry_session(*cmd)
@@ -482,48 +484,47 @@ module Squared
         def hatch_session(*cmd, opts: nil)
           return session('hatch', *preopts, *cmd, path: venv.nil?) unless opts
 
-          out = []
-          opts = option_sanitize(opts, OPT_HATCH[:common], target: out, single: /^(?:v+|q+)$/).first
-          ret = session('hatch', *out, *cmd, path: venv.nil?)
-          [ret, opts]
+          op = OptionPartition.new(opts, OPT_HATCH[:common], project: self, single: singleopt)
+          ret = session('hatch', *op.to_a, *cmd, path: venv.nil?)
+          [ret, op.extras]
         end
 
-        def append_pip(flag, opts, from: nil)
+        def append_pip(flag, opts, target: @session, from: nil)
           if !from || opts.empty?
-            append_global
+            append_global(target: target)
             return []
           end
-          opts, pat = option_sanitize(opts, OPT_PIP[from] + OPT_PIP[:common], single: /^(?:v+|q+)$/)
-          append_global
+          op = OptionPartition.new(opts, OPT_PIP[from] + OPT_PIP[:common], target, project: self, single: singleopt)
+          append_global(target: target)
           if from == :install
-            out = []
             edit = nil
-            opts.each do |opt|
-              if opt =~ pat
+            op.each do |opt|
+              if opt =~ op.values
                 case $1
                 when 'e', 'editable'
-                  out << edit if edit && flag == :editable
+                  op.found << edit if edit && flag == :editable
                   edit = $2
                 end
               elsif flag == :editable && !edit
                 edit = opt
               else
-                out << opt
+                op.found << opt
               end
             end
+            op.swap
             if edit
               edit = basepath(edit) unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
               if flag == :editable
-                out << edit
+                op.extras << edit
               else
                 target << quote_option('e', edit)
               end
             end
             case flag
             when :editable, :upgrade
-              out
+              op.extras
             else
-              option_clear out
+              op.clear
               []
             end
           else
@@ -531,25 +532,25 @@ module Squared
           end
         end
 
-        def append_editable
+        def append_editable(target: @session)
           return if requirements?
 
-          if (val = option('editable', 'e', ignore: false))
-            session_delete('e', 'editable')
+          if (val = option('editable', 'e', target: target, ignore: false))
+            session_delete('e', 'editable', target: target)
             case val
             when '0', 'false'
               return
             else
               val = basepath(val)
             end
-          elsif session_arg?('e', 'editable') || !(val = editable)
+          elsif session_arg?('e', 'editable', target: target) || !(val = editable)
             return
           end
-          @session << quote_option('e', val)
+          target << quote_option('e', val)
         end
 
         def append_global(target: @session)
-          if (val = option('cache-dir'))
+          if (val = option('cache-dir', target: target))
             target << case val
                       when '0', 'false'
                         '--no-cache-dir'
@@ -557,15 +558,26 @@ module Squared
                         quote_option('cache-dir', basepath(val))
                       end
           end
-          target << shell_option('proxy', val) if (val = option('proxy'))
-          target << quote_option('python', basepath(val)) if (val = option('python'))
+          target << shell_option('proxy', val) if (val = option('proxy', target: target))
+          target << quote_option('python', basepath(val)) if (val = option('python', target: target))
           append_nocolor(target: target)
         end
 
+        def singleopt(flag = nil)
+          case flag
+          when :python
+            /^(?:v+|q+|b+)$/
+          when :twine
+            nil
+          else
+            /^(?:v+|q+)$/
+          end
+        end
+
         def preopts(quiet: true)
           ret = []
           case verbose
-          when false
+          when FalseClass
             ret << '--quiet' if quiet
           when Numeric
             ret << "-#{'v' * verbose}" if verbose > 0