git-race 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca02ee92d5b76e0e25e076e52da6cd68c452bebf
-  data.tar.gz: 6cf5c260d47505d12f3320696b5299465727bb1a
+  metadata.gz: 63128ac4bb7efb21c0fbcd9034f613f2525d44e7
+  data.tar.gz: 0a61048d6bccf5e6bd7ec43adf6678f52be12f05
 SHA512:
-  metadata.gz: ea0e1e9e47f8202c85eb185e3f41ebf5ca73dd5b87036cfe6408d12e02ba2dc2a72fc28e2ff133ce2ee2c1da8555032ba5b30cb65b162dcece14efaccf2da3bf
-  data.tar.gz: f25ab5ed49ff447869cc2801706cb048a9c7911f53e9ddd89a892a5aac452f108a1223a4e5c93dc535a57dc4af34e050b05e004eb63727b09a1a966004aa778d
+  metadata.gz: 0a2dff5a49e97485b87d01b30836422bb7acea481156c848b7e1cad6ea978180d1a1dc23218450961c8ba4a9b016847e9ea2cd8c5b592b85ce76a773e158a0d1
+  data.tar.gz: c27e2ae5d187266f5f5c02897c343d5a8cf7e84db42e5fbbb9bceec7c4e5542be675809861629bae77a0a0f23d2de25b9b8edd226a4ca13b3bdf2b1539b9a95f

data/bin/git-race

@@ -1,30 +1,44 @@
 #!/usr/bin/env ruby
 
+require 'date'
+
 def query(cmd)
   `#{cmd}`.chomp
 end
 
 def command(cmd)
-  # redirects stdout and stderr to /dev/null
+  # quietly executes, but does tell you the exit status
   system("#{cmd} > /dev/null 2>&1")
 end
 
-class Merge
-  attr_reader :branch, :diff, :author
+Merge = Struct.new(:branch, :days_till_stale) do
+  def conflict?
+    diff.size > 0
+  end
 
-  def initialize(branch)
-    @branch = branch
-    @diff = conflicts_from(branch)
-    @author = query("git log -n1 --format='%an <%ae>' #{branch}")
+  def stale?
+    last_touched < stale_cutoff_date
   end
 
-  def conflict?
-    @diff.size > 0
+  def author
+    query("git log -n1 --format='%an <%ae>' #{branch}")
   end
 
   private
 
-  def conflicts_from(branch)
+  def stale_cutoff_date
+    Date.today - days_till_stale
+  end
+
+  def last_touched
+    Date.parse(log_date)
+  end
+
+  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
@@ -35,22 +49,24 @@ end
 
 MergeRacer = Struct.new(:branch) do
   MAINLINE = "origin/HEAD" # defaultly origin/master
+  STALE_THRESHOLD = 4 * 7 # days
+  SEPARATOR = "\n"
 
   def call
     if dirty?
       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 conflicts.none?
+    elsif recent_conflicts.none?
       puts "Congratulations! Your branch doesn't conflict with anyone"
     else
       puts "Danger! Merge race in progress"
-      conflicts.each do |merge|
+      recent_conflicts.each do |merge|
         puts "* Conflict: #{branch} with #{merge.branch}, last authored by #{merge.author}"
       end
     end
 
-    puts "\n" # separator
+    puts SEPARATOR
   end
 
   def abort
@@ -59,23 +75,21 @@ MergeRacer = Struct.new(:branch) do
   end
 
   private
-  
+
   def dirty?
     query("git status --porcelain").length > 0
   end
 
-  def conflicts
-    @conflicts ||= merges.select(&:conflict?)
+  def recent_conflicts
+    @recent_conflicts ||= merges.reject(&:stale?).select(&:conflict?)
   end
 
   def merges
-    branches_from_merge_base
-      .reject { |b| b.match(MAINLINE) }
-      .map { |b| Merge.new(b) }
+    branches_from_merge_base.map { |branch| Merge.new(branch, STALE_THRESHOLD) }
   end
 
   def branches_from_merge_base
-    query("git branch --remotes --contains #{merge_base}").split("\n").map(&:strip)
+    query("git branch --remotes --no-merged #{MAINLINE}").split("\n").map(&:strip)
   end
 
   def merge_base

metadata

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