pre-commit 0.1.12 → 0.1.13

data/lib/pre-commit/checks.rb

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

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

@@ -0,0 +1,47 @@
+class CiCheck
+
+  CI_TASK_NAME = 'pre_commit:ci'
+
+  def call
+    if rakefile_present? && has_ci_task?
+      run
+    else
+      $stderr.puts "pre-commit: skipping ci check. The `#{CI_TASK_NAME}` task is not defined."
+
+      # pretend the check passed and move on
+      true
+    end
+  end
+
+  def run
+    if tests_passed?
+      true
+    else
+      $stderr.puts 'pre-commit: your test suite has failed'
+      $stderr.puts "for the full output run `#{CI_TASK_NAME}`"
+      $stderr.puts
+
+      false
+    end
+  end
+
+  def tests_passed?
+    system("rake #{CI_TASK_NAME} --silent")
+  end
+
+  def rakefile_present?
+    ['rakefile', 'Rakefile', 'rakefile.rb', 'Rakefile.rb'].any? do |file|
+      File.exist?(file)
+    end
+  end
+
+  def has_ci_task?
+    require 'rake'
+    Rake.application.init
+    Rake.application.load_rakefile
+    Rake::Task.task_defined?(CI_TASK_NAME)
+  rescue LoadError
+    $stderr.puts 'pre-commit: rake not found, skipping ci check'
+  end
+
+end

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

@@ -11,9 +11,20 @@ class PreCommit
       Utils.staged_files('.').split(" ")
     end
 
+    def config
+      config_file = ENV['JSHINT_CONFIG']
+      config_file ||= File.exists?(".jshintrc") ? ".jshintrc" : nil
+
+      if config_file
+        ExecJS.exec("return (#{File.read(config_file)});")
+      else
+        {}
+      end
+    end
+
     def run_check(file)
       context = ExecJS.compile(File.read(linter_src))
-      if !(context.call('JSHINT', File.read(file)))
+      if !(context.call('JSHINT', File.read(file), config))
         context.exec('return JSHINT.errors;')
       else
         []

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

@@ -9,7 +9,24 @@ class MergeConflict
   end
 
   def run
-    !system("grep '<<<<<<<' #{staged_files}")
+    if detected_bad_code?
+      $stderr.puts 'pre-commit: detected a merge conflict'
+      $stderr.puts errors
+      $stderr.puts
+      $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
+      $stderr.puts
+      false
+    else
+      true
+    end
+  end
+
+  def detected_bad_code?
+    system("grep '<<<<<<<' #{staged_files} --quiet")
+  end
+
+  def errors
+    `grep -nH '<<<<<<<' #{staged_files}`
   end
 
 end

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

@@ -9,7 +9,16 @@ class Tabs
   def self.call
     check = new
     check.staged_files = Utils.staged_files('*')
-    check.run
+    result = check.run
+
+    if !result
+      $stderr.puts check.error_message
+      $stderr.puts
+      $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
+      $stderr.puts
+    end
+
+    result
   end
 
   def run
@@ -22,9 +31,6 @@ class Tabs
       @error_message = "pre-commit: detected tab before initial space:\n"
       @error_message += violations
 
-      $stderr.puts @error_message
-      $stderr.puts
-
       @passed = false
     else
       @passed = true

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pre-commit
 version: !ruby/object:Gem::Version 
-  hash: 3
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 12
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors: 
 - Shajith Chacko, Josh Lubaway
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-03 00:00:00 -07:00
+date: 2011-06-29 00:00:00 -07:00
 default_executable: pre-commit
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,9 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id001
@@ -42,6 +34,7 @@ extra_rdoc_files:
 - README.md
 files: 
 - lib/pre-commit/base.rb
+- lib/pre-commit/checks/ci_check.rb
 - lib/pre-commit/checks/console_log.rb
 - lib/pre-commit/checks/debugger_check.rb
 - lib/pre-commit/checks/js_check.rb
@@ -78,18 +71,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []