squared 0.0.9 → 0.0.11

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

@@ -12,25 +12,25 @@ module Squared
           include ::Rake::DSL
 
           def populate(ws, **)
-            return if ws.series.pull.empty?
+            return if ws.series[:pull].empty?
 
             desc ws.task_name('all[git?=rebase|stash]', desc: true)
             task ws.task_name('all'), [:git] do |_, args|
               sync = lambda do |key|
                 key = ws.task_name(key)
-                ws.task_defined?(ret = "#{key}:sync") ? ret : key
+                ws.task_defined?(ret = ws.task_join(key, 'sync')) ? ret : key
               end
               cmd = [case args.git
                      when 'rebase'
                        sync.('rebase')
                      when 'stash'
-                       invoke(sync.('stash'), exception: ws.exception, warning: ws.warning)
+                       invoke(sync.('stash'), **ws.invokeargs)
                        sync.('pull')
                      else
                        sync.('pull')
                      end]
-              cmd << ws.task_name(ws.dev? && ws.series.some?(:refresh) ? 'refresh' : 'build')
-              Common::Task.invoke(cmd, exception: ws.exception, warning: ws.warning)
+              cmd << ws.task_name('build')
+              Common::Task.invoke(cmd, **ws.invokeargs)
             end
           end
 
@@ -38,32 +38,34 @@ module Squared
             %i[pull rebase fetch stash status].freeze
           end
 
-          def is_a?(val)
-            if (val = as_path(val))
-              val.join('.git').directory?
-            else
-              super
-            end
+          def batchargs
+            [ref, { 'pull-s': %i[stash pull], 'rebase-s': %i[stash rebase] }]
+          end
+
+          def config?(val)
+            return false unless (val = as_path(val))
+
+            val.join('.git').directory?
           end
         end
 
         @@tasks[ref] = {
-          checkout: %i[branch detach force merge],
-          commit: %i[add amend amend-orig all no-all],
-          diff: %i[head cached branch files],
-          fetch: %i[all submodules unshallow],
-          files: %i[cached modified deleted others],
-          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],
-          restore: %i[worktree staged overlay],
-          rev: %i[commit branch]
+          checkout: %i[branch detach force merge].freeze,
+          commit: %i[add amend amend-orig all no-all].freeze,
+          diff: %i[head cached branch files].freeze,
+          fetch: %i[all submodules unshallow].freeze,
+          files: %i[cached modified deleted others].freeze,
+          pull: %i[head rebase no-rebase commit no-commit submodules].freeze,
+          stash: %i[push pop apply list clear].freeze,
+          refs: %i[heads tags].freeze,
+          reset: %i[head soft mixed hard merge keep submodules].freeze,
+          restore: %i[worktree staged overlay].freeze,
+          rev: %i[commit branch].freeze
         }.freeze
 
         def initialize(*, **)
           super
-          initialize_ref(Git.ref)
+          initialize_ref(Git.ref) if git_path.exist?
         end
 
         def ref
@@ -72,22 +74,17 @@ module Squared
 
         def populate(*)
           super
-          return unless gitdir.exist? && ref?(Git.ref)
+          return unless ref?(Git.ref)
 
           namespace name do
             @@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|
-                      pull(flag, opts: args.to_a)
-                    end
-                  when :fetch
-                    desc format_desc(action, flag, OPT_FETCH)
+                  when :pull, :fetch
+                    desc format_desc(action, flag, flag == :pull ? OPT_PULL : OPT_FETCH)
                     task flag, [:opts] do |_, args|
-                      fetch(flag, opts: args.to_a)
+                      __send__(action, flag, opts: args.to_a)
                     end
                   when :commit, :restore
                     if flag == :all
@@ -131,8 +128,7 @@ module Squared
                       desc format_desc(action, flag, 'index?=0,pathspec*')
                       task flag, [:pathspec] do |_, args|
                         files = args.to_a
-                        index = /^\d+$/.match?(files.first) && !git_option('index') ? files.shift.to_i : 0
-                        diff(flag, files, index: index)
+                        diff(flag, files, index: /^\d+$/.match?(files[0]) && !option('index') ? files.shift.to_i : 0)
                       end
                     when :cached
                       desc format_desc(action, flag, 'pathspec*')
@@ -193,7 +189,9 @@ module Squared
                     if flag == :head
                       desc format_desc(action, flag, 'ref?=HEAD,pathspec+')
                       task flag, [:ref, :pathspec] do |_, args|
-                        reset(flag, args.to_a[1..-1], ref: args.ref)
+                        files = args.to_a[1..-1]
+                        guard_params(action, flag, args: files)
+                        reset(flag, files, ref: args.ref)
                       end
                     else
                       desc format_desc(action, flag, 'ref?=HEAD')
@@ -210,18 +208,18 @@ module Squared
 
         def pull(flag = nil, sync: invoked_sync?('pull', flag), opts: [])
           cmd = git_session 'pull'
-          if flag == :'no-rebase'
+          if flag == :'no-rebase' || option('rebase', equals: '0')
             cmd << '--no-rebase'
-          elsif flag == :rebase || git_option('rebase')
+          elsif flag == :rebase || option('rebase')
             cmd << '--rebase'
           end
-          if flag == :'no-commit'
+          if flag == :'no-commit' || option('commit', equals: '0')
             cmd << '--no-commit'
-          elsif flag == :commit || git_option('commit')
+          elsif flag == :commit || option('commit')
             cmd << '--commit'
           end
           append_pull opts, OPT_PULL, flag
-          source(sync: sync, stderr: true, exception: !workspace.series.multiple?)
+          source(sync: sync, **threadargs)
         end
 
         def rebase
@@ -230,28 +228,28 @@ module Squared
 
         def fetch(flag = nil, opts: [])
           cmd = git_session 'fetch'
-          cmd << '--all' if flag == :all || git_option('all')
+          cmd << '--all' if flag == :all || option('all')
           append_pull opts, OPT_FETCH, flag
-          source(sync: invoked_sync?('fetch', flag), stderr: true, exception: !workspace.series.multiple?)
+          source(sync: invoked_sync?('fetch', flag), **threadargs)
         end
 
         def stash(flag = nil, files = [], commit: nil)
           cmd = git_session 'stash', (flag || 'push').to_s
           case flag
           when :apply, :pop
-            cmd << '--index' if git_option('index')
+            cmd << '--index' if option('index')
             cmd << commit
           else
-            append_option %w[all staged include-untracked]
-            append_message git_option('message', 'm', zero: false)
+            append_option %w[all staged include-untracked].freeze
+            append_message option('message', 'm', ignore: false)
             append_pathspec files
           end
-          source(sync: invoked_sync?('stash', flag), exception: workspace.exception)
+          source(sync: invoked_sync?('stash', flag), **threadargs)
         end
 
         def status
-          cmd = git_session 'status', git_option('long') ? '--long' : '--short'
-          if (val = git_option('ignore-submodules'))
+          cmd = git_session 'status', option('long') ? '--long' : '--short'
+          if (val = option('ignore-submodules', ignore: false))
             cmd << "--ignore-submodules=#{case val
                                           when '0', 'none'
                                             'none'
@@ -265,11 +263,11 @@ module Squared
           end
           append_pathspec
           out, banner = source(io: true)
-          if banner && invoked_sync?('status')
+          if invoked_sync?('status')
             print_item banner
             banner = nil
           end
