squared 0.0.4 → 0.0.6

data/lib/squared/{repo → workspace}/project/git.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
 module Squared
-  module Repo
+  module Workspace
     module Project
       class Git < Base
         include Format
 
         REF = :git
-        private_constant :REF
+        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
 
         class << self
           def populate(workspace, parallel: [], **)
-            return if workspace.series[:pull].empty?
+            return if workspace.series.pull.empty?
 
             desc 'all[git?=rebase|stash]'
-            task :all, [:git] do |_, args|
+            task 'all', [:git] do |_, args|
               sync = ->(key) { parallel.include?(key) ? :"#{key}:sync" : key }
               pull = case args.git
                      when 'rebase'
@@ -46,10 +48,10 @@ module Squared
         @@tasks[REF] = {
           checkout: %i[branch detach force merge],
           commit: %i[add amend amend-orig all no-all],
-          diff: %i[head cached branch],
+          diff: %i[head cached branch files],
           fetch: %i[all submodules unshallow],
           files: %i[cached modified deleted others],
-          pull: %i[rebase no-rebase commit no-commit submodules],
+          pull: %i[head rebase no-rebase commit no-commit submodules],
           stash: %i[push pop apply list clear],
           refs: %i[heads tags],
           reset: %i[head soft mixed hard merge keep submodules],
@@ -67,13 +69,13 @@ module Squared
                 flags.each do |flag|
                   case action
                   when :pull
-                    desc format_desc(action, flag, %w[all tags prune ff-only autostash dry-run])
+                    desc format_desc(action, flag, OPT_PULL)
                     task flag, [:opts] do |_, args|
                       opts = collect_args(args, :opts)
                       pull(flag, opts: opts)
                     end
                   when :fetch
-                    desc format_desc(action, flag, %w[tags prune prune-tags depth=n dry-run])
+                    desc format_desc(action, flag, OPT_FETCH)
                     task flag, [:opts] do |_, args|
                       opts = collect_args(args, :opts)
                       fetch(flag, opts: opts)
@@ -82,7 +84,7 @@ module Squared
                     if flag == :all
                       desc format_desc(action, flag, 'message?')
                       task flag, [:message] do |_, args|
-                        commit(:all, message: args.fetch(:message, nil))
+                        commit(flag, message: args.fetch(:message, nil))
                       end
                     else
                       desc format_desc(action, flag, 'pathspec+')
@@ -94,8 +96,8 @@ module Squared
                   when :stash
                     if flag == :push
                       desc format_desc(action, flag, 'pathspec*')
-                      task :push, [:pathspec] do |_, args|
-                        stash(:push, collect_args(args, :pathspec))
+                      task flag, [:pathspec] do |_, args|
+                        stash(flag, collect_args(args, :pathspec))
                       end
                     else
                       desc format_desc(action, flag, 'commit?')
@@ -120,18 +122,25 @@ module Squared
                       task flag, [:pathspec] do |_, args|
                         files = collect_args(args, :pathspec)
                         index = /^\d+$/.match?(files.first) && !option('index') ? files.shift.to_i : 0
-                        diff(:head, files, index: index)
+                        diff(flag, files, index: index)
                       end
                     when :cached
                       desc format_desc(action, flag, 'pathspec*')
                       task flag, [:pathspec] do |_, args|
-                        diff(:cached, collect_args(args, :pathspec))
+                        diff(flag, collect_args(args, :pathspec))
                       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(:branch, collect_args(args, :pathspec), branch: args.name)
+                        diff(flag, collect_args(args, :pathspec), branch: args.name)
+                      end
+                    when :files
+                      desc format_desc(action, flag, 'path1,path2')
+                      task flag, [:path1, :path2] do |_, args|
+                        guard_params(action, flag, args: args, key: :path1)
+                        guard_params(action, flag, args: args, key: :path2)
+                        diff(flag, [args.path1, args.path2])
                       end
                     end
                   when :checkout
@@ -157,12 +166,12 @@ module Squared
                           commit = args.commit
                         end
                         guard_params('checkout', :branch, args: args, key: :create, pat: /^[Bb]$/) if create
-                        checkout(:branch, branch: args.name, create: create, commit: commit, detach: detach)
+                        checkout(flag, branch: args.name, create: create, commit: commit, detach: detach)
                       end
                     when :detach
                       desc format_desc(action, flag, 'branch/commit?')
                       task flag, [:commit] do |_, args|
-                        checkout(:detach, commit: args.commit)
+                        checkout(flag, commit: args.commit)
                       end
                     else
                       desc format_desc(action, flag, 'pathspec*')
@@ -175,7 +184,7 @@ module Squared
                       desc format_desc(action, flag, 'ref?=HEAD,pathspec+')
                       task flag, [:ref, :pathspec] do |_, args|
                         guard_params(action, flag, args: args, key: :pathspec)
-                        reset(:head, collect_args(args, :pathspec), ref: args.ref)
+                        reset(flag, collect_args(args, :pathspec), ref: args.ref)
                       end
                     else
                       desc format_desc(action, flag, 'ref?=HEAD')
@@ -202,14 +211,8 @@ module Squared
           elsif flag == :commit || option('commit')
             cmd << '--commit'
           end
-          append_submodules flag
-          opts.each do |val|
-            case val
-            when 'all', 'tags', 'prune', 'ff-only', 'autostash', 'dry-run'
-              cmd << "--#{val}"
-            end
-          end
-          source(sync: sync, stderr: true, exception: !workspace.multitask?)
+          append_pull opts, OPT_PULL, flag
+          source(sync: sync, stderr: true, exception: !workspace.series.multiple?)
         end
 
         def rebase
@@ -219,16 +222,8 @@ module Squared
         def fetch(flag = nil, opts: [])
           cmd = git_session 'fetch'
           cmd << '--all' if flag == :all || option('all')
-          append_submodules flag
-          opts.each do |val|
-            case val
-            when 'tags', 'prune', 'prune-tags', 'dry-run'
-              cmd << "--#{val}"
-            else
-              cmd << "--depth=#{$1}" if /^depth=(\d+)$/.match(val)
-            end
-          end
-          source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !workspace.multitask?)
+          append_pull opts, OPT_FETCH, flag
+          source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !workspace.series.multiple?)
         end
 
         def stash(flag = :push, files = [], commit: nil)
