squared 0.4.7 → 0.4.8

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

@@ -14,14 +14,14 @@ module Squared
         check = ->(proj) { proj.is_a?(Project::Git) && !proj.exclude?(Project::Git.ref) && git_clone?(proj.path) }
         if uri.is_a?(Array)
           base = name
-          uri.each { |val| repo << proj if (proj = @project[val.to_s]) && check.(proj) }
+          uri.each { |val| repo << proj if (proj = @project[val.to_s]) && check.call(proj) }
         elsif uri
           data[name.to_s] = uri
         elsif name.is_a?(Enumerable)
           data = name.to_h
         elsif name.is_a?(String) && name.match?(GIT_PROTO)
           base = name
-          @project.each_value { |proj| repo << proj if !proj.parent && check.(proj) }
+          @project.each_value { |proj| repo << proj if !proj.parent && check.call(proj) }
         else
           warn log_message(Logger::WARN, name, subject: 'git', hint: 'invalid', pass: true) if warning
           return self
@@ -297,7 +297,7 @@ module Squared
           end
 
           def tasks
-            %i[pull rebase fetch clone stash status branch revbuild].freeze
+            %i[pull rebase autostash fetch clone stash status branch revbuild].freeze
           end
 
           def config?(val)
@@ -342,7 +342,7 @@ module Squared
           return unless ref?(Git.ref)
 
           namespace name do
-            @@tasks[Git.ref].each do |action, flags|
+            Git.subtasks do |action, flags|
               next if @pass.include?(action)
 
               namespace action do
@@ -383,9 +383,11 @@ module Squared
                         tag flag, args.to_a
                       end
                     when :delete
-                      format_desc action, flag, 'name+'
+                      format_desc action, flag, 'name+?'
                       task flag do |_, args|
-                        refs = param_guard(action, flag, args: args.to_a)
+                        if (refs = args.to_a).empty?
+                          refs = choice_refs('Choose a tag', 'tags', multiple: true, accept: 'Delete?')
+                        end
                         tag(flag, refs: refs)
                       end
                     when :add, :sign
@@ -408,7 +410,7 @@ module Squared
                     case flag
                     when :view, :between, :contain
                       if flag == :view && action == 'log'
-                        format_desc action, flag, '(^)commit/H0*,pathspec*,opts*'
+                        format_desc action, flag, '(^)commit/H0*,opts*,pathspec*'
                         task flag do |_, args|
                           index = []
                           args.to_a.each do |val|
@@ -416,18 +418,18 @@ module Squared
                               index << "HEAD~#{$1}"
                             elsif (sha = commithash(val))
                               index << sha
-                            elsif val.start_with?('^') || (!%r{^[.\\/]}.match?(val) && !%r{[\\/]$}.match?(val))
+                            elsif val.start_with?('^')
                               index << shell_quote(val)
                             end
                           end
-                          logx(flag, args.to_a.drop(index.size), index: index)
+                          log!(flag, args.to_a.drop(index.size), index: index)
                         end
                       else
-                        format_desc action, flag, 'commit1,commit2,pathspec*,opts*'
+                        format_desc action, flag, 'commit1,commit2,opts*,pathspec*'
                         task flag, [:commit1, :commit2] do |_, args|
                           commit1 = param_guard(action, flag, args: args, key: :commit1)
                           commit2 = param_guard(action, flag, args: args, key: :commit2)
-                          __send__(action == 'log' ? :logx : :diff, flag, args.extras, range: [commit1, commit2])
+                          __send__(action == 'log' ? :log! : :diff, flag, args.extras, range: [commit1, commit2])
                         end
                       end
                     when :head
@@ -458,33 +460,41 @@ module Squared
                   when 'checkout'
                     case flag
                     when :branch
-                      format_desc action, flag, 'name,create?=[bB],commit?,detach?=d'
+                      format_desc action, flag, 'name?,create?=[bB],commit?,detach?=d'
                       task flag, [:name, :create, :commit, :detach] do |_, args|
-                        branch = param_guard(action, flag, args: args, key: :name)
-                        create = args.create
-                        if args.commit == 'd'
-                          detach = 'd'
-                          commit = nil
-                        elsif create == 'd'
-                          create = nil
-                          commit = nil
-                          detach = 'd'
-                        elsif create && create.size > 1
-                          commit = create
-                          create = nil
-                          detach = args.commit
+                        if (branch = args.name)
+                          branch = param_guard(action, flag, args: args, key: :name)
+                          create = args.create
+                          if args.commit == 'd'
+                            detach = 'd'
+                            commit = nil
+                          elsif create == 'd'
+                            create = nil
+                            commit = nil
+                            detach = 'd'
+                          elsif create && create.size > 1
+                            commit = create
+                            create = nil
+                            detach = args.commit
+                          else
+                            detach = args.detach
+                            commit = args.commit
+                          end
+                          param_guard(action, flag, args: { create: create }, key: :create, pat: /\Ab\z/i) if create
                         else
-                          detach = args.detach
-                          commit = args.commit
+                          branch = choice_refs 'Choose a branch to switch', 'heads'
                         end
-                        param_guard(action, flag, args: { create: create }, key: :create, pat: /\Ab\z/i) if create
                         checkout(flag, branch: branch, create: create, commit: commit, detach: detach)
                       end
                     when :track
-                      format_desc action, flag, 'origin,(^)name?'
+                      format_desc action, flag, 'origin?,(^)name?'
                       task flag, [:origin, :name] do |_, args|
-                        origin = param_guard(action, flag, args: args, key: :origin)
-                        checkout(flag, branch: args.name, origin: origin)
+                        if (origin = args.origin)
+                          branch = args.name
+                        else
+                          origin, branch = choice_refs('Choose a remote', 'remotes', values: ['Enter branch name'])
+                        end
+                        checkout(flag, branch: branch, origin: origin)
                       end
                     when :commit
                       format_desc action, flag, 'branch/commit,opts*'
@@ -512,15 +522,21 @@ module Squared
                         branch(flag, target: target, ref: args.ref)
                       end
                     when :set
-                      format_desc(action, flag, '(^)upstream,name?')
+                      format_desc(action, flag, '(^)upstream?,name?')
                       task flag, [:upstream, :name] do |_, args|
-                        upstream = param_guard(action, flag, args: args, key: :upstream)
-                        branch(flag, target: args.name, ref: upstream)
+                        if (ref = args.upstream)
+                          target = args.name
+                        else
+                          ref, target = choice_refs('Choose a remote', 'remotes', values: ['Enter branch name'])
+                        end
+                        branch(flag, target: target, ref: ref)
                       end
                     when :delete
-                      format_desc action, flag, '(^~)name+'
+                      format_desc action, flag, '(^~)name+?'
                       task flag do |_, args|
-                        refs = param_guard(action, flag, args: args.to_a)
+                        if (refs = args.to_a).empty?
+                          refs = choice_refs('Choose a branch', 'heads', multiple: true, accept: 'Delete?')
+                        end
                         branch(flag, refs: refs)
                       end
                     when :edit
@@ -699,15 +715,18 @@ module Squared
           cmd, opts = git_session('pull', opts: opts)
           if flag == :rebase
             cmd << '--rebase'
-          elsif (val = option('rebase', ignore: false))
-            cmd << case val
-                   when '0', 'false'
-                     '--no-rebase'
-                   else
-                     VAL_GIT[:rebase][:value].include?(val) ? basic_option('rebase', val) : '--rebase'
-                   end
+            cmd << '--autostash' if option('autostash')
+          else
+            cmd << '--autostash' if flag == :autostash
+            if (val = option('rebase', ignore: false))
+              cmd << case val
+                     when '0', 'false'
+                       '--no-rebase'
+                     else
+                       VAL_GIT[:rebase][:value].include?(val) ? basic_option('rebase', val) : '--rebase'
+                     end
+            end
           end