-          sub = if verbose?
+          sub = if verbose
                   [
                     { pat: /^(.)([A-Z])(.+)$/, styles: :red, index: 2 },
                     { pat: /^([A-Z])(.+)$/, styles: :green },
@@ -284,7 +282,6 @@ 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
@@ -295,7 +292,7 @@ module Squared
               append_submodules flag
             else
               cmd << '--mixed'
-              cmd << '--no-refresh' if git_option('refresh', equals: '0')
+              cmd << '--no-refresh' if option('refresh', equals: '0')
             end
             append_commit ref
           end
@@ -306,10 +303,10 @@ module Squared
           cmd = git_session 'checkout'
           case flag
           when :branch
-            cmd << '--detach' if detach == 'd' || git_option('detach')
+            cmd << '--detach' if detach == 'd' || option('detach')
             if create
               cmd << "-#{create}" << branch
-              if (val = git_option('start-point'))
+              if (val = option('start-point'))
                 cmd << val
               end
             else
@@ -328,12 +325,11 @@ module Squared
         end
 
         def rev(flag, ref: nil, size: nil)
-          opt = if flag == :branch
-                  '--abbrev-ref'
-                else
-                  (n = size.to_i) > 0 ? "--short=#{[n, 5].max}" : '--verify'
-                end
-          git_session 'rev-parse', opt
+          git_session 'rev-parse', if flag == :branch
+                                     '--abbrev-ref'
+                                   else
+                                     (n = size.to_i) > 0 ? "--short=#{[n, 5].max}" : '--verify'
+                                   end
           append_commit ref
           source
         end
@@ -364,22 +360,22 @@ module Squared
               sha = nil
             end
           end
-          if (val = git_option('unified')).to_i > 0
+          if (val = option('unified')).to_i > 0
             cmd << "--unified=#{val}"
           end
           append_nocolor
           case flag
           when :cached
             cmd << '--cached'
-            cmd << '--merge-base' if git_option('merge-base')
+            cmd << '--merge-base' if option('merge-base')
           when :branch
             cmd << branch
           when :files
             cmd << '--no-index'
           else
-            if (val = git_option('index')) || index > 0
+            if (val = option('index')) || index > 0
               cmd << "HEAD~#{val || index}"
-            elsif sha && git_option('merge-base')
+            elsif sha && option('merge-base')
               cmd << '--merge-base'
             end
           end
@@ -389,7 +385,7 @@ module Squared
         end
 
         def commit(flag, files = [], message: nil, pass: false)
-          message ||= git_option('message', 'm', zero: false)
+          message ||= option('message', 'm', prefix: 'git', ignore: false)
           amend = flag.to_s.start_with?('amend')
           if !message && !amend
             return if pass
@@ -403,7 +399,7 @@ module Squared
                        raise_error('commit', 'pathspec', hint: 'missing') if files.empty?
                        "-- #{files.join(' ')}"
                      end
-          if !push?
+          unless push?
             source('git branch -vv --list', io: true, banner: false).first.each do |val|
               origin = %r{^\* [^\[]+(?<= )\[([\w.-/]+?)/([\w.-]+)\] }.match(val)
               next unless origin
@@ -414,9 +410,8 @@ module Squared
             end
           end
           raise_error('commit', 'work tree is not usable') unless push?
-
           cmd = git_session 'commit'
-          cmd << '--dry-run' if git_option('dry-run')
+          cmd << '--dry-run' if option('dry-run')
           if amend
             cmd << '--amend'
           else
@@ -424,7 +419,7 @@ module Squared
           end
           if message
             append_message message
-          elsif flag == :'amend-orig' || git_option('no-edit')
+          elsif flag == :'amend-orig' || option('no-edit')
             cmd << '--no-edit'
           end
           a = ['git add --verbose']
@@ -443,11 +438,7 @@ module Squared
         end
 
         def restore(flag, files)
-          cmd = git_session 'restore'
-          case flag
-          when :worktree, :staged, :overlay
-            cmd << "--#{flag}"
-          end
+          git_session 'restore', "--#{flag}"
           append_ours
           append_pathspec(files, expect: true)
           source(stdout: true)
@@ -455,20 +446,21 @@ module Squared
 
         private
 
-        def source(cmd = @session, exception: true, banner: true, io: false, sync: true, stdout: false, stderr: false)
-          cmd = close_session(cmd)
+        def source(cmd = @session, exception: true, io: false, sync: true, stdout: false, stderr: false,
+                   banner: ARG[:BANNER])
+          cmd = session_done(cmd)
           log.info cmd
           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)}")
