squared 0.7.4 → 0.7.5

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

@@ -242,7 +242,7 @@ module Squared
                              else
                                npmopts :run
                              end
-                      OptionPartition.new(opts, list, session(dependbin, 'run'), project: self)
+                      OptionPartition.new(opts, list, session(dependbin, 'run'), project: self, strict: strict?)
                                      .add_first
                                      .append(delim: true, quote: false)
                       run(from: :run)
@@ -261,7 +261,7 @@ module Squared
                               list = npmopts :exec
                               session 'npm', 'exec'
                             end
-                      op = OptionPartition.new(args, list, cmd, project: self)
+                      op = OptionPartition.new(args, list, cmd, project: self, strict: strict?)
                       if op.empty?
                         op << package
                         if (args = readline('Enter arguments', force: false))
@@ -532,6 +532,7 @@ module Squared
             end
             save, exact, omit = save if save.is_a?(Array)
             ws = env('NODE_WORKSPACES', equals: '0')
+            ci = option('ci')
             om = lambda do |cmd|
               if omit
                 save = case save
@@ -569,7 +570,7 @@ module Squared
                 end
                 if nolockfile?('yarn')
                   cmd << '--no-lockfile'
-                elsif option('ci')
+                elsif ci
                   if yarn == 1
                     cmd << '--frozen-lockfile'
                   elsif !flag
@@ -605,15 +606,15 @@ module Squared
                        '--force'
                      elsif nolockfile?('pnpm')
                        '--no-lockfile'
-                     elsif option('ci')
+                     elsif ci
                        '--frozen-lockfile'
                      end
               cmd << '--ignore-scripts' if option('ignore-scripts')
               cmd << '--dangerously-allow-all-builds' if option('approve-builds')
             else
-              cmd = session 'npm'
-              cmd << (ci = option('ci') ? 'ci' : 'install')
+              cmd = session('npm', ci ? 'ci' : 'install')
               cmd << '--workspaces=false' if ws
+              cmd << '--force' if option('force')
               append_nocolor
               append_loglevel
               if omit
@@ -958,7 +959,7 @@ module Squared
                                                                          when :add, :update then OPT_BERRY[:add_a]
                                                                          else []
                                                                          end
-                                           end, cmd, project: self)
+                                           end, cmd, project: self, strict: strict?)
             if yarn == 1 && flag != :reinstall
               op << '--no-lockfile' if nolockfile?('yarn')
               op << '--ignore-engines' if option('ignore-engines')
@@ -1027,7 +1028,7 @@ module Squared
                        session('npm', flag)
                      ]
                    end
-            op = OptionPartition.new(*args, no: no, project: self)
+            op = OptionPartition.new(*args, no: no, project: self, strict: strict?)
             append_platform if flag == :install
             append_nocolor
           end
@@ -1047,7 +1048,8 @@ module Squared
               end
             end
             op.swap.concat(packages)
-            raise_error ArgumentError, 'no packages to add' if op.empty? && spec == 1
+            raise ArgumentError, 'no packages to add' if op.empty? && spec == 1
+
             op.append(quote: true)
               .clear(errors: true)
           else
@@ -1092,10 +1094,11 @@ module Squared
 
           cmd = session dependbin, 'pack'
           if dependtype(:yarn) > 1
-            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self)
+            op = OptionPartition.new(opts, OPT_BERRY[:pack], cmd, project: self, strict: strict?)
             op.append?('out', Pathname.pwd + "#{project}-#{version}.tgz")
           else
-            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : npmopts(:pack), cmd, project: self)
+            op = OptionPartition.new(opts, pnpm? ? OPT_PNPM[:pack] : npmopts(:pack), cmd, project: self,
+                                                                                          strict: strict?)
             unless pnpm?
               op.each do |opt|
                 next unless opt =~ op.values
@@ -1130,7 +1133,7 @@ module Squared
             list.concat(OPT_TSC[:watch])
             cmd << '-w'
           end
-          op = OptionPartition.new(args, list, cmd, project: self, sep: ' ')
+          op = OptionPartition.new(args, list, cmd, project: self, strict: strict?, sep: ' ')
           unless p
             if b.is_a?(String)
               op.add_path(b)

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

@@ -216,7 +216,8 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise_error "script: #{val}" if exception
+                              raise "script: #{val}" if exception
+
                               found |= 2
                               log.warn "run script \"#{val}\"".subhint('not indexed')
                             end
@@ -232,7 +233,7 @@ module Squared
                                      subject: name, hint: pyprojectfile)
                   end
                 when 'exec'
