lint_trap 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f396478f2c6a32c23ecfdf34a20676b4ed71758
-  data.tar.gz: a9e32df036ae6f899d5e3faded18fa079f9038b1
+  metadata.gz: 048fa7d8ad65b35c53e5c8cf57560334b8cb55ec
+  data.tar.gz: 3847e8340d6b6f5ba74b66596d23163d18436ee7
 SHA512:
-  metadata.gz: 500e66d0eecf70fa532c19f49cd7799db0bdd2bb97199722a4c8458cc6c090f6c279af0610229eb8afd16bbaf5b94a1c611084cb87793d8e990499d53ae01bf0
-  data.tar.gz: e36300d63d52083907aef118e1e2326f3dddf87801ed7249fc62ac157a21f27982bca86fc0c68a11f7dd33d9e041721e8d844689cd646aecefc3505fda8e580b
+  metadata.gz: 34a346a1866a70b46d71a336ef591c2a26738209ad7424da6ef9847bcff1585df5bb19349cdb1af29976ad4e9a61aa3ad987364a07b9720a6adf9e4e54d007ce
+  data.tar.gz: a109bda2726893b13598208b154ef35e1fd7be8d07ac660a76253d0c6db0f2514328acdb75a36c5fb9cd2487e37b3558a676cca959982d320495daccaa914bc8

data/lib/lint_trap/command.rb

@@ -15,7 +15,7 @@ module LintTrap
     def run(container)
       Bundler.with_clean_env do
         puts command(container) if ENV['DEBUG_LINTING']
-        Open3.popen3(command(container)) do |_, stdout, _, thread|
+        Open3.popen2e(command(container)) do |_, stdout, thread|
           yield stdout
 
           thread.join
@@ -24,7 +24,7 @@ module LintTrap
     end
 
     def command(container = LintTrap::Container::Fake.new)
-      container.wrap("#{binary} #{flags} #{files(container)} 2>&1")
+      container.wrap("#{binary} #{flags} #{files(container)}")
     end
     alias_method :to_s, :command
 

data/lib/lint_trap/language/base.rb

@@ -2,17 +2,17 @@ module LintTrap
   module Language
     # Interface for languages
     class Base
-      def self.canonical_name
-        name.split('::').last
-      end
-
       def name
-        self.class.canonical_name
+        self.class.name.split('::').last
       end
 
       def linters
         raise NotImplementedError, 'Must define what linters this language supports.'
       end
+
+      def ==(other)
+        name == other.name
+      end
     end
   end
 end

data/lib/lint_trap/language/coffeescript.rb

@@ -6,7 +6,7 @@ module LintTrap
     # CoffeeScript
     class CoffeeScript < Base
       def linters
-        [Linter::CoffeeLint]
+        [Linter::CoffeeLint].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/cpp.rb

@@ -5,12 +5,12 @@ module LintTrap
   module Language
     # C++
     class CPP < Base
-      def self.canonical_name
+      def name
         'C++'
       end
 
       def linters
-        [Linter::CPPCheck]
+        [Linter::CPPCheck].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/css.rb

@@ -6,7 +6,7 @@ module LintTrap
     # CSS
     class CSS < Base
       def linters
-        [Linter::CSSLint]
+        [Linter::CSSLint].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/go.rb

@@ -6,7 +6,7 @@ module LintTrap
     # Go
     class Go < Base
       def linters
-        [Linter::GoLint]
+        [Linter::GoLint].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/java.rb

@@ -6,7 +6,7 @@ module LintTrap
     # Java
     class Java < Base
       def linters
-        [Linter::CheckStyle]
+        [Linter::CheckStyle].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/javascript.rb

@@ -6,7 +6,7 @@ module LintTrap
     # JavaScript
     class JavaScript < Base
       def linters
-        [Linter::JSHint]
+        [Linter::JSHint].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/json.rb

@@ -6,7 +6,7 @@ module LintTrap
     # JSON
     class JSON < Base
       def linters
-        [Linter::JSONLint]
+        [Linter::JSONLint].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/python.rb

@@ -6,7 +6,7 @@ module LintTrap
     # Python
     class Python < Base
       def linters
-        [Linter::PyLint]
+        [Linter::PyLint].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/ruby.rb

@@ -6,7 +6,7 @@ module LintTrap
     # Ruby
     class Ruby < Base
       def linters
-        [Linter::RuboCop]
+        [Linter::RuboCop].map(&:new)
       end
     end
   end

data/lib/lint_trap/language/scss.rb

@@ -6,7 +6,7 @@ module LintTrap
     # SCSS
     class SCSS < Base
       def linters
-        [Linter::SCSSLint]
+        [Linter::SCSSLint].map(&:new)
       end
     end
   end

data/lib/lint_trap/language.rb

@@ -17,8 +17,9 @@ module LintTrap
     @languages = {}
 
     class << self
-      def register(language)
-        languages[language.canonical_name] = language
+      def register(language_class)
+        language = language_class.new
+        languages[language.name] = language
       end
 
       def detect(file)

data/lib/lint_trap/linter/base.rb

@@ -7,16 +7,9 @@ module LintTrap
     class Base
       CONFIG_PATH = File.expand_path('../../../../config', __FILE__)
 
