coffeelint 1.16.0 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 532d82c2d2fe20d9f07bff65000dbc91ed408336
-  data.tar.gz: 0cc1a24400c1af0eae57410387d7701d6919f06d
+  metadata.gz: b7a4a2035e21315450af30547f9240faafc6b22f
+  data.tar.gz: e360a0cc21d61d9cab4875b8e21158608b61ac9b
 SHA512:
-  metadata.gz: c3e602fc00f1c43c67697aa734fff50bb353d2a894114139e533876724cf50338a8e43767a149e852c51adebf2bdd53dcf102d9326696142a77126b6de552866
-  data.tar.gz: 4734c6006186eaef06a21ec1d9fcb0d050657526ab0f05af472a551924f4a0bebf356962a29e2d0bc9f9ef4500da5805c354b540fa30783e8a0ea2baed0119f2
+  metadata.gz: d25210e7bfdf55cea135038df5388dc12242219a4c23fcf70d6e0f3471b0d95351d3d8ebbfd6b9ea884a433ef76cdce0fa0121f4e12c565db7d87a7e4617d4dd
+  data.tar.gz: 4885fca9294e012e30e2cce5b9b4ecef08e32726e8482e2dd7adeff1ef002e905006840d400bcec983e73cd96044a0ebe9675ea6941ea0011da1ebc497e97a03

data/README.md

@@ -1,6 +1,6 @@
 # Coffeelint [![Build Status](https://travis-ci.org/zmbush/coffeelint-ruby.svg?branch=master)](https://travis-ci.org/zmbush/coffeelint-ruby) [![Gem Version](https://badge.fury.io/rb/coffeelint.png)](http://badge.fury.io/rb/coffeelint)
 