-                  format_desc action, nil, ':|command,args*'
+                  format_desc action, nil, 'command|:,args*'
                   task action do |_, args|
                     args = args.to_a
                     cmd = if (i = args.delete(':')) && !workspace.windows?
@@ -243,7 +244,7 @@ module Squared
                             command_args(args, min: 1, prefix: 'python')
                             args.join(' ')
                           end
-                    shell(cmd, name: :exec, chdir: path)
+                    run(cmd, send: :exec, banner: false)
                   end
                 end
               else
@@ -296,11 +297,24 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/uninstall,opts*"
                         task flag do |_, args|
-                          next unless (file = pip(flag, opts: args.to_a, banner: true)) && !silent?
-
-                          puts File.read(file)
+                          opts = args.to_a
+                          if has_value!(opts, 'u', 'uninstall')
+                            unless venv
+                              print_error('no venv detected', subject: name)
+                              exit 1
+                            end
+                            require 'tempfile'
+                            temp = Tempfile.new("#{name}-")
+                            temp.close
+                            requirement = Pathname.new(temp)
+                          end
+                          file = pip(flag, opts: opts, banner: requirement.nil?, requirement: requirement)
+                          puts File.read(file) unless silent?
+                          if requirement && confirm_basic('Uninstall?', file)
+                            pip(:uninstall, opts: ['y', "r=#{shell_quote(file)}"])
+                          end
                         end
                       when :uninstall
                         format_desc action, flag, 'package+,opts*'
@@ -590,7 +604,7 @@ module Squared
         def install(flag, opts = [], packages: [], banner: !silent?)
           if flag == :poetry
             OptionPartition.new(opts, OPT_POETRY[:install] + OPT_POETRY[:common], poetry_session('install'),
-                                project: self, single: singleopt(flag))
+                                project: self, strict: strict?, single: singleopt(flag))
           else
             op = append_pip(flag, opts, pipopts(:install), target: pip_session('install'))
           end
@@ -626,7 +640,7 @@ module Squared
                    cmd, opts = python_session('-m build', opts: opts)
                    OPT_PYTHON[:build]
                  end
-          op = OptionPartition.new(opts, list, cmd, project: self, single: singleopt(flag))
+          op = OptionPartition.new(opts, list, cmd, project: self, strict: strict?, single: singleopt(flag))
           case flag
           when :hatch
             op.add_path(outdir) if !ENV['HATCH_BUILD_LOCATION'] && (outdir ||= op.shift)
@@ -662,7 +676,9 @@ module Squared
           from = symjoin flag, 'build'
           if flag == :meson
             cmd = session_output 'meson', 'compile', quote_option('C', basepath(outdir))
-            OptionPartition.new(op.extras, OPT_MESON[:compile], cmd, project: self).append unless op.empty?
+            unless op.empty?
+              OptionPartition.new(op.extras, OPT_MESON[:compile], cmd, project: self, strict: strict?).append
+            end
             run_s(op, cmd.done, from: from)
           else
             op.clear
@@ -685,7 +701,7 @@ module Squared
                    session 'twine', 'upload'
                    OPT_TWINE[:publish]
                  end
-          op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
+          op = OptionPartition.new(opts, list, @session, project: self, strict: strict?, single: singleopt(flag))
           dist = lambda do
             dir = basepath 'dist'
             return dir if dir.directory? && !dir.empty?
@@ -720,8 +736,8 @@ module Squared
         def python(*args, sync: true, banner: verbose?, with: nil, pass: PASS_PYTHON[:python], **kwargs)
           op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_PYTHON[:common],
                                    session('python', path: !venv?),
-                                   project: self, multiple: [/^-c/], single: singleopt(:python), args: true,
-                                   stdin: true)
+                                   project: self, strict: strict?, multiple: [/^-c/], single: singleopt(:python),
+                                   args: true, stdin: true)
           op.concat(args)
           if op.include?('-')
             op.exist?(add: true)
@@ -769,7 +785,12 @@ module Squared
           when :freeze
             venv_init
             op << '>'
-            op.add_quote(ret = basepath(op.detect { |val| op.exist?(val) } || DEP_PYTHON[4]))
+            ret = kwargs[:requirement] || begin
+              file = op.detect { |val| op.exist?(val) }
+              op.remove(file) if file
+              basepath(file || DEP_PYTHON[4])
+            end
+            op.add_quote(ret)
               .clear
           when :cache
             op.concat(args)
@@ -852,7 +873,7 @@ module Squared
           when :editable
             editable_set args.first
           when :venv
