squared 0.2.5 → 0.3.0

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

@@ -5,18 +5,21 @@ module Squared
     module Project
       class Python < Git
         REQUIREMENTS = %w[requirements.txt pyproject.toml].freeze
-        OPT_INSTALL = %w[I U break-system-packages check-build-dependencies compile dry-run force-reinstall
-                         ignore-installed ignore-requires-python no-build-isolation no-clean no-compile no-deps
-                         no-index no-warn-conflicts no-warn-script-location pre prefer-binary require-hashes upgrade
-                         use-pep517 user abi=s config-settings=s c=s constraint=s e=s? editable=s? extra-index-url=s
-                         f=s find-links=s global-option=s implementation=s i=s index-url=s no-binary=s only-binary=s
-                         platform=s prefix=s progress-bar=s python-version=s report=s r=s requirement=s
-                         root-user-action=s root=s src=s t=s target=s upgrade-strategy=s].freeze
-        OPT_GENERAL = %w[debug disable-pip-version-check isolated q quiet require-virtualenv v verbose
-                         no-cache-dir no-color no-input no-python-version-warning
-                         cache-dir=s cert=s client-cert=s exists-action=s log=s proxy=s python=s retries=i timeout=i
-                         trusted-host=s use-deprecated=s use-feature=s].freeze
-        private_constant :REQUIREMENTS, :OPT_INSTALL, :OPT_GENERAL
+        SETUPTOOLS = %w[setup.py pyproject.toml].freeze
+        DIR_PYTHON = (REQUIREMENTS + SETUPTOOLS).freeze
+        OPT_PIP = {
+          common: %w[debug disable-pip-version-check isolated no-cache-dir no-color no-input no-python-version-warning
+                     q|quiet require-virtualenv v|verbose cache-dir=p cert=p client-cert=p exists-action=b log=p
+                     proxy=q python=e retries=i timeout=i trusted-host=e use-deprecated=e use-feature=e].freeze,
+          install: %w[break-system-packages check-build-dependencies compile dry-run force-reinstall I|ignore-installed
+                      ignore-requires-python no-build-isolation no-clean no-compile no-deps no-index no-warn-conflicts
+                      no-warn-script-location pre prefer-binary require-hashes U|upgrade use-pep517 user abi=e
+                      config-settings=q c|constraint=p e|editable=s? extra-index-url=q f|find-links=q global-option=q
+                      implementation=b i|index-url=q no-binary=q only-binary=q platform=q prefix=p progress-bar=b
+                      python-version=q report=p r|requirement=p root=p root-user-action=e src=p t|target=p
+                      upgrade-strategy=b].freeze
+        }.freeze
+        private_constant :REQUIREMENTS, :SETUPTOOLS, :DIR_PYTHON, :OPT_PIP
 
         class << self
           def populate(*); end
@@ -37,7 +40,7 @@ module Squared
           def config?(val)
             return false unless (val = as_path(val))
 
-            (REQUIREMENTS + ['setup.py']).any? { |file| val.join(file).exist? }
+            DIR_PYTHON.any? { |file| val.join(file).exist? }
           end
         end
 
@@ -55,7 +58,7 @@ module Squared
         end
 
         @@tasks[ref] = {
-          'install' => %i[user upgrade force target].freeze
+          'install' => %i[user force upgrade target editable].freeze
         }.freeze
 
         def ref
@@ -74,23 +77,38 @@ module Squared
                 flags.each do |flag|
                   case action
                   when 'install'
-                    if @@task_desc
-                      format_desc(action, flag, OPT_INSTALL + OPT_GENERAL, before: case flag
-                                                                                   when :target
-                                                                                     'dir'
-                                                                                   when :upgrade
-                                                                                     'strategy?,packages+'
-                                                                                   end)
-                    end
+                    format_desc(action, flag, 'opts*', before: case flag
+                                                               when :target
+                                                                 'dir'
+                                                               when :editable
+                                                                 'path/url?'
+                                                               when :upgrade
+                                                                 'eager?,package+'
+                                                               end)
                     case flag
-                    when :target, :upgrade
-                      task flag, [:param] do |_, args|
-                        param = param_guard(action, flag, args: args, key: :param)
-                        depend(flag, param: param, opts: args.extras)
+                    when :editable
+                      task flag do |_, args|
+                        install flag, args.to_a
+                      end
+                    when :upgrade
+                      task flag, [:strategy] do |_, args|
+                        case (strategy = args.strategy)
+                        when 'eager', 'only-if-needed'
+                          opts = args.extras
+                        else
+                          opts = args.to_a
+                          strategy = nil
+                        end
+                        install(flag, opts, strategy: strategy)
+                      end
+                    when :target
+                      task flag, [:dir] do |_, args|
+                        dir = param_guard(action, flag, args: args, key: :dir)
+                        depend(flag, args.extras, target: dir)
                       end
                     else
                       task flag do |_, args|
