squared 0.6.5 → 0.6.7

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

@@ -246,11 +246,11 @@ module Squared
                       if op.empty?
                         op << package
                         if (args = readline('Enter arguments', force: false))
-                          op << '--' unless pnpm?
+                          op.delim unless pnpm?
                           op << args
                         end
                       else
-                        op << '--' unless pnpm?
+                        op.delim unless pnpm?
                         op << package << op.join(' ')
                       end
                     else
@@ -426,7 +426,7 @@ module Squared
                     Open3.capture2e(session_output('npm', 'pack --dry-run --no-color', npmname).to_s)
                          .first
                          .scan(/^npm notice \d+(?:\.\d+)?[a-z]+ (.+)$/i)
-                         .map { |item| Pathname.new(item.first) }
+                         .map! { |item| Pathname.new(item.first) }
                          .select(&:exist?)
                   end.concat(Array(files))
                   packed = true
@@ -507,22 +507,23 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
-            ci = -> { option('ci') }
-            is = -> { option('ignore-scripts') }
-            om = lambda do
-              next unless omit
-
-              save = case save
-                     when 'peer'
-                       'optional'
-                     when 'optional'
-                       'dev'
-                     when 'dev'
-                       'prod'
-                     end
+            om = lambda do |cmd|
+              if omit
+                save = case save
+                       when 'peer'
+                         'optional'
+                       when 'optional'
+                         'dev'
+                       when 'dev'
+                         'prod'
+                       end
+              end
+              return unless save && save != 'bundle'
+
+              cmd << "--#{save}"
             end
             rm = lambda do |target|
-              next if remove.empty?
+              return if remove.empty?
 
               run(target.temp(*remove).sub!(/ (?:add|install) /, ' remove '), from: :remove, sync: sync)
             end
@@ -531,15 +532,15 @@ module Squared
               append_loglevel
               if yarn == 1
                 cmd << '--ignore-engines' unless option('ignore-engines', equals: '0')
-                cmd << '--ignore-scripts' if is.call
+                cmd << '--ignore-scripts' if option('ignore-scripts')
                 cmd << '--force' if option('force')
               else
-                cmd << '--mode=skip-build' if is.call
+                cmd << '--mode=skip-build' if option('ignore-scripts')
                 cmd << '--check-cache' if !flag && option('force')
               end
               if nolockfile?('yarn')
                 cmd << '--no-lockfile'
-              elsif ci.call
+              elsif option('ci')
                 if yarn == 1
                   cmd << '--frozen-lockfile'
                 elsif !flag
@@ -549,8 +550,7 @@ module Squared
               if add
                 cmd << '-W' if yarn == 1 && !option('w', 'ignore-workspace-root-check', equals: '0')
                 rm.call(cmd)
-                om.call
-                cmd << "--#{save}" if save && save != 'bundle'
+                om.call(cmd)
                 cmd << '--exact' if exact
               end
             elsif pnpm?
@@ -558,8 +558,7 @@ module Squared
               append_nocolor
               append_loglevel
               if add
-                om.call
-                cmd << "--save-#{save}" if save && save != 'bundle'
+                om.call(cmd)
                 rm.call(cmd)
                 cmd << '--save-exact' if exact
                 option('allow-build') { |val| cmd << quote_option('allow-build', val) }
@@ -574,17 +573,18 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif ci.call
+                     elsif option('ci')
                        '--frozen-lockfile'
                      end
-              cmd << '--ignore-scripts' if is.call
+              cmd << '--ignore-scripts' if option('ignore-scripts')
             else
-              cmd = session('npm', (ci = ci.call) ? 'ci' : 'install')
+              cmd = session 'npm'
+              cmd << (ci = option('ci') ? 'ci' : 'install')
               cmd << '--workspaces=false' if ws
               append_nocolor
               append_loglevel
               if omit
-                cmd << "--omit=#{save}"
+                cmd << "--omit=#{save || omit}"
                 save = nil
               end
               unless ci
@@ -597,7 +597,7 @@ module Squared
                 end
               end
               cmd << '--package-lock=false' << 'save=false' if nolockfile?('npm')
-              cmd << '--ignore-scripts' if is.call
+              cmd << '--ignore-scripts' if option('ignore-scripts')
             end
             if add
               return if packages.empty?
@@ -710,7 +710,7 @@ module Squared
           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) }
           footer = lambda do |val, size|
