coffeelint 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjgyMzIyZWJlMmU1MjEwZjBhZWRlZDA5M2MyYmEwZWQ4MzU5ZTc0ZQ==
+    NWNhOWRlOGVkMDhkMTQwMjFkMTRhYjMwZTQxMTE2MGQxOTkxZjFlMA==
   data.tar.gz: !binary |-
-    ZDFiMmUzMzAwOGIzMzZjMDkyNjkzNTRkMzZkYTc1MzZjZDg4NzJkOA==
+    NTVlMzA1ZTk2OGU5NDNiY2U2YTU3OTc0MTEyMzcyYTAwZDRhZTMxMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZDQxODdhZmMzYTYxNGQyMDUwMzNmYmNhMDc2Y2Y2YmY2NzY0NTA4MWI2Mjg2
-    ZjZhY2UxMTQxYmJlYjEyMGQyY2Q5NTBlYTE4NGM5MzA4NjMyMWM0OTFkNWVi
-    NTJlOGYwM2Y3MmJjYTBhMWZiY2FmMWVkYmRhNTRkMGZlYTNlMjE=
+    YjBmNzVkZjRmMGJlOTRhOWRjMzJjNTJjZWU4MTE4MWQ2ZWUxOGJiNTRkOGUw
+    MDdhODRmYjg3OGU0OTdmMWViYTg5ODEyOWExYTI3ZWUyMjY1YTBiMjk3N2Q0
+    MmViOWQzOTc5MTlkOTJhYzE2M2RmZTE1OGFmMGMzY2YwMWM1NWU=
   data.tar.gz: !binary |-
-    YThmMTNhMjUzZThhNDZkODk2YzA3NzRlZTg0YmI2OGUzODkzY2JiYWQ2NjA0
-    ZGRkNjYzOWUyZmU1YThjYmEyNDE2OGY1ODMzZmY0NzJiODNhOTBmN2I4MDE2
-    Y2I2ZjY2ZTRmM2NlYjZlNzFhYTg1ZDI2YmVkNmMxMWMzYjA0ZDU=
+    YmViOTViODYyOWMxNDg0YTVhZDAyNmRjMTkzZGI0NDY0ZDk5OGU1NDE4NTQ4
+    ZmExMWUyYTVkZDVjYmRiZGQ5OGM5MzFmOTkyODY5YzExYzA4NTMzMTcwZjNl
+    YTU3YjdhMjMxN2ExZThkNTY4NzhkMDc3MTRhYmUzNjE1NmY4OGY=

data/README.md

@@ -45,8 +45,8 @@ Which will run the test on any *.coffee file in your `app` or `spec` directories
 
 Finally, there is a command line utility that allows you to run standalone tests:
 
-    coffeelint <filename>
-    coffeelint -r <directory>
+    coffeelint.rb <filename>
+    coffeelint.rb -r <directory>
 
 ## Contributing
 

data/coffeelint/src/coffeelint.coffee

@@ -96,6 +96,10 @@ coffeelint.RULES = RULES =
         level : IGNORE
         message : 'Invoking a constructor without parens and without arguments'
 
+    non_empty_constructor_needs_parens :
+        level : IGNORE
+        message : 'Invoking a constructor without parens and with arguments'
+
     no_empty_param_list :
         level : IGNORE
         message : 'Empty parameter list is forbidden'
@@ -121,6 +125,10 @@ coffeelint.RULES = RULES =
         level : IGNORE
         message : '@ must not be used stand alone'
 
+    arrow_spacing :
+        level : IGNORE
+        message : 'Function arrow (->) must be spaced properly'
+
     coffeescript_error :
         level : ERROR
         message : '' # The default coffeescript error is fine.
@@ -402,15 +410,19 @@ class LexicalLinter
     lintToken : (token) ->
         [type, value, lineNumber] = token
 