-                        depend(flag, opts: args.to_a)
+                        depend flag, args.to_a
                       end
                     end
                   end
@@ -100,41 +118,46 @@ module Squared
           end
         end
 
-        def depend(flag = nil, sync: invoked_sync?('depend', flag), param: nil, opts: [])
+        def depend(flag = nil, opts = [], sync: invoked_sync?('depend', flag), target: nil, **)
           if @depend && !flag
             super
           elsif outdated?
             cmd = pip_session 'install'
             case flag
             when :user
-              cmd << '--user'
-            when :upgrade
-              cmd << '--upgrade'
-              case param
-              when 'eager', 'only-if-needed'
-                cmd << basic_option('upgrade-strategy', param)
-              else
-                opts << param
-              end
+              cmd << "--#{flag}"
+            when :target
+              cmd << quote_option('target', basepath(target))
             when :force
               cmd << '--force-reinstall'
-            when :target
-              cmd << quote_option('target', basepath(param))
             else
               append_global
             end
-            append_pip flag, opts if flag
-            unless flag == :upgrade
-              if dependtype == 2 || cmd.find { |val| val =~ /^(?:-e|--editable)$/ }
-                cmd << '.'
-              elsif !cmd.find { |val| val =~ /^(?:-r|--requirement|-e|--editable)/ }
-                cmd << '-r requirements.txt'
-              end
+            append_pip(flag, opts, from: :install) if flag
+            if dependtype == 1 && !session_arg?('e', 'editable')
+              cmd << '-r requirements.txt' unless session_arg?('r', 'requirement')
+            elsif !session_arg?('e', 'editable', value: true)
+              cmd << '.'
             end
             run(from: :depend, sync: sync)
           end
         end
 
+        def install(flag, opts, strategy: nil)
+          cmd = pip_session 'install'
+          out = append_pip(flag, opts, from: :install)
+          case flag
+          when :editable
+            cmd << '--editable' << (out.pop || '.')
+            option_clear out
+          when :upgrade
+            cmd << '--upgrade'
+            cmd << basic_option('upgrade-strategy', strategy) if strategy
+            append_value out
+          end
+          run(from: :install)
+        end
+
         def outdated(*, sync: invoked_sync?('outdated'))
           cmd = pip_session 'list', '--outdated'
           append_global
@@ -241,39 +264,41 @@ module Squared
           session('python', *cmd)
         end
 
-        def append_pip(flag, opts, target: @session)
+        def append_pip(flag, opts, target: @session, from: nil)
           append_nocolor(target: target)
-          return if opts.empty?
+          return [] unless from && !opts.empty?
 
+          opts, pat = option_sanitize(opts, OPT_PIP[from] + OPT_PIP[:common], target: target)
           out = []
-          opts, pat = option_partition(opts, OPT_INSTALL + OPT_GENERAL, target: target)
+          edit = nil
           opts.each do |opt|
             if opt =~ /^(v+|q+)$/
               cmd << "-#{$1}"
             elsif opt =~ pat
               case $1
-              when 'root', 'prefix', 'src', 'cert', 'client-cert', 'cache-dir', 'log', 'report',
-                   'r', 'requirement', 'c', 'constraint', 't', 'target'
-                target << quote_option($1, basepath($2))
               when 'e', 'editable'
-                val = $2
-                target << quote_option($1, val =~ %r{^[a-z]+(?:\+[a-z]+)?://}i ? val : basepath(val))
-              when 'proxy', 'config-settings', 'global-option', 'extra-index-url',
-                   'f', 'find-links', 'i', 'index-url'
-                target << quote_option($1, $2)
-              when 'retries', 'timeout'
-                target << basic_option($1, $2) if $2.to_i > 0
-              else
-                target << shell_option($1, $2)
+                edit = $2
               end
+            elsif flag == :editable && !edit
+              edit = opt
             else
               out << opt
             end
           end
-          if flag == :upgrade
-            append_value(out, delim: true)
+          if edit
+            edit = basepath(edit) unless %r{^[a-z]+(?:\+[a-z]+)?://}i.match?(edit)
+            if flag == :editable
+              out << edit
+            else
+              target << quote_option('editable', edit)
+            end
+          end
+          case flag
+          when :editable, :upgrade
+            out
           else
             option_clear(out, target: target)
+            []
           end
         end
 
@@ -286,7 +311,7 @@ module Squared
                      quote_option('cache-dir', basepath(val))
                    end
           end
-          cmd << quote_option('proxy', val) if (val = option('proxy'))
+          cmd << shell_option('proxy', val) if (val = option('proxy'))
           cmd << quote_option('python', basepath(val)) if (val = option('python'))
           append_nocolor
         end