-            next unless verbose
+            return unless verbose
 
             msg, hint = if modified == -1
                           ['Packages were updated', 'more possible']
@@ -814,6 +814,7 @@ module Squared
                   else
                     footer.call(0, found.size)
                   end
+                  printsucc
                   commit(:add, [dependname], pass: true)
                 end
               end
@@ -961,7 +962,7 @@ module Squared
                      case flag
                      when :install, :update
                        opts.unshift('package-lock=false', 'save=false') if nolockfile?('npm')
-                       spec = 0
+                       spec = flag == :install ? 0 : 2
                      when :add
                        spec = 1
                        flag = :install
@@ -1000,17 +1001,17 @@ module Squared
           end
           append_loglevel
           case spec
-          when 0, 1
+          when Numeric
             op.each do |opt|
               if opt =~ op.values
                 case $1
                 when 'w', 'workspace'
                   op << quotepath($1, $2)
                 end
-              elsif opt.include?('=') || opt.start_with?('-')
+              elsif opt.match?(/^-|=/)
                 op.errors << opt
               else
-                op.found << opt
+                op.found << (spec == 2 && (n = opt.index('@')) ? opt[0, n] : opt)
               end
             end
             op.swap
@@ -1112,7 +1113,7 @@ module Squared
           print_run(cmd, banner, **kwargs)
           session 'npx', cmd
           start = time_epoch if kwargs.fetch(:verbose, verbose? && !stdin?)
-          run(sync: sync, banner: banner, from: from).tap do |ret|
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: from).tap do |ret|
             next unless success?(ret, banner, start.nil?) && start
 
             print_status(name, subject: 'tsc', start: start, from: :completed)
@@ -1326,7 +1327,7 @@ module Squared
 
         def remove_modules(prefix = dependbin)
           modules = basepath 'node_modules'
-          return false unless modules.directory? && (option('Y', prefix: prefix) || confirm_basic('Remove?', modules))
+          return false unless modules.directory? && (option('y', prefix: prefix) || confirm_basic('Remove?', modules))
 
           modules.rmtree
         rescue Timeout::Error => e
@@ -1373,7 +1374,11 @@ module Squared
         end
 
         def append_platform(target: @session)
-          %w[cpu os libc].each { |name| option(name) { |val| target << basic_option(name, val) } }
+          %w[cpu os libc].each do |name|
+            next unless (val = option(name))
+
+            target << basic_option(name, val)
+          end
         end
 
         def quotepath(name, val)

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

@@ -7,9 +7,9 @@ module Squared
         DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[README.rst]).freeze
         OPT_PYTHON = {
-          common: %w[b=+ B d E h i I O P q=+ s S u v=+ x c=q m=b W=b X=q check-hash-based-pycs=b].freeze,
-          build: %w[n|no-isolation s|sdist x|skip-dependency-check v|verbose w|wheel C|config-setting=q installer=b
-                    o|outdir=p].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=b].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
         }.freeze
