squared 0.8.7 → 0.9.0.pre1

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

@@ -4,27 +4,25 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        DEP_PYTHON = %w[poetry.lock setup.cfg pyproject.toml setup.py requirements.txt].freeze
+        DEP_PYTHON = %w[poetry.lock pdm.lock pylock.toml setup.cfg pyproject.toml setup.py requirements.txt].freeze
         DIR_PYTHON = (DEP_PYTHON + %w[meson.build README.rst]).freeze
         OPT_PYTHON = {
-          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={always,default,never}].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,
           virtualenv: %w[always-copy clear copies download never-download no-download no-periodic-update no-pip no-seed
-                         no-setuptools no-vcs-ignore no-venv-redirect q|quiet read-only-app-data reset-app-data
-                         symlink-app-data symlinks system-site-packages with-traceback without-pip upgrade-embed-wheels
-                         venv-redirect v|verbose=+ activators={bash,batch,cshell,fish,nushell,powershell,python,xonsh}
-                         app-data=p creator=b discovery={builtin} extra-search-dir=p pip=b prompt=q p|python=q
-                         seeder={app-data,pip} setuptools=b try-first-with=q].freeze
+                         no-setuptools no-vcs-ignore q|quiet read-only-app-data reset-app-data symlink-app-data symlinks
+                         system-site-packages with-traceback without-pip upgrade-embed-wheels v|verbose=+ activators=q
+                         app-data=p creator=b discovery=b extra-search-dir=p pip=b prompt=q p|python=q seeder=b
+                         setuptools=b try-first-with=q].freeze
         }.freeze
         OPT_PIP = {
-          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input no-proxy-env
-                     require-virtualenv q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b
-                     keyring-provider=b log=p proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b
-                     use-deprecated=b use-feature=b].freeze,
+          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input require-virtualenv
+                     q|quiet=+ v|verbose=+ cache-dir=p cert=p client-cert=p exists-action=b keyring-provider=b log=p
+                     proxy=q python=q resume-retries=i retries=i timeout=i trusted-host=b use-deprecated=b
+                     use-feature=b].freeze,
           cache: %w[format=b].freeze,
           completion: %w[b|bash f|fish p|powershell z|zsh].freeze,
           config: %w[global user site editor=p].freeze,
@@ -37,12 +35,12 @@ module Squared
                       no-warn-conflicts no-warn-script-location U|upgrade user prefix=p report=p root=p
                       root-user-action=b t|target=p upgrade-strategy=b].freeze,
           install_a: %w[no-index pre prefer-binary all-releases=b extra-index-url=q f|find-links=q i|index-url=q
-                        no-binary=q only-binary=q only-final=b refresh-package=q uploaded-prior-to=q].freeze,
-          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps no-require-hashes only-deps
-                        require-hashes use-pep517 build-constraint=p c|constraint=p group=q progress-bar=b
-                        r|requirement=p requirements-from-script=p src=p].freeze,
+                        no-binary=q only-binary=q only-final=b].freeze,
+          install_b: %w[check-build-dependencies no-build-isolation no-clean no-deps require-hashes use-pep517
+                        build-constraint=p c|constraint=p group=q progress-bar=b r|requirement=p
+                        requirements-from-script=p src=p].freeze,
           install_c: %w[C|config-settings=q e|editable=v].freeze,
-          install_d: %w[ignore-requires-python].freeze,
+          install_d: %w[ignore-requires-python uploaded-prior-to=q].freeze,
           hash: %w[a|algorithm].freeze,
           list: %w[e|editable exclude-editable include-editable l|local not-required o|outdated u|uptodate user
                    exclude=b format=b path=p].freeze,
