lint_trap 0.0.6 → 0.0.7

data/spec/integration/scsslint_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::SCSSLint do
-  let(:container){LintTrap::Container::Fake.new}
-  subject(:linter){described_class.new(container: container)}
+  let(:container){LintTrap::Container::Docker.new('lintci/spin_cycle:latest', fixture_path)}
+  let(:options){{}}
+  subject(:linter){described_class.new}
 
-  shared_examples '#lint' do
+  describe '#lint' do
     context 'when linting a bad file' do
       let(:file){fixture_path('bad.scss')}
 
       it 'generates lint' do
-        expect{|b| linter.lint([file], &b)}.to yield_successive_args(
+        expect{|b| linter.lint([file], container, options, &b)}.to yield_successive_args(
           {
             file: file,
             line: '2',
@@ -27,18 +28,8 @@ describe LintTrap::Linter::SCSSLint do
       let(:file){fixture_path('good.scss')}
 
       it 'generates no lint' do
-        expect{|b| linter.lint([file], &b)}.to_not yield_control
+        expect{|b| linter.lint([file], container, options, &b)}.to_not yield_control
       end
     end
   end
-
-  context 'with docker container', if: !ENV['SKIP_DOCKER'] do
-    let(:container){LintTrap::Container::Docker.new('lintci/spin_cycle:latest', fixture_path)}
-
-    it_behaves_like '#lint'
-  end
-
-  context 'without a docker container', if: ENV['SKIP_DOCKER'] do
-    it_behaves_like '#lint'
-  end
 end

data/spec/language/coffeescript_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::CoffeeScript do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('CoffeeScript')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::CoffeeLint])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::CoffeeLint.new])}
 end

data/spec/language/cpp_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::CPP do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('C++')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::CPPCheck])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::CPPCheck.new])}
 end

data/spec/language/css_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::CSS do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('CSS')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::CSSLint])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::CSSLint.new])}
 end

data/spec/language/go_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::Go do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('Go')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::GoLint])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::GoLint.new])}
 end

data/spec/language/java_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::Java do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('Java')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::CheckStyle])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::CheckStyle.new])}
 end

data/spec/language/javascript_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::JavaScript do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('JavaScript')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::JSHint])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::JSHint.new])}
 end

data/spec/language/json_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::JSON do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('JSON')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::JSONLint])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::JSONLint.new])}
 end

data/spec/language/python_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::Python do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('Python')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::PyLint])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::PyLint.new])}
 end

data/spec/language/ruby_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::Ruby do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('Ruby')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::RuboCop])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::RuboCop.new])}
 end

data/spec/language/scss_spec.rb

@@ -4,5 +4,5 @@ describe LintTrap::Language::SCSS do
   subject(:language){described_class.new}
 
   its(:name){is_expected.to eq('SCSS')}
-  its(:linters){is_expected.to eq([LintTrap::Linter::SCSSLint])}
+  its(:linters){is_expected.to eq([LintTrap::Linter::SCSSLint.new])}
 end

data/spec/language_spec.rb

@@ -7,61 +7,61 @@ describe LintTrap::Language do
     context 'when given a CoffeeScript file' do
       let(:file){fixture_path('good.coffee')}
 
-      it{is_expected.to eq(described_class::CoffeeScript)}
+      it{is_expected.to be_a(described_class::CoffeeScript)}
     end
 
     context 'when given a C++ file' do
       let(:file){fixture_path('good.cpp')}
 
-      it{is_expected.to eq(described_class::CPP)}
+      it{is_expected.to be_a(described_class::CPP)}
     end
 
     context 'when given a CSS file' do
       let(:file){fixture_path('good.css')}
 
-      it{is_expected.to eq(described_class::CSS)}
+      it{is_expected.to be_a(described_class::CSS)}
     end
 
     context 'when given a Go file' do
       let(:file){fixture_path('good.go')}
 
-      it{is_expected.to eq(described_class::Go)}
+      it{is_expected.to be_a(described_class::Go)}
     end
 
     context 'when given a Java file' do
       let(:file){fixture_path('Good.java')}
 
-      it{is_expected.to eq(described_class::Java)}
+      it{is_expected.to be_a(described_class::Java)}
     end
 
     context 'when given a JavaScript file' do
       let(:file){fixture_path('good.js')}
 
-      it{is_expected.to eq(described_class::JavaScript)}
+      it{is_expected.to be_a(described_class::JavaScript)}
     end
 
     context 'when given a JSON file' do
       let(:file){fixture_path('good.json')}
 