@@ -68,6 +68,7 @@ module Squared
                       sign-with=b u|username=q].freeze
         }.freeze
         PASS_PYTHON = {
+          python: %w[c v V].freeze,
           pip: {
             debug: %w[platform].freeze,
             install: %w[C config-settings c constraint extra-index-url no-binary only-binary platform
@@ -100,7 +101,7 @@ module Squared
 
         attr_reader :venv, :editable
 
-        def initialize(*, editable: '.', verbose: nil, asdf: 'python', **kwargs)
+        def initialize(*, editable: '.', asdf: 'python', **kwargs)
           super
           if @pass.include?(Python.ref)
             initialize_ref Python.ref
@@ -178,7 +179,7 @@ module Squared
                               indexerror n, list
                             else
                               found |= 2
-                              log.warn "run script #{n} of #{list.size} (out of range)"
+                              log.warn "run script #{n} of #{list.size}".subhint('out of range')
                             end
                           else
                             case i
@@ -191,18 +192,18 @@ module Squared
                             else
                               raise_error "script: #{val}" if exception
                               found |= 2
-                              log.warn "run script \"#{val}\" (not indexed)"
+                              log.warn "run script \"#{val}\"".subhint('not indexed')
                             end
                           end
                         end
                       end
                       break
                     end
-                    unless found.anybits?(1)
-                      puts log_message(found == 0 ? Logger::INFO : Logger.WARN,
-                                       "no scripts #{found == 0 ? 'found' : 'executed'}",
-                                       subject: name, hint: pyprojectfile)
-                    end
+                    next if found.anybits?(1)
+
+                    puts log_message(found == 0 ? Logger::INFO : Logger.WARN,
+                                     "no scripts #{found == 0 ? 'found' : 'executed'}",
+                                     subject: name, hint: pyprojectfile)
                   end
                 when 'exec'
                   format_desc action, nil, ':|command,args*'
@@ -234,11 +235,12 @@ module Squared
                         when :remove
                           next unless projectpath?(venv)
 
-                          format_desc action, flag, 'c/reate?,d/epend?'
+                          format_desc action, flag, 'c/reate?,d/epend?,opts*'
                           task flag do |_, args|
+                            args = args.to_a
                             rm_rf(venv, verbose: true)
-                            venv_init if has_value?(args = args.to_a, 'c', 'create')
-                            depend if has_value?(args, 'd', 'depend')
+                            venv_init if has_value!(args, 'c', 'create')
+                            depend :force, args if has_value!(args, 'd', 'depend')
                           end
                         when :exec
                           format_desc action, flag, 'command,args*'
@@ -286,11 +288,11 @@ module Squared
                           pip(flag, opts: args.to_a, banner: true)
                         end
                       when :reinstall
-                        if venv && projectpath?(venv)
-                          format_desc action, flag
-                          task flag do
-                            ns['venv:remove'].invoke('depend')
-                          end
+                        next unless venv && projectpath?(venv)
+
+                        format_desc action, flag
+                        task flag do
+                          ns['venv:remove'].invoke('depend')
                         end
                       end
                     when 'install'
@@ -309,7 +311,7 @@ module Squared
                           install flag, (case args.strategy
                                          when 'eager'
                                            'eager'
-                                         when /(?:\Aonly-if|needed\z)/
+                                         when /^only-if|needed$/
                                            'only-if-needed'
                                          end.yield_self do |val|
                                            if val
@@ -342,7 +344,7 @@ module Squared
                                                                 when :poetry then 'output?'
                                                                 when :pdm then 'dest?'
                                                                 when :hatch then 'location?'
-                                                                else 'srcdir?'
+                                                                else 'outdir?,srcdir?'
                                                                 end)
                       task flag do |_, args|
                         build! flag, args.to_a
@@ -451,11 +453,10 @@ module Squared
             buffer = []
             out = ->(val) { sync ? puts(val) : buffer << val }
             if workspace.windows?
-              (venv ? command(runenv, cmd) : `#{cmd}`).lines
+              (venv ? command(runenv, cmd) : `#{cmd}`).lines(chomp: true)
             else
-              IO.popen(runenv || {}, cmd)
+              IO.popen(runenv || {}, cmd).readlines(chomp: true)
             end.each do |line|
-              line.chomp!
               next if line.match?(/^[ -]+$/)
 
               if start > 0
@@ -516,34 +517,33 @@ module Squared
               puts buffer
             end
             if found > 0
-              if se
-                choice('Select a package', items.map(&:first),
-                       multiple: true, force: false, index: true, border: true).map! { |n| items[n.pred].last }
-              elsif ia
-                items.map(&:last)
-              else
-                case flag
-                when :major
-                  major + minor + patch
-                when :minor
-                  minor + patch
+              items = if se
+                        choice('Select a package', items.map(&:first),
+                               multiple: true, force: false, index: true, border: true).map! { |n| items[n.pred].last }
+                      elsif ia
+                        items.map(&:last)
+                      else
+                        case flag
+                        when :major
+                          major + minor + patch
+                        when :minor
+                          minor + patch
+                        else
+                          patch
+                        end
+                      end
+              if up && !items.empty?
+                base = %w[eager no-deps]
+                base << 'user' unless venv
+                opts = (base & opts).map! { |val| val == 'eager' ? "upgrade-strategy=#{val}" : val }
+                if dryrun
+                  opts.map! { |val| fill_option(val) }
+                  print_run pip_output('install --upgrade', *opts, *items.quote!), false
                 else
-                  patch
-                end
-              end.tap do |packages|
-                if up && !packages.empty?
-                  base = %w[eager no-deps]
-                  base << 'user' unless venv
-                  opts = (base & opts).map! { |val| val == 'eager' ? "upgrade-strategy=#{val}" : val }
-                  if dryrun
-                    opts.map! { |val| fill_option(val) }
-                    print_run pip_output('install --upgrade', *opts, *packages.quote!), false
-                  else
-                    install(:upgrade, opts, packages: packages, banner: false)
-                  end
+                  install(:upgrade, opts, packages: items, banner: false)
                 end
-                print_status(major.size, minor.size, patch.size, from: :outdated)
               end
+              print_status(major.size, minor.size, patch.size, from: :outdated)
             elsif start == 0 || hide
               puts 'No updates were found'
             end
@@ -582,36 +582,28 @@ module Squared
                    cmd, opts = python_session('-m build', opts: opts)
                    OPT_PYTHON[:build]
                  end
-          srcdir = nil
           op = OptionPartition.new(opts, list, cmd, project: self, single: singleopt(flag))
-          op.each do |opt|
-            if !srcdir && exist?(opt.chomp('*')) && projectpath?(opt.chomp('*'))
-              srcdir = opt
-            else
-              op.found << opt
-            end
-          end
-          op.swap
           case flag
-          when :poetry, :pdm
-            if srcdir
-              args = flag == :pdm ? %w[d dest] : %w[o output]
-              if op.arg?(*args)
-                op.push(srcdir)
-              else
-                op << quote_option(args.last, basepath(srcdir))
-              end
-              srcdir = nil
-            end
           when :hatch
-            if ENV['HATCH_BUILD_LOCATION']
-              srcdir = nil
-            else
-              srcdir ||= path
+            if !ENV['HATCH_BUILD_LOCATION'] && (outdir ||= op.shift)
+              op.add_path(outdir)
             end
             op << basic_option('p', project) unless ENV['HATCH_PROJECT'] || op.arg?('p', 'project')
+          else
+            unless op.empty?
+              args = case flag
+                     when :poetry
+                       %w[o output]
+                     when :pdm
+                       %w[d dest]
+                     else
+                       srcdir = true
+                       %w[o outdir]
+                     end
+              op << quote_option(args.last, basepath(op.shift)) unless op.arg?(*args)
+            end
           end
-          op.add_path(srcdir) if srcdir
+          op.exist?(add: true, first: true) if srcdir
           op.clear
           run(from: :"#{flag}:build")
         end
@@ -634,7 +626,7 @@ module Squared
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
             dir = basepath 'dist'
-            next dir if dir.directory? && !dir.empty?
+            return dir if dir.directory? && !dir.empty?
 
             if dir.exist?
               raise_error 'no source to publish', hint: dir
@@ -663,6 +655,27 @@ module Squared
           run(from: :"#{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.nil?),
+                                   project: self, multiple: [/^-c/], single: singleopt(:python), args: true,
+                                   stdin: true)
+          op.concat(args)
+          if op.include?('-')
+            op.exist?(add: true)
+          else
+            op.append_any { |val| OptionPartition.parse_arg!('c', val) }
+            if op.arg?('c')
+              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))
+            end
+          end
+          print_run(op, banner, **kwargs)
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: :python)
+        end
+
         def pip(flag, *args, sync: true, banner: verbose?, with: nil, pass: nil, **kwargs)
           flag = flag.to_sym
           pass = PASS_PYTHON[:pip].fetch(pip_install?(flag) ? :install : flag, []) + %w[v verbose] if pass.nil?
