squared 0.7.14 → 0.8.0

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

@@ -36,9 +36,9 @@ module Squared
                       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].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_b: %w[build-constraint check-build-dependencies no-build-isolation no-clean no-deps require-hashes
+                        use-pep517 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 uploaded-prior-to=q].freeze,
           hash: %w[a|algorithm].freeze,
@@ -79,12 +79,12 @@ module Squared
         OPT_MESON = {
           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=q build.cmake-prefix-path=p build.pkg-config-path=p buildtype=b cmake-prefix-path=p
-                    cross-file=p datadir=q default-library=b default-both-libraries=b force-fallback-for=q genvslite=b
-                    includedir=q infodir=q install-umask=b layout=b libdir=q libexecdir=q licensedir=q localedir=q
-                    localstatedir=q mandir=q native-file=p optimization=b pkg-config-path=p prefix=p
-                    python.bytecompile=b python.platlibdir=p python.purelibdir=p python.install-env=b sbindir=q
-                    sharedstatedir=q sysconfdir=q unity=b unity-size=i warnlevel=b wrap-mode=b].freeze,
+                    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 = {
@@ -105,7 +105,7 @@ module Squared
           end
 
           def bannerargs
-            %i[version dependfile venv].freeze
+            %i[version dependfile venv editable].freeze
           end
 
           def venv?
@@ -181,8 +181,8 @@ module Squared
                   format_desc action, nil, "script+|#{indexchar}index+|#,pattern*"
                   task action, [:command] do |_, args|
                     found = 0
-                    %w[tool.poetry tool.pdm project].each_with_index do |table, i|
-                      next if (list = read_pyproject("#{table}.scripts")).empty?
+                    %w[tool.poetry.scripts tool.pdm.scripts project.scripts].each_with_index do |table, i|
+                      next if (list = read_pyproject(table)).empty?
 
                       if args.command == '#'
                         format_list(list, "run[#{indexchar}N]", 'scripts', grep: args.extras, from: pyprojectfile)
@@ -208,7 +208,7 @@ module Squared
                               log.warn "run script #{n} of #{list.size}".subhint('out of range')
                             end
                           else
-                            case (i > 1 && poetry? ? 0 : i)
+                            case i
                             when 0
                               found |= 1
                               run(session_output('poetry', 'run', val), from: :run)
@@ -216,7 +216,7 @@ module Squared
                               found |= 1
                               run(pdm_session('run', val), from: :run)
                             else
-                              raise "script: #{val}" if exception?
+                              raise message('script', val) if exception?
 
                               found |= 2
                               log.warn "run script \"#{val}\"".subhint('not indexed')
@@ -265,10 +265,10 @@ module Squared
 
                           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, 'c', 'create')
-                            depend :force, args if has_value!(args, 'd', 'depend')
+                            opts = args.to_a
+                            rm_rf(venv, verbose: !silent?)
+                            venv_init if has_value!(opts, 'c', 'create')
+                            depend :force, opts if has_value!(opts, 'd', 'depend')
                           end
                         when :exec
                           format_desc action, flag, 'command,args*'
@@ -276,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
@@ -297,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[4]},u/uninstall,opts*"
                         task flag do |_, args|
                           opts = args.to_a
                           if has_value!(opts, 'u', 'uninstall')
@@ -312,7 +312,7 @@ module Squared
                           end
                           file = pip(flag, opts: opts, banner: requirement.nil?, requirement: requirement)
                           puts File.read(file) unless silent?
-                          if requirement && confirm_basic('Uninstall?', file, prefix: 'pip')
+                          if requirement && confirm_basic('Uninstall?', file)
                             pip(:uninstall, opts: ['y', "r=#{shell_quote(file)}"])
                           end
                         end
@@ -346,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.yield_self do |val|
+                                           if val
+                                             args.extras << "upgrade-strategy=#{val}"
+                                           else
+                                             args.to_a
+                                           end
+                                         end)
                         end
                       when :requirement, :target
                         task flag, [:path] do |_, args|
@@ -391,7 +391,7 @@ module Squared
                                                                 else 'outdir?,srcdir?'
                                                                 end)
                       task flag do |_, args|
-                        build! flag, args.to_a
+                        build_ flag, args.to_a
                       end
                       break if be
                     when 'publish'
@@ -438,9 +438,9 @@ module Squared
               if flag
                 cmd << case flag
                        when :requirement, :target
-                         quote_option(flag, basepath(target))
+                         quote_option flag, basepath(target)
                        else
-                         shell_option(flag)
+                         shell_option flag
                        end
                 op = append_pip flag, opts, pipopts(:install)
                 op.clear
@@ -482,7 +482,7 @@ module Squared
                               :patch
                             end
                    end
-                   '--not-required' if option('not-required', notequals: '0')
+                   '--not-required' if option('not-required', notequals: '0') && !env('PYTHON_DEFAULT')
                  end
           cmd << '--local' if option('l', 'local')
           append_global
@@ -607,22 +607,23 @@ module Squared
                                 project: self, strict: strict?, single: singleopt(flag))
           else
             op = append_pip(flag, opts, pipopts(:install), target: pip_session('install'))