-            @venv = args.empty? || args.first.nil? ? nil : basepath(*args)
+            @venv = (basepath(*args) unless args.empty? || args.first.nil?)
           else
             super
           end
@@ -867,7 +888,7 @@ module Squared
         end
 
         def venv?
-          !venv.nil?
+          !venv.nil? && venv.directory? && !venv.empty?
         end
 
         def serve?
@@ -877,11 +898,18 @@ module Squared
         private
 
         def pip_session(*cmd)
-          session('pip', *cmd, *preopts, path: !venv?)
+          main = venv?
+          ret = session('pip', *cmd, *preopts, main: main, path: false)
+          return ret if main
+
+          python_session '-m', ret.to_s
         end
 
         def pip_output(*cmd)
-          session_output('pip', *cmd, *preopts, path: !venv?)
+          ret = session_output('pip', *cmd, path: false)
+          return ret if venv?
+
+          session_output 'python', '-m', ret.to_s
         end
 
         def python_session(*cmd, opts: nil)
@@ -910,12 +938,12 @@ module Squared
           pre = preopts(quiet: quiet)
           return session(name, *pre, *cmd, path: !venv?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, single: singleopt(name.to_sym))
+          op = OptionPartition.new(opts, common, project: self, strict: strict?, single: singleopt(name.to_sym))
           [session(name, *pre, *op.to_a, *cmd, path: !venv?), op.extras]
         end
 
         def append_pip(flag, opts, list, target: @session)
-          op = OptionPartition.new(opts, list, target, project: self, single: singleopt)
+          op = OptionPartition.new(opts, list, target, project: self, strict: strict?, single: singleopt)
           append_global(target: target)
           case flag
           when :install, :lock, :wheel, :editable, :upgrade
@@ -1172,7 +1200,7 @@ module Squared
                    :venv
                  end
           cmd, opts = python_session('-m', flag, opts: opts)
-          op = OptionPartition.new(opts, OPT_PYTHON[flag], cmd, project: self)
+          op = OptionPartition.new(opts, OPT_PYTHON[flag], cmd, project: self, strict: strict?)
           op.append(dir, delim: true)
             .clear(pass: false)
           status ||= op.arg?(/\A-v+\z/)

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

@@ -578,9 +578,6 @@ module Squared
                           if s && (%w[system latest].include?(s) || SEM_VER.match?(s) || s.start_with?(/(path|ref):/))
                             rbvm = exist?(ver.last) && !exist?(ver.first)
                             case vmname
-                            when nil
-                              print_error('no version manager detected', subject: name)
-                              next
                             when 'asdf'
                               unless rbvm
                                 asdf(:set, **{ name: args.name, version: s, banner: verbose? }.compact)
@@ -596,6 +593,9 @@ module Squared
                                 run(banner: verbose?)
                                 next
                               end
+                            when nil
+                              print_error('no version manager detected', subject: name)
+                              next
                             end
                             File.write(basepath(ver.last), "#{s}\n") if SEM_VER.match?(s)
                             next
@@ -604,16 +604,14 @@ module Squared
                             out = []
                             tool = args.name || (args.local && !SEM_VER.match?(args.local) ? args.local : 'ruby')
                             trim = ->(s) { s[/^\D+\d+\.\d+(?:\.\S+)?/, 0].sub(/^([a-z]+)-/i, '\1 ') }