@@ -60,8 +58,8 @@ module Squared
                       u|username=qq].freeze
         }.freeze
         OPT_PDM = {
-          common: %w[I|ignore-python no-cache n|non-interactive].freeze,
-          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=q d|dest=p
+          common: %w[c|config I|ignore-python no-cache n|non-interactive].freeze,
+          build: %w[C=bm no-clean no-isolation no-sdist no-wheel q|quiet v|verbose=+ config-setting=qq d|dest=p
                     p|project=p k|skip=b].freeze,
           publish: %w[no-build no-very-ssl q|quiet S|sign skip-existing v|verbose=+ ca-certs=p c|comment=q d|dest=p
                       i|identity=b P|password=q p|project=p r|repository=q k|skip=b u|username=qq].freeze
@@ -79,20 +77,15 @@ module Squared
                       sign-with=b u|username=qq].freeze
         }.freeze
         OPT_MESON = {
-          build: %w[D=q clearcache debug errorlogs fatal-meson-warnings os2-emxomf pkgconfig.relocatable prefer-static
-                    python.allow-limited-api reconfigure stdsplit strip vsenv werror wipe auto-features=b
-                    backend={ninja,vs,vs2010,vs2012,vs2013,vs2015,vs2017,vs2019,vs2022,vs2026,xcode,none}
-                    bindir=q build.cmake-prefix-path=p build.pkg-config-path=p
-                    buildtype={plain,debug,debugoptimized,release,minsize,custom} cmake-prefix-path=p cross-file=p
-                    datadir=q default-library={shared,static,both} default-both-libraries={shared,static,auto}
-                    force-fallback-for=q genvslite={vs2022,vs2026} includedir=q infodir=q install-umask=b
-                    layout={mirror,flat} libdir=q libexecdir=q licensedir=q localedir=q localstatedir=q mandir=q
-                    namingscheme={platform,classic} native-file=p optimization={plain,0,g,1,2,3,s} pkg-config-path=p
-                    prefix=p python.build-config=p python.bytecompile=b python.platlibdir=p python.purelibdir=p
-                    python.install-env={auto,prefix,system,venv} sbindir=q sharedstatedir=q sysconfdir=q
-                    unity={on,off,subprojects} unity-size=i warnlevel={0,1,2,3,everything}
-                    wrap-mode={default,nofallback,nodownload,forcefallback,nopromote}].freeze,
-          compile: %w[C=p clean v|verbose j|jobs=i l|load-average=b ninja-args=q vs-args=q xcode-args=q].freeze
+          build: %w[D=q clearcache debug errorlogs fatal-meson-warnings pkgconfig.relocatable prefer-static
+                    python.allow-limited-api reconfigure stdsplit strip vsenv werror wipe auto-features=b backend=b
+                    bindir=p build.cmake-prefix-path=p build.pkg-config-path=p buildtype=b cmake-prefix-path=p
+                    cross-file=p datadir=p default-library=b default-both-libraries=b force-fallback-for=q genvslite=b
+                    includedir=p infodir=p install-umask=b layout=b libdir=p libexecdir=p licensedir=p localedir=p
+                    localstatedir=p mandir=p native-file=p optimization=b pkg-config-path=p prefix=p
+                    python.bytecompile=i python.platlibdir=p python.purelibdir=p python.install-env=b sbindir=p
+                    sharedstatedir=p sysconfdir=p unity=b unity-size=i warnlevel=b wrap-mode=b].freeze,
+          compile: %w[clean v|verbose j|jobs=i l|load-average=b ninja-args=q vs-args=q xcode-args=q].freeze
         }.freeze
         PASS_PYTHON = {
           python: %w[c v V].freeze,
@@ -138,7 +131,7 @@ module Squared
             initialize_build(Python.ref, **kwargs)
             initialize_env(**kwargs)
           end
-          dependfile_set(DEP_PYTHON, default: 2)
+          dependfile_set(DEP_PYTHON, default: 4)
           serve_set kwargs[:serve]
           editable_set editable
           venv_set kwargs[:venv]
@@ -283,7 +276,7 @@ module Squared
                             args = args.to_a
                             if args.empty?
                               args = readline('Enter command', force: true).split(' ', 2)
-                            elsif args.size == 1 && option('interactive', notequals: '0', prefix: 'python')
+                            elsif args.size == 1 && option('interactive', notequals: '0', prefix: ref)
                               args << readline('Enter arguments', force: false) unless args.first.include?(' ')
                             end
                             venv_init
@@ -304,7 +297,7 @@ module Squared
                           install flag, ['upgrade', *args.to_a, 'pip']
                         end
                       when :freeze
-                        format_desc action, flag, "file?=#{DEP_PYTHON[4]},u/ninstall?,opts*"
+                        format_desc action, flag, "file?=#{DEP_PYTHON[6]},u/ninstall?,opts*"
                         task flag do |_, args|
                           opts = args.to_a
                           if has_value!(opts, 'u', 'uninstall')
@@ -353,18 +346,18 @@ module Squared
                       case flag
                       when :upgrade
                         task flag, [:strategy] do |_, args|
-                          val = case args.strategy
-                                when 'eager'
-                                  'eager'
-                                when /^only-if/, /needed$/
-                                  'only-if-needed'
-                                end
-                          args = if val
-                                   args.extras << "upgrade-strategy=#{val}"
-                                 else
-                                   args.to_a
-                                 end
-                          install flag, args
+                          install flag, (case args.strategy
+                                         when 'eager'
+                                           'eager'
+                                         when /^only-if|needed$/
+                                           'only-if-needed'
+                                         end.then do |val|
+                                           if val
+                                             args.extras << "upgrade-strategy=#{val}"
+                                           else
+                                             args.to_a
+                                           end
+                                         end)
                         end
                       when :requirement, :target
                         task flag, [:path] do |_, args|
@@ -437,7 +430,17 @@ module Squared
             workspace.rev_clear(name, sync: sync)
             if !flag && poetry?
               cmd = poetry_session 'install -n'
+              if prod?
+                cmd << '--only=main'
+              else
+                option('with') { |val| cmd << basic_option('with', val) }
+                option('without') { |val| cmd << basic_option('without', val) }
+              end
               cmd << '--no-root' if option('no-root')
+            elsif !flag && pdm?
+              cmd = pdm_session 'install'
+              cmd << '--prod' if prod?
+              option('G', 'group') { |val| cmd << basic_option('G', val) }
             else
               cmd = pip_session 'install'
               cmd << '--upgrade-strategy=eager' if env('UPDATE') || env('PYTHON_UPDATE')
@@ -454,9 +457,13 @@ module Squared
               else
                 append_global
               end
-              if exist?(DEP_PYTHON[4]) && !session_arg?('r', 'requirement')
-                cmd << basic_option('r', DEP_PYTHON[4])
-                cmd << basic_option('c', 'constraints.txt') if exist?('constraints.txt')
+              unless session_arg?('r', 'requirement')
+                if exist?(DEP_PYTHON[2])
+                  cmd << basic_option('r', DEP_PYTHON[2])
+                elsif exist?(DEP_PYTHON[6])
+                  cmd << basic_option('r', DEP_PYTHON[6])
+                  cmd << basic_option('c', 'constraints.txt') if exist?('constraints.txt')
+                end
               end
               append_editable
             end
@@ -576,8 +583,9 @@ module Squared
             end
             if found > 0
               items = if se
-                        choice('Select a package', items.map(&:first),
-                               multiple: true, force: false, index: true, border: true).map { |n| items[n.pred].last }
+                        choice('Select a package', items.map(&:first), multiple: true, force: false, index: true,
+                                                                       border: true, **parse_select)
+                          .map { |n| items[n.pred].last }
                       elsif ia
                         items.map(&:last)
                       else
@@ -742,7 +750,7 @@ module Squared
           op = OptionPartition.new(session_opts(with, args: args, kwargs: kwargs, pass: pass), OPT_PYTHON[:common],
                                    session('python', path: !venv?),
                                    project: self, strict: strict?, multiple: [/^-c/], single: singleopt(:python),
-                                   sep: ' ', args: true, stdin: true)
+                                   args: true, stdin: true)
           op.concat(args)
           if op.include?('-')
             op.exist?(add: true)