-      it{is_expected.to eq(described_class::JSON)}
+      it{is_expected.to be_a(described_class::JSON)}
     end
 
     context 'when given a Python file' do
       let(:file){fixture_path('good.py')}
 
-      it{is_expected.to eq(described_class::Python)}
+      it{is_expected.to be_a(described_class::Python)}
     end
 
     context 'when given a Ruby file' do
       let(:file){fixture_path('good.rb')}
 
-      it{is_expected.to eq(described_class::Ruby)}
+      it{is_expected.to be_a(described_class::Ruby)}
     end
 
     context 'when given a SCSS file' do
       let(:file){fixture_path('good.scss')}
 
-      it{is_expected.to eq(described_class::SCSS)}
+      it{is_expected.to be_a(described_class::SCSS)}
     end
 
     context 'when given an unknown language file' do
@@ -77,61 +77,61 @@ describe LintTrap::Language do
     context 'when given CoffeeScript' do
       let(:language_name){'CoffeeScript'}
 
-      it{is_expected.to eq(described_class::CoffeeScript)}
+      it{is_expected.to be_a(described_class::CoffeeScript)}
     end
 
     context 'when given C++' do
       let(:language_name){'C++'}
 
-      it{is_expected.to eq(described_class::CPP)}
+      it{is_expected.to be_a(described_class::CPP)}
     end
 
     context 'when given CSS' do
       let(:language_name){'CSS'}
 
-      it{is_expected.to eq(described_class::CSS)}
+      it{is_expected.to be_a(described_class::CSS)}
     end
 
     context 'when given Go' do
       let(:language_name){'Go'}
 
-      it{is_expected.to eq(described_class::Go)}
+      it{is_expected.to be_a(described_class::Go)}
     end
 
     context 'when given Java' do
       let(:language_name){'Java'}
 
-      it{is_expected.to eq(described_class::Java)}
+      it{is_expected.to be_a(described_class::Java)}
     end
 
     context 'when given JavaScript' do
       let(:language_name){'JavaScript'}
 
-      it{is_expected.to eq(described_class::JavaScript)}
+      it{is_expected.to be_a(described_class::JavaScript)}
     end
 
     context 'when given JSON' do
       let(:language_name){'JSON'}
 
-      it{is_expected.to eq(described_class::JSON)}
+      it{is_expected.to be_a(described_class::JSON)}
     end
 
     context 'when given Python' do
       let(:language_name){'Python'}
 
-      it{is_expected.to eq(described_class::Python)}
+      it{is_expected.to be_a(described_class::Python)}
     end
 
     context 'when given Ruby' do
       let(:language_name){'Ruby'}
 
-      it{is_expected.to eq(described_class::Ruby)}
+      it{is_expected.to be_a(described_class::Ruby)}
     end
 
     context 'when given SCSS' do
       let(:language_name){'SCSS'}
 
-      it{is_expected.to eq(described_class::SCSS)}
+      it{is_expected.to be_a(described_class::SCSS)}
     end
 
     context 'when given an invalid language' do

data/spec/linter/checkstyle_spec.rb

@@ -2,27 +2,27 @@ require 'spec_helper'
 
 describe LintTrap::Linter::CheckStyle do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(Good.java bad.java)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
     context 'when config is provided' do
-      let(:config){'checks.xml'}
+      let(:options){{config: 'checks.xml'}}
 
       it 'runs the lint command with the correct arguments' do
         expect(LintTrap::Command).to receive(:new).with(
           'java',
           [
             '-jar', container.config_path(described_class::JAR),
-            '-c', config
+            '-c', options[:config]
           ],
           files
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
 
@@ -38,7 +38,7 @@ describe LintTrap::Linter::CheckStyle do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
   end

data/spec/linter/coffeelint_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe LintTrap::Linter::CoffeeLint do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.coffee bad.coffee)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
     context 'when config is provided' do
-      let(:config){'coffeelint.json'}
+      let(:options){{config: 'coffeelint.json'}}
 
       it 'runs the lint command with the correct arguments' do
         expect(LintTrap::Command).to receive(:new).with(
@@ -23,7 +23,7 @@ describe LintTrap::Linter::CoffeeLint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
 
@@ -39,7 +39,7 @@ describe LintTrap::Linter::CoffeeLint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
   end

data/spec/linter/cppcheck_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe LintTrap::Linter::CPPCheck do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.cpp bad.cpp)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
@@ -20,7 +20,7 @@ describe LintTrap::Linter::CPPCheck do
       ).and_return(command)
       expect(command).to receive(:run).with(container)
 
-      linter.lint(files)
+      linter.lint(files, container, options)
     end
   end
 end