+          cmd = cmd.sub(/^git\b/, "git --work-tree #{shell_quote(path)} --git-dir #{shell_quote(git_path)}")
           begin
             if io
               [IO.popen(cmd), banner]
-            elsif pipe? ? sync : stdout
+            elsif stdin? ? sync : stdout
               print_item banner
               ret = `#{cmd}`
               if !ret.empty?
                 puts ret
-              elsif banner && stdout && !pipe?
+              elsif banner && stdout && !stdin?
                 puts 'Success'
               end
             elsif sync || (!exception && !stderr)
@@ -482,7 +474,7 @@ module Squared
                   if ret == 0
                     write_lines(err, banner: banner)
                   else
-                    write_lines(err, loglevel: Logger::DEBUG)
+                    write_lines(err, loglevel: ::Logger::DEBUG)
                   end
                 end
               else
@@ -493,16 +485,16 @@ module Squared
             log.error e
             raise if exception
 
-            warn e if workspace.warning
+            warn log_message(::Logger::WARN, e) if warning?
           end
         end
 
-        def write_lines(iter, banner: nil, loglevel: nil, grep: nil, sub: nil, pass: false)
+        def write_lines(data, banner: nil, loglevel: nil, grep: nil, sub: nil, pass: false)
           grep = Regexp.new(grep == '*' ? '.+' : grep) if grep.is_a?(::String)
-          sub = nil if pipe?
-          found = 0
+          sub = nil if stdin?
+          ret = 0
           lines = []
-          iter.each do |line|
+          data.each do |line|
             next if grep && !line.match?(grep)
 
             if loglevel
@@ -515,14 +507,14 @@ module Squared
                 puts line
               end
             end
-            found += 1
+            ret += 1
           end
-          print_item banner, lines if banner && (found > 0 || !pass)
-          found
+          print_item banner, lines if banner && (ret > 0 || !pass)
+          ret
         end
 
         def list_result(size, type, action: 'found', grep: nil)
-          return unless verbose?
+          return unless verbose
 
           if size > 0
             styles = theme.fetch(:banner, []).reject { |s| s.to_s.end_with?('!') }
@@ -556,7 +548,7 @@ module Squared
         end
 
         def append_pathspec(files = [], expect: false, pass: false)
-          if files.empty? && (val = git_option('pathspec'))
+          if files.empty? && (val = option('pathspec'))
             files = split_escape(val)
           end
           files = source_path(files, pass: pass)
@@ -572,54 +564,37 @@ module Squared
         end
 
         def append_head
-          @session << (git_option('head') || git_option('tree-ish'))
+          @session << (option('head') || option('tree-ish'))
         end
 
         def append_ours
-          if git_option('ours')
+          if option('ours')
             @session << '--ours'
-          elsif git_option('theirs')
+          elsif option('theirs')
             @session << '--theirs'
           end
         end
 
         def append_submodules(flag = nil)
-          if git_option('recurse-submodules', equals: '0')
+          if option('recurse-submodules', equals: '0')
             @session << '--no-recurse-submodules'
-          elsif flag == :submodules || git_option('recurse-submodules')
+          elsif flag == :submodules || option('recurse-submodules')
             @session << '--recurse-submodules'
           end
         end
 
         def append_option(list)
-          list.each { |val| @session << "--#{val}" if git_option(val) }
-        end
-
-        def git_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
+          list.each { |val| @session << "--#{val}" if option(val) }
         end
 
         def git_session(*cmd)
           session('git', *cmd)
         end
 
-        def gitdir
+        def git_path
           base_path('.git')
         end
 
-        def source_path?(val)
-          return val.to_s.start_with?(File.join(path, '').to_s) if Pathname.new(val).absolute?
-
-          !val.match?(%r{^\.\.[/\\]})
-        end
-
         def push?
           !@origin.nil? && !@branch.nil?
         end
@@ -627,7 +602,13 @@ module Squared
         def dry_run?
           @session.include?('--dry-run')
         end
+
+        def threadargs
+          { stderr: true, exception: !workspace.series.multiple? }
+        end
       end
+
+      Application.implement Git
     end
   end
 end