@@ -236,10 +231,10 @@ module Squared
           case flag
           when :apply, :pop
             cmd << '--index' if option('index')
-            cmd << commit if commit
+            cmd << commit
           else
-            %w[all staged include-untracked].each { |val| cmd << "--#{val}" if option(val) }
-            append_message option('message')
+            append_option %w[all staged include-untracked]
+            append_message option('message', 'm', zero: false)
             append_pathspec files
           end
           source(sync: invoked_sync?('stash', flag), exception: workspace.exception)
@@ -259,9 +254,7 @@ module Squared
                                             'all'
                                           end}"
           end
-          if (val = option('pathspec'))
-            append_pathspec split_escape(val)
-          end
+          append_pathspec
           out, banner = source(io: true)
           if banner && invoked_sync?('status')
             print_item banner
@@ -302,17 +295,16 @@ module Squared
           when :branch
             cmd << '--detach' if detach == 'd' || option('detach')
             if create
-              cmd << "-#{create} #{branch}"
+              cmd << "-#{create}" << branch
               if (val = option('start-point'))
                 cmd << val
               end
             else
               cmd << branch
             end
-            cmd << commit if commit
+            cmd << commit
           when :detach
-            cmd << "--#{flag}"
-            cmd << commit if commit
+            cmd << "--#{flag}" << commit
           else
             cmd << "--#{flag}"
             append_ours
@@ -351,10 +343,13 @@ module Squared
 
         def diff(flag, files = [], branch: nil, index: 0)
           cmd = git_session 'diff'
