coffeelint 1.11.0 → 1.14.0

data/lib/coffeelint.rb

@@ -43,37 +43,49 @@ module Coffeelint
     ExecJS.compile(coffeescriptSource + bootstrap + coffeelintSource)
   end
 
-  def self.lint(script, config = {})
+  def self.lint(script, config = {}, context = Coffeelint.context)
     fname = config.fetch(:config_file, CoffeeLint::Config.locate)
     config.merge!(CoffeeLint::Config.parse(fname)) unless fname.nil?
-    Coffeelint.context.call('window.coffeelint.lint', script, config)
+    context.call('window.coffeelint.lint', script, config)
   end
 
-  def self.lint_file(filename, config = {})
-    Coffeelint.lint(File.read(filename), config)
+  def self.lint_file(filename, config = {}, context = Coffeelint.context)
+    Coffeelint.lint(File.read(filename), config, context)
   end
 
-  def self.lint_dir(directory, config = {})
+  def self.lint_dir(directory, config = {}, context = Coffeelint.context)
     retval = {}
-    Dir.glob("#{directory}/**/*.coffee") do |name|
-      retval[name] = Coffeelint.lint_file(name, config)
+    filtered_path = filter(directory)
+
+    Dir.glob(filtered_path) do |name|
+      retval[name] = Coffeelint.lint_file(name, config, context)
       yield name, retval[name] if block_given?
     end
     retval
   end
 
+  def self.filter(directory)
+    Dir.glob("#{directory}/**/*.coffee") - Dir.glob("#{directory}/**/{#{ignored_paths}}")
+  end
+
+  def self.ignored_paths
+    if File.exist?(".coffeelintignore")
+      File.read(".coffeelintignore").lines.map(&:chomp).join(",")
+    else
+      []
+    end
+  end
+
   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'
 
+    failure_count = 0
     if errors.length == 0
       puts "  #{good} " + Coffeelint.green(name, pretty_output)
-      return true
     else
-      no_failures = true
       if errors.any? {|e| e["level"] == "error"}
-        no_failures = false
         puts "  #{bad} " + Coffeelint.red(name, pretty_output)
       else
         puts "  #{warn} " + Coffeelint.yellow(name, pretty_output)
@@ -90,28 +102,26 @@ module Coffeelint
           print warn + " "
           print Coffeelint.yellow(disp, pretty_output)
         else
+          failure_count += 1
           print bad + " "
           print Coffeelint.red(disp, pretty_output)
         end
         puts ": #{error["message"]}. #{error["context"]}."
       end
-      return no_failures
     end
+    return failure_count
   end
 
   def self.run_test(file, config = {})
     pretty_output = config.has_key?(:pretty_output) ? config.delete(:pretty_output) : true
-    result = Coffeelint.lint_file(file, config)
-    Coffeelint.display_test_results(file, result, pretty_output)
+    errors = Coffeelint.lint_file(file, config)
+    Coffeelint.display_test_results(file, errors, pretty_output)
   end
 
   def self.run_test_suite(directory, config = {})
     pretty_output = config.has_key?(:pretty_output) ? config.delete(:pretty_output) : true
-    errors_count = 0
-    Coffeelint.lint_dir(directory, config) do |name, errors|
-      errors_count += errors.count
-      result = Coffeelint.display_test_results(name, errors, pretty_output)
-    end
-    errors_count
+    Coffeelint.lint_dir(directory, config).map do |name, errors|
+      Coffeelint.display_test_results(name, errors, pretty_output)
+    end.inject(0, :+)
   end
 end

data/lib/coffeelint/cmd.rb

@@ -79,13 +79,15 @@ module Coffeelint
       options = parse_options
 
       if ARGV.length > 0
+        errors_count = 0
         ARGV.each do |file|
           if options[:options][:recursive]
-            Coffeelint.run_test_suite(file, options[:linter_options])
+            errors_count += Coffeelint.run_test_suite(file, options[:linter_options])
           else
-            Coffeelint.run_test(file, options[:linter_options])
+            errors_count += Coffeelint.run_test(file, options[:linter_options])
           end
         end
+        exit errors_count
       end
     end
   end

data/lib/coffeelint/version.rb

@@ -1,3 +1,3 @@
 module Coffeelint
