squared 0.0.1 → 0.0.2

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

@@ -6,25 +6,44 @@ module Squared
       class Git < Base
         include Common::Format
 
+        REF = :git
+        private_constant :REF
+
         class << self
-          def tasks
-            %i[pull rebase fetch stash status].freeze
+          def populate(workspace, parallel: [], **)
+            return if workspace.series[:pull].empty?
+
+            desc 'all[git?=rebase|stash]'
+            task :all, [:git] do |_, args|
+              sync = ->(key) { parallel.include?(key) ? :"#{key}:sync" : key }
+              pull = case args.git
+                     when 'rebase'
+                       sync.(:rebase)
+                     when 'stash'
+                       invoke sync.(:stash)
+                       sync.(:pull)
+                     else
+                       sync.(:pull)
+                     end
+              invoke(pull, exception: workspace.exception)
+              invoke(workspace.dev? ? :refresh : :build, exception: workspace.exception)
+            end
           end
 
-          def to_sym
-            :git
+          def tasks
+            %i[pull rebase fetch stash status].freeze
           end
 
-          def is_a?(path)
-            if path.is_a?(::String) || path.is_a?(::Pathname)
-              Pathname.new(path).join('.git').directory?
+          def is_a?(val)
+            if val.is_a?(::Pathname) || (val.is_a?(::String) && (val = Pathname.new(val)))
+              val.join('.git').directory?
             else
               super
             end
           end
         end
 
-        @@tasks[:git] = {
+        @@tasks[REF] = {
           checkout: %i[branch detach force merge],
           commit: %i[add amend amend-orig all no-all],
           diff: %i[head cached branch],
@@ -33,16 +52,17 @@ module Squared
           pull: %i[rebase no-rebase commit no-commit submodules],
           stash: %i[push pop apply list clear],
           refs: %i[heads tags],
-          reset: %i[hard mixed soft],
+          reset: %i[head soft mixed hard merge keep submodules],
+          restore: %i[worktree staged overlay],
           rev: %i[commit branch]
         }.freeze
 
         def populate(*)
           super
-          return unless vardir.exist?
+          return unless gitdir.exist?
 
-          namespace @name do
-            @@tasks[:git].each do |action, flags|
+          namespace name do
+            @@tasks[REF].each do |action, flags|
               namespace action do
                 flags.each do |flag|
                   case action
@@ -58,7 +78,7 @@ module Squared
                       opts = collect_args(args, :opts)
                       fetch(flag, opts: opts)
                     end
-                  when :commit
+                  when :commit, :restore
                     if flag == :all
                       desc format_desc(action, flag, 'message?')
                       task flag, [:message] do |_, args|
@@ -68,7 +88,7 @@ module Squared
                       desc format_desc(action, flag, 'pathspec+')
                       task flag, [:pathspec] do |_, args|
                         guard_params(action, flag, args: args, key: :pathspec)
-                        commit(flag, collect_args(args, :pathspec))
+                        __send__(action, flag, collect_args(args, :pathspec))
                       end
                     end
                   when :stash
@@ -91,7 +111,7 @@ module Squared
                   when :refs, :files
                     desc format_desc(action, flag, 'grep?=pattern')
                     task flag, [:grep] do |_, args|
-                      send(action, flag, grep: args.fetch(:grep, nil))
+                      __send__(action, flag, grep: args.fetch(:grep, nil))
                     end
                   when :diff
                     case flag
@@ -151,10 +171,17 @@ module Squared
                       end
                     end
                   when :reset
-                    desc format_desc(action, flag, 'commit')
-                    task flag, [:commit] do |_, args|
-                      guard_params(action, flag, args: args, key: :commit)
-                      reset(flag, commit: args.commit)
+                    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(:head, collect_args(args, :pathspec), ref: args.ref)
+                      end
+                    else
+                      desc format_desc(action, flag, 'ref?=HEAD')
+                      task flag, [:ref] do |_, args|
+                        reset(flag, ref: args.ref)
+                      end
                     end
                   end
                 end
@@ -175,14 +202,14 @@ module Squared
           elsif flag == :commit || option('commit')
             cmd << '--commit'
           end
-          cmd << '--recurse-submodules' if flag == :submodules || option('recurse-submodules')
+          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?)
+          source(sync: sync, stderr: true, exception: !workspace.multitask?)
         end
 
         def rebase
@@ -192,7 +219,7 @@ module Squared
         def fetch(flag = nil, opts: [])
           cmd = git_session 'fetch'
           cmd << '--all' if flag == :all || option('all')
-          cmd << '--recurse-submodules' if flag == :submodules || option('recurse-submodules')
+          append_submodules flag
           opts.each do |val|
             case val
             when 'tags', 'prune', 'prune-tags', 'dry-run'
@@ -201,7 +228,7 @@ module Squared
               cmd << "--depth=#{$1}" if /^depth=(\d+)$/.match(val)
             end
           end
-          source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !@workspace.multitask?)
+          source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !workspace.multitask?)
         end
 
         def stash(flag = :push, files = [], commit: nil)
@@ -215,7 +242,7 @@ module Squared
             append_message option('message')
             append_pathspec files
           end
-          source(sync: invoked_sync?('stash', flag), exception: @workspace.exception)
+          source(sync: invoked_sync?('stash', flag), exception: workspace.exception)
         end
 
         def status
@@ -249,8 +276,24 @@ module Squared
           list_result(ret, 'files', action: 'modified')
         end
 
