squared 0.0.6 → 0.0.8

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

@@ -4,31 +4,33 @@ module Squared
   module Workspace
     module Project
       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
-          def populate(workspace, parallel: [], **)
+          include ::Rake::DSL
+
+          def populate(workspace, **)
             return if workspace.series.pull.empty?
 
             desc 'all[git?=rebase|stash]'
             task 'all', [:git] do |_, args|
-              sync = ->(key) { parallel.include?(key) ? :"#{key}:sync" : key }
+              exception = workspace.exception
+              warning = workspace.warning
+              sync = ->(key) { workspace.task_defined?(s = "#{key}:sync") ? s : key }
               pull = case args.git
                      when 'rebase'
-                       sync.(:rebase)
+                       sync.('rebase')
                      when 'stash'
-                       invoke sync.(:stash)
-                       sync.(:pull)
+                       invoke(sync.('stash'), exception: exception, warning: warning)
+                       sync.('pull')
                      else
-                       sync.(:pull)
+                       sync.('pull')
                      end
-              invoke(pull, exception: workspace.exception)
-              invoke(workspace.dev? ? :refresh : :build, exception: workspace.exception)
+              Common::Task.invoke(pull, exception: exception, warning: warning)
+              Common::Task.invoke(workspace.dev? && workspace.series.has?(:refresh) ? :refresh : :build,
+                                  exception: exception, warning: warning)
             end
           end
 
@@ -45,7 +47,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],
@@ -59,26 +61,29 @@ module Squared
           rev: %i[commit branch]
         }.freeze
 
+        def initialize(*, **)
+          super
+          initialize_ref(Git.ref)
+        end
+
         def populate(*)
           super
-          return unless gitdir.exist?
+          return unless gitdir.exist? && ref?(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 +94,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 +126,20 @@ module Squared
                     when :head
                       desc format_desc(action, flag, 'index?=0,pathspec*')
                       task flag, [:pathspec] do |_, args|
-                        files = collect_args(args, :pathspec)
-                        index = /^\d+$/.match?(files.first) && !option('index') ? files.shift.to_i : 0
+                        files = args.to_a
+                        index = /^\d+$/.match?(files.first) && !git_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 +171,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 +182,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')
@@ -203,12 +208,12 @@ module Squared
           cmd = git_session 'pull'
           if flag == :'no-rebase'
             cmd << '--no-rebase'
-          elsif flag == :rebase || option('rebase')
+          elsif flag == :rebase || git_option('rebase')
             cmd << '--rebase'
           end
           if flag == :'no-commit'
             cmd << '--no-commit'
-          elsif flag == :commit || option('commit')
+          elsif flag == :commit || git_option('commit')
             cmd << '--commit'
           end
           append_pull opts, OPT_PULL, flag
@@ -221,28 +226,28 @@ module Squared
 
         def fetch(flag = nil, opts: [])
           cmd = git_session 'fetch'
-          cmd << '--all' if flag == :all || option('all')
+          cmd << '--all' if flag == :all || git_option('all')
           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)
-          cmd = git_session 'stash', flag.to_s
+        def stash(flag = nil, files = [], commit: nil)
+          cmd = git_session 'stash', (flag || 'push').to_s
           case flag
           when :apply, :pop
-            cmd << '--index' if option('index')
+            cmd << '--index' if git_option('index')
             cmd << commit
           else
             append_option %w[all staged include-untracked]
-            append_message option('message', 'm', zero: false)
+            append_message git_option('message', 'm', zero: false)
             append_pathspec files
           end
           source(sync: invoked_sync?('stash', flag), exception: workspace.exception)
         end
 
         def status
-          cmd = git_session 'status', option('long') ? '--long' : '--short'
-          if (val = option('ignore-submodules'))
+          cmd = git_session 'status', git_option('long') ? '--long' : '--short'
+          if (val = git_option('ignore-submodules'))
             cmd << "--ignore-submodules=#{case val
                                           when '0', 'none'
                                             'none'
@@ -272,6 +277,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
@@ -282,7 +288,7 @@ module Squared
               append_submodules flag
             else
               cmd << '--mixed'
-              cmd << '--no-refresh' if option('refresh', equals: '0')
+              cmd << '--no-refresh' if git_option('refresh', equals: '0')
             end
             append_commit ref
           end
@@ -293,10 +299,10 @@ module Squared
           cmd = git_session 'checkout'
           case flag
           when :branch
-            cmd << '--detach' if detach == 'd' || option('detach')
+            cmd << '--detach' if detach == 'd' || git_option('detach')
             if create
               cmd << "-#{create}" << branch
-              if (val = option('start-point'))
+              if (val = git_option('start-point'))
                 cmd << val
               end
             else
