git-race 0.0.1

checksums.yaml

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

data/bin/git-race

@@ -0,0 +1,88 @@
+#!/usr/bin/env ruby
+
+def query(cmd)
+  `#{cmd}`.chomp
+end
+
+def command(cmd)
+  # redirects stdout and stderr to /dev/null
+  system("#{cmd} > /dev/null 2>&1")
+end
+
+class Merge
+  attr_reader :branch, :diff, :author
+
+  def initialize(branch)
+    @branch = branch
+    @diff = conflicts_from(branch)
+    @author = query("git log -n1 --format='%an <%ae>' #{branch}")
+  end
+
+  def conflict?
+    @diff.size > 0
+  end
+
+  private
+
+  def conflicts_from(branch)
+    # 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
+  MAINLINE = "origin/HEAD" # defaultly origin/master
+
+  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?
+      puts "Congratulations! Your branch doesn't conflict with anyone"
+    else
+      puts "Danger! Merge race in progress"
+      conflicts.each do |merge|
+        puts "* Conflict: #{branch} with #{merge.branch}, last authored by #{merge.author}"
+      end
+    end
+
+    puts "\n" # separator
+  end
+
+  def abort
+    puts "Abort! Abort!"
+    command("git merge --abort")
+  end
+
+  private
+  
+  def dirty?
+    query("git status --porcelain").length > 0
+  end
+
+  def conflicts
+    @conflicts ||= merges.select(&:conflict?)
+  end
+
+  def merges
+    branches_from_merge_base
+      .reject { |b| b.match(MAINLINE) }
+      .map { |b| Merge.new(b) }
+  end
+
+  def branches_from_merge_base
+    query("git branch --remotes --contains #{merge_base}").split("\n").map(&:strip)
+  end
+
+  def merge_base
+    query("git merge-base #{MAINLINE} #{branch}")
+  end
+end
+
+service = MergeRacer.new("HEAD")
+# Signal.trap("TERM") { service.abort and exit }
+service.call

metadata

@@ -0,0 +1,46 @@
+--- !ruby/object:Gem::Specification
+name: git-race
+version: !ruby/object:Gem::Version
+  version: 0.0.1
+platform: ruby
+authors:
+- Matthew B. Gray
+autorequire: 
+bindir: bin
+cert_chain: []
+date: 2017-03-23 00:00:00.000000000 Z
+dependencies: []
+description: This is a script that checks branches that have happened since you branched,
+  and tells you if any of them are in conflict with yours.
+email: himself@matthew.geek.nz
+executables:
+- git-race
+extensions: []
+extra_rdoc_files: []
+files:
+- bin/git-race
+homepage: https://github.com/wohyah/git-race
+licenses:
+- MIT
+metadata: {}
+post_install_message: 
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubyforge_project: 
+rubygems_version: 2.6.8
+signing_key: 
+specification_version: 4
+summary: A merge race detector
+test_files: []