roger_eslint 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3ed5a00c847aa7df8754176d1dbeef857ff1969
-  data.tar.gz: 20509207b4e93285315bfdd7a4064f866b7226a6
+  metadata.gz: 147aa12ad5cdcde7af013082566d33aa3e497597
+  data.tar.gz: dc97130bb05546b487d4bedd3459703cb27eff37
 SHA512:
-  metadata.gz: b5c82390bd2e59841405044d4435cbbf160c3125d45e229424697981b550e990508a5317cdc62fb7477dac78ee885a64fd281565e5bbc22794ed62de0d8c40ca
-  data.tar.gz: 4d542778c45ca52cdfa929e1f250d982cf1c767d3d8281ec7fec22d12548a366aaacfe857190fbcf3a9adb22ba231668dcb8587d9e1bdedee77cc6c362e521f2
+  metadata.gz: 0dce1b94ecbfed10fedccf4c96b0fb7bcb70837e03dae9dd9a4bfa11d4a736eda58b8ce37cc62c2d5ee3253feb5a2d8f5964a5744fd1b7ee578e87c2e5184d08
+  data.tar.gz: 74970d9a1f0fb43916e8eba4d06ec9ec6764d46598c137c047c3c37e36854fd7315f9eabadd210a21216010c2d6ad9a96f7eb5983f5167ec0552cb2da6eca04b

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Changelog
 
+## Version 1.0.1
+* Prefer to load eslint from local node_modules. This makes it much easier to in combination with eslint configs from other NPM.
+
 ## Version 1.0.0
 * First workable version

data/lib/roger_eslint/lint.rb

@@ -15,21 +15,20 @@ module RogerEslint
     # @option options [Array] :match Files to match
     # @option options [Array[Regexp]] :skip Array of regular expressions to skip files
     # @option options [Boolean] (false) :fail_on_warning Wether or not to fail test on warnings
-    # @option options [String] :eslint eslint command
+    # @option options [String, nil] :eslint eslint command, if nil will search for the command
+    #   Preferring the local node_modules path.
     # @option options [Array] :eslint_options An array of eslint options; make sure
     #   you have the commandline flag and the value in separate elments, so: `["--global", "$"]`
     def initialize(options = {})
       @options = {
         match: ["html/**/*.js"],
-        skip: [],
+        skip: [%r{vendor\/.*\.js\Z}],
         fail_on_warning: false,
-        eslint: "eslint",
+        eslint: nil,
         eslint_options: []
       }
 
       @options.update(options) if options
-
-      detect_eslint
     end
 
     def lint(test, file_path)
@@ -42,7 +41,7 @@ module RogerEslint
       end
 
       success = file_lints["errorCount"] <= 0
-      success &&= file_lints["warningCount"] <= 0 if @options[:fail_on_warning]
+      success &&= file_lints["warningCount"] <= 0 if @_call_options[:fail_on_warning]
 
       fixables = []
 
@@ -64,25 +63,29 @@ module RogerEslint
     # @option options [Array] :match Files to match
     # @option options [Array[Regexp]] :skip Array of regular expressions to skip files
     def call(test, options)
-      options = {}.update(@options).update(options)
+      @_call_options = {}.update(@options).update(options)
+
+      detect_eslint(test)
 
       test.log(self, "ESLinting files")
 
-      failures = test.get_files(options[:match], options[:skip]).select do |file_path|
+      failures = test.get_files(@_call_options[:match], @_call_options[:skip]).select do |file_path|
         !lint(test, file_path)
       end
       failures.empty?
+    ensure
+      @_call_options = {}
     end
 
     private
 
     def eslint_command(file_path, extras = [])
       command = [
-        @options[:eslint],
+        @_call_options[:eslint],
         "-f", "json"
       ]
 
-      command += @options[:eslint_options] if @options[:eslint_options]
+      command += @_call_options[:eslint_options] if @_call_options[:eslint_options]
 
       command += extras
       command << file_path
@@ -112,11 +115,27 @@ module RogerEslint
       end
     end
 
-    def detect_eslint
-      command = [@options[:eslint], "-v", "2>/dev/null"]
-      detect = system(Shellwords.join(command))
-      unless detect
+    def detect_eslint(test)
+      if @_call_options[:eslint]
+        commands_to_test = [@_call_options[:eslint]]
+      else
+        commands_to_test = [
+          test.project.path + "node_modules/eslint/bin/eslint.js",
+          "eslint.js",
+          "eslint"
+        ]
+      end
+
+      detect = commands_to_test.detect do |command|
+        system(Shellwords.join([command, "-v"]) + "> /dev/null 2>&1")
+      end
+
+      if detect
+        # Bit of a hack to set the value like this
+        @_call_options[:eslint] = detect
+      else
         err = "Could not find eslint. Install eslint using: 'npm install -g eslint'."
+        err += " Or install eslint locally."
         fail ArgumentError, err
       end
     end

data/lib/roger_eslint/version.rb

@@ -1,4 +1,4 @@
 # Roger main namespace
 module RogerEslint
-  VERSION = "1.0.0"
+  VERSION = "1.0.1".freeze
 end

data/test/lint_test.rb

@@ -1,5 +1,6 @@
 require File.dirname(__FILE__) + "/../lib/roger_eslint/lint.rb"
 require "test/unit"
+require "roger/testing/mock_project"
 
 # Fake tester to pass into the linter plugin
 class TesterStub
@@ -11,6 +12,15 @@ class TesterStub
     @files = []
   end
 
+  def project
+    # Creating a mock project with path will forego the construct creation
+    @project ||= Roger::Testing::MockProject.new(".")
+  end
+
+  def destroy
+    @project.destroy if @project
+  end
+
   def log(_, message)
     @messages.push(message)
   end
@@ -31,11 +41,11 @@ class LintTest < Test::Unit::TestCase
 
   def test_detect_eslint
     assert_nothing_raised do
-      RogerEslint::Lint.new
+      lint_file "test.js"
     end
 
     assert_raise(ArgumentError) do
-      RogerEslint::Lint.new eslint: "eslint-blabla"
+      lint_file "test.js", eslint: "eslint-blabla"
     end
   end
 
@@ -93,5 +103,7 @@ class LintTest < Test::Unit::TestCase
     messages.shift
 
     [success, messages]
+  ensure
+    faketester.destroy
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roger_eslint
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Flurin Egger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-17 00:00:00.000000000 Z
+date: 2016-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: roger