@@ -351,22 +357,22 @@ module Squared
               sha = nil
             end
           end
-          if (val = option('unified')).to_i > 0
+          if (val = git_option('unified')).to_i > 0
             cmd << "--unified=#{val}"
           end
           append_nocolor
           case flag
           when :cached
             cmd << '--cached'
-            cmd << '--merge-base' if option('merge-base')
+            cmd << '--merge-base' if git_option('merge-base')
           when :branch
             cmd << branch
           when :files
             cmd << '--no-index'
           else
-            if (val = option('index')) || index > 0
+            if (val = git_option('index')) || index > 0
               cmd << "HEAD~#{val || index}"
-            elsif sha && option('merge-base')
+            elsif sha && git_option('merge-base')
               cmd << '--merge-base'
             end
           end
@@ -376,7 +382,7 @@ module Squared
         end
 
         def commit(flag, files = [], message: nil, pass: false)
-          message ||= option('message', 'm', zero: false)
+          message ||= git_option('message', 'm', zero: false)
           amend = flag.to_s.start_with?('amend')
           if !message && !amend
             return if pass
@@ -391,7 +397,7 @@ module Squared
                        "-- #{files.join(' ')}"
                      end
           if !push?
-            source('git branch -vv --list', io: true, banner: false)[0].each do |val|
+            source('git branch -vv --list', io: true, banner: false).first.each do |val|
               origin = %r{^\* [^\[]+(?<= )\[([\w.-/]+?)/([\w.-]+)\] }.match(val)
               next unless origin
 
@@ -403,7 +409,7 @@ module Squared
           raise_error('commit', 'work tree is not usable') unless push?
 
           cmd = git_session 'commit'
-          cmd << '--dry-run' if option('dry-run')
+          cmd << '--dry-run' if git_option('dry-run')
           if amend
             cmd << '--amend'
           else
@@ -411,7 +417,7 @@ module Squared
           end
           if message
             append_message message
-          elsif flag == :'amend-orig' || option('no-edit')
+          elsif flag == :'amend-orig' || git_option('no-edit')
             cmd << '--no-edit'
           end
           a = ['git add --verbose']
@@ -440,14 +446,14 @@ module Squared
           source(stdout: true)
         end
 
-        protected
+        private
 
         def source(cmd = @session, exception: true, banner: true, io: false, sync: true, stdout: false, stderr: false)
           cmd = close_session(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)}")
           begin
-            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]
             elsif pipe? ? sync : stdout
@@ -480,7 +486,7 @@ module Squared
             log.error e
             raise if exception
 
-            warn e
+            warn e if workspace.warning
           end
         end
 
@@ -526,14 +532,6 @@ module Squared
           files.map { |val| val == '.' ? '.' : shell_quote(base_path(val.strip)) }
         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
-
-        private
-
         def append_pull(opts, list, flag = nil)
           append_submodules flag
           opts.each do |opt|
@@ -551,7 +549,7 @@ module Squared
         end
 
         def append_pathspec(files = [], expect: false, pass: false)
-          if files.empty? && (val = option('pathspec'))
+          if files.empty? && (val = git_option('pathspec'))
             files = split_escape(val)
           end
           files = source_path(files, pass: pass)
@@ -567,30 +565,30 @@ module Squared
         end
 
         def append_head
-          @session << (option('head') || option('tree-ish'))
+          @session << (git_option('head') || git_option('tree-ish'))
         end
 
         def append_ours
-          if option('ours')
+          if git_option('ours')
             @session << '--ours'
-          elsif option('theirs')
+          elsif git_option('theirs')
             @session << '--theirs'
           end
         end
 
         def append_submodules(flag = nil)
-          if option('recurse-submodules', equals: '0')
+          if git_option('recurse-submodules', equals: '0')
             @session << '--no-recurse-submodules'
-          elsif flag == :submodules || option('recurse-submodules')
+          elsif flag == :submodules || git_option('recurse-submodules')
             @session << '--recurse-submodules'
           end
         end
 
         def append_option(list)
-          list.each { |val| @session << "--#{val}" if option(val) }
+          list.each { |val| @session << "--#{val}" if git_option(val) }
         end
 
-        def option(*args, equals: nil, zero: true)
+        def git_option(*args, equals: nil, zero: true)
           for val in args
             break if (ret = ENV["GIT_#{val.gsub(/\W/, '_').upcase}"])
           end
@@ -606,11 +604,13 @@ module Squared
         end
 
         def gitdir
-          @gitdir ||= base_path('.git')
+          base_path('.git')
         end
 
-        def invoked_sync?(action, flag = nil)
-          !flag.nil? || super(action)
+        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?