Merge pull request #6 from xpol/master

Support `luajit -bl` and add settings to set luac or luajit path.

Author: hd-deman

README.md

@@ -3,20 +3,26 @@ linter-lua
 
 > luac — The luac program parses lua files. It can be used for detecting errors in lua code. See [http://www.lua.org/manual/4.0/luac.html](http://www.lua.org/manual/4.0/luac.html) for more informations about luac.
 
-This package will lint your `.lua` opened files in Atom through luac.  **It will lint on edit and/or save**, so you'll see instantly if your code has errors.
+This package will lint your `.lua` opened files in Atom through luac or [luajit](http://luajit.org/running.html).  **It will lint on edit and/or save**, so you'll see instantly if your code has errors.
 
 Due to the way that luac works it will only notify you of the first error found in the file.
 
 ## Linter Installation
-Before using this package, you must ensure that `luac` is installed on your system.
+Before using this package, you must ensure that `luac` or `luajit` is installed on your system.
 
 ## Installation
 
 * `$ apm install linter` (if you don't have [AtomLinter/Linter](https://github.com/AtomLinter/Linter) installed).
 * `$ apm install linter-lua`
 
+## Configuration
+
+Atom -> Preferences... -> Packages -> Linter lua -> Settings:
+
+* **Executable** Path to your `luac` or `luajit` executable.
 
 ## Other available linters
+- [linter-luacheck](https://atom.io/packages/linter-luacheck), for lua using `luacheck`
 - [linter-php](https://atom.io/packages/linter-php), for PHP using `php -l`
 - [linter-phpcs](https://atom.io/packages/linter-phpcs) - Linter plugin for PHP, using phpcs.
 - [linter-phpmd](https://atom.io/packages/linter-phpmd) - Linter plugin for PHP, using phpmd.

lib/init.coffee

@@ -1,6 +1,9 @@
 module.exports =
-  configDefaults:
-    luacExecutablePath: null
+  config:
+    executable:
+      type: 'string'
+      default: 'luac'
+      description: 'The executable path to luac or luajit.'
 
   activate: ->
     console.log 'activate linter-lua'

lib/linter-lua.coffee

@@ -6,10 +6,6 @@ class LinterLua extends Linter
   # list/tuple of strings. Names should be all lowercase.
   @syntax: 'source.lua'
 
-  # A string, list, tuple or callable that returns a string, list or tuple,
-  # containing the command line (with arguments) used to lint.
-  cmd: 'luac -p'
-
   linterName: 'luac'
 
   # A regex pattern used to extract information from the executable's output.
@@ -24,10 +20,17 @@ class LinterLua extends Linter
   constructor: (editor) ->
     super(editor)
 
-    atom.config.observe 'linter-lua.luacExecutablePath', =>
-            @executablePath = atom.config.get 'linter-lua.luacExecutablePath'
+    # Set to observe config options
+    atom.config.observe 'linter-lua.executable', => @updateCommand()
+
+  updateCommand: ->
+    executable = atom.config.get 'linter-lua.executable'
+    if /luajit[^\\/]*$/.test(executable)
+        @cmd = [executable, '-bl']
+    else
+        @cmd = [executable, '-p']
 
   destroy: ->
-    atom.config.unobserve 'linter-lua.luacExecutablePath'
+    atom.config.unobserve 'linter-lua.executable'
 
 module.exports = LinterLua

package.json

@@ -3,8 +3,8 @@
   "linter-package": true,
   "activationEvents": [],
   "main": "./lib/init",
-  "version": "0.1.3",
-  "description": "Lint Lua on the fly, using luac -p",
+  "version": "0.1.4",
+  "description": "Lint Lua on the fly, using luac -p or luajit -bl",
   "repository": {
     "type": "git",
     "url": "https://github.com/AtomLinter/linter-lua"