data/spec/linter/csslint_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe LintTrap::Linter::CSSLint do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.css bad.css)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
     context 'when config is provided' do
-      let(:config){'.csslintrc'}
+      let(:options){{config: '.csslintrc'}}
 
       it 'runs the lint command with the correct arguments' do
         expect(LintTrap::Command).to receive(:new).with(
@@ -22,7 +22,7 @@ describe LintTrap::Linter::CSSLint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
 
@@ -37,7 +37,7 @@ describe LintTrap::Linter::CSSLint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
   end

data/spec/linter/golint_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe LintTrap::Linter::GoLint do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.go bad.go)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
@@ -16,7 +16,7 @@ describe LintTrap::Linter::GoLint do
       ).and_return(command)
       expect(command).to receive(:run).with(container)
 
-      linter.lint(files)
+      linter.lint(files, container, options)
     end
   end
 end

data/spec/linter/jshint_spec.rb

@@ -2,27 +2,27 @@ require 'spec_helper'
 
 describe LintTrap::Linter::JSHint do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.js bad.js)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
     context 'when config is provided' do
-      let(:config){'.jshintrc'}
+      let(:options){{config: '.jshintrc'}}
 
       it 'runs the lint command with the correct arguments' do
         expect(LintTrap::Command).to receive(:new).with(
           'jshint',
           [
             '--reporter', container.config_path(described_class::FORMATTER),
-            '--config', config
+            '--config', options[:config]
           ],
           files
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
 
@@ -37,7 +37,7 @@ describe LintTrap::Linter::JSHint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
   end

data/spec/linter/jsonlint_spec.rb

@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe LintTrap::Linter::JSONLint do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.go bad.go)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
@@ -16,7 +16,7 @@ describe LintTrap::Linter::JSONLint do
       ).and_return(command)
       expect(command).to receive(:run).with(container)
 
-      linter.lint(files)
+      linter.lint(files, container, options)
     end
   end
 end

data/spec/linter/pylint_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe LintTrap::Linter::PyLint do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.py bad.py)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
     context 'when config is provided' do
-      let(:config){'.pylintrc'}
+      let(:options){{config: '.pylintrc'}}
 
       it 'runs the lint command with the correct arguments' do
         expect(LintTrap::Command).to receive(:new).with(
@@ -17,13 +17,13 @@ describe LintTrap::Linter::PyLint do
           [
             '-r', 'no',
             '--msg-template', '"{abspath}:{line}:{column}::{symbol}:{category}:{msg}"',
-            '--rcfile', config
+            '--rcfile', options[:config]
           ],
           files
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
 
@@ -39,7 +39,7 @@ describe LintTrap::Linter::PyLint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
   end

data/spec/linter/rubocop_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe LintTrap::Linter::RuboCop do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.rb bad.rb)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
     context 'when config is provided' do
-      let(:config){'.rubocop.yml'}
+      let(:options){{config: '.rubocop.yml'}}
 
       it 'runs the lint command with the correct arguments' do
         expect(LintTrap::Command).to receive(:new).with(
@@ -18,13 +18,13 @@ describe LintTrap::Linter::RuboCop do
             '--require', container.config_path(described_class::FORMATTER),
             '--format', 'LintTrap::Rubocop::Formatter',
             '--no-color',
-            '--config', config
+            '--config', options[:config]
           ],
           files
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
 
@@ -41,7 +41,7 @@ describe LintTrap::Linter::RuboCop do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
   end

data/spec/linter/scsslint_spec.rb

@@ -2,14 +2,14 @@ require 'spec_helper'
 
 describe LintTrap::Linter::SCSSLint do
   let(:container){LintTrap::Container::Fake.new}
-  let(:config){nil}
+  let(:options){{}}
   let(:files){%w(good.scss bad.scss)}
-  subject(:linter){described_class.new(container: container, config: config)}
+  subject(:linter){described_class.new}
   let(:command){instance_double(LintTrap::Command)}
 
   describe '#lint' do
     context 'when config is provided' do
-      let(:config){'.scss-lint.yml'}
+      let(:options){{config: '.scss-lint.yml'}}
 
       it 'runs the lint command with the correct arguments' do
         expect(LintTrap::Command).to receive(:new).with(
@@ -22,7 +22,7 @@ describe LintTrap::Linter::SCSSLint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
 
@@ -37,7 +37,7 @@ describe LintTrap::Linter::SCSSLint do
         ).and_return(command)
         expect(command).to receive(:run).with(container)
 
-        linter.lint(files)
+        linter.lint(files, container, options)
       end
     end
   end