-        lineNumber = lineNumber.first_line if lineNumber?.first_line?
+        if typeof lineNumber == "object"
+            if type == 'OUTDENT' or type == 'INDENT'
+                lineNumber = lineNumber.last_line
+            else
+                lineNumber = lineNumber.first_line
         @tokensByLine[lineNumber] ?= []
         @tokensByLine[lineNumber].push(token)
         # CoffeeScript loses line numbers of interpolations and multi-line
         # regexes, so fake it by using the last line number we know.
         @lineNumber = lineNumber or @lineNumber or 0
-
         # Now lint it.
         switch type
+            when "->"                     then @lintArrowSpacing(token)
             when "INDENT"                 then @lintIndentation(token)
             when "CLASS"                  then @lintClass(token)
             when "UNARY"                  then @lintUnary(token)
@@ -430,14 +442,18 @@ class LexicalLinter
             else null
 
     lintUnary: (token) ->
-      if token[1] is 'new'
-        expectedIdentifier = @peek(1)
-        # The callStart is generated if your parameters are on the next line
-        # but is missing if there are no params and no parens.
-        expectedCallStart  = @peek(2)
-        if expectedIdentifier?[0] is 'IDENTIFIER' and
-          expectedCallStart?[0] isnt 'CALL_START'
-            @createLexError('empty_constructor_needs_parens')
+        if token[1] is 'new'
+            expectedIdentifier = @peek(1)
+            # The callStart is generated if your parameters are all on the same
+            # line with implicit parens, and if your parameters start on the
+            # next line, but is missing if there are no params and no parens.
+            expectedCallStart  = @peek(2)
+            if expectedIdentifier?[0] is 'IDENTIFIER' and expectedCallStart?
+                if expectedCallStart[0] is 'CALL_START'
+                    if expectedCallStart.generated
+                        @createLexError('non_empty_constructor_needs_parens')
+                else
+                    @createLexError('empty_constructor_needs_parens')
 
     # Lint the given array token.
     lintArray : (token) ->
@@ -673,6 +689,27 @@ class LexicalLinter
         else
             null
 
+    lintArrowSpacing : (token) ->
+        # Throw error unless the following happens.
+
+        # We will take a look at the previous token to see
+        # 1. That the token is properly spaced
+        # 2. Wasn't generated by the CoffeeScript compiler
+        # 3. That it is just indentation
+        # 4. If the function declaration has no parameters
+        # e.g. x(-> 3)
+        #      x( -> 3)
+        # we will accept either having a space or not having a space there.
+        unless (token.spaced? or token.newLine?) and
+               # Throw error unless the previous token...
+               (@peek(-1).spaced? or #1
+                @peek(-1).generated? or #2
+                @peek(-1)[0] is "INDENT" or #3
+                (@peek(-1)[0] is "CALL_START" and not @peek(-1).generated?)) #4
+            @createLexError('arrow_spacing')
+        else
+            null
+
     createLexError : (rule, attrs = {}) ->
         attrs.lineNumber = @lineNumber + 1
         attrs.level = @config[rule].level
@@ -768,8 +805,11 @@ class ASTLinter
 
         # Parse the line number
         lineNumber = -1
-        match = /line (\d+)/.exec message
-        lineNumber = parseInt match[1], 10 if match?.length > 1
+        if coffeeError.location?
+            lineNumber = coffeeError.location.first_line + 1
+        else
+            match = /line (\d+)/.exec message
+            lineNumber = parseInt match[1], 10 if match?.length > 1
         attrs = {
             message: message
             level: rule.level

data/lib/coffeelint/version.rb

@@ -1,3 +1,3 @@
 module Coffeelint
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffeelint
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Zachary Bush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-07 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -56,7 +56,7 @@ description: Ruby bindings for coffeelint
 email:
 - zach@zmbush.com
 executables:
-- coffeelint
+- coffeelint.rb
 extensions: []
 extra_rdoc_files: []
 files:
@@ -66,7 +66,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/coffeelint
+- bin/coffeelint.rb
 - coffeelint.gemspec
 - lib/coffeelint.rb
 - lib/coffeelint/railtie.rb