-          if /^#[0-9a-f]{5,40}\#$/.match?(sha = files.first)
-            files.shift
-          else
-            sha = nil
+          unless flag == :files
+            if /^#[0-9a-f]{5,40}\#$/.match?(sha = files.first)
+              sha = sha[1..-2]
+              files.shift
+            else
+              sha = nil
+            end
           end
           if (val = option('unified')).to_i > 0
             cmd << "--unified=#{val}"
@@ -366,6 +361,8 @@ module Squared
             cmd << '--merge-base' if option('merge-base')
           when :branch
             cmd << branch
+          when :files
+            cmd << '--no-index'
           else
             if (val = option('index')) || index > 0
               cmd << "HEAD~#{val || index}"
@@ -373,25 +370,24 @@ module Squared
               cmd << '--merge-base'
             end
           end
-          cmd << sha if sha
-          append_pathspec files
-          source
+          cmd << sha
+          append_pathspec(files, pass: flag == :files)
+          source(exception: cmd.include?('--exit-code'))
         end
 
         def commit(flag, files = [], message: nil, pass: false)
-          message = option('message') if message.nil?
+          message ||= option('message', 'm', zero: false)
           amend = flag.to_s.start_with?('amend')
           if !message && !amend
             return if pass
 
-            raise ArgumentError, message('commit', 'GIT_MESSAGE="description"', hint: 'missing')
+            raise_error('commit', 'GIT_MESSAGE="description"', hint: 'missing')
           end
           pathspec = if flag == :all || (amend && files.size == 1 && files.first == '*')
                        '--all'
                      else
                        files = source_path(as_a(files))
-                       raise ArgumentError, message('commit', 'pathspec', hint: 'missing') if files.empty?
-
+                       raise_error('commit', 'pathspec', hint: 'missing') if files.empty?
                        "-- #{files.join(' ')}"
                      end
           if !push?
@@ -404,7 +400,7 @@ module Squared
               break
             end
           end
-          raise ArgumentError, message('commit', 'work tree is not usable') unless push?
+          raise_error('commit', 'work tree is not usable') unless push?
 
           cmd = git_session 'commit'
           cmd << '--dry-run' if option('dry-run')
@@ -448,9 +444,9 @@ module Squared
 
         def source(cmd = @session, exception: true, banner: true, io: false, sync: true, stdout: false, stderr: false)
           cmd = close_session(cmd)
-          info cmd
+          log.info cmd
           begin
-            banner = format_banner(cmd.gsub(trailing_slash(path), ''), banner: banner, multitask: true)
+            banner = format_banner(cmd.gsub(File.join(path, ''), ''), banner: banner, multiple: true)
             cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitdir)}")
             if io
               [IO.popen(cmd), banner]
@@ -481,10 +477,10 @@ module Squared
               end
             end
           rescue StandardError => e
-            error e
+            log.error e
             raise if exception
 
-            emphasize e, message('git', cmd)
+            warn e
           end
         end
 
@@ -497,7 +493,7 @@ module Squared
             next if grep && !line.match?(grep)
 
             if loglevel
-              log loglevel, line
+              log.add loglevel, line
             else
               sub&.each { |h| line = sub_style(line, **h) }
               if banner
@@ -516,37 +512,53 @@ module Squared
           return unless verbose?
 
           if size > 0
-            args = theme[:banner]&.reject { |s| s.to_s.end_with?('!') } || []
-            args << :bold if args.size <= 1
-            puts print_footer "#{sub_style(size, *args)} #{size == 1 ? type.sub(/s$/, '') : type}"
+            styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
+            styles << :bold if styles.size <= 1
+            puts print_footer("#{size} #{size == 1 ? type.sub(/s$/, '') : type}",
+                              sub: { styles: styles, pat: /^(\d+)(.+)$/ })
           else
             puts empty_status("No #{type} were #{action}", 'grep', grep)
           end
         end
 
-        def source_path(files)
-          files.select { |val| source_path?(val) }.map { |val| val == '.' ? '.' : shell_quote(base_path(val.strip)) }
+        def source_path(files, pass: false)
+          files = files.select { |val| source_path?(val) } unless pass
+          files.map { |val| val == '.' ? '.' : shell_quote(base_path(val.strip)) }
         end
 
         def source_path?(val)
