coffeelint 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e26570cb6aeb608b13718ee0643a3587799f5b
-  data.tar.gz: 87ca1b9e93e502ab77443fd76ab7f8b227c098cd
+  metadata.gz: 344ed179d709d31cb9cfc849b08bfee88b8aec30
+  data.tar.gz: 505057ae769bedb0e2703c0190cb3bf248a68e3e
 SHA512:
-  metadata.gz: 4bb4389a7e90c880e22ffb9a11f4e881a70225749c410a707d37c8e59d7e0c028c2386d979659804eaa4d612054c93bc817cba2f382ac42640f085a9ce6c5e26
-  data.tar.gz: 0dda5a52009fe77364cc10812362b249dd48368410d3796700e2d0c521a44ecfb53bd17419d66a4b836e9fe8bdccd5b82edd4b1fedb6199f6328254e6c55c40e
+  metadata.gz: 2d810eeab5acfc59ff90273a0c084dac875a059fc05bba4caf09a3e84b727649d766b7c344f1092d6a92a45c879314c4a5bd7dc2a60b189e97aed0590da755a5
+  data.tar.gz: c7f271a95c8c5dfc6c9b85b77bdab7f4f3c973380877415adab41fb7bee057add6fe00bc60bee59119987149a332fb9f8b2d6615d3563e6e8a03983dc8ddc831

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.1.0-21-g5dc0408-20-gc896693
+Using coffeelint version: v1.2.0-6-g20613f6
 
 Coffeelint is a set of simple ruby bindings for [coffeelint](https://github.com/clutchski/coffeelint).
 

data/Rakefile

@@ -8,6 +8,10 @@ task :console do
   sh "irb -rubygems -I lib -r coffeelint.rb"
 end
 
+task :cmd do
+  sh "ruby -I lib -- bin/coffeelint.rb"
+end
+
 task :prepare_coffeelint do
   sh "git submodule init"
   sh "git submodule update"

data/bin/coffeelint.rb

@@ -1,79 +1,5 @@
 #!/usr/bin/env ruby
 
 require 'coffeelint'
-require 'coffeelint/version'
-require 'optparse'
 
-options = {
-            :recursive => false,
-            :noconfig => false,
-            :stdin => false,
-            :quiet => false,
-          }
-
-linter_options = {}
-
-opt_parser = OptionParser.new do |opts|
-  opts.banner = "Usage: coffeelint.rb [options] source [...]"
-
-=begin
--f, --file     Specify a custom configuration file.               
---noconfig     Ignores the environment variable COFFEELINT_CONFIG.  [boolean]
--h, --help     Print help information.                            
--v, --version  Print current version number.                      
--r             Recursively lint .coffee files in subdirectories.    [boolean]
---csv          Use the csv reporter.                                [boolean]
---jslint       Use the JSLint XML reporter.                         [boolean]
---nocolor      Don't colorize the output                            [boolean]
--s, --stdin    Lint the source from stdin                           [boolean]
--q, --quiet    Only print errors.                                   [boolean]
-=end
-
-
-  opts.on "-f FILE", "--file FILE", "Specify a custom configuration file." do |f|
-    linter_options[:config_file] = f
-  end
-
-=begin
-  opts.on "--noconfig", "Ignores the environment variabel COFFEELINT_CONFIG." do |f|
-    options[:noconfig] = true
-  end
-=end
-
-  opts.on_tail "-h", "--help", "Print help information." do
-    puts opts
-    exit
-  end
-
-  opts.on_tail "-v", "--version", "Print current version number." do
-    puts Coffeelint::VERSION
-    exit
-  end
-
-  opts.on '-r', "Recursively lint .coffee files in subdirectories." do
-    options[:recursive] = true
-  end
-
-=begin
-  opts.on '-s', '--stdin', "Lint the source from stdin" do
-    options[:stdin] = true
-  end
-
-  opts.on '-q', '--quiet', 'Only print errors.' do
-    options[:quiet] = true
-  end
-=end
-
-end
-
-opt_parser.parse!
-
-if ARGV.length > 0
-  ARGV.each do |file|
-    if options[:recursive]
-      Coffeelint.run_test_suite(file, linter_options)
-    else
-      Coffeelint.run_test(file, linter_options)
-    end
-  end
-end
+Coffeelint::Cmd.main

data/coffeelint.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |gem|
   gem.licenses      = ["MIT"]
 
   gem.files         = `git ls-files`.split($/)
+  gem.files        -= ['bin/coffeelint']
   gem.files        << 'coffeelint/lib/coffeelint.js'
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/coffeelint/lib/coffeelint.js

@@ -2,7 +2,7 @@
 module.exports={
   "name": "coffeelint",
   "description": "Lint your CoffeeScript",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "homepage": "http://www.coffeelint.org",
   "keywords": [
     "lint",
@@ -87,15 +87,7 @@ ASTApi = (function() {
   ASTApi.prototype.getNodeName = function(node) {
     var children, name, _ref;
     name = node != null ? (_ref = node.constructor) != null ? _ref.name : void 0 : void 0;
-    if (name === (function() {
-      var _results;
-      _results = [];
-      for (name in node_children) {
-        if (!__hasProp.call(node_children, name)) continue;
-        _results.push(name);
-      }
-      return _results;
-    })()) {
+    if (node_children[name]) {
       return name;
     } else {
       for (name in node_children) {

data/lib/coffeelint.rb

@@ -1,4 +1,5 @@
 require "coffeelint/version"
+require 'coffeelint/cmd'
 require 'execjs'
 require 'coffee-script'
 require 'json'
@@ -22,6 +23,10 @@ module Coffeelint
     pretty_output ? Coffeelint.colorize(str, 32) : str
   end
 
+  def self.yellow(str, pretty_output = true)
+    pretty_output ? Coffeelint.colorize(str, 33) : str
+  end
+
   def self.context
     coffeescriptSource = File.read(CoffeeScript::Source.path)
     bootstrap = <<-EOF
@@ -57,19 +62,38 @@ module Coffeelint
 
   def self.display_test_results(name, errors, pretty_output = true)
     good = pretty_output ? "\u2713" : 'Passed'
+    warn = pretty_output ? "\u26A1" : 'Warn'
     bad = pretty_output ? "\u2717" : 'Failed'
 
     if errors.length == 0
       puts "  #{good} " + Coffeelint.green(name, pretty_output)
       return true
     else
-      puts "  #{bad} " + Coffeelint.red(name, pretty_output)
+      failed = false
+      if errors.any? {|e| e["level"] == "error"}
+        failed = true
+        puts "  #{bad} " + Coffeelint.red(name, pretty_output)
+      else
+        puts "  #{warn} " + Coffeelint.yellow(name, pretty_output)
+      end
+
       errors.each do |error|
-        print "     #{bad} "
-        print Coffeelint.red(error["lineNumber"], pretty_output)
-        puts ": #{error["message"]}, #{error["context"]}."
+        disp = "##{error["lineNumber"]}"
+        if error["lineNumberEnd"]
+          disp += "-#{error["lineNumberEnd"]}"
+        end
+
+        print "     "
+        if error["level"] == "warn"
+          print warn + " "
+          print Coffeelint.yellow(disp, pretty_output)
+        else
+          print bad + " "
+          print Coffeelint.red(disp, pretty_output)
+        end
+        puts ": #{error["message"]}. #{error["context"]}."
       end
-      return false
+      return failed
     end
   end
 

data/lib/coffeelint/cmd.rb

@@ -0,0 +1,94 @@
+require 'coffeelint/version'
+
+require 'optparse'
+
+module Coffeelint
+  module Cmd
+    def self.parse_options(name = 'coffeelint.rb')
+      options = {
+                  :recursive => false,
+                  :noconfig => false,
+                  :stdin => false,
+                  :quiet => false,
+                }
+
+      linter_options = {}
+
+      opt_parser = OptionParser.new do |opts|
+        opts.banner = "Usage: coffeelint.rb [options] source [...]"
+
+=begin
+      -f, --file     Specify a custom configuration file.               
+      --noconfig     Ignores the environment variable COFFEELINT_CONFIG.  [boolean]
+      -h, --help     Print help information.                            
+      -v, --version  Print current version number.                      
+      -r             Recursively lint .coffee files in subdirectories.    [boolean]
+      --csv          Use the csv reporter.                                [boolean]
+      --jslint       Use the JSLint XML reporter.                         [boolean]
+      --nocolor      Don't colorize the output                            [boolean]
+      -s, --stdin    Lint the source from stdin                           [boolean]
+      -q, --quiet    Only print errors.                                   [boolean]
+=end
+
+
+        opts.on "-f FILE", "--file FILE", "Specify a custom configuration file." do |f|
+          linter_options[:config_file] = f
+        end
+
+=begin
+        opts.on "--noconfig", "Ignores the environment variabel COFFEELINT_CONFIG." do |f|
+          options[:noconfig] = true
+        end
+=end
+
+        opts.on_tail "-h", "--help", "Print help information." do
+          puts opts
+          exit
+        end
+
+        opts.on_tail "-v", "--version", "Print current version number." do
+          puts Coffeelint::VERSION
+          exit
+        end
+
+        opts.on '-r', "Recursively lint .coffee files in subdirectories." do
+          options[:recursive] = true
+        end
+
+=begin
+        opts.on '-s', '--stdin', "Lint the source from stdin" do
+          options[:stdin] = true
+        end
+
+        opts.on '-q', '--quiet', 'Only print errors.' do
+          options[:quiet] = true
+        end
+=end
+
+      end
+
+      opt_parser.parse!
+
+      return {
+        :options => options,
+        :linter_options => linter_options
+      }
+    end
+
+    def self.main
+      options = parse_options
+
+      if ARGV.length > 0
+        ARGV.each do |file|
+          if options[:options][:recursive]
+            Coffeelint.run_test_suite(file, options[:linter_options])
+          else
+            Coffeelint.run_test(file, options[:linter_options])
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/coffeelint/version.rb

@@ -1,3 +1,3 @@
 module Coffeelint
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffeelint
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Zachary Bush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -98,6 +98,7 @@ files:
 - bin/coffeelint.rb
 - coffeelint.gemspec
 - lib/coffeelint.rb
+- lib/coffeelint/cmd.rb
 - lib/coffeelint/railtie.rb
 - lib/coffeelint/version.rb
 - lib/tasks/coffeelint.rake