squared 0.6.3 → 0.6.5

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

@@ -330,7 +330,8 @@ module Squared
                         end
                       end
                     when 'outdated'
-                      format_desc action, flag, 'eager?,user?,s/elect'
+                      format_desc(action, flag, "eager?,no-deps?,#{shortname('h', 'i', 's', 'u', 'd')}",
+                                  before: ('user?' unless venv))
                       task flag do |_, args|
                         outdated flag, args.to_a
                       end
@@ -406,21 +407,44 @@ module Squared
 
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = pip_session 'list --outdated'
-          cmd << '--not-required' unless flag || option('not-required', equals: '0')
+          cmd << if flag
+                   se = has_value! opts, 's', 'select'
+                   ia = has_value!(opts, 'i', 'interactive') && !se
+                   up = has_value! opts, 'u', 'update'
+                   hide = has_value! opts, 'h', 'hide'
+                   dryrun = has_value! opts, 'd', 'dry-run'
+                   if !sync || stdin?
+                     se = false
+                     ia = false
+                   elsif se || ia
+                     up = true
+                     items = []
+                   end
+                   '--not-required' if opts.include?('no-deps')
+                 else
+                   if (up = option('u', 'update'))
+                     flag = case up
+                            when 'major', 'minor'
+                              up.to_sym
+                            else
+                              :patch
+                            end
+                   end
+                   '--not-required' unless option('not-required', equals: '0')
+                 end
           cmd << '--local' if option('l', 'local')
           append_global
+          dryrun ||= dryrun?
           cmd = session_done cmd
           log.info cmd
           on :first, :outdated
           banner = format_banner cmd
-          items = if sync
-                    print_item banner
-                    [] if flag && has_value?(opts, 's', 'select') && !stdin?
-                  end
+          print_item banner if sync
           pwd_set(from: :outdated) do
             tc = theme[:current]
             start = 0
             found = 0
+            col = 0
             major = []
             minor = []
             patch = []
@@ -431,53 +455,58 @@ module Squared
             else
               IO.popen(runenv || {}, cmd)
             end.each do |line|
+              line.chomp!
               next if line.match?(/^[ -]+$/)
 
               if start > 0
+                n = line.size
                 unless stdin?
                   cur, lat = line.scan(SEM_VER)
                   next unless cur && lat
 
-                  latest = lat.join
-                  current = cur.join
+                  name = line.split(' ', 2).first
+                  c = cur.join
+                  l = lat.join
                   semver cur
                   semver lat
-                  name = line.split(' ', 2).first
-                  type = if semmajor?(cur, lat)
-                           major << name
-                           2
-                         elsif cur[2] == lat[2]
-                           patch << name
-                           0
-                         else
-                           minor << name
-                           1
-                         end
-                  if type == 0
+                  case (type = semtype(cur, lat))
+                  when 1
+                    major << name
+                  when 2
+                    minor << name
+                  else
+                    patch << name
+                  end
+                  next if hide && ((flag == :patch && type < 3) || (flag == :minor && type < 2))
+
+                  if type == 3
                     styles = color(:yellow)
                   else
                     styles = color(:green)
