squared 0.6.3 → 0.6.4

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', '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)
-                    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 +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|
@@ -517,34 +518,44 @@ 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 = []
@@ -552,9 +563,9 @@ module Squared
                     styles = %i[green bold]
                     major += 1
                   end
-                  mi = -> { styles[0] = cur[2] == lat[2] ? :yellow : :green }
+                  mi = -> { styles[0] = type == 2 ? :yellow : :green }
                   if data.empty?
-                    semmajor?(cur, lat) ? ma.call : mi.call
+                    type == 1 ? ma.call : mi.call
                   else
                     data.each do |val|
                       break unless line =~ /(>=?|=|~>|!=|<=?) (#{Regexp.escape(val.join)})/
@@ -562,10 +573,10 @@ module Squared
                       v = semver(val).join
                       case $1
                       when '>', '>='
-                        semmajor?(cur, lat) ? ma.call : mi.call
+                        type == 1 ? ma.call : mi.call
                       when '<', '<='
                         if c <= v
-                          if semmajor?(cur, lat)
+                          if type == 1
                             ma.call
                           else
                             styles[0] = :yellow
@@ -597,17 +608,28 @@ module Squared
                     when :yellow
                       found += 1
                     end
-                    l = Regexp.escape(l)
                     sub_style!(line, **opt_style(tc, /^(.+)(#{Regexp.escape(c)})(.+)$/, 2)) if tc
-                    sub_style!(line, **opt_style(colormap(styles), /^((?:\S+\s+){2})(#{l})(.*)$/, 2))
+                    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
@@ -832,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
@@ -847,7 +869,6 @@ module Squared
                 e = 0
                 f = 0
                 j = 0
-                col4 = 0
                 queue = nil
                 rows.each do |row|
                   a, b, c = row.first
@@ -859,10 +880,10 @@ 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]
-                    col4 = line.size
-                    s = ARG[:BORDER][1] * col4
+                    s = ARG[:BORDER][1] * line.size
                     queue = if stdin?
                               [line, s]
                             else
@@ -876,7 +897,7 @@ module Squared
                     pat = [/^([^.]+\.)([^.]+\..+)$/, /^([^.]+\.[^.]+\.)(.+)$/]
                     pre = b.start_with?('0.')
                     latest = [theme[:latest]]
-                    case row.last
+                    case type
                     when 1
                       case semver
                       when 'major'
@@ -926,13 +947,18 @@ module Squared
                       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, col4: col4, timeout: 0)
                   end
                 end
               end
@@ -948,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
@@ -966,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
@@ -1381,7 +1411,7 @@ module Squared
         end
 
         def outdated?
-          dependtype > 0
+          dependtype > 0 && !task_pass?('outdated')
         end
 
         private

data/lib/squared/workspace/project/support/class.rb

@@ -49,7 +49,7 @@ module Squared
           end
 
           def compact
-            to_ary.map!(&:to_s).reject(&:empty?)
+            dump to_ary
           end
 
           def last(val, pat)
@@ -79,7 +79,7 @@ module Squared
               end
               ret[items.last] = val
             end
-            ret.concat(extras.map(&:to_s).reject(&:empty?)) unless extras.empty?
+            ret.concat(dump(extras)) unless extras.empty?
             return ret unless block_given?
 
             ret.reject(&blk)
@@ -116,12 +116,12 @@ module Squared
               self
             elsif (n = enum.find_index { |val| extras?(val) })
               data = enum.to_a
-              @extras = if n == 0
-                          data
-                        else
-                          super(data[0...n])
-                          data[n..-1]
-                        end
+              extras.concat(if n == 0
+                              data
+                            else
+                              super(data[0...n])
+                              data[n..-1]
+                            end)
               self
             else
               super
@@ -164,6 +164,10 @@ module Squared
 
           private
 
+          def dump(enum)
+            enum.map(&:to_s).reject(&:empty?)
+          end
+
           def extras?(obj)
             obj == @partition || (include?(obj) && (!@uniq.match?(s = obj.to_s) || multiple.include?(s)))
           end

data/lib/squared/workspace/project/support/optionpartition.rb

@@ -550,7 +550,7 @@ module Squared
               if path
                 found.each { |val| add_path(val) }
               else
-                found.map! { |val| shell_quote(val) } if quote
+                found.quote! if quote
                 merge found
               end
             end

data/lib/squared/workspace/repo.rb

@@ -3,9 +3,12 @@
 module Squared
   module Workspace
     module Repo
+      REPO_URL = 'https://storage.googleapis.com/git-repo-downloads/repo'
+      private_constant :REPO_URL
+
       attr_reader :manifest_url, :manifest
 
-      def repo(url, manifest = 'latest', run: nil, script: nil, args: nil, dev: nil, prod: nil,
+      def repo(url, manifest = 'latest', install: nil, run: nil, script: nil, args: nil, dev: nil, prod: nil,
                ref: @ref, group: @group)
         @home = if (val = env('REPO_HOME'))
                   path = Pathname.new(val)
@@ -101,6 +104,7 @@ module Squared
           data[:prod] = prod
           script_set(data, group: group, ref: ref)
         end
+        @repo_bin = install.is_a?(String) ? @root + install : @root if install
         self
       end
 
@@ -154,7 +158,7 @@ module Squared
           desc.call("init[manifest?=#{target},groups?,{0}]", target)
           task 'init' do |_, args|
             args = args.to_a
-            u = env('REPO_URL') || manifest_url
+            u = env('REPO_GIT') || manifest_url
             m = args.first && !opts.include?(args.first) ? args.shift : target
             g = (args.shift if args.first && !opts.include?(args.first))
             g = case (val = env('REPO_GROUPS'))
@@ -247,12 +251,26 @@ module Squared
       end
 
       def repo_run(cmd, exception: false)
-        puts log_message(Logger::INFO, cmd, subject: main, hint: root) if verbose
+        puts log_message(cmd, subject: main, hint: root) if verbose
         Common::System.shell(cmd, chdir: root, exception: exception)
       end
 
       def repo_bin
-        Common::Shell.shell_bin('repo')
+        return Common::Shell.shell_bin('repo') unless @repo_bin
+
+        @repo_bin.join('repo').tap do |bin|
+          next if bin.file?
+
+          require 'open-uri'
+          puts log_message('Installing repo...', subject: main, hint: @repo_bin) if verbose
+          URI.open(REPO_URL) do |url|
+            @repo_bin.mkpath
+            File.open(bin, 'wb') do |f|
+              f.write(url.read)
+              f.chmod(0o755)
+            end
+          end
+        end
       end
 
       def repo_opts(*args)
@@ -262,7 +280,7 @@ module Squared
       end
 
       def repo?
-        return false unless manifest_url
+        return false unless manifest_url && !windows?
 
         repo_install? || @repo_override == true
       end