-          return val.to_s.start_with?("#{path}#{::File::SEPARATOR}") if Pathname.new(val).absolute?
+          return val.to_s.start_with?(File.join(path, '').to_s) if Pathname.new(val).absolute?
 
           !val.match?(%r{^\.\.[/\\]})
         end
 
         private
 
+        def append_pull(opts, list, flag = nil)
+          append_submodules flag
+          opts.each do |opt|
+            if list.include?(opt)
+              @session << "--#{opt}"
+            elsif opt.match(/^depth=(\d+)$/)
+              @session << "--depth=#{$1}"
+            end
+          end
+        end
+
         def append_commit(val)
           val = val.to_s.strip
           val.empty? ? 'HEAD' : val
         end
 
-        def append_pathspec(files, expect: false)
-          files = source_path(files)
-          if files.empty?
-            raise ArgumentError, message('pathspec not within worktree', hint: 'invalid') if expect
-          else
+        def append_pathspec(files = [], expect: false, pass: false)
+          if files.empty? && (val = option('pathspec'))
+            files = split_escape(val)
+          end
+          files = source_path(files, pass: pass)
+          if !files.empty?
             @session << "-- #{files.join(' ')}"
+          elsif expect
+            raise_error(pass ? 'pathspec not present' : 'pathspec not within worktree', hint: 'invalid')
           end
         end
 
@@ -555,9 +567,7 @@ module Squared
         end
 
         def append_head
-          return unless (val = option('head')) || (val = option('tree-ish'))
-
-          @session << val
+          @session << (option('head') || option('tree-ish'))
         end
 
         def append_ours
@@ -576,11 +586,19 @@ module Squared
           end
         end
 
-        def option(val, equals: nil)
-          ret = ENV.fetch("GIT_#{val.gsub(/\W/, '_').upcase}", '')
-          return ret == equals.to_s unless equals.nil?
+        def append_option(list)
+          list.each { |val| @session << "--#{val}" if option(val) }
+        end
 
-          ret unless ret.empty? || ret == '0'
+        def option(*args, equals: nil, zero: true)
+          for val in args
+            break if (ret = ENV["GIT_#{val.gsub(/\W/, '_').upcase}"])
+          end
+          if !equals.nil?
+            ret == equals.to_s
+          elsif !ret.nil? && !ret.empty? && !(ret == '0' && zero)
+            ret
+          end
         end
 
         def git_session(*cmd)

data/lib/squared/{repo → workspace}/project/node.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Squared
-  module Repo
+  module Workspace
     module Project
       class Node < Git
         REF = :node
@@ -33,19 +33,21 @@ module Squared
           run: nil
         }.freeze
 
-        def initialize(name, path, workspace, *, **kwargs)
+        attr_reader :package
+
+        def initialize(name, path, workspace, *, dev: nil, prod: nil, **kwargs)
           super
           initialize_script(REF)
           if (opts = env('BUILD', strict: true))
-            raise ArgumentError, message("BUILD_#{@name.upcase}", opts) if @output[0].is_a?(::Array)
-
+            raise_error("BUILD_#{@name.upcase}", opts) if @output[0].is_a?(::Array)
             @output[1] = opts
           else
             @output[1] = (@script && @script[:run]) || workspace.script
           end
-          @dev = workspace.bool_match(env('BUILD', suffix: 'DEV'), kwargs.delete(:dev))
-          @prod = workspace.bool_match(env('BUILD', suffix: 'PROD'), kwargs.delete(:prod))
+          @dev = dev
+          @prod = prod
           @pm = {}
+          @package = base_path('package.json')
         end
 
         def populate(*)
@@ -105,7 +107,7 @@ module Squared
             elsif dir.is_a?(::String)
               dest = workspace.root_path(dir)
             elsif dir.is_a?(::Symbol)