@@ -736,7 +749,8 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, from: :"pip:#{flag}").yield_self { |val| ret || val }
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception), from: :"pip:#{flag}")
+            .yield_self { |val| ret || val }
         end
 
         def variable_set(key, *args, **, &blk)
@@ -785,14 +799,14 @@ module Squared
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
-          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: /\A(?:v+|OO)\z/)
+          op = OptionPartition.new(opts, OPT_PYTHON[:common], project: self, single: singleopt(:python))
           [session('python', *op.to_a, *cmd, path: venv.nil?), op.extras]
         end
 
         def poetry_session(*cmd)
-          session('poetry', *cmd, *preopts).tap do |ret|
-            option('project', ignore: false) { |val| ret << quote_option('project', basepath(val)) }
-          end
+          ret = session('poetry', *cmd, *preopts)
+          option('project', ignore: false) { |val| ret << quote_option('project', basepath(val)) }
+          ret
         end
 
         def pdm_session(*cmd, opts: nil)
@@ -859,7 +873,7 @@ module Squared
         def append_editable(target: @session)
           return if requirements? && editable == '.'
 
-          if (val = option('editable', 'e', target: target, ignore: false))
+          if (val = option('e', 'editable', target: target, ignore: false))
             OptionPartition.delete_key(target, 'e', 'editable')
             case val
             when '0', 'false'
