git-precommit 1.0.0 → 1.1.0

data/README.rdoc

@@ -1,6 +1,6 @@
 = Git Pre-Commit
 
-Rake Commit[http://github.com/pgr0ss/rake_commit_tasks] is a great tool for
+Rake-Commit[http://github.com/pgr0ss/rake_commit_tasks] is a great tool for
 helping make sure our check-ins don't break the build. However, in Git we
 don't need all that stuff. Running our tests before check-in is easy with a
 Git pre-commit hook.
@@ -11,12 +11,51 @@ will be installed that calls `<tt>rake precommit</tt>`
 
 == Installation
 
-    script/plugin install git://github.com/tobytripp/git-pre-commit
+=== As a Rails Plugin
+
+This plugin can be installed as a gem via config.gem or the gem bundler.
+Require the library as 'git_precommit'.
 
-or
+To install as a non-gem plugin use one of the following commands from the root
+of your Rails project:
 
+    script/plugin install git://github.com/tobytripp/git-pre-commit
     git clone git://github.com/tobytripp/git-pre-commit.git vendor/plugins/git_pre_commit
+    git submodule add git://github.com/tobytripp/git-pre-commit.git vendor/plugins/git_pre_commit
 
-_or_
+One installed, add the following to your project's Rakefile:
 
-    git submodule add git://github.com/tobytripp/git-pre-commit.git vendor/plugins/git_pre_commit
+    require 'git-precommit/tasks'
+
+Note: the above require will define the git hook tasks only in the
+'development' and 'test' rails environments.
+
+=== In a Stand-Alone Ruby Program
+
+Add the following code to your project's Rakefile:
+
+    require "git_precommit"
+    GitPrecommit::PrecommitTasks.new
+    
+    task :default => ".git/hooks/pre-commit"
+    task :precommit => :default
+
+== CruiseControl.rb Integration
+
+git-precommit can be configured to automatically push to your remote
+repository on successful checkin by installing the post-commit hook:
+    rake .git/hooks/post-commit
+However, if you're running a continuous
+integration build, you shouldn't push onto a broken build (unless you're
+pushing the fix).
+
+To check the status of a
+cruisecontrol.rb[http://cruisecontrolrb.thoughtworks.com/] build before
+pushing, install the cruisestatus[http://github.com/tobytripp/cruisestatus]
+gem and record the url of your build server in a file called CRUISE_URL:
+
+    sudo gem install cruisestatus
+    echo http://my.cruiseserver.rb >> CRUISE_URL
+
+Once you've done that, if your build has failed, you'll be prompted before
+your changes will be pushed.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/git-hooks/post-commit

@@ -1,4 +1,16 @@
 #!/usr/bin/env sh
+cmd=`which cruisestatus`
 
-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
+  else
+    echo "aborted due to build failures"
+    exit 1
+  fi
+else
+  git pull --rebase
+  git push
+fi

data/git-precommit.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{git-precommit}
-  s.version = "1.0.0"
+  s.version = "1.1.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-23}
+  s.date = %q{2010-01-24}
   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.
 }
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
      "git-hooks/pre-commit",
      "git-precommit.gemspec",
      "lib/git-precommit/precommit_tasks.rb",
-     "lib/git_precommit.rb",
-     "tasks/git.rake"
+     "lib/git-precommit/tasks.rb",
+     "lib/git_precommit.rb"
   ]
   s.homepage = %q{http://github.com/tobytripp/git-pre-commit}
   s.rdoc_options = ["--charset=UTF-8"]

data/lib/git-precommit/precommit_tasks.rb

@@ -3,23 +3,27 @@ require "rake/tasklib"
 
 module GitPrecommit
   class PrecommitTasks < ::Rake::TaskLib
-    TEMPLATE_PATH = File.expand_path File.join( File.dirname(__FILE__), '..', '..' )
-
+    TEMPLATE_PATH =
+      File.expand_path File.join( File.dirname(__FILE__), '..', '..', 'git-hooks' )
+    attr_accessor :template_path
+    
     def initialize()
       yield self if block_given?
+      @template_path ||= TEMPLATE_PATH
+      
       define
     end
     
     def define()
-      desc "Install the pre-commit hook"
-      file ".git/hooks/pre-commit" => "#{TEMPLATE_PATH}/git-hooks/pre-commit" do |t|
+      desc "Install the git pre-commit hook"
+      file ".git/hooks/pre-commit" => "#{template_path}/pre-commit" do |t|
         warn "Git pre-commit hook missing, setting up…"
         copy  t.prerequisites.first, t.name
         chmod 0755, t.name
       end
 
-      desc "Install the post-commit hook"
-      file ".git/hooks/post-commit" => "#{TEMPLATE_PATH}/git-hooks/post-commit" do |t|
+      desc "Install the git post-commit hook"
+      file ".git/hooks/post-commit" => "#{template_path}/post-commit" do |t|
         copy t.prerequisites.first, t.name
         chmod 0755, t.name
       end

data/{tasks/git.rake → lib/git-precommit/tasks.rb}

@@ -1,5 +1,4 @@
 if RAILS_ENV == 'development' || RAILS_ENV == 'test'
-  $LOAD_PATH.unshift( File.join( File.dirname( __FILE__ ), '..', 'lib' ) )
   require "git_precommit"
   
   GitPrecommit::PrecommitTasks.new

data/lib/git_precommit.rb

@@ -1 +1,3 @@
+$:.unshift File.dirname(__FILE__)
+
 require "git-precommit/precommit_tasks.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: git-precommit
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Toby Tripp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-23 00:00:00 -06:00
+date: 2010-01-24 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -30,8 +30,8 @@ files:
 - git-hooks/pre-commit
 - git-precommit.gemspec
 - lib/git-precommit/precommit_tasks.rb
+- lib/git-precommit/tasks.rb
 - lib/git_precommit.rb
-- tasks/git.rake
 has_rdoc: true
 homepage: http://github.com/tobytripp/git-pre-commit
 licenses: []