pre-commit 0.1.16 → 0.1.17

data/README.md

@@ -24,6 +24,7 @@ These are the available checks:
 * js\_lint\_all (Runs JSLint on all staged JS files)
 * js\_lint\_new (Runs JSLint on all new staged JS files)
 * closure\_syntax\_check
+* php (Runs php -l on all staged files)
 
 To configure which checks you would like to run, simply set the `pre-commit.checks` git configuration setting. 
 

data/lib/pre-commit/checks.rb

@@ -8,6 +8,7 @@ require 'pre-commit/checks/jslint_check'
 require 'pre-commit/checks/jshint_check'
 require 'pre-commit/checks/migration_check'
 require 'pre-commit/checks/ci_check'
+require 'pre-commit/checks/php_check'
 
 class PreCommit
 
@@ -36,7 +37,8 @@ class PreCommit
     :closure_syntax_check => ClosureSyntaxCheck,
     :merge_conflict       => MergeConflict,
     :migrations           => MigrationCheck.new,
-    :ci                   => CiCheck.new
+    :ci                   => CiCheck.new,
+    :php                  => PhpCheck.new
   }
 
   # Can not delete this method with out a deprecation strategy.

data/lib/pre-commit/checks/migration_check.rb

@@ -22,7 +22,7 @@ class PreCommit
         @error_message = "It looks like you're adding a migration, but did not update the schema file"
         @passed = false
       elsif schema_change && !migration_present
-        @error_message = "You're trying to change the schema without adding a migraiton file"
+        @error_message = "You're trying to change the schema without adding a migration file"
         @passed = false
       else
         @passed = true

data/lib/pre-commit/checks/php_check.rb

@@ -0,0 +1,74 @@
+require 'pre-commit/base'
+require 'pre-commit/utils'
+
+class PreCommit
+  class PhpCheck
+
+    def files_to_check
+      Utils.staged_files('.').split(" ")
+    end
+
+    def call
+      php_files = reject_non_php(files_to_check)
+      if should_run?(php_files)
+        run(php_files)
+      else
+        # pretend the check passed and move on
+        true
+      end
+    end
+
+    def check_name
+      "PHP Lint"
+    end
+
+    def run(php_files)
+      errors = []
+
+      php_files.each do |file|
+        error = run_check(file)
+        unless error.nil?
+          errors << display_error(error)
+        end
+      end
+
+      if errors.empty?
+        true
+      else
+        $stderr.puts errors.join("\n")
+        $stderr.puts
+        $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
+        $stderr.puts
+        false
+      end
+    end
+
+    def should_run?(php_files)
+      php_files.any?
+    end
+
+    def reject_non_php(staged_files)
+      staged_files.select { |f| f =~ /\.(php|engine|theme|install|inc|module|test)$/ }
+    end
+
+    def run_check(file)
+      # We force PHP to display errors otherwise they will likely end up in the
+      # error_log and not in stdout.
+      cmd = "php -d display_errors=1 -l #{file}"
+      result = %x[ #{cmd} ]
+      # Filter out the obvious note from PHP.
+      result = result.split($/).find_all {|line| line !~ /Errors/}.join($/)
+      # If PHP exited non-zero then there was a parse error.
+      if ($? != 0)
+        result
+      end
+    end
+
+    # Format an error line.
+    def display_error(error)
+      "pre-commit: #{check_name.upcase} #{error}"
+    end
+
+  end
+end
+     

metadata

@@ -1,37 +1,36 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: pre-commit
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.17
   prerelease: 
-  version: 0.1.16
 platform: ruby
-authors: 
+authors:
 - Shajith Chacko, Josh Lubaway
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-24 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: execjs
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153774880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: A git pre-commit hook written in ruby with a few more tricks up it's sleeve
+  prerelease: false
+  version_requirements: *2153774880
+description: A git pre-commit hook written in ruby with a few more tricks up it's
+  sleeve
 email: dontneedmoreemail@example.com
-executables: 
+executables:
 - pre-commit
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - lib/pre-commit/base.rb
 - lib/pre-commit/checks/ci_check.rb
 - lib/pre-commit/checks/console_log.rb
@@ -41,6 +40,7 @@ files:
 - lib/pre-commit/checks/jslint_check.rb
 - lib/pre-commit/checks/merge_conflict.rb
 - lib/pre-commit/checks/migration_check.rb
+- lib/pre-commit/checks/php_check.rb
 - lib/pre-commit/checks/tabs.rb
 - lib/pre-commit/checks.rb
 - lib/pre-commit/runner.rb
@@ -57,31 +57,28 @@ files:
 - bin/pre-commit
 homepage: http://github.com/jish/pre-commit
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A slightly better git pre-commit hook
 test_files: []
-