-                            out << trim.call(case (vm, bin = vmname(bin: true))
+                            vm, bin = vmname(bin: true)
+                            out << trim.call(case vm
                                              when 'rvm'
-                                               ver.shift
                                                `rvm current`[/^\S+/, 0]
                                              when 'rbenv'
-                                               ver.shift
                                                name = `rbenv version-name`
                                                (name =~ SEM_VER) == 0 ? "ruby #{name}" : name
                                              when 'chruby'
-                                               ver.shift
                                                chruby = session_output 'source', bin
                                                `#{chruby.with('ruby --version')}`
                                              when 'mise'
@@ -673,26 +671,47 @@ module Squared
                                 log.debug e
                               end
                               if ver
-                                ver = mise + ver if vm == 'mise'
+                                if vm == 'mise'
+                                  ver = mise + ver
+                                  pat = /^\s*#{tool}\s*=\s*\[?(.+?)\]?\s*$/
+                                elsif vm != 'asdf'
+                                  ver.shift
+                                end
+                                append = ->(file, hint) { out << message("found #{file}", hint: hint) }
                                 catch :found do
                                   path.ascend do |dir|
-                                    ver.filter { |val| dir.join(val).exist? }.each do |val|
-                                      dir += val
-                                      file = File.read(dir)
+                                    ver.select { |val| dir.join(val).exist? }.each do |val|
+                                      file = dir + val
                                       hint = if val.include?('mise')
-                                               line = file[/^\s*#{tool}\s*=\s*\[?(.+?)\]?\s*$/, 1]
-                                               line&.gsub(/["']/, '')
+                                               file.read[pat, 1]&.gsub(/["']/, '')
                                              else
-                                               file.lines
+                                               file.read
+                                                   .lines
                                                    .map { |line| line.sub(/#.*$/, '').strip }
                                                    .reject(&:empty?)
                                                    .join(', ')
                                              end
-                                      out << message("found #{dir}", hint: hint)
+                                      append.call(file, hint)
                                       throw :found if hint&.include?(out.first[/^(?:j|truffle)?ruby ([\d.]+)/, 1])
                                     rescue
                                       nil
                                     end
+                                    file = case vm
+                                           when 'rbenv'
+                                             '.rbenv/version'
+                                           when 'rvm'
+                                             '.rvm/config/default'
+                                           when 'mise'
+                                             '.config/mise/config.toml'
+                                           else
+                                             next
+                                           end
+                                    if File.exist?(file = dir.join(file))
+                                      hint = out.first.split(' ', 2).last
+                                      pat ||= SEM_VER
+                                      append.call(file, file.read[/^(.*(?:#{Regexp.escape(hint)}|#{pat}).*)$/, 1])
+                                      throw :found
+                                    end
                                   end
                                 end
                               end
@@ -714,7 +733,7 @@ module Squared
                           when 'mise'
                             cmd = session('mise', 'reshim', args.name || 'ruby')
                           else
-                            print_error('not supported by version manager', subject: args.name)
+                            print_error('reshim not supported by version manager', subject: args.name)
                           end
                           success?(run(banner: verbose?), verbose?) if cmd
                         end
@@ -821,7 +840,7 @@ module Squared
             elsif se || ia || up
               items = []
             end
-            OptionPartition.new(opts, bundleopts(:outdated), cmd << "--#{flag}", project: self)
+            OptionPartition.new(opts, bundleopts(:outdated), cmd << "--#{flag}", project: self, strict: strict?)
                            .clear
           elsif (up = option('u', 'update', prefix: 'bundle'))
             flag = case up
@@ -892,7 +911,7 @@ module Squared
                       when '~>'
                         if c < v && cur[0] == val[0] && !semmajor?(cur, val)
                           styles[0] = :yellow
-                        else 
+                        else
                           styles[1] = semmajor?(val, lat) ? :underline : :bold
                         end
                       end
@@ -982,8 +1001,8 @@ module Squared
             from = symjoin 'ruby', flag
           end
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, multiple: [/^-e/], args: true,
-                                                                        stdin: true)
+          op = OptionPartition.new(opts, OPT_RUBY[:ruby], ruby_session, project: self, strict: strict?,
+                                                                        multiple: [/^-e/], args: true, stdin: true)
           if kwargs[:command]
             op << quote_option('e', kwargs[:command])
           elsif kwargs[:file]
@@ -1026,7 +1045,7 @@ module Squared
             opts.concat(args)
           end
           op = OptionPartition.new(opts, gemopts(flag), gem_session(flag),
-                                   project: self, no: OPT_GEM[:no][flag == :update ? :install : flag])
+                                   project: self, strict: strict?, no: OPT_GEM[:no][flag == :update ? :install : flag])
           from = symjoin 'gem', flag
           if flag == :outdated
             op.adjoin(gempwd, start: 0) if gempwd
@@ -1380,7 +1399,7 @@ module Squared
           end
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
           invalid = ->(a) { raise_error ArgumentError, "unrecognized args: #{a.join(', ')}", hint: flag }
-          cmd = bundle_session(flag)
+          cmd = bundle_session flag
           case flag
           when :cache, :check, :clean, :init, :install, :lock, :pack, :package, :platform
             pre = true
@@ -1426,7 +1445,8 @@ module Squared
                                                       flag
                                                     end),
                                    cmd,
-                                   project: self, no: OPT_BUNDLE[:no][flag], args: flag == :exec || flag == :config)
+                                   project: self, strict: strict?, no: OPT_BUNDLE[:no][flag],
+                                   args: flag == :exec || flag == :config)
           op.concat(args) unless pre
           output = false
           case flag
@@ -1437,7 +1457,7 @@ module Squared
               a = op.dup
               b, c = op.slice!(0, 2)
               d = op.arg?('global', 'local')
-              getname = -> { op << (b || readline('Enter name', force: true)) }
+              getname = -> { b ? op << b : op.readline('Enter name') }
               case pre
               when 'get'
                 getname.call
@@ -1448,7 +1468,7 @@ module Squared
                   c = op.shift
                 end
                 getname.call
-                op << (c || readline('Enter value', force: true))
+                c ? op << c : op.readline('Enter value', quote: true)
                 output = true
               when 'unset'
                 if d
@@ -1472,9 +1492,8 @@ module Squared
               end
               op.clear
             else
-              val = readline('Enter arguments', force: false)
-              op << (val.empty? ? 'list' : val)
-              output = val.start_with?('set', 'unset')
+              output = op.readline('Enter arguments', 'list')
+                         .start_with?('set', 'unset')
             end
           when :plugin
             case plu
@@ -1485,7 +1504,7 @@ module Squared
             end
           when :exec
             if op.empty? || (op.remove(':') && op.append(quote: false))
-              op << readline('Enter arguments', force: true)
+              op.readline('Enter arguments')
             else
               op.append(quote: false)
             end
@@ -1509,7 +1528,7 @@ module Squared
 
         def rake(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rake], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:rake], rake_session, project: self)
+          op = OptionPartition.new(opts, OPT_RUBY[:rake], rake_session, project: self, strict: strict?)
           op.adjoin(quote_option('f', rakefile)) if rakefile && !op.arg?('f', 'rakefile')
           op.concat(args)
           op.append(escape: true)
@@ -1535,11 +1554,11 @@ module Squared
             break if val == '--'
             next unless exist?(val, type: 'f')
 
-            args[index] = shell_quote(basepath(val))
+            args[index] = shell_quote basepath(val)
             cmd.merge(args.slice!(0, index + 1))
             break
           end
-          op = OptionPartition.new(opts, OPT_RUBY[:rdbg], cmd, project: self, first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[:rdbg], cmd, project: self, strict: strict?, first: [/\.rb$/])
           op.concat(args)
           op.append(quote: false, delim: true)
           print_run(op, banner, **kwargs)
@@ -1555,7 +1574,7 @@ module Squared
           end
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
           cmd, opts = rbs_session(opts: opts)
-          op = OptionPartition.new(opts, [], cmd << flag, project: self)
+          op = OptionPartition.new(opts, [], cmd << flag, project: self, strict: strict?)
           case flag
           when :prototype
             sig = args.shift
@@ -1598,7 +1617,7 @@ module Squared
 
         def rubocop(*args, sync: true, banner: verbose?, with: nil, pass: PASS_RUBY[:rubocop], **kwargs)
           opts = session_opts(with, args: args, kwargs: kwargs, pass: pass)
-          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self,
+          op = OptionPartition.new(opts, OPT_RUBY[:rubocop], session('rubocop'), project: self, strict: strict?,
                                                                                  no: OPT_RUBY[:no][:rubocop])
           if @rubocopfile && !op.arg?('c', 'config') && !rootpath('.rubocop.yml', ascend: true).exist?
             op.add_path(@rubocopfile, option: 'c')
@@ -1773,7 +1792,7 @@ module Squared
               parse.call(target.resolve_feature_path(gemname)&.last)
             end
             unless gemdir || pwd_set { parse.call(`#{bundle_output('show', gemname)}`) }
-              raise_error Errno::ENOENT, 'gems home'
+              raise Errno::ENOENT, 'gems home'
             end
           end
         rescue => e
@@ -1792,7 +1811,8 @@ module Squared
         private
 
         def run_repl(*args, opts:, banner:, from:, delim: true, **kwargs)
-          op = OptionPartition.new(opts, OPT_RUBY[from], session(from), project: self, first: [/\.rb$/])
+          op = OptionPartition.new(opts, OPT_RUBY[from], session(from), project: self, strict: strict?,
+                                                                        first: [/\.rb$/])
           r = []
           r << 'bundler/setup' if !op.arg?('r') && bundle_load
           r.concat(Array(kwargs[:name])) if kwargs[:name]
@@ -1825,7 +1845,7 @@ module Squared
         def rbs_session(*cmd, opts: nil)
           return session('rbs', *cmd) unless opts
 
-          op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self)
+          op = OptionPartition.new(opts, OPT_RUBY[:rbs], project: self, strict: strict?)
           [session('rbs', *op.to_a, *cmd), op.extras]
         end