@@ -756,7 +764,7 @@ module Squared
             end
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: :python)
+          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)
@@ -793,7 +801,7 @@ module Squared
             ret = kwargs[:requirement] || begin
               file = op.detect { |val| op.exist?(val) }
               op.remove(file) if file
-              basepath(file || DEP_PYTHON[4])
+              basepath(file || DEP_PYTHON[6])
             end
             op.add_quote(ret)
               .clear
@@ -838,8 +846,8 @@ module Squared
             op.clear
           end
           print_run(op, banner, **kwargs)
-          run(sync: sync, banner: banner, exception: exception?(**kwargs), from: symjoin('pip', flag))
-            .yield_self { |val| ret || val }
+          run(sync: sync, banner: banner, exception: kwargs.fetch(:exception, exception?), from: symjoin('pip', flag))
+            .then { |val| ret || val }
         end
 
         def serve(root, opts = [], bind: 'localhost', port: nil, **)
@@ -943,8 +951,7 @@ module Squared
           pre = preopts(quiet: quiet)
           return session(name, *pre, *cmd, path: !venv?) unless opts
 
-          op = OptionPartition.new(opts, common, project: self, strict: strict?, sep: name == 'python' ? ' ' : '=',
-                                                 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
 
@@ -1047,7 +1054,15 @@ module Squared
                     end
                   end
                   ret.last[1] += val
-                elsif line.strip =~ /^(\S+)\s*=\s*([+-]?[\d.]+|true|false|("""|'''|["'\[{])(.*))$/
+                elsif line.strip =~ /^(\S+)\s*=\s*
+                  (
+                    [+-]?(?:[\d._]+(?:[eE].+)?|0x[\dA-Fa-f]+|0[ob]\d+|nan|inf)
+                    |true|false
+                    |\d{4}-\d{2}-\d{2}.*
+                    |\d{2}:\d{2}.*
+                    |("""|'''|["'\[{])(.*)
+                  )$/x
+                  name = $1
                   if (val = $4)
                     case (ch = $3)
                     when '{', '['
@@ -1067,11 +1082,21 @@ module Squared
                             true
                           when 'false'
                             false
+                          when /^\d{4}-/
+                            Time.parse(ch)
+                          when /^\d{2}:/
+                            Time.strptime(ch, '%T')
+                          when /nan$/
+                            Float::NAN
+                          when /inf$/
+                            Float::INFINITY * (ch[0] == '-' ? -1 : 1)
+                          when /^[+-]?0[xob]/
+                            eval ch
                           else
                             ch.include?('.') ? ch.to_f : ch.to_i
                           end
                   end
-                  ret << [$1, val]
+                  ret << [name, val]
                 end
                 if !ch && (val = ret.last[1]).is_a?(String) && (val.match?(/\A\{.+\}\z/m) || val.match?(/\A\[.+\]\z/m))
                   ret.last[1] = JSON.parse(val) rescue nil
@@ -1090,19 +1115,19 @@ module Squared
         end
 
         def pyprojectfile
-          @pyprojectfile = basepath!(DEP_PYTHON[2]) || false if @pyprojectfile.nil?
+          @pyprojectfile = basepath!(DEP_PYTHON[4]) || false if @pyprojectfile.nil?
           @pyprojectfile || nil
         end
 
         def singleopt(flag = nil)
           case flag
           when :python
-            /\A(v+|q+|b+|V+|O+)\z/
+            /\A(?:v+|q+|b+|V+|O+)\z/
           when :pdm, :poetry
             /\Av+\z/
           when :twine, :meson then nil
           else
-            /\A(v+|q+)\z/
+            /\A(?:v+|q+)\z/
           end
         end
 
@@ -1120,18 +1145,19 @@ module Squared
         def pipopts(flag)
           ret = OPT_PIP.fetch(flag, []) + OPT_PIP[:common]
           if pip_install?(flag)
-            ret.concat(OPT_PIP[:install_a], OPT_PIP[:install_d])
+            ret.concat(OPT_PIP[:install_a])
             ret.concat(OPT_PIP[:install_b]) unless flag == :index
+            ret.concat(OPT_PIP[:install_d])
             case flag
             when :install
-              ret.concat(OPT_PIP[:install_c], OPT_PIP[:debug])
+              ret.concat(OPT_PIP[:install_c] + OPT_PIP[:debug])
             when :lock, :wheel
               ret.concat(OPT_PIP[:install_c])
             when :download, :index
               ret.concat(OPT_PIP[:debug])
             end
           elsif flag == :list
-            ret.concat(OPT_PIP[:install_a], OPT_PIP[:install_d])
+            ret.concat(OPT_PIP[:install_a])
           end
           ret
         end
@@ -1146,7 +1172,7 @@ module Squared
           if windows?
             shell_quote(venvbin.join(powershell? ? 'Activate.ps1' : 'activate.bat'), option: false)
           else
-            { 'VIRTUAL_ENV' => venv.to_s, 'PATH' => "#{venvbin}:#{ENV['PATH']}" }
+            { 'VIRTUAL_ENV' => venv.to_s, 'PATH' => task_join(venvbin, ENV['PATH']) }
           end
         end
 
@@ -1205,7 +1231,6 @@ module Squared
                    status = true
                    :virtualenv
                  else
-                   status = !banner
                    :venv
                  end
           cmd, opts = python_session('-m', flag, opts: opts)
@@ -1213,31 +1238,34 @@ module Squared
           op.append(dir, delim: true)
             .clear(pass: false)
           status ||= op.arg?(/\A-v+\z/)
-          if run(op, env, exception: true, banner: banner) && dir.directory?
-            args = []
-            requires = read_pyproject 'build-system', 'requires'
-            args.concat(requires) if requires.is_a?(Array)
-            if poetry?
-              requires = read_pyproject 'tool.poetry', 'requires-poetry'
-              args << "poetry#{requires}"
-            elsif setuptools? && !virtualenv?
-              args << 'setuptools' << 'wheel'
-            end
-            pip(:install, *args, banner: false) unless args.empty?
-            if poetry?
-              dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
-              poetry_session 'env use'
-            elsif pdm?
-              pdm_session 'use -f'
+          ret = run(op, env, exception: true, banner: banner)
+          args = []
+          requires = read_pyproject 'build-system', 'requires'
+          args.concat(requires) if requires.is_a?(Array)
+          if poetry?
+            requires = read_pyproject 'tool.poetry', 'requires-poetry'
+            args << "poetry#{requires}"
+          elsif setuptools? && !virtualenv?
+            args << 'setuptools' << 'wheel'
+          end
+          pip(:install, *args, banner: false) unless args.empty?
+          success?(ret, banner, !status) do |out|
+            if out && dir.directory?
+              if poetry?
+                dir += (windows? ? 'Scripts/python.exe' : 'bin/python')
+                cmd = poetry_session 'env use'
+              elsif pdm?
+                cmd = pdm_session 'use -f'
+              else
+                puts "Success: #{dir}"
+                return
+              end
+              cmd << shell_quote(dir)
+              print_run cmd, silent?
+              run(banner: false)
             else
-              puts "Success: #{dir}" unless status
-              return
+              puts 'Failed'
             end
-            cmd << shell_quote(dir)
-            print_run cmd, silent?
-            run(banner: false)
-          elsif !status
-            puts 'Failed'
           end
         end
 
@@ -1271,13 +1299,17 @@ module Squared
         end
 
         def setuptools?
-          dependtype == 2 || dependtype == 4
+          dependtype == 4 || dependtype == 6
         end
 
         def poetry?
           dependtype == 1
         end
 
+        def pdm?
+          dependtype == 2
+        end
+
         def twine?
           venv_package?('twine')
         end
@@ -1287,7 +1319,7 @@ module Squared
         end
 
         def requirements?
-          dependtype == 5
+          dependtype == 7
         end
       end