lint_trap 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd8b059140d1d4487ff867109b06886cee712990
-  data.tar.gz: 546a5bf4794e33d96cce6a0caf1eb06154f657e5
+  metadata.gz: 91b370e674d44dad5e9d53a8679ef006512a2c59
+  data.tar.gz: 479b9f36c2720e98a64dc89e1cecc07868dc3f9a
 SHA512:
-  metadata.gz: e5da1f4256d21805a0000e717de18bb7525544d1e9951ec6dff7c0532ba03815271fc0be2f85483fcc40d05545b26eb929cdaf143f0b1469394df5c050053e6a
-  data.tar.gz: 161a54aebfc888fa3cfe6524674be8f28dcddd23d9a35df5dcc0e66b903f92e57cbcc718aeb45a88393f6ed17f9c7beea57aca28cfe0a527c7456b7279d6aa98
+  metadata.gz: 5e3a5e71fc5a801515d19e139f94ac7c3745c29cf7b9e37e101a3588f9f4dd61f9d4f4037a78759f2e92e9ad0aaf5f1e1f10026dcc93ed1e0c8b81789e5a7824
+  data.tar.gz: c421bc8a945487ee9b53b6d6ab9aa2a49c3e74b622755fa3f9cfb4d6bf6995ef8096873669113f6beeb423101b77213ded9dfae851e8b7e7945b86a35c5f3e1e

data/lib/lint_trap/container/base.rb

@@ -8,9 +8,10 @@ module LintTrap
 
       LOCAL_CONFIG_PATH = Pathname.new(File.expand_path('../../../../config', __FILE__))
 
-      def initialize(image, repo_path)
+      def initialize(image, repo_path, options = {})
         @image = image
         @repo_path = Pathname.new(repo_path)
+        @options = default_options.merge(options)
       end
 
       def pull
@@ -31,7 +32,13 @@ module LintTrap
 
     protected
 
-      attr_reader :image, :repo_path
+      attr_reader :image, :repo_path, :options
+
+    private
+
+      def default_options
+        {}
+      end
     end
   end
 end

data/lib/lint_trap/container/docker.rb

@@ -42,8 +42,12 @@ module LintTrap
 
     private
 
+      def default_options
+        {remove_container: true}
+      end
+
       def flags
-        [
+        flags = [
           # '-m', '50m', # memory
           # '-c', '1', # number of cpus
           '--net="none"',
@@ -52,7 +56,11 @@ module LintTrap
           '-v', "#{repo_path}:#{CODE_PATH}",
           "--workdir=#{CODE_PATH}",
           '--user=lint_trap'
-        ].join(' ')
+        ]
+
+        flags.unshift('--rm') if options[:remove_container]
+
+        flags.join(' ')
       end
     end
   end

data/lib/lint_trap/version.rb

@@ -1,3 +1,3 @@
 module LintTrap
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/spec/command_spec.rb

@@ -6,6 +6,8 @@ describe LintTrap::Command do
   let(:container){LintTrap::Container::Docker.new('lintci/rubocop', fixture_path)}
 
   describe '#run' do
+    let(:container){LintTrap::Container::Docker.new('lintci/rubocop', fixture_path, remove_container: ENV['CI'].nil?)}
+
     it 'generates the expected output' do
       success = command.run(container) do |io|
         expect(io.read).to eq("     1\tlint\n")
