pre-commit 0.1.19 → 0.2.0

data/bin/pre-commit

@@ -1,18 +1,8 @@
 #!/usr/bin/env ruby
 
-template = <<EOS
-#!/usr/bin/env ruby
-
-require 'rubygems'
-require 'pre-commit'
-
-exit_status = PreCommit.checks_to_run.inject(true) do |acc, cmd|
-  acc = cmd.call && acc
-end
-
-exit(exit_status ? 0 : 1)
+require 'pre-commit/cli'
 
-EOS
+PRE_COMMIT_HOOK_PATH = '.git/hooks/pre-commit'
 
 if ARGV[0] != "install"
   puts "Usage: pre-commit install"
@@ -24,17 +14,8 @@ if !File.exists?(".git")
   exit(1)
 end
 
-if File.exists?(".git/hooks/pre-commit")
-  puts "Not overwriting existing hook: .git/hooks/pre-commit"
-  exit(1)
-end
-
-File.open(".git/hooks/pre-commit","w") {|f| 
-  f.write(template)
-}
-
-require 'fileutils'
-
-FileUtils.chmod(0755, ".git/hooks/pre-commit")
+cli = PreCommit::Cli.new
+cli.install
 
-puts "Installed hook: .git/hooks/pre-commit"
+puts "Installed hook: #{PRE_COMMIT_HOOK_PATH}"
+puts

data/lib/pre-commit/checks.rb

@@ -61,4 +61,12 @@ class PreCommit
       Checks.values_at(*checks_to_run)
     end.compact
   end
+
+  def self.run
+    exit_status = self.checks_to_run.inject(true) do |acc, cmd|
+      acc = cmd.call && acc
+    end
+
+    exit(exit_status ? 0 : 1)
+  end
 end

data/lib/pre-commit/cli.rb

@@ -0,0 +1,42 @@
+require 'fileutils'
+require 'pre-commit/base'
+
+class PreCommit
+  class Cli
+
+    PRE_COMMIT_HOOK_PATH = '.git/hooks/pre-commit'
+
+    def answered_yes?(answer)
+      answer =~ /y\n/i || answer == "\n"
+    end
+
+    def install
+      if File.exists?(PRE_COMMIT_HOOK_PATH)
+        ask_to_overwrite
+      end
+
+      install_pre_commit_hook
+    end
+
+    def ask_to_overwrite
+      puts "pre-commit: WARNING There is already a pre-commit hook installed in this git repo."
+      print "Would you like to overwrite it? [Yn] "
+      answer = $stdin.gets
+
+      if answered_yes?(answer)
+        FileUtils.rm(PRE_COMMIT_HOOK_PATH)
+      else
+        puts "Not overwriting existing hook: #{PRE_COMMIT_HOOK_PATH}"
+        puts
+        exit(1)
+      end
+    end
+
+    def install_pre_commit_hook
+      hook = File.join(PreCommit.root, 'templates', 'pre-commit-hook')
+      FileUtils.cp(hook, PRE_COMMIT_HOOK_PATH)
+      FileUtils.chmod(0755, PRE_COMMIT_HOOK_PATH)
+    end
+
+  end
+end

data/templates/pre-commit-hook

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+if system("which rvm > /dev/null")
+  cmd = "rvm default do ruby -rrubygems "
+else
+  cmd = "ruby -rrubygems "
+end
+
+cmd << %Q{-e "require 'pre-commit'; PreCommit.run"}
+
+exit(system(cmd) ? 0 : 1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pre-commit
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-21 00:00:00.000000000 Z
+date: 2012-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: execjs
@@ -48,6 +48,7 @@ files:
 - lib/pre-commit/checks/php_check.rb
 - lib/pre-commit/checks/tabs.rb
 - lib/pre-commit/checks.rb
+- lib/pre-commit/cli.rb
 - lib/pre-commit/runner.rb
 - lib/pre-commit/utils.rb
 - lib/pre-commit.rb
@@ -58,6 +59,7 @@ files:
 - lib/support/jslint/lint.js
 - lib/support/whitespace/whitespace
 - lib/support/whitespace/whitespace_checker.rb
+- templates/pre-commit-hook
 - README.md
 - !binary |-
   YmluL3ByZS1jb21taXQ=
@@ -83,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A slightly better git pre-commit hook