-              dest = Repo.resolve(dir)&.path
+              dest = Workspace.resolve(dir)&.path
             elsif dir.is_a?(Project)
               dest = dir.path
             elsif dir.is_a?(::Hash)
@@ -129,7 +131,7 @@ module Squared
 
             from = base_path(from)
             dest = dest.join(subdir, into || project)
-            warn "cp #{from.join(glob)} #{dest}"
+            log.warn "cp #{from.join(glob)} #{dest}"
             copy_d(from, dest, glob: glob, verbose: verbose?)
           end
         end
@@ -192,7 +194,7 @@ module Squared
               append_nocolor
             end
             append_loglevel
-            run(exception: workspace.exception)
+            run(exception: workspace.exception, sync: invoked_sync?('depend'))
           end
         end
 
@@ -200,37 +202,37 @@ module Squared
           require 'json'
           rev ||= prod? ? :patch : :minor
           cmd = pnpm? ? 'pnpm outdated' : 'npm outdated'
-          print_item format_banner(message("#{cmd}#{opts.include?('dry-run') ? ' --dry-run' : ''}"), multitask: true)
+          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)
-          info cmd
+          log.info cmd
           data = `#{cmd} --json --loglevel=error`
           Dir.chdir(pwd)
           json = JSON.parse(doc = package.read)
-          pat = /^(\d+)(\.)(\d+)(\.)(\d+)$/
           dep1 = json['dependencies'] || {}
           dep2 = json['devDependencies'] || {}
           found = []
           avail = []
           if !data.empty?
-            validate = ->(ver) { ver.match?(pat) }
             JSON.parse(data).each_pair do |key, val|
               val = val.find { |item| item['dependent'] == json['name'] } if val.is_a?(Array)
               next unless val && (file = dep1[key] || dep2[key])
 
               ch = file[0]
-              unless ch.match?(/[~^]/)
+              unless ch =~ /[~^]/
                 avail << [key, file, val['latest'], true]
                 next
               end
               file = file[1..-1]
               cur = val['current']
-              want = if rev == :major && validate.(val['latest'])
+              want = if rev == :major && val['latest'] =~ SEM_VER
                        [val['latest'], val['wanted']].max { |a, b| a <=> b }
                      else
                        val['wanted']
                      end
-              next unless (cur != want || file != want) && (validate.(want) || !validate.(file))
+              next unless (cur != want || file != want) && (want.match?(SEM_VER) || !file.match?(SEM_VER))
 
               a, b = file.split('.')
               c, d = want.split('.')
@@ -241,7 +243,7 @@ module Squared
               when :minor
                 upgrade = ch == '^' && (a == '0' ? c == '0' && b == d : a == c)
               when :patch
-                upgrade = a == c && b == d
+                upgrade = a == c && b == d && Regexp.last_match(5)
               end
               if upgrade
                 next if file == want
@@ -301,7 +303,7 @@ module Squared
                     a = sub_style(a, :bold)
                     sub_style(c, :green, :bold)
                   else
-                    sub_style(c, :green, :bold, pat: pat, index: d)
+                    sub_style(c, :green, :bold, pat: SEM_VER, index: d)
                   end
               puts "#{pad_ord.(i, found)}. #{a}#{b.ljust(col2)}#{c}"
             end
@@ -349,7 +351,7 @@ module Squared
           elsif args.is_a?(::String)
             cmd << args
           else
-            raise ArgumentError, message("#{cmd.first} script name", hint: args.nil? ? 'missing' : 'invalid')
+            raise_error("#{cmd.first} script name", hint: args.nil? ? 'missing' : 'invalid')
           end
           cmd.join(' ')
         end
@@ -366,7 +368,7 @@ module Squared
         end
 
         def depend?
-          !!@depend || outdated?
+          outdated? || !!@depend
         end
 
         def copy?
@@ -465,12 +467,6 @@ module Squared
             end
           end
         end
-
-        private
-
-        def package
-          @package ||= base_path('package.json')
-        end
       end
     end
   end