@@ -18,7 +20,7 @@ describe LintTrap::Command do
   describe '#command/#to_s' do
     it 'generates a wrapped executable command' do
       expect(command.to_s(container)).to eq(
-        'docker run --net="none" --privileged=false '\
+        'docker run --rm --net="none" --privileged=false '\
         "-v #{LintTrap::Container::Base::LOCAL_CONFIG_PATH}:/config "\
         "-v #{fixture_path}:/src --workdir=/src --user=lint_trap lintci/rubocop "\
         'cat -b /src/lint.txt'

data/spec/container/docker_spec.rb

@@ -24,13 +24,28 @@ describe LintTrap::Container::Docker do
   end
 
   describe '#wrap' do
-    it 'wraps the command passed in with a call to docker' do
-      expect(container.wrap('ls')).to eq(
-        'docker run --net="none" --privileged=false '\
-        "-v #{described_class::LOCAL_CONFIG_PATH}:/config "\
-        '-v /local/path:/src '\
-        "--workdir=/src --user=lint_trap #{image} ls"
-      )
+    context 'with remove_container option' do
+      it 'wraps the command passed in with a call to docker' do
+        expect(container.wrap('ls')).to eq(
+          'docker run --rm --net="none" --privileged=false '\
+          "-v #{described_class::LOCAL_CONFIG_PATH}:/config "\
+          '-v /local/path:/src '\
+          "--workdir=/src --user=lint_trap #{image} ls"
+        )
+      end
+    end
+
+    context 'without remove_container option' do
+      subject(:container){described_class.new(image, '/local/path', remove_container: false)}
+
+      it 'wraps the command passed in with a call to docker' do
+        expect(container.wrap('ls')).to eq(
+          'docker run --net="none" --privileged=false '\
+          "-v #{described_class::LOCAL_CONFIG_PATH}:/config "\
+          '-v /local/path:/src '\
+          "--workdir=/src --user=lint_trap #{image} ls"
+        )
+      end
     end
   end
 

data/spec/integration/base_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe LintTrap::Linter::Base do
   let(:image){LintTrap::Linter::RuboCop.new.image_version}
-  let(:container){LintTrap::Container::Docker.new(image, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(image, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter) do
     ErrorLinter = Class.new(described_class) do

data/spec/integration/checkstyle_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CheckStyle do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/coffeelint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CoffeeLint do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/cppcheck_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CPPCheck do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 
@@ -26,7 +26,7 @@ describe LintTrap::Linter::CPPCheck do
             length: nil,
             rule: 'unassignedVariable',
             severity: 'style',
-            message: "Variable 'p' is not assigned a value."
+            message: start_with("Variable 'p' is not assigned a value.") # Other text sometimes gets added
           }, {
             file: file,
             line: '4',
@@ -34,7 +34,7 @@ describe LintTrap::Linter::CPPCheck do
             length: nil,
             rule: 'uninitvar',
             severity: 'error',
-            message: 'Uninitialized variable: p'
+            message: start_with('Uninitialized variable: p')
           }, {
             file: file,
             line: '1',
@@ -42,7 +42,7 @@ describe LintTrap::Linter::CPPCheck do
             length: nil,
             rule: 'unusedFunction',
             severity: 'style',
-            message: "The function 'f' is never used."
+            message: start_with("The function 'f' is never used.")
           }
         )
       end

data/spec/integration/csslint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::CSSLint do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/golint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::GoLint do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/jshint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::JSHint do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/jsonlint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::JSONLint do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/pylint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::PyLint do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/rubocop_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::RuboCop do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/integration/scsslint_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe LintTrap::Linter::SCSSLint do
-  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(linter.image_version, fixture_path, remove_container: ENV['CI'].nil?)}
   let(:options){{}}
   subject(:linter){described_class.new}
 

data/spec/parser/base_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe LintTrap::Parser::Base do
   let(:image){LintTrap::Linter::RuboCop.new.image_version}
-  let(:container){LintTrap::Container::Docker.new(image, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(image, fixture_path, remove_container: ENV['CI'].nil?)}
   subject(:parser){Class.new(described_class).new(StringIO.new, container)}
 
   describe '#parse' do

data/spec/parser/line_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe LintTrap::Parser::Line do
   let(:image){LintTrap::Linter::RuboCop.new.image_version}
-  let(:container){LintTrap::Container::Docker.new(image, fixture_path)}
+  let(:container){LintTrap::Container::Docker.new(image, fixture_path, remove_container: ENV['CI'].nil?)}
   subject(:parser){Class.new(described_class).new(StringIO.new('violation'), container)}
 
   describe '#parse' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lint_trap
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Allen Madsen