-      def self.canonical_name
-        name.split('::').last
-      end
-
-      def initialize(container:, **options)
-        @container = container
-        @options = options
-      end
+      def lint(files, container, options)
+        @container, @options = container, options
 
-      def lint(files)
         command(files).run(container) do |stdout|
           parser(stdout).parse do |violation|
             yield violation
@@ -25,7 +18,11 @@ module LintTrap
       end
 
       def name
-        self.class.canonical_name
+        self.class.name.split('::').last
+      end
+
+      def ==(other)
+        name == other.name
       end
 
     protected
@@ -46,7 +43,7 @@ module LintTrap
         container.config_path(path)
       end
 
-      def flags
+      def flags(options)
         raise NotImplementedError, 'Method flags must be implemented.'
       end
 

data/lib/lint_trap/linter.rb

@@ -15,8 +15,10 @@ module LintTrap
     @linters = {}
 
     class << self
-      def register(linter)
-        linters[linter.canonical_name] = linter
+      def register(linter_class)
+        linter = linter_class.new
+
+        linters[linter.name] = linter
       end
 
       def find(name)

data/lib/lint_trap/version.rb

@@ -1,3 +1,3 @@
 module LintTrap
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

data/spec/command_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
 describe LintTrap::Command do
-  let(:file){'fake file.txt'}
+  let(:file){fixture_path('lint.txt')}
   let(:command){described_class.new('cat', %w(-b), [file])}
-  let(:container){LintTrap::Container::Fake.new}
+  let(:container){LintTrap::Container::Docker.new('lintci/spin_cycle', fixture_path)}
 
   describe '#run' do
-    let(:file){File.expand_path('../fixtures/lint.txt', __FILE__)}
-
     it 'generates the expected output' do
       command.run(container) do |io|
         expect(io.read).to eq("     1\tlint\n")
@@ -16,23 +14,12 @@ describe LintTrap::Command do
   end
 
   describe '#command/#to_s' do
-    context 'with fake container' do
-      it 'generates a bare executable command' do
-        expect(command.to_s).to eq('cat -b fake\ file.txt 2>&1')
-      end
-    end
-
-    context 'with docker container' do
-      let(:file){fixture_path('lint.txt')}
-      let(:container){LintTrap::Container::Docker.new('lint/runner', fixture_path)}
-
-      it 'generates a wrapped executable command' do
-        expect(command.to_s(container)).to eq(
-          "docker run --privileged=false -v #{LintTrap::Container::Base::LOCAL_CONFIG_PATH}:/opt/lint_trap/config "\
-          "-v #{fixture_path}:/home/spin_cycle --workdir=/home/spin_cycle --user=spin_cycle lint/runner "\
-          'cat -b /home/spin_cycle/lint.txt 2>&1'
-        )
-      end
+    it 'generates a wrapped executable command' do
+      expect(command.to_s(container)).to eq(
+        "docker run --privileged=false -v #{LintTrap::Container::Base::LOCAL_CONFIG_PATH}:/opt/lint_trap/config "\
+        "-v #{fixture_path}:/home/spin_cycle --workdir=/home/spin_cycle --user=spin_cycle lintci/spin_cycle "\
+        'cat -b /home/spin_cycle/lint.txt'
+      )
     end
   end
 end

data/spec/integration/checkstyle_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CheckStyle 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.java')}
 
       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: '1',
@@ -35,18 +36,8 @@ describe LintTrap::Linter::CheckStyle do
       let(:file){fixture_path('Good.java')}
 
       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/integration/coffeelint_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CoffeeLint 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.coffee')}
 
       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: '1',
@@ -27,18 +28,8 @@ describe LintTrap::Linter::CoffeeLint do
       let(:file){fixture_path('good.coffee')}
 
       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/integration/cppcheck_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CPPCheck 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.cpp')}
 
       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: '3',
@@ -43,18 +44,8 @@ describe LintTrap::Linter::CPPCheck do
       let(:file){fixture_path('good.cpp')}
 
       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/integration/csslint_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CSSLint 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.css')}
 
       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::CSSLint do
       let(:file){fixture_path('good.css')}
 
       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/integration/golint_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::GoLint 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.go')}
 
       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: '5',
@@ -27,18 +28,8 @@ describe LintTrap::Linter::GoLint do
       let(:file){fixture_path('good.go')}
 
       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/integration/jshint_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::JSHint 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.js')}
 
       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',
@@ -53,18 +54,8 @@ describe LintTrap::Linter::JSHint do
       let(:file){fixture_path('good.js')}
 
       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/integration/jsonlint_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::JSONLint 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.json')}
 
       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',
@@ -43,18 +44,8 @@ describe LintTrap::Linter::JSONLint do
       let(:file){fixture_path('good.json')}
 
       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/integration/pylint_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::PyLint 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.py')}
 
       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: '1',
@@ -34,18 +35,8 @@ describe LintTrap::Linter::PyLint do
       let(:file){fixture_path('good.py')}
 
       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/integration/rubocop_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::RuboCop 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.rb')}
 
       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: '1',
@@ -35,18 +36,8 @@ describe LintTrap::Linter::RuboCop do
       let(:file){fixture_path('good.rb')}
 
       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