-Using coffeelint version: v1.16.0
+Using coffeelint version: v1.16.1
 
 Coffeelint is a set of simple ruby bindings for [coffeelint](https://github.com/clutchski/coffeelint).
 

data/coffeelint.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency "json"
   gem.add_dependency "execjs"
 
-  gem.add_development_dependency 'rspec', '~> 3.1.0'
+  gem.add_development_dependency 'rspec', '~> 3.4.0'
   gem.add_development_dependency 'rake', '~>11.3.0'
 end

data/coffeelint/lib/coffeelint.js

@@ -2,7 +2,7 @@
 module.exports={
   "name": "coffeelint",
   "description": "Lint your CoffeeScript",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "homepage": "http://www.coffeelint.org",
   "keywords": [
     "lint",
@@ -1685,21 +1685,37 @@ module.exports = Indentation = (function() {
 
   Indentation.prototype.tokens = ['INDENT', '[', ']', '.'];
 
-  Indentation.prototype.keywords = ['->', '=>', '@', 'CATCH', 'CLASS', 'ELSE', 'FINALLY', 'FOR', 'FORIN', 'FOROF', 'IDENTIFIER', 'IF', 'LEADING_WHEN', 'LOOP', 'RETURN', 'SWITCH', 'THROW', 'TRY', 'UNTIL', 'WHEN', 'WHILE', 'YIELD'];
+  Indentation.prototype.keywords = ['->', '=>', '@', 'CATCH', 'CLASS', 'ELSE', 'FINALLY', 'FOR', 'FORIN', 'FOROF', 'IDENTIFIER', 'IF', 'LEADING_WHEN', 'LOOP', 'PROPERTY', 'RETURN', 'SWITCH', 'THROW', 'TRY', 'UNTIL', 'WHEN', 'WHILE', 'YIELD'];
 
   function Indentation() {
     this.arrayTokens = [];
   }
 
   Indentation.prototype.lintToken = function(token, tokenApi) {
-    var currentLine, expected, ignoreIndent, isArrayIndent, isMultiline, lineNumber, lines, numIndents, previous, previousSymbol, ref, ref1, ref2, type;
-    type = token[0], numIndents = token[1], (ref = token[2], lineNumber = ref.first_line);
+    var chain, currentLine, dotIndent, expected, got, ignoreIndent, isArrayIndent, isMultiline, lineNumber, lines, next, numIndents, previous, previousSymbol, ref, ref1, ref2, startsWith, type;
+    type = token[0], numIndents = token[1];
+    dotIndent = token[2].first_column;
     lines = tokenApi.lines, lineNumber = tokenApi.lineNumber;
     expected = tokenApi.config[this.rule.name].value;
     if (type === '.') {
       currentLine = lines[lineNumber];
-      if (((ref1 = currentLine.match(/\S/)) != null ? ref1[0] : void 0) === '.') {
-        return this.handleChain(tokenApi, expected);
+      if (((ref = currentLine.match(/\S/)) != null ? ref[0] : void 0) === '.') {
+        next = tokenApi.peek(1);
+        if (next[0] === 'PROPERTY') {
+          chain = '.' + next[1];
+          startsWith = new RegExp('\\S{' + chain.length + '}');
+          if (((ref1 = currentLine.match(startsWith)) != null ? ref1[0] : void 0) === chain) {
+            got = dotIndent;
+            if (dotIndent - expected > expected) {
+              got %= expected;
+            }
+            if (dotIndent % expected !== 0) {
+              return {
+                context: "Expected " + expected + " got " + got
+              };
+            }
+          }
+        }
       }
       return void 0;
     }
@@ -1736,43 +1752,6 @@ module.exports = Indentation = (function() {
     return null;
   };
 
-  Indentation.prototype.handleChain = function(tokenApi, expected) {
-    var callStart, checkNum, currIsIndent, currentLine, currentSpaces, findCallStart, lastCheck, lineNumber, lines, numIndents, prevIsIndent, prevLine, prevNum, prevSpaces, ref, ref1;
-    lastCheck = 1;
-    callStart = 1;
-    prevNum = 1;
-    lineNumber = tokenApi.lineNumber, lines = tokenApi.lines;
-    currentLine = lines[lineNumber];
-    findCallStart = tokenApi.peek(-callStart);
-    while (findCallStart && findCallStart[0] !== 'TERMINATOR') {
-      lastCheck = findCallStart[2].first_line;
-      callStart += 1;
-      findCallStart = tokenApi.peek(-callStart);
-    }
-    while ((lineNumber - prevNum > lastCheck) && !/^\s*\./.test(lines[lineNumber - prevNum])) {
-      prevNum += 1;
-    }
-    checkNum = lineNumber - prevNum;
-    if (checkNum >= 0) {
-      prevLine = lines[checkNum];
-      if (prevLine.match(/\S/)[0] === '.' || checkNum === lastCheck) {
-        currentSpaces = (ref = currentLine.match(/\S/)) != null ? ref.index : void 0;
-        prevSpaces = (ref1 = prevLine.match(/\S/)) != null ? ref1.index : void 0;
-        numIndents = currentSpaces - prevSpaces;
-        prevIsIndent = prevSpaces % expected !== 0;
-        currIsIndent = currentSpaces % expected !== 0;
-        if (prevIsIndent && currIsIndent) {
-          numIndents = currentSpaces;
-        }
-        if (numIndents % expected !== 0) {
-          return {
-            context: "Expected " + expected + " got " + numIndents
-          };
-        }
-      }
-    }
-  };
-
   Indentation.prototype.grabLineTokens = function(tokenApi, lineNumber, all) {
     var i, k, len, len1, ref, ref1, results, results1, tok, tokensByLine;
     if (all == null) {

data/lib/coffeelint/version.rb

@@ -1,3 +1,3 @@
 module Coffeelint
-  VERSION = "1.16.0"
+  VERSION = "1.16.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffeelint
 version: !ruby/object:Gem::Version
-  version: 1.16.0
+  version: 1.16.1
 platform: ruby
 authors:
 - Zachary Bush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement