puppet_docker_tools 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5065c334b38bfde31cc9e305063afaab1fb057b3
-  data.tar.gz: 39a900482ea78b84b8affcb445148b5be494f884
+  metadata.gz: 0cced50b6cd276b28389615a751ad0946a6e3196
+  data.tar.gz: 30084e7aebeee1dd037537bdb6ad521ff33376b3
 SHA512:
-  metadata.gz: 217da3ed11d92e6421aa4702f4776a7e807fdae85c6049ab9dd611949c24b988ea060c3ac393edef517eafa61ccc1afc7d245a6f7e3356a8e666fcd6806f23b6
-  data.tar.gz: 2e23e6ed966dbbc28ac5b40a7187059b85873c2ad26a1903ab378d39bb5da145af50674625a022873551bddd94eabbef60e014691382fcbbbb84dc21640cb225
+  metadata.gz: 2612cf5a9ce5c38bd1518c503f72c0943e4517ad6ba789e5573c562123604f9bd0978b4e4c5ceefeaff286ccef2da78868a93e7d3588263495da970d4551eca7
+  data.tar.gz: fe1ae2b95ab05230b2aeb780a111c286fde043ebe068af55dd9f4560a59412f44d8d1275fc78f7f72960035e37f6443d5cdb0a91e062586b027c031b1d49427e

data/README.md

@@ -44,6 +44,7 @@ Build a docker image based on the dockerfile in DIRECTORY.
 
 Run [hadolint](https://github.com/hadolint/hadolint) on the dockerfile in DIRECTORY. The lint task runs on the `hadolint/hadolint` container with the following rule exclusions:
 * [DL3008](https://github.com/hadolint/hadolint/wiki/DL3008) - Pin versions in apt get install
+* [DL3018](https://github.com/hadolint/hadolint/wiki/DL3018) - Pin versions in apk install
 * [DL4000](https://github.com/hadolint/hadolint/wiki/DL4000) - MAINTAINER is deprecated
 * [DL4001](https://github.com/hadolint/hadolint/wiki/DL4001) - Don't use both wget and curl
 

data/lib/puppet_docker_tools/runner.rb

@@ -3,7 +3,7 @@ require 'docker'
 require 'rspec/core'
 require 'time'
 require 'puppet_docker_tools/utilities'
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec", 'spec_helper.rb'))
+require 'puppet_docker_tools/spec_helper'
 
 class PuppetDockerTools
   class Runner
@@ -52,9 +52,17 @@ class PuppetDockerTools
     #
     def lint
       hadolint_container = 'hadolint/hadolint'
+      ignore_rules = [
+        'DL3008',
+        'DL3018',
+        'DL4000',
+        'DL4001',
+      ]
+      ignore_string = ignore_rules.map { |x| "--ignore #{x}" }.join(' ')
+
       # make sure we have the container locally
       PuppetDockerTools::Utilities.pull("#{hadolint_container}:latest")
-      container = Docker::Container.create('Cmd' => ['/bin/sh', '-c', "hadolint --ignore DL3008 --ignore DL4000 --ignore DL4001 - "], 'Image' => hadolint_container, 'OpenStdin' => true, 'StdinOnce' => true)
+      container = Docker::Container.create('Cmd' => ['/bin/sh', '-c', "hadolint #{ignore_string} - "], 'Image' => hadolint_container, 'OpenStdin' => true, 'StdinOnce' => true)
       # This container.tap startes the container created above, and passes directory/Dockerfile to the container
       container.tap(&:start).attach(stdin: "#{directory}/#{dockerfile}")
       # Wait for the run to finish
@@ -117,7 +125,18 @@ class PuppetDockerTools
       test_files = tests.map { |test| File.basename(test, '.rb') }
 
       puts "Running RSpec tests from #{File.expand_path("#{directory}/spec")} (#{test_files.join ","}), this may take some time"
-      RSpec::Core::Runner.run(tests, $stderr, $stdout)
+      success = true
+      tests.each do |test|
+        Open3.popen2e("rspec spec #{test}") do |stdin, output_stream, wait_thread|
+          while line = output_stream.gets
+            puts line
+          end
+          exit_status = wait_thread.value.exitstatus
+          success = success && (exit_status == 0)
+        end
+      end
+
+      fail "Running RSpec tests for #{directory} failed!" unless success
     end
 
     # Get the version set in the Dockerfile in the specified directory

data/{spec → lib/puppet_docker_tools}/spec_helper.rb

@@ -5,4 +5,4 @@ require 'docker'
 Docker.options[:read_timeout] = 7200
 
 # Load any shared examples or context helpers
-Dir[File.join(File.dirname(__FILE__), 'support', '**', '*.rb')].sort.each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), '..', '..', 'spec', 'support', '**', '*.rb')].sort.each { |f| require f }

data/spec/lib/puppet_docker_tools/runner_spec.rb

@@ -155,9 +155,10 @@ HERE
 
   describe '#spec' do
     it "runs tests under the 'spec' directory" do
-      tests=["/tmp/test-image/spec/test1_spec.rb", "/tmp/test-dir/spec/test2_spec.rb"]
+      tests=["/tmp/test-image/spec/test1_spec.rb", "/tmp/test-image/spec/test2_spec.rb"]
       expect(Dir).to receive(:glob).with("/tmp/test-image/spec/*_spec.rb").and_return(tests)
-      expect(RSpec::Core::Runner).to receive(:run).with(tests, $stderr, $stdout).and_return(nil)
+      expect(Open3).to receive(:popen2e).with('rspec spec /tmp/test-image/spec/test1_spec.rb')
+      expect(Open3).to receive(:popen2e).with('rspec spec /tmp/test-image/spec/test2_spec.rb')
       runner.spec
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet_docker_tools
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Puppet, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-18 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api
@@ -78,10 +78,10 @@ files:
 - bin/puppet-docker
 - lib/puppet_docker_tools.rb
 - lib/puppet_docker_tools/runner.rb
+- lib/puppet_docker_tools/spec_helper.rb
 - lib/puppet_docker_tools/utilities.rb
 - spec/lib/puppet_docker_tools/runner_spec.rb
 - spec/lib/puppet_docker_tools/utilities_spec.rb
-- spec/spec_helper.rb
 - spec/support/context/using_alpine.rb
 - spec/support/context/using_centos.rb
 - spec/support/context/with_docker_container.rb