squared 0.0.9 → 0.0.10

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

@@ -29,7 +29,7 @@ module Squared
                      else
                        sync.('pull')
                      end]
-              cmd << ws.task_name(ws.dev? && ws.series.some?(:refresh) ? 'refresh' : 'build')
+              cmd << ws.task_name(ws.dev?(global: true) && ws.series.some?(:refresh) ? 'refresh' : 'build')
               Common::Task.invoke(cmd, exception: ws.exception, warning: ws.warning)
             end
           end
@@ -63,7 +63,7 @@ module Squared
 
         def initialize(*, **)
           super
-          initialize_ref(Git.ref)
+          initialize_ref(Git.ref) if gitdir.exist?
         end
 
         def ref
@@ -72,22 +72,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)
+                  when :pull, :fetch
+                    desc format_desc(action, flag, flag == :pull ? OPT_PULL : OPT_FETCH)
                     task flag, [:opts] do |_, args|
-                      pull(flag, opts: args.to_a)
-                    end
-                  when :fetch
-                    desc format_desc(action, flag, 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 +126,11 @@ 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: if /^\d+$/.match?(files.first) && !git_option('index')
+                                                   files.shift.to_i
+                                                 else
+                                                   0
+                                                 end)
                       end
                     when :cached
                       desc format_desc(action, flag, 'pathspec*')
@@ -193,7 +191,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')
@@ -221,7 +221,7 @@ module Squared
             cmd << '--commit'
           end
           append_pull opts, OPT_PULL, flag
-          source(sync: sync, stderr: true, exception: !workspace.series.multiple?)
+          source(sync: sync, **gitthread)
         end
 
         def rebase
@@ -232,7 +232,7 @@ module Squared
           cmd = git_session 'fetch'
           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?)
+          source(sync: invoked_sync?('fetch', flag), **gitthread)
         end
 
         def stash(flag = nil, files = [], commit: nil)
@@ -242,11 +242,11 @@ module Squared
             cmd << '--index' if git_option('index')
             cmd << commit
           else
-            append_option %w[all staged include-untracked]
+            append_option %w[all staged include-untracked].freeze
             append_message git_option('message', 'm', zero: false)
             append_pathspec files
           end
-          source(sync: invoked_sync?('stash', flag), exception: workspace.exception)
+          source(sync: invoked_sync?('stash', flag), **gitthread)
         end
 
         def status
@@ -265,11 +265,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 +284,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
@@ -328,12 +327,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
@@ -403,7 +401,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,7 +412,6 @@ 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')
           if amend
@@ -443,11 +440,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)
@@ -463,12 +456,12 @@ module Squared
           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 +475,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 +486,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 +508,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?('!') }
@@ -610,14 +603,12 @@ module Squared
           session('git', *cmd)
         end
 
-        def gitdir
-          base_path('.git')
+        def gitthread
+          { stderr: true, exception: !workspace.series.multiple? }
         end
 
-        def source_path?(val)
-          return val.to_s.start_with?(File.join(path, '').to_s) if Pathname.new(val).absolute?
-
-          !val.match?(%r{^\.\.[/\\]})
+        def gitdir
+          base_path('.git')
         end
 
         def push?