-                    sub_style!(line, if type == 2
+                    sub_style!(line, if type == 1
                                        styles += [:bold]
                                        theme[:major]
                                      else
                                        theme[:active]
                                      end, pat: /^(\S+)(.+)$/)
                   end
-                  sub_style!(line, **opt_style(tc, /^(.+)(#{Regexp.escape(current)})(.+)$/, 2)) if tc
-                  sub_style!(line, **opt_style(styles, /^(.+)(#{Regexp.escape(latest)})(.+)$/, 2))
+                  sub_style!(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
+                  sub_style!(line, **opt_style(styles, /^(.+)(#{Regexp.escape(l)})(.+)$/, 2))
                   found += 1
                 end
-                if items
-                  items << [line, name]
-                else
-                  out.call("#{start.to_s.rjust(2)}. #{line}")
-                end
+                s = '%2d. %s' % [start, line]
                 start += 1
+                if ia
+                  next unless confirm_semver(s.ljust(col + line.size - n), type)
+                elsif !se
+                  out.call(s)
+                end
+                items&.push([line, name])
               elsif line.start_with?('Package')
                 unless stdin?
+                  col = line.size + 5
                   sub = [opt_style(theme[:header], /^(.*)(?<!\dm)(Package|Latest)(.+)$/, 2)] * 2
-                  out.call(print_footer(" #  #{line.chomp}", reverse: true, sub: sub))
+                  out.call(print_footer(" #  #{line}", reverse: true, sub: sub))
                 end
                 start += 1
               end
@@ -487,9 +516,11 @@ module Squared
               puts buffer
             end
             if found > 0
-              if 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
@@ -500,12 +531,20 @@ module Squared
                   patch
                 end
               end.tap do |packages|
-                unless packages.empty?
-                  install(:upgrade, opts.grep(/^(?:eager|user)$/), packages: packages, banner: false)
+                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
                 end
                 print_status(major.size, minor.size, patch.size, from: :outdated)
               end
-            elsif start == 0
+            elsif start == 0 || hide
               puts 'No updates were found'
             end
           end
@@ -595,7 +634,7 @@ module Squared
           op = OptionPartition.new(opts, list, @session, project: self, single: singleopt(flag))
           dist = lambda do
             dir = basepath 'dist'
-            return dir if dir.directory? && !dir.empty?
+            next dir if dir.directory? && !dir.empty?
 
             if dir.exist?
               raise_error 'no source to publish', hint: dir
@@ -700,26 +739,26 @@ module Squared
           run(sync: sync, banner: banner, from: :"pip:#{flag}").yield_self { |val| ret || val }
         end
 
-        def variable_set(key, *val, **, &blk)
+        def variable_set(key, *args, **, &blk)
           if block_given?
             case key
             when :dependfile, :venv, :editable
-              val = block_args val, &blk
+              args = block_args args, &blk
             end
           end
           case key
           when :dependfile
-            req = basepath(*val)
-            if (index = DEP_PYTHON.index(req.basename.to_s))
+            val = basepath(*args)
+            if (index = DEP_PYTHON.index(val.basename.to_s))
               @dependindex = index
-              @dependfile = req
+              @dependfile = val
             else
-              log.warn "variable_set: @#{key}=#{req} (not supported)"
+              log.warn "variable_set: @#{key}=#{val} (not supported)"
             end
           when :editable
-            editable_set val.first
+            editable_set args.first
           when :venv
-            instance_variable_set(:"@#{key}", (basepath(*val) unless val.empty?))
+            instance_variable_set(:"@#{key}", (basepath(*args) unless args.empty?))
           else
             super
           end
@@ -730,7 +769,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private
@@ -739,6 +778,10 @@ module Squared
           session('pip', *cmd, *preopts, path: venv.nil?)
         end
 
+        def pip_output(*cmd)
+          session_output('pip', *cmd, *preopts, path: venv.nil?)
+        end
+
         def python_session(*cmd, opts: nil)
           return session('python', *preopts(quiet: false), *cmd, path: venv.nil?) unless opts
 
@@ -769,11 +812,11 @@ module Squared
 
         def append_pip(flag, opts, target: @session, from: nil)
           list = OPT_PIP.fetch(from, []) + OPT_PIP[:common]
-          if pip_install?(flag)
+          if pip_install?(flag) || from == :install
             list.concat(OPT_PIP[:install_a])
             list.concat(OPT_PIP[:install_b]) unless flag == :index
             case flag
-            when :install
+            when :install, :editable, :upgrade
               list.concat(OPT_PIP[:install_c] + OPT_PIP[:debug])
             when :lock, :wheel
               list.concat(OPT_PIP[:install_c])
@@ -785,7 +828,7 @@ module Squared
           op = OptionPartition.new(opts, list, target, project: self, single: singleopt)
           append_global(target: target)
           case flag
-          when :install, :lock, :wheel
+          when :install, :lock, :wheel, :editable, :upgrade
             edit = nil
             op.each do |opt|
               if opt =~ op.values
@@ -994,10 +1037,10 @@ module Squared
         def venv_init
           return if !venv || (venvbin.directory? && !venvbin.empty?)
 
-          puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'init')
+          puts log_message(venv, subject: 'venv', hint: 'init')
           opts = @venvopts&.map { |val| OptionPartition.strip(val) }&.flatten
           venv_create(venv, opts || ["prompt=#{name}", 'upgrade-deps'], env: false, banner: false)
-          puts log_message(Logger::INFO, venv, subject: 'venv', hint: 'created')
+          puts log_message(venv, subject: 'venv', hint: 'created')
         end
 
         def venv_create(dir, opts = [], env: nil, banner: true)