-          cmd << '--autostash' if option('autostash')
           append_pull(opts, OPT_GIT[:pull] + OPT_GIT[:fetch][:pull],
                       no: OPT_GIT[:no][:pull] + OPT_GIT[:no][:fetch][:pull], remote: remote, flag: flag)
           source(sync: sync, sub: if verbose
@@ -750,10 +769,14 @@ module Squared
           source
         end
 
+        def autostash(*, sync: invoked_sync?('autostash'), **)
+          pull(:autostash, sync: sync)
+        end
+
         def fetch(flag = nil, opts = [], sync: invoked_sync?('fetch', flag), remote: nil)
           cmd, opts = git_session('fetch', opts: opts)
-          append_pull(opts, collect_hash(OPT_GIT[:fetch]), no: collect_hash(OPT_GIT[:no][:fetch]), remote: remote,
-                                                           flag: flag)
+          append_pull(opts, collect_hash(OPT_GIT[:fetch]),
+                      no: collect_hash(OPT_GIT[:no][:fetch]), remote: remote, flag: flag)
           cmd << '--all' if !remote && !session_arg?('multiple') && option('all')
           cmd << '--verbose' if verbose && !session_arg?('quiet')
           source(sync: sync, **threadargs)
@@ -853,16 +876,16 @@ module Squared
           end
           unless workspace.closed
             if @revbuild
-              statusargs.().each { |key, val| @revbuild[key] += val }
+              statusargs.call.each { |key, val| @revbuild[key] += val }
             else
-              @revbuild = statusargs.()
+              @revbuild = statusargs.call
             end
             return
           end
-          sha = git_spawn('rev-parse --verify HEAD').first.to_s.chomp
+          sha = git_spawn('rev-parse --verify HEAD').chomp
           return if sha.empty?
 
-          kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? statusargs.() : @revbuild || {}
+          kwargs = kwargs.key?(:include) || kwargs.key?(:exclude) ? statusargs.call : @revbuild || {}
           case flag
           when :build
             op = OptionPartition.new(opts, OPT_GIT[:status], project: self)
@@ -937,16 +960,16 @@ module Squared
           when :branch
             cmd << '--detach' if detach == 'd' || option('detach')
             append_option('track', equals: true)
-            cmd << (create ? shell_option(create, branch) : branch) << commit
+            cmd << (create ? quote_option(create, branch) : branch) << commit
           when :track
             if branch
               if branch.start_with?('^')
                 opt = 'B'
                 branch = branch[1..-1]
               end
-              cmd << shell_option(opt || 'b', branch)
+              cmd << quote_option(opt || 'b', branch)
             end
-            cmd << '--track' << origin
+            cmd << '--track' << shell_quote(origin)
           when :detach
             cmd << '--detach' << commit
           else
@@ -995,7 +1018,7 @@ module Squared
           source
         end
 
-        def logx(flag, opts = [], range: [], index: [])
+        def log!(flag, opts = [], range: [], index: [])
           cmd, opts = git_session('log', opts: opts)
           op = OptionPartition.new(opts, collect_hash(OPT_GIT[:log]), cmd,
                                    project: self, no: collect_hash(OPT_GIT[:no][:log]))
@@ -1068,7 +1091,7 @@ module Squared
           branch = nil
           upstream = nil
           git_spawn 'fetch --no-tags --quiet'
-          git_spawn('branch -vv --list', stdout: false).first.each do |val|
+          git_spawn('branch -vv --list', stdout: false).each do |val|
             next unless (r = /^\*\s(\S+)\s+(\h+)(?:\s\[(.+?)(?=\]\s)\])?\s/.match(val))
 
             branch = r[1]
