squared 0.6.2 → 0.6.4

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

@@ -269,7 +269,7 @@ module Squared
                       when :freeze
                         format_desc action, flag, "file?=#{DEP_PYTHON[4]},opts*"
                         task flag do |_, args|
-                          if (file = pip(flag, opts: args.to_a, banner: true)) && verbose
+                          if (file = pip(flag, opts: args.to_a, banner: true)) && !silent?
                             puts File.read(file)
                           end
                         end
@@ -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', 'd')}",
+                                  before: ('user?' unless venv))
                       task flag do |_, args|
                         outdated flag, args.to_a
                       end
@@ -406,21 +407,34 @@ 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
+                   hide = has_value! opts, 'h', 'hide'
+                   dryrun = has_value! opts, 'd', 'dry-run'
+                   if !sync || stdin?
+                     se = false
+                     ia = false
+                   elsif se || ia
+                     items = []
+                   end
+                   '--not-required' if opts.include?('no-deps')
+                 else
+                   '--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 +445,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)
-                    line = sub_style(line, styles: if type == 2
-                                                     styles += [:bold]
-                                                     theme[:major]
-                                                   else
-                                                     theme[:active]
-                                                   end, pat: /^(\S+)(.+)$/)
+                    sub_style!(line, if type == 1
+                                       styles += [:bold]
+                                       theme[:major]
+                                     else
+                                       theme[:active]
+                                     end, pat: /^(\S+)(.+)$/)
                   end