@@ -883,7 +897,7 @@ module Squared
                 quote_option 'cache-dir', basepath(val)
               end
             end,
-            option('proxy', target: target) { |val| shell_option('proxy', val) },
+            option('proxy', target: target) { |val| quote_option('proxy', val) },
             option('python', target: target) { |val| quote_option('python', basepath(val)) }
           ])
           append_nocolor(target: target)
@@ -957,15 +971,14 @@ module Squared
         end
 
         def pyprojectfile
-          return @pyprojectfile || nil unless @pyprojectfile.nil?
-
-          @pyprojectfile = (file = basepath(DEP_PYTHON[2])).exist? ? file : false
+          @pyprojectfile = basepath!(DEP_PYTHON[2]) || false if @pyprojectfile.nil?
+          @pyprojectfile || nil
         end
 
         def singleopt(flag = nil)
           case flag
           when :python
-            /\A(?:v+|q+|b+)\z/
+            /\A(?:v+|q+|b+|V+|O+)\z/
           when :pdm
             /\Av+\z/
           when :twine
@@ -976,14 +989,14 @@ module Squared
         end
 
         def preopts(quiet: true)
-          [].tap do |ret|
-            case verbose
-            when FalseClass
-              ret << '--quiet' if quiet
-            when Numeric
-              ret << "-#{'v' * verbose}" if verbose > 0
-            end
+          ret = []
+          case verbose
+          when FalseClass
+            ret << '--quiet' if quiet
+          when Numeric
+            ret << "-#{'v' * verbose}" if verbose > 0
           end
+          ret
         end
 
         def variables
@@ -1016,20 +1029,21 @@ module Squared
         def venv_set(val)
           return unless val
 
+          write = ->(level, hint) { log.add(level, "venv: #{@venv}".subhint(hint)) }
           if val.is_a?(Array)
             val, *opts = val
             @venvopts = opts
           end
-          @venv = basepath(val)
+          @venv = basepath val
           if projectpath?(@venv)
             if @venv.exist?
-              log.debug "venv found: #{@venv}"
-            elsif @path.directory? && !@path.empty?
+              write.call(Logger::DEBUG, 'found')
+            elsif path.directory? && !path.empty?
               @venv.mkpath
-              log.info "venv mkdir: #{@venv}"
+              write.call(Logger::INFO, 'mkdir')
             end
           elsif !@venv.directory?
-            log.warn "venv invalid: #{@venv}"
+            write.call(Logger::WARN, 'invalid')
             @venv = nil
           end
         end
@@ -1037,20 +1051,21 @@ module Squared
         def venv_init
           return if !venv || (venvbin.directory? && !venvbin.empty?)
 
-          puts log_message(venv, subject: 'venv', hint: 'init')
+          puts log_message(venv, subject: 'venv', hint: 'init') unless silent?
           opts = @venvopts&.map { |val| OptionPartition.strip(val) }&.flatten
           venv_create(venv, opts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
-          puts log_message(venv, subject: 'venv', hint: 'created')
+          puts log_message(venv, subject: 'venv', hint: 'created') unless silent?
         end
 
-        def venv_create(dir, opts = [], env: nil, banner: true)
+        def venv_create(dir, opts = [], env: nil, banner: banner?)
           cmd, opts = python_session('-m venv', opts: opts)
           op = OptionPartition.new(opts, OPT_PYTHON[:venv], cmd, project: self)
           status = op.append(dir, delim: true)
                      .clear(pass: false)
                      .arg?(/\A-v+\z/)
-          run(op, env, exception: true, banner: banner)
-          puts(dir.directory? ? "Success: #{dir}" : 'Failed') if banner && !status
+          success?(run(op, env, exception: true, banner: banner), banner, !status) do |ret|
+            puts(ret && dir.directory? ? "Success: #{dir}" : 'Failed')
+          end
         end
 
         def pip_install?(flag)
@@ -1071,7 +1086,7 @@ module Squared
         end
 
         def installable?
-          setuptools? || !pyprojectfile.nil?
+          setuptools? || !!pyprojectfile
         end
 
         def setuptools?