@@ -1076,7 +1099,7 @@ module Squared
               origin = r[3][%r{^(.+)/#{Regexp.escape(branch)}$}, 1]
             else
               unless (origin = option('repository', prefix: 'git', ignore: false))
-                out = git_spawn('log -n1 --format=%h%d').first
+                out = git_spawn 'log -n1 --format=%h%d'
                 if out =~ /^#{r[2]} \(HEAD -> #{Regexp.escape(branch)}, (.+?)\)$/
                   split_escape($1).each do |s|
                     next unless s.end_with?("/#{branch}")
@@ -1161,17 +1184,17 @@ module Squared
             end
             ref = nil
           when :delete
-            force, list = refs.partition { |val| val.match?(/^[\^~]/) }
+            force, list = refs.partition { |val| val.match?(/^[~^]/) }
             force.each do |val|
               dr = val[0, 3]
               d = dr.include?('^') ? '-D' : '-d'
-              r = dr.include?('~') ? '-r' : nil
+              r = '-r' if dr.include?('~')
               source git_output('branch', d, r, shell_quote(val.sub(/^[\^~]+/, '')))
             end
             return if list.empty?
 
             cmd << '-d'
-            list.each { |val| cmd << shell_quote(val) }
+            append_value list
           when :move, :copy
             flag = "-#{flag.to_s[0]}"
             cmd << (option('force') ? flag.upcase : flag)
@@ -1196,7 +1219,7 @@ module Squared
             list_result(ret, 'branches', from: from)
             return
           else
-            head = git_spawn('rev-parse --abbrev-ref HEAD').first.chomp
+            head = git_spawn('rev-parse --abbrev-ref HEAD').chomp
             if head.empty?
               ret = 0
             else
@@ -1212,8 +1235,8 @@ module Squared
                 if (r1 = r[1]) && r1 =~ /^(.+):(?: ([a-z]+) (\d+),)? ([a-z]+) (\d+)$/
                   write = ->(s1, s2) { "#{s1.capitalize.rjust(7)}: #{sub_style(s2, styles: theme[:warn])}" }
                   r1 = $1
-                  r2 = $2 && write.($2, $3)
-                  r3 = write.($4, $5)
+                  r2 = $2 && write.call($2, $3)
+                  r3 = write.call($4, $5)
                 end
                 r1 = nil if r1 == "origin/#{data[0]}"
                 [" Branch: #{a + (r1 ? " (#{r1})" : '')}", r2, r3, " Commit: #{b}", "Message: #{r[2]}"]
@@ -1381,8 +1404,11 @@ module Squared
                      format_banner((banner.is_a?(String) ? banner : cmd).gsub(File.join(path, ''), ''), banner: true)
                    end
           begin
-            return [stdout ? `#{cmd}` : IO.popen(cmd), banner, from] if io
+            if io
+              return `#{cmd}` if stdout
 
+              return banner ? [IO.popen(cmd), banner, from] : IO.popen(cmd)
+            end
             if stdin? ? sync : stdout
               print_item banner unless multiple
               ret = `#{cmd}`
@@ -1471,11 +1497,29 @@ module Squared
           on :last, from
         end
 
-        def status_digest(*args, algorithm: Digest::SHA256, **kwargs)
+        def choice_refs(msg, type, format: nil, sort: '-creatordate', count: ARG[:CHOICE], short: true, **kwargs)
+          unless format
+            format = +"%(refname#{short ? ':short' : ''})"
+            case type
+            when 'heads', 'tags'
+              format += '%(if)%(HEAD)%(then) *%(end)'
+              trim = /\s+\*\z/
+            end
+          end
+          cmd = git_output 'for-each-ref', quote_option('format', format)
+          cmd << quote_option('sort', sort) if sort
+          cmd << shell_option('count', count) if count
+          cmd << "refs/#{type}"
+          choice_index(msg, source(cmd, io: true, banner: false), trim: trim, **kwargs)
+        end
+
+        def status_digest(*args, algorithm: nil, **kwargs)
+          require 'digest'
+          algorithm ||= Digest::SHA256
           glob = kwargs.fetch(:include, [])
           pass = kwargs.fetch(:exclude, [])
           ret = {}
-          git_spawn('status -s --porcelain', *args, stdout: false).first.each do |line|
+          git_spawn('status -s --porcelain', *args, stdout: false).each do |line|
             next unless (file = line[/^[A-Z ?!]{3}"?(.+?)"?$/, 1])
             next if !glob.empty? && glob.none? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
             next if !pass.empty? && pass.any? { |val| File.fnmatch?(val, file, File::FNM_DOTMATCH) }
@@ -1492,6 +1536,8 @@ module Squared
         def append_pull(opts, list, target: @session, flag: nil, no: nil, remote: nil)
           target << '--force' if option('force', target: target)
           append_submodules(target: target)
+          return if !remote && opts.empty?
+
           refspec = []
           op = OptionPartition.new(opts, remote ? list + ['refspec=v'] : list, target, project: self, no: no)
           op.each do |opt|

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

@@ -112,7 +112,7 @@ module Squared
           return unless outdated? && ref?(Node.ref)
 
           namespace name do
-            @@tasks[Node.ref].each do |action, flags|
+            Node.subtasks do |action, flags|
               next if @pass.include?(action)
 
               if flags.nil?
@@ -201,11 +201,11 @@ module Squared
                           tag, otp, dryrun = args
                         end
                         check = ->(val) { val == 'dry-run' || val == 'true' }
-                        if check.(otp)
+                        if check.call(otp)
                           dryrun = true
                           otp = nil
                         elsif dryrun
-                          dryrun = check.(dryrun)
+                          dryrun = check.call(dryrun)
                         end
                         publish(flag, otp: otp, tag: tag, dryrun: dryrun)
                       end
@@ -445,14 +445,13 @@ module Squared
               if upgrade && !w[5]
                 next if file == want
 
-                index = if a != c
-                          1
-                        elsif b != d
-                          3
-                        else
-                          5
-                        end
-                found << [key, file, want, index, major, f, w]
+                found << [key, file, want, if a != c
+                                             1
+                                           elsif b != d
+                                             3
+                                           else
+                                             5
+                                           end, major, f, w]
               elsif !major
                 avail << [key, file, latest, latest != current]
               end
@@ -478,11 +477,12 @@ module Squared
           end
           print_item banner unless sync
           if !found.empty?
-            col1 = size_col.(found, 0) + 4
-            col2 = size_col.(found, 1) + 4
+            col1 = size_col.call(found, 0) + 4
+            col2 = size_col.call(found, 1) + 4
             found.each_with_index do |item, i|
               a, b, c, d, e = item
-              if inter && (rev != :major || e || semmajor?(item[5], item[6])) && !confirm_outdated(a, c, d, e)
+              inter &&= rev != :major || e || semmajor?(item[5], item[6])
+              if inter && !confirm_outdated(a, c, (d / 2.0).ceil, lock: e)
                 cur = -1
               else
                 cur = modified
@@ -510,22 +510,22 @@ module Squared
                   else
                     sub_style(c, pat: SEM_VER, styles: color(:green), index: d)
                   end
-              puts "#{pad_ord.(i, found)}. #{a + b + c}"
+              puts "#{pad_ord.call(i, found)}. #{a + b + c}"
             end
             pending = avail.reduce(pending) { |a, b| a + (b[3] ? 0 : 1) }
             if dryrun || (modified == 0 && pending > 0)
-              footer.(modified, found.size)
+              footer.call(modified, found.size)
             elsif modified > 0
               modified = -1
-              footer.(0, found.size)
+              footer.call(0, found.size)
               File.write(dependfile, doc)
               commit(:add, refs: ['package.json'], pass: true)
               install if opts.include?('prune')
             end
           elsif !avail.empty?
-            col1 = size_col.(avail, 0) + 4
-            col2 = size_col.(avail, 1)
-            col3 = size_col.(avail, 2) + 4
+            col1 = size_col.call(avail, 0) + 4
+            col2 = size_col.call(avail, 1)
+            col3 = size_col.call(avail, 2) + 4
             avail.each_with_index do |item, i|
               a, b, c, d = item
               a = a.ljust(col1)
@@ -536,9 +536,9 @@ module Squared
                 c = sub_style(c, styles: color(:green))
                 pending += 1
               end
-              puts "#{pad_ord.(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
+              puts "#{pad_ord.call(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
             end
-            footer.(0, avail.size)
+            footer.call(0, avail.size)
           else
             puts 'No updates were found'
           end
@@ -902,21 +902,6 @@ module Squared
           end
         end
 
-        def confirm_outdated(pkg, ver, rev, lock)
-          a = sub_style(case rev
-                        when 1
-                          'MAJOR'
-                        when 3
-                          'MINOR'
-                        else
-                          'PATCH'
-                        end, styles: theme[:header])
-          b = sub_style("#{pkg} #{ver}", styles: theme[:inline])
-          c, d = rev == 1 || lock ? ['y/N', 'N'] : ['Y/n', 'Y']
-          e = lock ? " #{sub_style('(locked)', styles: color(:red))}" : ''
-          confirm("Upgrade to #{a}? #{b + e} [#{c}] ", d, timeout: 60)
-        end
-
         def dryrun?(prefix = dependbin, **)
           super || !option('dry-run', prefix: prefix).nil?
         end

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

@@ -55,7 +55,7 @@ module Squared
           end
 
           def bannerargs
-            [:dependfile].freeze
+            %i[dependfile venv].freeze
           end
 
           def venv?
@@ -109,7 +109,7 @@ module Squared
           return unless outdated? && ref?(Python.ref)
 
           namespace name do
-            @@tasks[Python.ref].each do |action, flags|
+            Python.subtasks do |action, flags|
               next if @pass.include?(action)
 
               namespace action do
@@ -211,7 +211,7 @@ module Squared
                                                                 'location?'
                                                               end)
                     task flag do |_, args|
-                      buildx flag, args.to_a
+                      build! flag, args.to_a
                     end
                   when 'publish'
                     format_desc(action, flag, 'opts*', after: case flag
@@ -311,12 +311,12 @@ module Squared
                   line = sub_style(line, pat: /^(.+)(#{Regexp.escape(latest)})(.+)$/, styles: styles, index: 2)
                   found += 1
                 end
-                out.("#{start.to_s.rjust(2)}. #{line}")
+                out.call("#{start.to_s.rjust(2)}. #{line}")
                 start += 1
               elsif line.start_with?('Package')
                 unless stdin?
                   sub = { pat: /^(.*)(?<!\dm)(Package|Latest)(.+)$/, styles: theme[:header], index: 2 }
-                  out.(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
+                  out.call(print_footer(" #  #{line.chomp}", reverse: true, sub: [sub, sub]))
                 end
                 start += 1
               end
@@ -350,7 +350,7 @@ module Squared
           run(from: :install)
         end
 
-        def buildx(flag, opts = [])
+        def build!(flag, opts = [])
           case flag
           when :python
             cmd, opts = python_session('-m build', opts: opts)
@@ -577,7 +577,7 @@ module Squared
         def preopts(quiet: true)
           ret = []
           case verbose
-          when false
+          when FalseClass
             ret << '--quiet' if quiet
           when Numeric
             ret << "-#{'v' * verbose}" if verbose > 0