-                  line = sub_style(line, **opt_style(tc, /^(.+)(#{Regexp.escape(current)})(.+)$/, 2)) if tc
-                  line = 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 +506,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
@@ -501,11 +522,19 @@ module Squared
                 end
               end.tap do |packages|
                 unless packages.empty?
-                  install(:upgrade, opts.grep(/^(?:eager|user)$/), packages: packages, banner: false)
+                  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
@@ -730,7 +759,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private
@@ -739,6 +768,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 +802,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 +818,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 +1027,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)

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

@@ -157,7 +157,7 @@ module Squared
         end
 
         subtasks({
-          'outdated' => %i[patch minor major].freeze,
+          'outdated' => %i[major minor patch].freeze,
           'ruby' => %i[file script version].freeze,
           'gem' => %i[install uninstall outdated update pristine build push exec command].freeze,
           'bundle' => %i[install update cache exec config reinstall command].freeze,
@@ -334,14 +334,14 @@ module Squared
                   flags.each do |flag|
                     case action
                     when 'outdated'
-                      format_desc action, flag, 's/elect?,u/pdate?,opts*'
+                      format_desc action, flag, "#{shortname('i', 's', 'u', 'd')},opts*"
                       task flag do |_, args|
-                        __send__ action, flag, args.to_a
+                        outdated flag, args.to_a
                       end
                     when 'gem'
                       case flag
                       when :outdated
-                        format_desc action, flag, 'semver?=major|minor|patch,i/nteractive?,s/elect?,u/pdate?,opts*'
+                        format_desc action, flag, "semver?=major|minor|patch,#{shortname('i', 's', 'u', 'd')},opts*"
                         task flag, [:semver] do |_, args|
                           opts = case (semver = args.semver)
                                  when 'major', 'minor', 'patch'
@@ -354,13 +354,14 @@ module Squared
                             semver: semver,
                             update: has_value!(opts, 'u', 'update'),
                             interactive: has_value!(opts, 'i', 'interactive'),
-                            select: has_value!(opts, 's', 'select')
+                            select: has_value!(opts, 's', 'select'),
+                            dryrun: has_value!(opts, 'd', 'dry-run')
                           })
                         end
                       when :build, :push, :exec, :update
                         format_desc(action, flag, 'opts*', after: case flag
                                                                   when :exec then 'command,args*'
-                                                                  when :push then 'file?|:'
+                                                                  when :push then 'file/:'
                                                                   when :update then 'name*'
                                                                   end)
                         task flag do |_, args|
@@ -507,7 +508,7 @@ module Squared
             b = dest + val
             c = glob[i] || glob.first
             log.info "cp #{a + c} #{b}"
-            copy_dir(a, b, c, pass: pass, verbose: verbosetype > 0)
+            copy_dir(a, b, c, pass: pass, verbose: !silent?)
           rescue StandardError => e
             on_error e, :copy
           end
@@ -517,44 +518,54 @@ module Squared
         def outdated(flag = nil, opts = [], sync: invoked_sync?('outdated', flag))
           cmd = bundle_output 'outdated'
           if flag
-            se = has_value!(opts, 's', 'select') && !stdin?
+            se = has_value!(opts, 's', 'select')
+            ia = has_value!(opts, 'i', 'interactive') && !se
             up = has_value!(opts, 'u', 'update')
-            cmd << "--#{flag}"
-            OptionPartition.new(opts, bundleopts(:outdated), cmd, project: self)
+            dryrun = has_value!(opts, 'd', 'dry-run')
+            if !sync || stdin?
+              se = false
+              ia = false
+            elsif se || ia || up
+              items = []
+            end
+            OptionPartition.new(opts, bundleopts(:outdated), cmd << "--#{flag}", project: self)
                            .clear
           end
+          dryrun ||= dryrun?(prefix: 'bundle')
           log.info cmd.to_s
           on :first, :outdated
           banner = format_banner cmd.to_s
-          items = if sync
-                    print_item banner
-                    [] if flag && (se || up)
-                  end
+          print_item banner if sync
           pwd_set(from: :outdated) do
             tc = theme[:current]
             start = 0
             found = 0
             major = 0
+            col = 0
             buffer = []
             out = ->(val) { sync ? puts(val) : buffer << val }
             IO.popen(cmd.temp('--no-color')).each do |line|
+              line.chomp!
               if start > 0
+                n = line.size
                 unless stdin?
+                  line = line[0...col] if col > 0
                   data = line.scan(SEM_VER)
                   next unless (cur = data.shift) && (lat = data.shift)
 
                   semver cur
                   semver lat
+                  type = semtype cur, lat
                   c = cur.join
                   l = lat.join
                   styles = []
-                  major_set = lambda do
+                  ma = lambda do
                     styles = %i[green bold]
                     major += 1
                   end
-                  minor_set = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
+                  mi = -> { styles[0] = type == 2 ? :yellow : :green }
                   if data.empty?
-                    semmajor?(cur, lat) ? major_set.call : minor_set.call
+                    type == 1 ? ma.call : mi.call
                   else
                     data.each do |val|
                       break unless line =~ /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/
@@ -562,11 +573,11 @@ module Squared
                       v = semver(val).join
                       case $1
                       when '>', '>='
-                        semmajor?(cur, lat) ? major_set.call : minor_set.call
+                        type == 1 ? ma.call : mi.call
                       when '<', '<='
                         if c <= v
-                          if semmajor?(cur, lat)
-                            major_set.call
+                          if type == 1
+                            ma.call
                           else
                             styles[0] = :yellow
                           end
@@ -592,22 +603,33 @@ module Squared
                   unless styles.empty?
                     case styles.first
                     when :green
-                      line = sub_style(line, **opt_style(theme[styles.last == :bold ? :major : :active], /^(\S+)(.+)$/))
+                      sub_style!(line, **opt_style(theme[styles.last == :bold ? :major : :active], /^(\S+)(.+)$/))
                       found += 1
                     when :yellow
                       found += 1
                     end
-                    l = Regexp.escape(l)
-                    line = sub_style(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
-                    line = sub_style(line, **opt_style(colormap(styles), /^((?:\S+\s+){2})(#{l})(.*)$/, 2))
+                    sub_style!(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
+                    sub_style!(line, **opt_style(colormap(styles), /^((?:\S+\s+){2})(#{Regexp.escape(l)})(.*)$/, 2))
                   end
                 end
+                s = '%2d. %s' % [start, line]
+                if ia
+                  unless confirm_semver(s.ljust(col + 4 + line.size - n), type)
+                    start += 1
+                    next
+                  end
+                elsif !se
+                  out.call(s)
+                end
                 items&.push([line, name])
-                out.call('%2d. %s' % [start, line]) unless se
               elsif line.start_with?('Gem')
                 unless stdin?
+                  if ia
+                    line.sub!(/\sGroups$/, '')
+                    col = line.size
+                  end
                   sub = [opt_style(theme[:header], /^(.+)(?<!\dm)(Gem|Latest)(.+)$/, 2)] * 2
-                  out.call(print_footer(" #  #{line.chomp}", reverse: true, sub: sub))
+                  out.call(print_footer(" #  #{line}", reverse: true, sub: sub))
                 end
               else
                 next
@@ -619,26 +641,30 @@ module Squared
               puts buffer
             end
             if found > 0
-              if items
+              unless Array(items).empty?
                 gems = if se
                          choice('Select a package', items.map(&:first),
                                 multiple: true, force: false, index: true, border: true).map! { |n| items[n.pred].last }
                        else
                          items.map(&:last)
                        end
-                bundle(:update, *gems, opts: [flag.to_s])
+                if dryrun
+                  print_run bundle_output("update --#{flag}", *gems.quote!), false
+                else
+                  bundle(:update, *gems, opts: [flag.to_s])
+                end
               end
               begin
-                if major == 0 && dependfile.read =~ /\b(?:source\s+(["'])((?~\1))\1|remote:\s+(\S+))/
-                  status = ($2 || $3).chomp('/')
-                  right = true
-                end
+                status = if gems
+                           "#{gems.size} packages were updated"
+                         elsif dependfile.read =~ /\b(?:source\s+(["'])((?~\1))\1|remote:\s+(\S+))/
+                           right = true
+                           ($2 || $3).chomp('/')
+                         end
               rescue StandardError => e
                 log.debug e
-              ensure
-                status ||= (items ? 'Updates were made' : 'Updates are available')
               end
-              puts print_footer(empty_status(status, 'major', major, always: !right), right: right)
+              puts print_footer(status || 'Updates are available', right: right)
             elsif start == 0 && banner
               puts 'No updates were found'
             end
@@ -799,8 +825,7 @@ module Squared
           when :build, :cert, :generate_index, :mirror, :outdated, :push, :server, :signin, :signout, :sources, :stale
             opts.concat(args)
           end
-          op = OptionPartition.new(opts, gemopts(flag), gem_session(flag, *preopts), project: self,
-                                                                                     no: OPT_GEM[:no][flag])
+          op = OptionPartition.new(opts, gemopts(flag), gem_session(flag), project: self, no: OPT_GEM[:no][flag])
           from = :"gem:#{flag}"
           if flag == :outdated
             op.adjoin(gempwd, start: 0) if gempwd
@@ -833,11 +858,7 @@ module Squared
                 if line =~ /^(\S+) \((\S+) < ([^)]+)\)$/
                   cur = semscan $2
                   lat = semscan $3
-                  rows << [$~.to_a.drop(1), if semmajor?(cur, lat)
-                                              1
-                                            else
-                                              cur[2] == lat[2] ? 3 : 2
-                                            end]
+                  rows << [$~.to_a.drop(1), semtype(cur, lat)]
                 else
                   out.call(line)
                 end
@@ -859,23 +880,24 @@ module Squared
                   next if i == 0 && stdin?
 
                   a, b, c = row.first
+                  type = row.last
                   if i == 0
                     line = '%-*s %-*s    %*s  %*s' % [pad, ' #', d, a, e, b, f, c]
-                    n = line.size
+                    s = ARG[:BORDER][1] * line.size
                     queue = if stdin?
-                              [line, ARG[:BORDER][1] * n]
+                              [line, s]
                             else
                               2.times do
-                                line = sub_style(line, **opt_style(theme[:header], /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, 2))
+                                sub_style!(line, **opt_style(theme[:header], /^(.+)(?<!\dm)(#{a}|#{c})(.*)$/, 2))
                               end
-                              [line, sub_style(ARG[:BORDER][1] * n, styles: borderstyle)]
+                              [line, sub_style(s, borderstyle)]
                             end
                   else
                     g = a.ljust(d)
                     pat = [/^([^.]+\.)([^.]+\..+)$/, /^([^.]+\.[^.]+\.)(.+)$/]
                     pre = b.start_with?('0.')
                     latest = [theme[:latest]]
-                    case row.last
+                    case type
                     when 1
                       case semver
                       when 'major'
@@ -884,7 +906,7 @@ module Squared
                         next
                       end
                       unless stdin?
-                        g = sub_style(g, styles: theme[:major])
+                        sub_style! g, theme[:major]
                         styles = %i[green bold]
                         pat = (pat.first if pre)
                         latest << :bold
@@ -898,7 +920,7 @@ module Squared
                         next
                       end
                       unless stdin?
-                        g = sub_style(g, styles: theme[:active])
+                        sub_style! g, theme[:active]
                         styles = %i[green]
                         pat = pre ? pat.last : pat.first
                       end
@@ -917,21 +939,26 @@ module Squared
                     b = b.rjust(e)
                     h = c.rjust(f)
                     unless stdin?
-                      b = sub_style(b, **opt_style(colormap(styles), pat, 2))
-                      h = sub_style(h, **opt_style(latest.flatten.compact, pat, 2))
+                      sub_style!(b, **opt_style(colormap(styles), pat, 2))
+                      sub_style!(h, **opt_style(latest.flatten.compact, pat, 2))
                     end
                     j += 1
                     if queue
                       out.call(queue)
                       queue = nil
                     end
-                    s = '%s    %s  %s' % [g, b, h]
-                    if items
-                      items << [s, a]
-                    else
-                      out.call('%*s %s' % [pad, "#{j}.", s])
+                    s = ('%s    %s  %s' % [g, b, h]).yield_self do |val|
+                      items&.push([val, a])
+                      '%*s %s' % [pad, "#{j}.", val]
+                    end
+                    if ia
+                      unless confirm_semver(s, type)
+                        update.delete(a)
+                        next
+                      end
+                    elsif !items
+                      out.call(s)
                     end
-                    update.delete(a) if ia && !confirm_outdated(a, c, row.last, timeout: 0)
                   end
                 end
               end
@@ -947,7 +974,7 @@ module Squared
                 update = choice('Select a package', items.map(&:first),
                                 multiple: true, force: false, index: true, border: true).map! { |n| items[n.pred].last }
               end
-              if update && !update.empty?
+              unless Array(update).empty?
                 cmd = gem_output 'update -f'
                 option('document', prefix: 'gem', ignore: false) do |val|
                   cmd << case val
@@ -965,8 +992,12 @@ module Squared
                            '--user-install'
                          end
                 end
-                cmd.merge(update)
-                run(cmd, sync: sync, banner: false, from: :'gem:update')
+                cmd.merge(update.quote!)
+                if filter[:dryrun]
+                  print_run cmd, false
+                else
+                  run(cmd, sync: sync, banner: false, from: :'gem:update')
+                end
               end
               print_status(*major, from: :outdated)
             end
@@ -1257,7 +1288,7 @@ module Squared
               dir = basepath sig, file.dirname
               dir.mkpath unless dir.exist?
               base = file.basename.to_s
-              rbs = dir.join(base.stripext + '.rbs')
+              rbs = dir.join("#{base.stripext}.rbs")
               status = if rbs.exist?
                          case y
                          when '0', 'false'
@@ -1380,7 +1411,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private
@@ -1394,18 +1425,11 @@ module Squared
         end
 
         def gem_session(*cmd, **kwargs)
-          ret = session('gem', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          ret.merge(preopts)
+          session('gem', *cmd, *preopts, **kwargs)
         end
 
         def bundle_session(*cmd, **kwargs)
-          ret = session('bundle', *cmd, **kwargs)
-          return ret if cmd.empty?
-
-          append_nocolor
-          ret.merge(preopts)
+          session('bundle', *cmd, *preopts, **kwargs).tap { append_nocolor }
         end
 
         def rake_session(*cmd, **kwargs)
@@ -1458,7 +1482,7 @@ module Squared
         end
 
         def preopts
-          verbose? && !session_arg?('quiet') ? ['--verbose'] : []
+          verbose? ? ['--verbose'] : []
         end
 
         def variables
@@ -1538,8 +1562,7 @@ module Squared
         end
 
         def gemlib
-          @gemlib ||= begin
-            lib = Set.new(['lib'])
+          @gemlib ||= Set.new(['lib']).yield_self do |lib|
             if (spec = gemspec)
               lib.merge(spec.require_paths || [])
             end
@@ -1552,7 +1575,9 @@ module Squared
         end
 
         def gemdir?
-          !@gemdir.nil? && @gemdir.exist? && !@gemdir.empty?
+          return false unless @gemdir
+
+          @gemdir.exist? && !@gemdir.empty?
         end
       end