-            case flag
-            when :editable
-              op << quote_option('e', op.pop || editable || '.')
-              op.clear
-            when :user, :upgrade
-              op.concat(packages)
-              raise_error ArgumentError, 'no packages listed', hint: flag if op.empty?
-              op << "--#{flag}"
-              op.append
-              python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
-            end
+          end
+          case flag
+          when :editable
+            op << quote_option('e', op.pop || editable || '.')
+            op.clear
+          when :user, :upgrade
+            op.concat(packages)
+            raise ArgumentError, message('no packages listed', hint: flag) if op.empty?
+
+            op << "--#{flag}"
+            op.append
+            python_session('-m pip', *op.to_a.drop(1)) if workspace.windows?
           end
           run(banner: banner, from: :install)
         end
 
-        def build!(flag, opts = [], outdir: nil, srcdir: nil)
+        def build_(flag, opts = [], outdir: nil, srcdir: nil)
           list = case flag
                  when :poetry
                    cmd = poetry_session 'build'
@@ -685,7 +686,6 @@ module Squared
             run(from: from)
           end
         end
-        alias build_ build!
 
         def publish(flag, opts = [], test: false)
           list = case flag
@@ -706,12 +706,9 @@ module Squared
           dist = lambda do
             dir = basepath 'dist'
             return dir if dir.directory? && !dir.empty?
+            raise message('no source to publish', hint: dir) if dir.exist?
 
-            if dir.exist?
-              raise_error 'no source to publish', hint: dir
-            else
-              raise_error Errno::ENOENT, dir, hint: 'publish'
-            end
+            raise Errno::ENOENT, message(dir, hint: 'publish')
           end
           if test
             if op.arg?('r', flag == :hatch ? 'repo' : 'repository')
@@ -726,7 +723,7 @@ module Squared
             op.clear(pass: false)
           else
             if op.empty?
-              op.add_path(dist.call, '*')
+              op << "#{dist.call}/*"
             else
               op.add_path
             end
@@ -738,7 +735,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)
@@ -772,7 +769,7 @@ module Squared
               when :install, :uninstall
                 op << '.' if installable? && !op.arg?('r', 'requirement')
               else
-                raise_error ArgumentError, 'no packages listed', hint: flag
+                raise ArgumentError, message('no packages listed', hint: flag)
               end
             elsif flag == :install
               op.append_any
@@ -795,27 +792,32 @@ module Squared
               .clear
           when :cache
             op.concat(args)
-            raise_error 'no subcommand', hint: flag if op.empty?
+            raise message('no subcommand', hint: flag) if op.empty?
+
             op << (action = op.shift)
             case action
-            when 'dir', 'info', 'purge' then nil
+            when 'dir', 'info', 'purge'
+              nil
             when 'list', 'remove'
               op.add_first(quote: true)
             else
-              raise_error ArgumentError, "unrecognized args: #{action}", hint: flag
+              raise ArgumentError, message('unrecognized args', action, hint: flag)
             end
             op.clear
           when :config
             op.concat(args)
-            raise_error 'no subcommand', hint: flag if op.empty?
-            op << (action = op.shift)
+            raise message('no subcommand', hint: flag) if op.empty?
+
+            action = op.shift
+            op << action
             case action
-            when 'list', 'edit', 'debug' then nil
+            when 'list', 'edit', 'debug'
+              nil
             when 'get', 'unset', 'set'
               op.add_first
               op.add_first(quote: true, expect: true) if action == 'set'
             else
-              raise_error ArgumentError, "unrecognized args: #{action}", hint: flag
+              raise ArgumentError, message('unrecognized args', action, hint: flag)
             end
             op.clear
           when :hash
@@ -852,7 +854,7 @@ module Squared
         def variable_set(key, *args, **, &blk)
           if block_given?
             case key
-            when :dependfile, :editable, :venv
+            when :dependfile, :venv
               args = block_args args, &blk
             end
           end
@@ -869,8 +871,6 @@ module Squared
                 log.warn "variable_set: @dependfile=#{val}".subhint('not supported')
               end
             end
-          when :editable
-            editable_set args.first
           when :venv
             @venv = (basepath(*args) unless args.empty? || args.first.nil?)
           else
@@ -937,8 +937,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
 
@@ -1025,7 +1024,7 @@ module Squared
 
               if found
                 line.chomp!($1) if line =~ /(?<=[\d"'{}\[\]]|true|false)(\s*#.*)$/
-                break if line.match?(/^\s*\[(?:[\w.\-"' ]+|".+"|'.+')\]\s*$/)
+                break if line.match?(/^\s*\[([\w.\-"' ]+|".+"|'.+')\]\s*$/)
 
                 if ch
                   val = line.rstrip
@@ -1090,7 +1089,8 @@ module Squared
             /\A(?:v+|q+|b+|V+|O+)\z/
           when :pdm, :poetry
             /\Av+\z/
-          when :twine, :meson then nil
+          when :twine, :meson
+            nil
           else
             /\A(?:v+|q+)\z/
           end
@@ -1128,7 +1128,7 @@ module Squared
         end
 
         def variables
-          (super + %i[venv editable]).freeze
+          (super + %i[venv]).freeze
         end
 
         def runenv