squared 0.0.6 → 0.0.7

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

@@ -6,12 +6,13 @@ module Squared
       class Git < Base
         include Format
 
-        REF = :git
         OPT_PULL = %w[all tags prune ff-only autostash dry-run].freeze
         OPT_FETCH = %w[tags prune prune-tags depth=n dry-run].freeze
-        private_constant :REF, :OPT_PULL, :OPT_FETCH
+        private_constant :OPT_PULL, :OPT_FETCH
 
         class << self
+          include ::Rake::DSL
+
           def populate(workspace, parallel: [], **)
             return if workspace.series.pull.empty?
 
@@ -27,8 +28,8 @@ module Squared
                      else
                        sync.(:pull)
                      end
-              invoke(pull, exception: workspace.exception)
-              invoke(workspace.dev? ? :refresh : :build, exception: workspace.exception)
+              Common::Task.invoke(pull, exception: workspace.exception)
+              Common::Task.invoke(workspace.dev? ? :refresh : :build, exception: workspace.exception)
             end
           end
 
@@ -45,7 +46,7 @@ module Squared
           end
         end
 
-        @@tasks[REF] = {
+        @@tasks[ref] = {
           checkout: %i[branch detach force merge],
           commit: %i[add amend amend-orig all no-all],
           diff: %i[head cached branch files],
@@ -61,24 +62,22 @@ module Squared
 
         def populate(*)
           super
-          return unless gitdir.exist?
+          return unless gitdir.exist? && !@exclude.include?(Git.ref)
 
           namespace name do
-            @@tasks[REF].each do |action, flags|
+            @@tasks[Git.ref].each do |action, flags|
               namespace action do
                 flags.each do |flag|
                   case action
                   when :pull
                     desc format_desc(action, flag, OPT_PULL)
                     task flag, [:opts] do |_, args|
-                      opts = collect_args(args, :opts)
-                      pull(flag, opts: opts)
+                      pull(flag, opts: args.to_a)
                     end
                   when :fetch
                     desc format_desc(action, flag, OPT_FETCH)
                     task flag, [:opts] do |_, args|
-                      opts = collect_args(args, :opts)
-                      fetch(flag, opts: opts)
+                      fetch(flag, opts: args.to_a)
                     end
                   when :commit, :restore
                     if flag == :all
@@ -89,15 +88,16 @@ module Squared
                     else
                       desc format_desc(action, flag, 'pathspec+')
                       task flag, [:pathspec] do |_, args|
-                        guard_params(action, flag, args: args, key: :pathspec)
-                        __send__(action, flag, collect_args(args, :pathspec))
+                        files = args.to_a
+                        guard_params(action, flag, args: files)
+                        __send__(action, flag, files)
                       end
                     end
                   when :stash
                     if flag == :push
                       desc format_desc(action, flag, 'pathspec*')
                       task flag, [:pathspec] do |_, args|
-                        stash(flag, collect_args(args, :pathspec))
+                        stash(flag, args.to_a)
                       end
                     else
                       desc format_desc(action, flag, 'commit?')
@@ -120,20 +120,20 @@ module Squared
                     when :head
                       desc format_desc(action, flag, 'index?=0,pathspec*')
                       task flag, [:pathspec] do |_, args|
-                        files = collect_args(args, :pathspec)
+                        files = args.to_a
                         index = /^\d+$/.match?(files.first) && !option('index') ? files.shift.to_i : 0
                         diff(flag, files, index: index)
                       end
                     when :cached
                       desc format_desc(action, flag, 'pathspec*')
                       task flag, [:pathspec] do |_, args|
-                        diff(flag, collect_args(args, :pathspec))
+                        diff(flag, args.to_a)
                       end
                     when :branch
                       desc format_desc(action, flag, 'name,pathspec*')
                       task flag, [:name, :pathspec] do |_, args|
                         guard_params(action, flag, args: args, key: :name)
-                        diff(flag, collect_args(args, :pathspec), branch: args.name)
+                        diff(flag, args.to_a[1..-1], branch: args.name)
                       end
                     when :files
                       desc format_desc(action, flag, 'path1,path2')
@@ -165,7 +165,7 @@ module Squared
                           detach = args.detach
                           commit = args.commit
                         end
-                        guard_params('checkout', :branch, args: args, key: :create, pat: /^[Bb]$/) if create
+                        guard_params(action, flag, args: { create: create }, key: :create, pat: /^b$/i) if create
                         checkout(flag, branch: args.name, create: create, commit: commit, detach: detach)
                       end
                     when :detach
@@ -176,15 +176,14 @@ module Squared
                     else
                       desc format_desc(action, flag, 'pathspec*')
                       task flag, [:pathspec] do |_, args|
-                        checkout(flag, collect_args(args, :pathspec))
+                        checkout(flag, args.to_a)
                       end
                     end
                   when :reset
                     if flag == :head
                       desc format_desc(action, flag, 'ref?=HEAD,pathspec+')
                       task flag, [:ref, :pathspec] do |_, args|
-                        guard_params(action, flag, args: args, key: :pathspec)
-                        reset(flag, collect_args(args, :pathspec), ref: args.ref)
+                        reset(flag, args.to_a[1..-1], ref: args.ref)
                       end
                     else
                       desc format_desc(action, flag, 'ref?=HEAD')
@@ -272,6 +271,7 @@ module Squared
         def reset(flag, files = [], ref: nil)
           cmd = git_session 'reset'
           if flag == :head
+            guard_params('reset', flag, args: files)
             append_commit ref
             append_pathspec files
           else

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

@@ -4,9 +4,6 @@ module Squared
   module Workspace
     module Project
       class Node < Git
-        REF = :node
-        private_constant :REF
-
         class << self
           def populate(*); end
 
@@ -27,7 +24,7 @@ module Squared
           end
         end
 
-        @@tasks[REF] = {
+        @@tasks[ref] = {
           install: %i[force dedupe frozen],
           outdated: %i[major minor patch],
           run: nil
@@ -35,35 +32,35 @@ module Squared
 
         attr_reader :package
 
-        def initialize(name, path, workspace, *, dev: nil, prod: nil, **kwargs)
+        def initialize(*, **kwargs)
           super
-          initialize_script(REF)
+          initialize_script(Node.ref, **kwargs)
           if (opts = env('BUILD', strict: true))
             raise_error("BUILD_#{@name.upcase}", opts) if @output[0].is_a?(::Array)
             @output[1] = opts
           else
-            @output[1] = (@script && @script[:run]) || workspace.script
+            @output[1] = (@script && @script[:run]) || @workspace.script
           end
-          @dev = dev
-          @prod = prod
+          @dev = kwargs[:dev]
+          @prod = kwargs[:prod]
           @pm = {}
           @package = base_path('package.json')
         end
 
         def populate(*)
           super
-          return unless outdated?
+          return unless outdated? && !@exclude.include?(Node.ref)
 
           namespace name do
-            @@tasks[REF].each do |action, flags|
+            @@tasks[Node.ref].each do |action, flags|
               if flags.nil?
                 case action
                 when :run
                   desc format_desc(action, nil, 'command+')
                   task action, [:command] do |_, args|
-                    command = collect_args(args, :command)
-                    guard_params(action, 'command', args: command)
-                    run_script command
+                    cmd = args.to_a
+                    guard_params(action, 'command', args: cmd)
+                    run_script cmd
                   end
                 end
               else
@@ -76,9 +73,9 @@ module Squared
                         depend(flag, override: true)
                       end
                     when :outdated
-                      desc format_desc(action, flag, %w[prune dry-run], req: 'opts?')
+                      desc format_desc(action, flag, %w[prune interactive dry-run], req: 'opts?')
                       task flag, [:opts] do |_, args|
-                        outdated(flag, opts: collect_args(args, :opts))
+                        outdated(flag, opts: args.to_a)
                       end
                     end
                   end
@@ -194,22 +191,20 @@ module Squared
               append_nocolor
             end
             append_loglevel
-            run(exception: workspace.exception, sync: invoked_sync?('depend'))
+            run(sync: invoked_sync?('depend'))
           end
         end
 
         def outdated(rev = nil, opts: [])
           require 'json'
-          rev ||= prod? ? :patch : :minor
+          equ = rev || (prod? ? :patch : :minor)
           cmd = pnpm? ? 'pnpm outdated' : 'npm outdated'
-          if invoked_sync?('outdated')
-            print_item format_banner(message("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}"), multiple: true)
-          end
-          pwd = Dir.pwd
-          Dir.chdir(path)
           log.info cmd
+          if store_pwd || invoked_sync?("outdated#{rev ? ":#{rev}" : ''}")
+            print_item format_banner("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}", multiple: true)
+          end
           data = `#{cmd} --json --loglevel=error`
-          Dir.chdir(pwd)
+          store_pwd true
           json = JSON.parse(doc = package.read)
           dep1 = json['dependencies'] || {}
           dep2 = json['devDependencies'] || {}
@@ -227,7 +222,7 @@ module Squared
               end
               file = file[1..-1]
               cur = val['current']
-              want = if rev == :major && val['latest'] =~ SEM_VER
+              want = if equ == :major && val['latest'] =~ SEM_VER
                        [val['latest'], val['wanted']].max { |a, b| a <=> b }
                      else
                        val['wanted']
@@ -235,15 +230,14 @@ module Squared
               next unless (cur != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
               a, b = file.split('.')
-              c, d = want.split('.')
-              upgrade = false
-              case rev
+              c, d, e = want.split('.')
+              case equ
               when :major
                 upgrade = a == '0' ? c == '0' : true
               when :minor
                 upgrade = ch == '^' && (a == '0' ? c == '0' && b == d : a == c)
               when :patch
-                upgrade = a == c && b == d && Regexp.last_match(5)
+                upgrade = a == c && b == d && !e.nil?
               end
               if upgrade
                 next if file == want
@@ -281,17 +275,23 @@ module Squared
           if !found.empty?
             col1 = size_col.(found, 0) + 4
             col2 = size_col.(found, 1) + 4
+            inter = opts.include?('interactive')
             found.each_with_index do |item, i|
               a, b, c, d = item
-              cur = modified
-              doc.sub!(/("#{Regexp.escape(a)}"\s*:\s*)"([~^])#{Regexp.escape(b)}"/) do |capture|
-                if $2 == '~' && rev != :patch
-                  cur = -1
-                  pending += 1
-                  capture
-                else
-                  modified += 1
-                  "#{$1}\"#{$2 || ''}#{c}\""
+              prompt = inter && (equ != :major || semmajor(semver(b.scan(SEM_VER)[0]), semver(c.scan(SEM_VER)[0])))
+              if prompt && !confirm_outdated(equ.upcase, a, c)
+                cur = -1
+              else
+                cur = modified
+                doc.sub!(/("#{Regexp.escape(a)}"\s*:\s*)"([~^])#{Regexp.escape(b)}"/) do |capture|
+                  if $2 == '~' && equ != :patch
+                    cur = -1
+                    pending += 1
+                    capture
+                  else
+                    modified += 1
+                    "#{$1}\"#{$2 || ''}#{c}\""
+                  end
                 end
               end
               a = a.ljust(col1)
@@ -300,7 +300,7 @@ module Squared
                   elsif modified == cur
                     'FAIL'
                   elsif d == 1
-                    a = sub_style(a, :bold)
+                    a = sub_style(a, styles: theme[:active])
                     sub_style(c, :green, :bold)
                   else
                     sub_style(c, :green, :bold, pat: SEM_VER, index: d)
@@ -323,9 +323,15 @@ module Squared
             col3 = size_col.(avail, 2) + 4
             avail.each_with_index do |item, i|
               a, b, c, d = item
-              e = sub_style(b.ljust(col2), d ? :red : :yellow)
-              puts "#{pad_ord.(i, avail)}. #{a.ljust(col1)}#{c.ljust(col3)}#{e} (#{d ? 'locked' : 'latest'})"
-              pending += 1 unless d
+              a = a.ljust(col1)
+              b = sub_style(b.ljust(col2), d ? :red : :yellow)
+              c = c.ljust(col3)
+              unless d
+                a = sub_style(a, styles: theme[:active])
+                c = sub_style(c, :green)
+                pending += 1
+              end
+              puts "#{pad_ord.(i, avail)}. #{a + c + b} (#{d ? 'locked' : 'latest'})"
             end
             footer.()
           else
@@ -367,10 +373,6 @@ module Squared
           @output[0] != false && (!@output[0].nil? || !@output[1].nil?)
         end
 
-        def depend?
-          outdated? || !!@depend
-        end
-
         def copy?
           !!@copy
         end
@@ -424,15 +426,11 @@ module Squared
         end
 
         def dev?
-          return false if Node.prod?
-
-          workspace.dev?(script: @output[1], pat: @dev, global: !@script || @script[:run].nil?)
+          !Node.prod? && workspace.dev?(script: @output[1], pat: @dev, **runargs)
         end
 
         def prod?
-          return true if Node.prod?
-
-          workspace.prod?(script: @output[1], pat: @prod, global: !@script || @script[:run].nil?)
+          Node.prod? || workspace.prod?(script: @output[1], pat: @prod, **runargs)
         end
 
         protected
@@ -467,6 +465,18 @@ module Squared
             end
           end
         end
+
+        private
+
+        def confirm_outdated(rev, pkg, ver)
+          m = ver == :major
+          confirm("Upgrade to #{rev}? #{sub_style("#{pkg} #{ver}", styles: theme[:inline])} [#{m ? 'y/N' : 'Y/n'}] ",
+                  default: m ? 'N' : 'Y', timeout: 60)
+        end
+
+        def runargs
+          { ref: Node.ref, group: group, global: !@script || @script[:run].nil? }
+        end
       end
     end
   end

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

@@ -4,13 +4,12 @@ module Squared
   module Workspace
     module Project
       class Python < Git
-        REF = :python
         REQUIREMENTS = %w[requirements.txt pyproject.toml setup.py].freeze
         OPT_USER = %w[pre dry-run].freeze
         OPT_FORCE = [*OPT_USER, 'user'].freeze
         OPT_UPGRADE = [*OPT_FORCE, 'eager'].freeze
-        OPT_GENERAL = %w{venv isolated no-cache [v]erbose}.freeze
-        private_constant :REF, :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_UPGRADE, :OPT_GENERAL
+        OPT_GENERAL = %w{venv isolated no-cache-dir [v]erbose}.freeze
+        private_constant :REQUIREMENTS, :OPT_USER, :OPT_FORCE, :OPT_UPGRADE, :OPT_GENERAL
 
         class << self
           def populate(*); end
@@ -35,23 +34,23 @@ module Squared
 
         attr_reader :requirements
 
-        def initialize(name, path, workspace, *, **kwargs)
+        def initialize(*, **kwargs)
           super
           @reqindex = REQUIREMENTS.index { |file| base_path(file).exist? } || 0
           @requirements = base_path(REQUIREMENTS[@reqindex])
-          initialize_build(REF, **kwargs)
+          initialize_build(Python.ref, **kwargs)
         end
 
-        @@tasks[REF] = {
+        @@tasks[ref] = {
           install: %i[user upgrade force]
         }.freeze
 
         def populate(*)
           super
-          return unless outdated?
+          return unless outdated? && !@exclude.include?(Python.ref)
 
           namespace name do
-            @@tasks[REF].each do |action, flags|
+            @@tasks[Python.ref].each do |action, flags|
               namespace action do
                 flags.each do |flag|
                   case action
@@ -66,7 +65,7 @@ module Squared
                            end
                     desc format_desc(action, flag, list + OPT_GENERAL)
                     task flag do |_, args|
-                      depend(flag, opts: collect_args(args, :opts), override: true)
+                      depend(flag, opts: args.to_a, override: true)
                     end
                   end
                 end
@@ -94,7 +93,7 @@ module Squared
                 append_general opts, OPT_FORCE
               end
               cmd << (type == 1 ? '-r requirements.txt' : '.')
-              run(exception: workspace.exception, sync: invoked_sync?('depend'))
+              run(sync: invoked_sync?('depend'))
             when 3
               run_s("#{@bin} setup.py install", sync: invoked_sync?('depend'))
             end
@@ -107,10 +106,6 @@ module Squared
           requirements.exist? ? @reqindex + 1 : 0
         end
 
-        def depend?
-          outdated? || !!@depend
-        end
-
         def outdated?
           install_type > 0
         end
@@ -131,8 +126,6 @@ module Squared
                           '--upgrade-strategy=eager'
                         when 'venv'
                           '--require-virtualenv'
-                        when 'no-cache'
-                          '--no-cache-dir'
                         else
                           (v ? "-#{v[0]}" : "--#{opt}")
                         end