pre-commit 0.1.5 → 0.1.6

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

@@ -0,0 +1,45 @@
+# This (PreCommit) should be a module
+# ... it should also have a cooler name :P
+class PreCommit
+  class JslintCheck
+
+    attr_accessor :therubyracer_installed, :type
+
+    def initialize(type = :all)
+      @type = type
+      @therubyracer_installed = check_for_therubyracer_install
+    end
+
+    def should_run?
+      @therubyracer_installed
+    end
+
+    def call
+      if should_run?
+        run
+      else
+        $stderr.puts 'pre-commit: Skipping JSLint check (to run it: `gem install therubyracer`)'
+        # pretent the check passed and move on
+        true
+      end
+    end
+
+    def run
+      errors = check_to_run.call
+    end
+
+    def check_to_run
+      @type == :all ? JSLintAll : JSLintNew
+    end
+
+    private
+
+    def check_for_therubyracer_install
+      require 'v8'
+      @therubyracer_installed = true
+    rescue LoadError
+      @therubyracer_installed = false
+    end
+
+  end
+end

data/lib/pre-commit/checks.rb

@@ -4,6 +4,7 @@ require 'pre-commit/checks/merge_conflict'
 require 'pre-commit/checks/tabs'
 require 'pre-commit/checks/console_log'
 require 'pre-commit/checks/debugger_check'
+require 'pre-commit/checks/jslint_check'
 
 class PreCommit
 
@@ -27,10 +28,18 @@ class PreCommit
       errors << JSLint.lint_file(file)
     end
 
+    # JSLint.lint_file returns an array.
+    # Therefore no errors looks like this: [[]]
+    # And errors.empty? returns false
+    errors.flatten!
+
     if errors.empty?
       true
     else
-      puts errors.join("\n")
+      $stderr.puts errors.join("\n")
+      $stderr.puts
+      $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
+      $stderr.puts
       false
     end
   }
@@ -48,8 +57,8 @@ class PreCommit
   Checks = {
     :white_space          => WhiteSpace,
     :console_log          => ConsoleLog,
-    :js_lint_all          => JSLintAll,
-    :js_lint_new          => JSLintNew,
+    :js_lint_all          => JslintCheck.new(:all),
+    :js_lint_new          => JslintCheck.new(:new),
     :debugger             => DebuggerCheck,
     :tabs                 => Tabs,
     :closure_syntax_check => ClosureSyntaxCheck,
@@ -61,6 +70,12 @@ class PreCommit
   #
   # NOTE: The deprecation strategy *may* be just delete it since, we're still
   # pre 1.0.
+
+  #
+  # Actually, on the deprecation note. This method isn't really the problem.
+  # The problem is the default generated pre-commit hook. It shouldn't have
+  # logic in it. The we have freedom to change the gem implementation however
+  # we want, and nobody is forced to update their pre-commit binary.
   def self.checks_to_run
     checks_to_run = `git config pre-commit.checks`.chomp.split(/,\s*/).map(&:to_sym)
 

data/lib/support/jslint/jslint_checker.rb

@@ -10,14 +10,6 @@ class JSLint
   LINT_PATH = File.join(File.dirname(__FILE__), "lint.js")
 
   def self.lint_file(file)
-    begin
-      require 'rubygems'
-      require 'v8'
-    rescue LoadError
-      puts "ERROR: Couldn't load therubyracer, which is needed to run JSLint checks. Install via \"gem install therubyracer\", or disable the JS lint checks."
-      return []
-    end
-
     errors = []
     V8::Context.new do |context|
       context.load(LINT_PATH)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: pre-commit
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 5
-  version: 0.1.5
+  prerelease: 
+  version: 0.1.6
 platform: ruby
 authors: 
 - Shajith Chacko, Josh Lubaway
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-28 00:00:00 -08:00
+date: 2011-04-06 00:00:00 -07:00
 default_executable: pre-commit
 dependencies: []
 
@@ -29,6 +25,7 @@ extra_rdoc_files:
 files: 
 - lib/pre-commit/checks/console_log.rb
 - lib/pre-commit/checks/debugger_check.rb
+- lib/pre-commit/checks/jslint_check.rb
 - lib/pre-commit/checks/merge_conflict.rb
 - lib/pre-commit/checks/tabs.rb
 - lib/pre-commit/checks.rb
@@ -59,21 +56,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: What this thing does