-  VERSION = "1.11.0"
+  VERSION = "1.14.0"
 end

data/spec/coffeelint_spec.rb

@@ -40,4 +40,59 @@ describe Coffeelint do
     expect(results.length).to eq 1
     expect(results[0]['name']).to eq 'cyclomatic_complexity'
   end
+
+  describe 'linting files' do
+    before do
+      FileUtils.mkdir_p('/tmp/coffeelint')
+      File.open('/tmp/coffeelint/file1.coffee', 'w') { |f| f.write("a;\na;") }
+      File.open('/tmp/coffeelint/file2.coffee', 'w') { |f| f.write("a;") }
+    end
+
+    after(:all) { FileUtils.rm_r('/tmp/coffeelint') }
+
+    it "should return error count from run_test" do
+      expect(Coffeelint.run_test('/tmp/coffeelint/file1.coffee')).to eq 2
+    end
+
+    it "should return error count from run_test_suite" do
+      expect(Coffeelint.run_test_suite("/tmp/coffeelint")).to eq 3
+    end
+  end
+
+  describe 'files to lint' do
+    before(:all) do
+      FileUtils.mkdir_p('/tmp/coffeelint/subdirectory')
+      FileUtils.touch('/tmp/coffeelint/file1.coffee')
+      FileUtils.touch('/tmp/coffeelint/file2.coffee')
+      FileUtils.touch('/tmp/coffeelint/subdirectory/file3.coffee')
+    end
+
+    after(:all) { FileUtils.rm_r('/tmp/coffeelint') }
+
+    before { allow(Coffeelint).to receive(:lint_file) }
+
+    it 'lints all .coffee files in the directory, searching recursively' do
+      results = Coffeelint.lint_dir('/tmp/coffeelint')
+      expect(results).to include(
+        '/tmp/coffeelint/file1.coffee',
+        '/tmp/coffeelint/file2.coffee',
+        '/tmp/coffeelint/subdirectory/file3.coffee'
+      )
+    end
+
+    context 'with a .coffeelintignore file' do
+      before { File.open('.coffeelintignore', 'w') { |f| f.write("file1.coffee\n*file3.coffee") } }
+      after  { FileUtils.rm('.coffeelintignore') }
+
+      it "does not lint ignored paths" do
+        results = Coffeelint.lint_dir('/tmp/coffeelint')
+
+        expect(results).to include('/tmp/coffeelint/file2.coffee')
+        expect(results).not_to include(
+          '/tmp/coffeelint/file1.coffee',
+          '/tmp/coffeelint/subdirectory/file3.coffee'
+        )
+      end
+    end
+  end
 end

metadata

@@ -1,83 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: coffeelint
 version: !ruby/object:Gem::Version
-  version: 1.11.0
+  version: 1.14.0
+  prerelease: 
 platform: ruby
 authors:
 - Zachary Bush
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby bindings for coffeelint
@@ -88,17 +99,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .gitmodules
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/coffeelint.rb
 - coffeelint.gemspec
-- coffeelint/lib/coffeelint.js
 - lib/coffeelint.rb
 - lib/coffeelint/cmd.rb
 - lib/coffeelint/config.rb
@@ -109,29 +119,31 @@ files:
 - spec/coffeelint_spec.rb
 - spec/config_spec.rb
 - spec/spec_helper.rb
+- coffeelint/lib/coffeelint.js
 homepage: https://github.com/zipcodeman/coffeelint-ruby
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby bindings for coffeelint along with railtie to add rake task to rails
 test_files:
 - spec/assets/.coffeelint.json

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4e482db9f7267c3b2e3b6a6a39d445a23ed6d2cc
-  data.tar.gz: 16fc6cb55ddc9d88776df33a882d2e1cf374d91c
-SHA512:
-  metadata.gz: 440d9e0c1106684bfbd074359e06b0b2a88ef2c30be6e9c58bf0dd3c8e9ad6d7a668d64f78ee0aa543a08572a6f8722a2a3be3e19408ee3df688b588a7fe402b
-  data.tar.gz: a15b9a7d6e6af6646b715996d1c98781a5c7820d4bdcc99be5dcfc672d3447ec44d8da5a8ded34bbeeaa4f3e4f21a2f7136c506c7cba070bc5c48cfbf8c5b2fb