pre-commit 0.1.11 → 0.1.12

data/lib/pre-commit/checks.rb

@@ -10,7 +10,7 @@ require 'pre-commit/checks/migration_check'
 
 class PreCommit
 
-  WhiteSpace = lambda { 
+  WhiteSpace = lambda {
     WhiteSpaceChecker.check
   }
 
@@ -24,38 +24,6 @@ class PreCommit
     end
   }
 
-  JSLintCheck = lambda { |files|
-    errors = []
-    files.each do |file|
-      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
-      $stderr.puts errors.join("\n")
-      $stderr.puts
-      $stderr.puts 'pre-commit: You can bypass this check using `git commit -n`'
-      $stderr.puts
-      false
-    end
-  }
-
-  JSLintNew = lambda {
-    new_js_files = Utils.new_files('.').split(" ").reject {|f| f !~ /\.js$/}
-    JSLintCheck[new_js_files]
-  }
-
-  JSLintAll = lambda {
-    staged_js_files = Utils.staged_files('.').split(" ").reject {|f| f !~ /\.js$/}
-    JSLintCheck[staged_js_files]
-  }
-  
   Checks = {
     :white_space          => WhiteSpace,
     :console_log          => ConsoleLog,

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

@@ -0,0 +1,59 @@
+require 'pre-commit/base'
+require 'pre-commit/utils'
+require 'execjs'
+
+class PreCommit
+  class JsCheck
+
+    def call
+      js_files = reject_non_js(files_to_check)
+      if should_run?(js_files)
+        run(js_files)
+      else
+        # pretend the check passed and move on
+        true
+      end
+    end
+
+    def run(js_files)
+      errors = []
+
+      js_files.each do |file|
+        error_list = run_check(file)
+        error_list.each { |error_object| errors << display_error(error_object, file) }
+      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?(js_files)
+      js_files.any?
+    end
+
+    def reject_non_js(staged_files)
+      staged_files.select { |f| f =~ /\.js$/ }
+    end
+
+    def check_name
+      raise "Must be defined by subclass"
+    end
+
+    def linter_src
+      raise "Must be defined by subclass"
+    end
+
+    def display_error(error_object, file)
+      line = error_object['line'].to_i + 1
+      "pre-commit: #{check_name.upcase} #{error_object['reason']}\n#{file}:#{line} #{error_object['evidence']}"
+    end
+
+  end
+end

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

@@ -1,87 +1,27 @@
-require 'pre-commit/base'
-require 'pre-commit/utils'
+require 'pre-commit/checks/js_check'
 
 class PreCommit
-  class JshintCheck
+  class JshintCheck < JsCheck
 
-    attr_accessor :therubyracer_installed
-
-    def initialize
-      @therubyracer_installed = ruby_racer_installed?
-    end
-
-    def call
-      js_files = reject_non_js(load_staged_files)
-
-      if should_run?(js_files)
-        run(js_files)
-      else
-        $stderr.puts 'pre-commit: Skipping JSHint check (to run it: `gem install therubyracer`)' if !ruby_racer_installed?
-        # pretend the check passed and move on
-        true
-      end
+    def check_name
+      "JSHint"
     end
 
-    def run(js_files)
-      errors = []
-
-      js_files.each do |file|
-        V8::Context.new do |context|
-          context.load(jshint_src)
-          context['source'] = lambda { File.read(file) }
-          context['report'] = lambda do |array|
-            array.each { |error_object| errors << display_error(error_object, file) }
-          end
-
-          context.eval('var result = JSHINT(source());')
-          context.eval('report(JSHINT.errors);')
-        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?(js_files)
-      ruby_racer_installed? && js_files.any?
+    def files_to_check
+      Utils.staged_files('.').split(" ")
     end
 
-    def ruby_racer_installed?
-      if instance_variable_defined?(:@therubyracer_installed)
-        @therubyracer_installed
+    def run_check(file)
+      context = ExecJS.compile(File.read(linter_src))
+      if !(context.call('JSHINT', File.read(file)))
+        context.exec('return JSHINT.errors;')
       else
-        begin
-          require 'v8'
-          @therubyracer_installed = true
-        rescue LoadError
-          @therubyracer_installed = false
-        end
+        []
       end
     end
 
-    def jshint_src
+    def linter_src
       File.join(PreCommit.root, 'lib', 'support', 'jshint', 'jshint.js')
     end
-
-    def load_staged_files
-      Utils.staged_files('.').split(" ")
-    end
-
-    def reject_non_js(staged_files)
-      staged_files.select { |f| f =~ /\.js$/ }
-    end
-
-    def display_error(error_object, file)
-      line = error_object['line'].to_i + 1
-      "pre-commit: JSHINT #{error_object['reason']}\n#{file}:#{line} #{error_object['evidence']}"
-    end
-
   end
 end

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

@@ -1,44 +1,40 @@
+require 'pre-commit/checks/js_check'
+
 # This (PreCommit) should be a module
 # ... it should also have a cooler name :P
 class PreCommit
-  class JslintCheck
+  class JslintCheck < JsCheck
 
-    attr_accessor :therubyracer_installed, :type
+    attr_accessor :type
 
-    def initialize(type = :all)
-      @type = type
-      @therubyracer_installed = check_for_therubyracer_install
+    def check_name
+      "JSLint"
     end
 
-    def should_run?
-      @therubyracer_installed
+    def initialize(type = :all)
+      @type = type
     end
 
-    def call
-      if should_run?
-        run
+    def files_to_check
+      case @type
+      when :new
+        Utils.new_files('.').split(" ")
       else
-        $stderr.puts 'pre-commit: Skipping JSLint check (to run it: `gem install therubyracer`)'
-        # pretend the check passed and move on
-        true
+        Utils.staged_files('.').split(" ")
       end
     end
 
-    def run
-      errors = check_to_run.call
-    end
-
-    def check_to_run
-      @type == :all ? JSLintAll : JSLintNew
+    def run_check(file)
+      context = ExecJS.compile(File.read(linter_src))
+      if !(context.call('JSLINT', File.read(file)))
+        context.exec('return JSLINT.errors;')
+      else
+        []
+      end
     end
 
-    private
-
-    def check_for_therubyracer_install
-      require 'v8'
-      @therubyracer_installed = true
-    rescue LoadError
-      @therubyracer_installed = false
+    def linter_src
+      File.join(PreCommit.root, 'lib', 'support', 'jslint', 'lint.js')
     end
 
   end

data/lib/support/all.rb

@@ -1,3 +1,2 @@
-require 'support/jslint/jslint_checker'
 require 'support/closure/closure_checker'
 require 'support/whitespace/whitespace_checker'

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pre-commit
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: 
-  version: 0.1.11
+  segments: 
+  - 0
+  - 1
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Shajith Chacko, Josh Lubaway
@@ -10,11 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-17 00:00:00 -07:00
+date: 2011-06-03 00:00:00 -07:00
 default_executable: pre-commit
-dependencies: []
-
-description: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: execjs
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        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
 email: dontneedmoreemail@example.com
 executables: 
 - pre-commit
@@ -26,6 +44,7 @@ files:
 - lib/pre-commit/base.rb
 - lib/pre-commit/checks/console_log.rb
 - lib/pre-commit/checks/debugger_check.rb
+- lib/pre-commit/checks/js_check.rb
 - lib/pre-commit/checks/jshint_check.rb
 - lib/pre-commit/checks/jslint_check.rb
 - lib/pre-commit/checks/merge_conflict.rb
@@ -39,7 +58,6 @@ files:
 - lib/support/closure/closure_checker.rb
 - lib/support/closure/compiler.jar
 - lib/support/jshint/jshint.js
-- lib/support/jslint/jslint_checker.rb
 - lib/support/jslint/lint.js
 - lib/support/whitespace/whitespace
 - lib/support/whitespace/whitespace_checker.rb
@@ -60,12 +78,18 @@ 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: []
 
@@ -73,6 +97,6 @@ rubyforge_project:
 rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
-summary: What this thing does
+summary: A slightly better git pre-commit hook
 test_files: []
 

data/lib/support/jslint/jslint_checker.rb

@@ -1,43 +0,0 @@
-
-class JSLint
-  OK_REASONS = [ "Expected an identifier and instead saw 'undefined' (a reserved word).",
-                 "Use '===' to compare with 'null'.",
-                 "Use '!==' to compare with 'null'.",
-                 "Expected an assignment or function call and instead saw an expression.",
-                 "Expected a 'break' statement before 'case'.",
-                 "'e' is already defined." ]
-
-  LINT_PATH = File.join(File.dirname(__FILE__), "lint.js")
-
-  def self.lint_file(file)
-    errors = []
-    V8::Context.new do |context|
-      context.load(LINT_PATH)
-      context['input'] = lambda{
-        File.read(file)
-      }
-
-      context['reportErrors'] = lambda{|js_errors|
-        js_errors.each do |e|
-          next if e.nil? || OK_REASONS.include?(e.reason)
-
-          errors << "\n\e[1;31mJSLINT: #{file}\e[0m"
-          errors << "  Error at line #{e['line'].to_i + 1} " + 
-            "character #{e['character'].to_i + 1}: \e[1;33m#{e['reason']}\e[0m"
-          errors << "#{e['evidence']}"
-        end
-      }
-
-      context.eval %{
-          JSLINT(input(), { evil: true, forin: true, maxerr: 100 });
-          reportErrors(JSLINT.errors);
-        }
-    end
-
-    return errors
-  end
-end
-
-if __FILE__ == $0
-  puts JSLint.lint_file(ARGV[0]).join("\n")
-end