-        def reset(flag, commit: nil)
-          source "git reset --#{flag} #{commit}"
+        def reset(flag, files = [], ref: nil)
+          cmd = git_session 'reset'
+          if flag == :head
+            append_commit ref
+            append_pathspec files
+          else
+            case flag
+            when :hard, :soft, :merge, :keep
+              cmd << "--#{flag}"
+            when :submodules
+              append_submodules flag
+            else
+              cmd << '--mixed'
+              cmd << '--no-refresh' if option('refresh', equals: '0')
+            end
+            append_commit ref
+          end
+          source
         end
 
         def checkout(flag, files = [], branch: nil, create: nil, commit: nil, detach: nil)
@@ -272,14 +315,8 @@ module Squared
             cmd << commit if commit
           else
             cmd << "--#{flag}"
-            if option('ours')
-              cmd << '--ours'
-            elsif option('theirs')
-              cmd << '--theirs'
-            end
-            if (val = option('tree-ish'))
-              cmd << val
-            end
+            append_ours
+            append_head
             append_pathspec files
           end
           source
@@ -291,7 +328,8 @@ module Squared
                 else
                   (n = size.to_i) > 0 ? "--short=#{[n, 5].max}" : '--verify'
                 end
-          git_session 'rev-parse', opt, ref || 'HEAD'
+          git_session 'rev-parse', opt
+          append_commit ref
           source
         end
 
@@ -395,19 +433,35 @@ module Squared
           source b.join(' ')
         end
 
+        def restore(flag, files)
+          cmd = git_session 'restore'
+          case flag
+          when :worktree, :staged, :overlay
+            cmd << "--#{flag}"
+          end
+          append_ours
+          append_pathspec(files, expect: true)
+          source(stdout: true)
+        end
+
         protected
 
         def source(cmd = @session, exception: true, banner: true, io: false, sync: true, stdout: false, stderr: false)
           cmd = close_session(cmd)
           info cmd
           begin
-            banner = format_banner(cmd.gsub(trailing_slash(@path), ''), banner: banner, multitask: true)
-            cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(@path)} --git-dir #{shell_quote(vardir)}")
+            banner = format_banner(cmd.gsub(trailing_slash(path), ''), banner: banner, multitask: true)
+            cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(gitdir)}")
             if io
               [IO.popen(cmd), banner]
             elsif pipe? ? sync : stdout
               print_item banner
-              puts `#{cmd}`
+              ret = `#{cmd}`
+              if !ret.empty?
+                puts ret
+              elsif banner && stdout && !pipe?
+                puts 'Success'
+              end
             elsif sync || (!exception && !stderr)
               print_item banner
               shell(cmd, exception: exception)
@@ -440,7 +494,7 @@ module Squared
           found = 0
           lines = []
           iter.each do |line|
-            next if grep && !grep.match?(line)
+            next if grep && !line.match?(grep)
 
             if loglevel
               log loglevel, line
@@ -464,39 +518,68 @@ module Squared
           if size > 0
             args = styles[:banner]&.reject { |s| s.to_s.end_with?('!') } || []
             args << :bold if args.size <= 1
-            puts Project.footer "#{sub_style(size, *args)} #{size == 1 ? type.sub(/s$/, '') : type}"
+            puts print_footer "#{sub_style(size, *args)} #{size == 1 ? type.sub(/s$/, '') : type}"
           else
             puts empty_status("No #{type} were #{action}", 'grep', grep)
           end
         end
 
         def source_path(files)
-          files.select { |val| source_path?(val) }.map { |val| shell_quote(base_path(val.strip)) }
+          files.select { |val| source_path?(val) }.map { |val| val == '.' ? '.' : shell_quote(base_path(val.strip)) }
         end
 
-        def source_path?(path)
-          return path.to_s.start_with?("#{@path}#{::File::SEPARATOR}") if Pathname.new(path).absolute?
+        def source_path?(val)
+          return val.to_s.start_with?("#{path}#{::File::SEPARATOR}") if Pathname.new(val).absolute?
 
-          !%r{^\.\.[/\\]}.match?(path)
+          !val.match?(%r{^\.\.[/\\]})
         end
 
         private
 
-        def append_pathspec(files)
+        def append_commit(val)
+          val = val.to_s.strip
+          val.empty? ? 'HEAD' : val
+        end
+
+        def append_pathspec(files, expect: false)
           files = source_path(files)
-          @session << "-- #{files.join(' ')}" unless files.empty?
+          if files.empty?
+            raise ArgumentError, message('pathspec not within worktree', hint: 'invalid') if expect
+          else
+            @session << "-- #{files.join(' ')}"
+          end
         end
 
         def append_message(val)
           @session << "--message \"#{double_quote(val)}\"" if val
         end
 
-        def invoked_sync?(action, flag = nil)
-          !flag.nil? || super(action)
+        def append_head
+          return unless (val = option('head')) || (val = option('tree-ish'))
+
+          @session << val
         end
 
-        def option(val)
+        def append_ours
+          if option('ours')
+            @session << '--ours'
+          elsif option('theirs')
+            @session << '--theirs'
+          end
+        end
+
+        def append_submodules(flag = nil)
+          if option('recurse-submodules', equals: '0')
+            @session << '--no-recurse-submodules'
+          elsif flag == :submodules || option('recurse-submodules')
+            @session << '--recurse-submodules'
+          end
+        end
+
+        def option(val, equals: nil)
           ret = ENV.fetch("GIT_#{val.gsub(/\W/, '_').upcase}", '')
+          return ret == equals.to_s unless equals.nil?
+
           ret unless ret.empty? || ret == '0'
         end
 
@@ -504,8 +587,12 @@ module Squared
           session('git', *cmd)
         end
 
-        def vardir
-          @vardir ||= base_path('.git')
+        def gitdir
+          @gitdir ||= base_path('.git')
+        end
+
+        def invoked_sync?(action, flag = nil)
+          !flag.nil? || super(action)
         end
 
         def push?