git-precommit 1.1.1 → 1.2.0

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/bin/setpairs

@@ -0,0 +1,60 @@
+#!/usr/bin/env ruby
+
+# Configures the git author to a list of developers when pair programming
+# 
+# Usage: pair lm bh (Sets the author to 'Luke Melia and Bryan Helmkamp')
+#        pair       (Unsets the author so the git global config takes effect)
+# 
+# Author: Bryan Helmkamp (http://brynary.com)
+
+# http://www.brynary.com/2008/9/1/setting-the-git-commit-author-to-pair-programmers-names
+
+#######################################################################
+## Configuration
+
+# Do not use a valid github account email here.
+PAIR_EMAIL = "developers@weplay.com"
+
+AUTHORS = {
+  "bh" => "Bryan Helmkamp",
+  "lm" => "Luke Melia"
+  # ...
+}
+
+## End of configuration
+#######################################################################
+
+unless File.exists?(".git")
+  puts "This doesn't look like a git repository."
+  exit 1
+end
+
+authors = ARGV.map do |initials|
+  if AUTHORS[initials.downcase]
+    AUTHORS[initials.downcase]
+  else
+    puts "Couldn't find author name for initials: #{initials}"
+    exit 1
+  end
+end
+
+if authors.any?
+  if authors.size == 1
+    authors = authors.first
+  elsif authors.size == 2
+    authors = authors.join(" and ")
+  else
+    authors = authors[0..-2].join(", ") + " and " + authors.last
+  end
+  
+  `git config user.name  '#{authors}'`
+  `git config user.email '#{PAIR_EMAIL}'`
+  
+  puts "user.name  = #{authors}"
+  puts "user.email = #{PAIR_EMAIL}"
+else
+  `git config --unset user.name`
+  `git config --unset user.email`
+  
+  puts "Unset user.name and user.email"
+end

data/git-hooks/post-commit

@@ -1,16 +1,22 @@
 #!/usr/bin/env sh
 cmd=`which cruisestatus`
 
+do_push() {
+  git pull --rebase
+  git push
+}
+
 if [ -x "$cmd" ] && [ -f CRUISE_URL ]; then
-  if $cmd -p `cat CRUISE_URL`; then
-    echo "pulling"
-    git pull --rebase
-    git push
+  if $cmd `cat CRUISE_URL`; then
+    do_push
+  elif [ -n "$BUILD_FIX" ] || git log -1 --oneline | grep -i 'build.*fix'; then
+    echo "Pushing build fix"
+    do_push
   else
-    echo "aborted due to build failures"
-    exit 1
+    echo "Push aborted due to build failures."
+    echo "To push a build fix, include 'BUILD FIX' in your commit comment"
+    echo "or set the environment variable: BUILD_FIX"
   fi
 else
-  git pull --rebase
-  git push
+  do_push
 fi

data/git-precommit.gemspec

@@ -5,15 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-precommit}
-  s.version = "1.1.1"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Toby Tripp"]
-  s.date = %q{2010-01-24}
+  s.date = %q{2010-02-11}
+  s.default_executable = %q{setpairs}
   s.description = %q{    A set of rake tasks that install git pre-commit hooks to call your build.
     If your build fails, the commit will not proceed.
 }
   s.email = %q{toby.tripp+git@gmail.com}
+  s.executables = ["setpairs"]
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
@@ -22,6 +24,7 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/setpairs",
      "git-hooks/post-commit",
      "git-hooks/pre-commit",
      "git-precommit.gemspec",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-precommit
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors: 
 - Toby Tripp
@@ -9,14 +9,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -06:00
-default_executable: 
+date: 2010-02-11 00:00:00 -06:00
+default_executable: setpairs
 dependencies: []
 
 description: "    A set of rake tasks that install git pre-commit hooks to call your build.\n    If your build fails, the commit will not proceed.\n"
 email: toby.tripp+git@gmail.com
-executables: []
-
+executables: 
+- setpairs
 extensions: []
 
 extra_rdoc_files: 
@@ -26,6 +26,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- bin/setpairs
 - git-hooks/post-commit
 - git-hooks/pre-commit
 - git-precommit.gemspec