git-race 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63128ac4bb7efb21c0fbcd9034f613f2525d44e7
-  data.tar.gz: 0a61048d6bccf5e6bd7ec43adf6678f52be12f05
+  metadata.gz: 7e0d34c05f848d4ac765d295b1032e3f801ead60
+  data.tar.gz: abddd753525253dc6a77979d2f6f46f865a337d0
 SHA512:
-  metadata.gz: 0a2dff5a49e97485b87d01b30836422bb7acea481156c848b7e1cad6ea978180d1a1dc23218450961c8ba4a9b016847e9ea2cd8c5b592b85ce76a773e158a0d1
-  data.tar.gz: c27e2ae5d187266f5f5c02897c343d5a8cf7e84db42e5fbbb9bceec7c4e5542be675809861629bae77a0a0f23d2de25b9b8edd226a4ca13b3bdf2b1539b9a95f
+  metadata.gz: 496dc94a50d8e698ed82bd3f2259c34958dc89a0b520c846b3bb2a14d3361ca7fc8a58b705d070b2eb91e4867b9b2eb076814bbdafa60398cba31b2265671f1b
+  data.tar.gz: f1a5d2aef47dd499798ce87f44e8023d064562cec9a19aaab4f005c03d6338117ea9d1258db0131ccecc25d36c023ca3be0b01f9faf17fc87fc2e343bf62f33c

data/bin/git-race

@@ -11,25 +11,73 @@ def command(cmd)
   system("#{cmd} > /dev/null 2>&1")
 end
 
-Merge = Struct.new(:branch, :days_till_stale) do
+MergeInformation = Struct.new(:branch) do
   def conflict?
-    diff.size > 0
+    conflict_diff.size > 0
   end
 
-  def stale?
-    last_touched < stale_cutoff_date
+  def description
+    "#{file_count} files, #{conflict_lines} line conflict with #{branch}, last authored by #{last_author}"
   end
 
-  def author
-    query("git log -n1 --format='%an <%ae>' #{branch}")
+  def <=>(their)
+    sort_fields <=> their.sort_fields
+  end
+
+  protected
+
+  def sort_fields
+    [file_count, conflict_lines]
   end
 
   private
 
-  def stale_cutoff_date
-    Date.today - days_till_stale
+  def file_count
+    diff_extract(/(\d+) file/).to_i
+  end
+
+  def conflict_lines
+    insertion_count + deletion_count
   end
 
+  def insertion_count
+    diff_extract(/(\d+) insertion/).to_i
+  end
+
+  def deletion_count
+    diff_extract(/(\d+) deletion/).to_i
+  end
+
+  def diff_extract(regex)
+    if match = conflict_diff.match(regex)
+      match[1]
+    else
+      nil
+    end
+  end
+
+  def conflict_diff
+    @conflict_diff ||= begin
+      # sadly we can't dry run a merge
+      command("git merge --no-ff --no-commit #{branch}")
+      query("git diff --shortstat").tap do
+        command("git merge --abort")
+      end
+    end
+  end
+
+  def last_author
+    query("git log -n1 --format='%an <%ae>' #{branch}")
+  end
+end
+
+BranchAgeChecker = Struct.new(:branch, :stale_cutoff_date) do
+  def stale?
+    last_touched < stale_cutoff_date
+  end
+
+  private
+
   def last_touched
     Date.parse(log_date)
   end
@@ -37,14 +85,6 @@ Merge = Struct.new(:branch, :days_till_stale) do
   def log_date
     query("git log -1 --date=iso --format=%cd #{branch}")
   end
-
-  def diff
-    # you can't dry run a merge, so we have to apply and abort merges
-    command("git merge --no-ff --no-commit #{branch}")
-    query("git diff").tap do
-      command("git merge --abort")
-    end
-  end
 end
 
 MergeRacer = Struct.new(:branch) do
@@ -57,12 +97,12 @@ MergeRacer = Struct.new(:branch) do
       puts "Cowardly refusing to run, please commit your work or update .gitignore"
       puts "You can figure out what files to modify with\n"
       puts "  git status"
-    elsif recent_conflicts.none?
+    elsif merge_conflicts.none?
       puts "Congratulations! Your branch doesn't conflict with anyone"
     else
       puts "Danger! Merge race in progress"
-      recent_conflicts.each do |merge|
-        puts "* Conflict: #{branch} with #{merge.branch}, last authored by #{merge.author}"
+      merge_conflicts.each do |merge|
+        puts "* #{merge.description}"
       end
     end
 
@@ -80,23 +120,25 @@ MergeRacer = Struct.new(:branch) do
     query("git status --porcelain").length > 0
   end
 
-  def recent_conflicts
-    @recent_conflicts ||= merges.reject(&:stale?).select(&:conflict?)
+  def merge_conflicts
+    @merge_conflicts ||= recent_merges.select(&:conflict?)
   end
 
-  def merges
-    branches_from_merge_base.map { |branch| Merge.new(branch, STALE_THRESHOLD) }
+  def recent_merges
+    branches_from_merge_base
+      .reject { |branch| BranchAgeChecker.new(branch, stale_cutoff).stale? }
+      .map    { |branch| MergeInformation.new(branch) }
   end
 
   def branches_from_merge_base
     query("git branch --remotes --no-merged #{MAINLINE}").split("\n").map(&:strip)
   end
 
-  def merge_base
-    query("git merge-base #{MAINLINE} #{branch}")
+  def stale_cutoff
+    Date.today - STALE_THRESHOLD
   end
 end
 
 service = MergeRacer.new("HEAD")
-# Signal.trap("TERM") { service.abort and exit }
+Signal.trap("INT") { service.abort and exit }
 service.call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git-race
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Matthew B. Gray