overcommit 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7ae9be51eb3b0d57670dc28a29c359ec89c040
-  data.tar.gz: 6830fbb57c870026962e5ea7b98b74a2ae69ca78
+  metadata.gz: ee54344839806219b40d78711ba92a3d75807f78
+  data.tar.gz: 943596ad2a69862b7495b714cb5a7047c86a6faa
 SHA512:
-  metadata.gz: faa4abb76a1d4b681b29bcdf0bfa84d9d55498fd8e472bc654ffd4ce7dd3edbcd49da126f1299ca49efc519f7310b023afb7229c2d03a9ca0b2535eb92ee0f15
-  data.tar.gz: 817e12dcedd4b6a624fb9eb5203443fd81279d130f37a65613e30126e71d8337a51f65d6e85a3f930a4d5aa7c13d13c940053851da47793d4bfa536f84021558
+  metadata.gz: 38c3e9ab81ed52c14bca93297c3ad2fa9aefb6350460ccb6f46976a5559cc7c08638c3c3124d396e91a9349a376cadc9a7a812ca3b235baa9bb49898f1eabd84
+  data.tar.gz: afeda1f2ba01a717d5b5d120ce8d1a5e3bba0fc77f68062d3a7994e81e35ecfe19061d106aeb445dd7488617292b00eafd647d478b6877096e40662cf8752000

data/bin/scripts/jshint_runner.js

@@ -28,19 +28,13 @@ for (i = 0; i < arguments.length; i++) {
   source = readFile(file);
   result = JSHINT(source, options);
 
-  if (result === true) {
-    print(arguments[i] + " -- OK");
-  }
-  else {
+  if (!result) {
     for (j = 0; j < JSHINT.errors.length; j++) {
       error = JSHINT.errors[j];
 
-      print("ERROR in " + file + " at " + error.line + ":" + error.character);
-      print("");
-      print("\t" + error.reason);
-      print("");
+      print(file + ": line " + error.line + ", col  " + error.character + ", " +
+            error.reason);
       print("\t" + error.evidence);
-      print("");
     }
   }
 }

data/lib/overcommit/plugins/pre_commit/js_syntax.rb

@@ -3,16 +3,26 @@ module Overcommit::GitHook
     include HookRegistry
     file_type :js
 
-    JS_HINT_PATH        = Overcommit::Utils.script_path 'jshint.js'
-    JS_HINT_RUNNER_PATH = Overcommit::Utils.script_path 'jshint_runner.js'
-
     def run_check
-      return :warn, "Rhino is not installed" unless in_path? 'rhino'
+      return :warn, 'Need either `jshint` or `rhino` in path' unless runner
+
+      output = runner.call(staged.join(' ')).split("\n")
+      return (output.none? ? :good : :bad), output
+    end
+
+  private
 
-      paths = staged.join(' ')
+    JS_HINT_PATH        = Overcommit::Utils.script_path 'jshint.js'
+    JS_HINT_RUNNER_PATH = Overcommit::Utils.script_path 'jshint_runner.js'
 
-      output = `rhino -strict -f #{JS_HINT_PATH} #{JS_HINT_RUNNER_PATH} #{paths} 2>&1 | grep -v warning | grep -v -e '^js: '`
-      return (output !~ /^ERROR/ ? :good : :bad), output
+    def runner
+      if in_path? 'jshint'
+        lambda { |paths| `jshint #{paths}` }
+      elsif in_path? 'rhino'
+        lambda do |paths|
+          `rhino -strict -f #{JS_HINT_PATH} #{JS_HINT_RUNNER_PATH} #{paths} 2>&1 | grep -v warning | grep -v -e '^js: '`
+        end
+      end
     end
   end
 end

data/lib/overcommit/version.rb

@@ -1,3 +1,3 @@
 module Overcommit
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Causes Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-29 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec