kitchen-docker 2.4.0 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49be9eaec81f6c9277c620d4c99e7a50b99f930f
-  data.tar.gz: 1daa96d8e99245bec677921425fe125a21266544
+  metadata.gz: 75827cd02d9a9ddd56f0c8b7855e972e65d5ee18
+  data.tar.gz: 4b6a7af9475fa2eea7ea86baffe7e107b6418b0a
 SHA512:
-  metadata.gz: ed5cc8b3f3cd1d8300969bb4fe51c7dcd288dcc79a9744dcdd37150cd73231111ca3dec9ce1ff3f9797e40cbd55a809e97c38da69613ef47abfd872c95b722f6
-  data.tar.gz: a21bf725b1eb0082d32a8e6dd4e955f0847b667a8e015a08ba1a04a2c2e5abe1ebbe6241810ed3cffe7d9e8ee13e6b05032c9d04f0d4b8c1daf095a112ead259
+  metadata.gz: 3e56b648c7ea34db0f0e0f79d4caee22cf82d3c63924a908acfa5591b265f9a630f566d6b0af00e229f04d907d4c11964cb4bc7d3c195146ee54a68afac0a365
+  data.tar.gz: 603475404366c87800fd38e35e1bdc6be00c8b5a637f6a1d305796df69c966cde0591a8d842b2e402f46868b7eb84e1aaf6bb308e3ca2650fabf554fbed12d31

data/.kitchen.yml

@@ -1,55 +1,53 @@
+<% # Make sure the local copy of the driver is loaded %>
+<% lib = File.expand_path('../lib', __FILE__) %>
+<% $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib) %>
 ---
 driver:
   name: docker
-  provision_command: curl -L http://www.chef.io/chef/install.sh | bash
+  provision_command: curl -L https://www.chef.io/chef/install.sh | bash
 
 provisioner:
   name: dummy
 
 platforms:
-  - name: ubuntu-12.04
-  - name: ubuntu-14.04
-  - name: centos-6.4
-  - name: centos-7
-  - name: debian
-  - name: arch
-    driver:
-      image: base/arch
-  - name: unknown
-    driver:
-      image: ubuntu:12.04
-      platform: ubuntu
-  - name: dockerfile
-    driver:
-      username: dockerfile
-      password: dockerfile
-      dockerfile: test/Dockerfile
-      run_command: /sbin/init
-  - name: database
-    driver:
-      image: ubuntu:14.04
-      platform: ubuntu
-      instance_name: db
-      publish_all: true
-  - name: linked
-    driver:
-      image: ubuntu:14.04
-      platform: ubuntu
-      links: "db:db"
+- name: ubuntu-12.04
+- name: ubuntu-14.04
+- name: ubuntu-16.04
+- name: centos-6
+- name: centos-7
+- name: debian
+- name: arch
+  driver:
+    image: base/archlinux
+    provision_command: true
+- name: unknown
+  driver:
+    image: ubuntu:12.04
+    platform: ubuntu
+- name: dockerfile
+  driver:
+    username: dockerfile
+    password: dockerfile
+    dockerfile: test/Dockerfile
+    run_command: /sbin/init
+
 suites:
-  - name: default
-  - name: concurrency
-  - name: context
-    driver:
-      build_context: false
-  - name: capabilities
-    excludes: [arch,unknown,centos-7,centos-6.4,dockerfile]
-    driver:
-      provision_command:  
-      - curl -L http://www.chef.io/chef/install.sh | bash
-      - apt-get install -y net-tools 
-      username: kitchen
-      password: kitchen 
-      cap_drop:
-      - NET_ADMIN 
-     
+- name: default
+  excludes: [arch]
+- name: context
+  excludes: [arch]
+  driver:
+    build_context: false
+- name: capabilities
+  excludes: [arch,unknown,centos-7,centos-6,dockerfile]
+  driver:
+    provision_command:
+    - curl -L https://www.chef.io/chef/install.sh | bash
+    - apt-get install -y net-tools
+    cap_drop:
+    - NET_ADMIN
+- name: inspec
+  driver:
+    provision_command: true
+  verifier:
+    name: inspec

data/.travis.yml

@@ -1,11 +1,17 @@
+sudo: required
+dist: trusty
 language: ruby
 
 rvm:
-- 2.0.0
-- 1.9.3
-- 1.9.2
-- ruby-head
+- "2.1"
+- "2.2"
+- "2.3"
 
-matrix:
-  allow_failures:
-  - rvm: ruby-head
+services:
+- docker
+
+script:
+- docker version
+- kitchen --version
+- rake spec
+- kitchen test -d always

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# Kitchen-Docker Changelog
+
+## 2.5.0
+
+* [#209](https://github.com/portertech/kitchen-docker/pulls/209) Fix usage with Kitchen rake tasks.
+* Add `run_options` and `build_options` configuration.
+* [#195](https://github.com/portertech/kitchen-docker/pulls/195) Fix Arch Linux support.
+* Fix shell escaping for build paths and SSH keys.
+
 ## 2.4.0
 
 * [#148](https://github.com/portertech/kitchen-docker/issues/148) Restored support for older versions of Ruby.

data/README.md

@@ -436,6 +436,40 @@ Examples:
   build_context: true
 ```
 
+### build_options
+
+Extra command-line options to pass to `docker build` when creating the image.
+
+Examples:
+
+```yaml
+  build_options: --rm=false
+```
+
+```yaml
+  build_options:
+    rm: false
+    build-arg: something
+```
+
+### run_options
+
+Extra command-line options to pass to `docker run` when starting the container.
+
+Examples:
+
+```yaml
+  run_options: --ip=1.2.3.4
+```
+
+```yaml
+  run_options:
+    tmpfs:
+    - /run/lock
+    - /tmp
+    net: br3
+```
+
 ## Development
 
 * Source hosted at [GitHub][repo]
@@ -453,7 +487,9 @@ example:
 
 ## Authors
 
-Created and maintained by [Sean Porter][author] (<portertech@gmail.com>)
+Created by [Sean Porter][author] (<portertech@gmail.com>).
+
+Maintained by [Noah Kantrowitz][https://github.com/coderanger].
 
 ## License
 
@@ -461,14 +497,14 @@ Apache 2.0 (see [LICENSE][license])
 
 
 [author]:                 https://github.com/portertech
-[issues]:                 https://github.com/portertech/kitchen-docker/issues
-[license]:                https://github.com/portertech/kitchen-docker/blob/master/LICENSE
-[repo]:                   https://github.com/portertech/kitchen-docker
+[issues]:                 https://github.com/test-kitchen/kitchen-docker/issues
+[license]:                https://github.com/test-kitchen/kitchen-docker/blob/master/LICENSE
+[repo]:                   https://github.com/test-kitchen/kitchen-docker
 [docker_installation]:    https://docs.docker.com/installation/#installation
 [docker_upstart_issue]:   https://github.com/dotcloud/docker/issues/223
 [docker_index]:           https://index.docker.io/
 [docker_default_image]:   https://index.docker.io/_/base/
 [test_kitchen_docs]:      http://kitchen.ci/docs/getting-started/
-[chef_omnibus_dl]:        http://www.opscode.com/chef/install/
+[chef_omnibus_dl]:        https://downloads.chef.io/chef-client/
 [cpu_shares]:             https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-cpu.html
 [memory_limit]:           https://docs.fedoraproject.org/en-US/Fedora/17/html/Resource_Management_Guide/sec-memory.html

data/Rakefile

@@ -20,9 +20,23 @@ task :quality => [:cane, :tailor, :stats]
 
 task :default => [:quality]
 
-begin
-  require 'kitchen/rake_tasks'
-  Kitchen::RakeTasks.new
-rescue LoadError
-  puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
+# begin
+#   require 'kitchen/rake_tasks'
+#   Kitchen::RakeTasks.new
+# rescue LoadError
+#   puts ">>>>> Kitchen gem not loaded, omitting tasks" unless ENV['CI']
+# end
+
+# Create the spec task.
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec, :tag) do |t, args|
+  t.rspec_opts = [].tap do |a|
+    a << '--color'
+    a << "--format #{ENV['CI'] ? 'documentation' : 'Fuubar'}"
+    a << '--backtrace' if ENV['VERBOSE'] || ENV['DEBUG']
+    a << "--seed #{ENV['SEED']}" if ENV['SEED']
+    a << "--tag #{args[:tag]}" if args[:tag]
+    a << "--default-path test"
+    a << '-I test/spec'
+  end.join(' ')
 end

data/kitchen-docker.gemspec

@@ -23,7 +23,17 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
 
+  # Style checker gems.
   spec.add_development_dependency 'cane'
   spec.add_development_dependency 'tailor'
   spec.add_development_dependency 'countloc'
+
+  # Unit testing gems.
+  spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'rspec-its', '~> 1.2'
+  spec.add_development_dependency 'fuubar', '~> 2.0'
+  spec.add_development_dependency 'simplecov', '~> 0.9'
+
+  # Integration testing gems.
+  spec.add_development_dependency 'kitchen-inspec', '~> 0.14'
 end

data/lib/kitchen/driver/docker.rb

@@ -19,6 +19,8 @@ require 'json'
 require 'securerandom'
 require 'uri'
 require 'net/ssh'
+require 'tempfile'
+require 'shellwords'
 require File.join(File.dirname(__FILE__), 'docker', 'erb')
 
 module Kitchen
@@ -51,6 +53,8 @@ module Kitchen
       default_config :wait_for_sshd, true
       default_config :private_key,   File.join(Dir.pwd, '.kitchen', 'docker_id_rsa')
       default_config :public_key,    File.join(Dir.pwd, '.kitchen', 'docker_id_rsa.pub')
+      default_config :build_options, nil
+      default_config :run_options,   nil
 
       default_config :use_sudo do |driver|
         !driver.remote_socket?
@@ -196,11 +200,15 @@ module Kitchen
             RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N ''
           eos
         when 'arch'
+          # See https://bugs.archlinux.org/task/47052 for why we
+          # blank out limits.conf.
           <<-eos
-            RUN pacman -Syu --noconfirm
-            RUN pacman -S --noconfirm openssh sudo curl
+            RUN pacman --noconfirm -Sy archlinux-keyring
+            RUN pacman-db-upgrade
+            RUN pacman --noconfirm -Sy openssl openssh sudo curl
             RUN ssh-keygen -A -t rsa -f /etc/ssh/ssh_host_rsa_key
             RUN ssh-keygen -A -t dsa -f /etc/ssh/ssh_host_dsa_key
+            RUN echo >/etc/security/limits.conf
           eos
         when 'gentoo'
           <<-eos
@@ -231,10 +239,8 @@ module Kitchen
                 useradd -d #{homedir} -m -s /bin/bash #{username}; \
               fi
           RUN echo #{username}:#{password} | chpasswd
-          RUN echo '#{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-          RUN mkdir -p /etc/sudoers.d
-          RUN echo '#{username} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers.d/#{username}
-          RUN chmod 0440 /etc/sudoers.d/#{username}
+          RUN echo "#{username} ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
+          RUN echo "Defaults !requiretty" >> /etc/sudoers
           RUN mkdir -p #{homedir}/.ssh
           RUN chown -R #{username} #{homedir}/.ssh
           RUN chmod 0700 #{homedir}/.ssh
@@ -246,7 +252,7 @@ module Kitchen
         Array(config[:provision_command]).each do |cmd|
           custom << "RUN #{cmd}\n"
         end
-        ssh_key = "RUN echo '#{public_key}' >> #{homedir}/.ssh/authorized_keys"
+        ssh_key = "RUN echo #{Shellwords.escape(public_key)} >> #{homedir}/.ssh/authorized_keys"
         # Empty string to ensure the file ends with a newline.
         [from, env_variables, platform, base, custom, ssh_key, ''].join("\n")
       end
@@ -268,19 +274,21 @@ module Kitchen
           end
         end
         raise ActionFailed,
-        'Could not parse Docker build output for image ID'
+          'Could not parse Docker build output for image ID'
       end
 
       def build_image(state)
         cmd = "build"
         cmd << " --no-cache" unless config[:use_cache]
+        extra_build_options = config_to_options(config[:build_options])
+        cmd << " #{extra_build_options}" unless extra_build_options.empty?
         dockerfile_contents = dockerfile
         build_context = config[:build_context] ? '.' : '-'
         file = Tempfile.new('Dockerfile-kitchen', Dir.pwd)
         output = begin
           file.write(dockerfile)
           file.close
-          docker_command("#{cmd} -f #{file.path} #{build_context}", :input => dockerfile_contents)
+          docker_command("#{cmd} -f #{Shellwords.escape(file.path)} #{build_context}", :input => dockerfile_contents)
         ensure
           file.close unless file.closed?
           file.unlink
@@ -317,6 +325,8 @@ module Kitchen
         Array(config[:cap_add]).each {|cap| cmd << " --cap-add=#{cap}"} if config[:cap_add]
         Array(config[:cap_drop]).each {|cap| cmd << " --cap-drop=#{cap}"} if config[:cap_drop]
         Array(config[:security_opt]).each {|opt| cmd << " --security-opt=#{opt}"} if config[:security_opt]
+        extra_run_options = config_to_options(config[:run_options])
+        cmd << " #{extra_run_options}" unless extra_run_options.empty?
         cmd << " #{image_id} #{config[:run_command]}"
         cmd
       end
@@ -333,11 +343,11 @@ module Kitchen
 
       def parse_container_ssh_port(output)
         begin
-          host, port = output.split(':')
+          _host, port = output.split(':')
           port.to_i
         rescue
           raise ActionFailed,
-          'Could not parse Docker port output for container SSH port'
+            'Could not parse Docker port output for container SSH port'
         end
       end
 
@@ -361,6 +371,26 @@ module Kitchen
         image_id = state[:image_id]
         docker_command("rmi #{image_id}")
       end
+
+      # Convert the config input for `:build_options` or `:run_options` in to a
+      # command line string for use with Docker.
+      #
+      # @since 2.5.0
+      # @param config [nil, String, Array, Hash] Config data to convert.
+      # @return [String]
+      def config_to_options(config)
+        case config
+        when nil
+          ''
+        when String
+          config
+        when Array
+          config.map {|c| config_to_options(c) }.join(' ')
+        when Hash
+          config.map {|k, v| Array(v).map {|c| "--#{k}=#{Shellwords.escape(c)}" }.join(' ') }.join(' ')
+        end
+      end
+
     end
   end
 end

data/lib/kitchen/driver/docker_version.rb

@@ -19,6 +19,6 @@ module Kitchen
   module Driver
 
     # Version string for Docker Kitchen driver
-    DOCKER_VERSION = "2.4.0"
+    DOCKER_VERSION = "2.5.0"
   end
 end

data/test/Dockerfile

@@ -1,4 +1,4 @@
-FROM centos:6.4
+FROM centos:6
 RUN yum clean all
 RUN yum install -y sudo openssh-server openssh-clients which curl htop
 RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
@@ -7,4 +7,11 @@ RUN mkdir -p /var/run/sshd
 RUN useradd -d /home/<%= @username %> -m -s /bin/bash <%= @username %>
 RUN echo <%= "#{@username}:#{@password}" %> | chpasswd
 RUN echo '<%= @username %> ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
-RUN curl -L http://www.opscode.com/chef/install.sh | bash
+RUN mkdir -p /home/<%= @username %>/.ssh
+RUN chown -R <%= @username %> /home/<%= @username %>/.ssh
+RUN chmod 0700 /home/<%= @username %>/.ssh
+RUN touch /home/<%= @username %>/.ssh/authorized_keys
+RUN chown <%= @username %> /home/<%= @username %>/.ssh/authorized_keys
+RUN chmod 0600 /home/<%= @username %>/.ssh/authorized_keys
+RUN curl -L https://www.chef.io/chef/install.sh | bash
+RUN echo '<%= IO.read(@public_key).strip %>' >> /home/<%= @username %>/.ssh/authorized_keys

data/test/integration/capabilities/serverspec/capabilities_drop_spec.rb

@@ -1,6 +1,23 @@
-require_relative 'spec_helper' 
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
-describe command('sudo /sbin/ifconfig eth0 multicast') do
-  its(:exit_status) { should_not eq 0 }
-  its(:stdout) { should match /Operation not permitted/ }
+require 'serverspec'
+set :backend, :exec
+
+describe command('/sbin/ifconfig eth0 multicast') do
+  its(:exit_status) { is_expected.to_not eq 0 }
+  its(:stderr) { is_expected.to match /Operation not permitted/ }
 end

data/test/integration/default/serverspec/default_spec.rb

@@ -1,5 +1,23 @@
-require_relative 'spec_helper'
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
-describe file('/etc/passwd') do
-  it { should be_file }
+require 'serverspec'
+set :backend, :exec
+
+# Just make sure the image launched and is reachable.
+describe command('true') do
+  its(:exit_status) { is_expected.to eq 0 }
 end

data/test/integration/inspec/inspec_spec.rb

@@ -0,0 +1,20 @@
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# Just make sure the image launched and is reachable.
+describe command('true') do
+  its(:exit_status) { is_expected.to eq 0 }
+end

data/test/spec/docker_spec.rb

@@ -0,0 +1,64 @@
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'spec_helper'
+
+describe Kitchen::Driver::Docker do
+  describe '#config_to_options' do
+    let(:config) { }
+    subject { described_class.new.send(:config_to_options, config) }
+
+    context 'with nil' do
+      let(:config) { nil }
+      it { is_expected.to eq '' }
+    end # /context with nil
+
+    context 'with a string' do
+      let(:config) { '--foo' }
+      it { is_expected.to eq '--foo' }
+    end # /context with a string
+
+    context 'with a string with spaces' do
+      let(:config) { '--foo bar' }
+      it { is_expected.to eq '--foo bar' }
+    end # /context with a string with spaces
+
+    context 'with an array of strings' do
+      let(:config) { %w{--foo --bar} }
+      it { is_expected.to eq '--foo --bar' }
+    end # /context with an array of strings
+
+    context 'with an array of hashes' do
+      let(:config) { [{foo: 'bar'}, {other: 'baz'}] }
+      it { is_expected.to eq '--foo=bar --other=baz' }
+    end # /context with an array of hashes
+
+    context 'with a hash of strings' do
+      let(:config) { {foo: 'bar', other: 'baz'} }
+      it { is_expected.to eq '--foo=bar --other=baz' }
+    end # /context with a hash of strings
+
+    context 'with a hash of arrays' do
+      let(:config) { {foo: %w{bar baz}} }
+      it { is_expected.to eq '--foo=bar --foo=baz' }
+    end # /context with a hash of arrays
+
+    context 'with a hash of strings with spaces' do
+      let(:config) { {foo: 'bar two', other: 'baz'} }
+      it { is_expected.to eq '--foo=bar\\ two --other=baz' }
+    end # /context with a hash of strings with spaces
+  end # /describe #config_to_options
+end

data/test/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+#
+# Copyright 2016, Noah Kantrowitz
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'rake'
+require 'rspec'
+require 'rspec/its'
+require 'kitchen/driver/docker'
+
+RSpec.configure do |config|
+  # Basic configuraiton
+  config.run_all_when_everything_filtered = true
+  config.filter_run(:focus)
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-docker
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0
 platform: ruby
 authors:
 - Sean Porter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -94,6 +94,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: fuubar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: kitchen-inspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.14'
 description: A Docker Driver for Test Kitchen
 email:
 - portertech@gmail.com
@@ -117,9 +187,10 @@ files:
 - lib/kitchen/driver/docker_version.rb
 - test/Dockerfile
 - test/integration/capabilities/serverspec/capabilities_drop_spec.rb
-- test/integration/capabilities/serverspec/spec_helper.rb
 - test/integration/default/serverspec/default_spec.rb
-- test/integration/default/serverspec/spec_helper.rb
+- test/integration/inspec/inspec_spec.rb
+- test/spec/docker_spec.rb
+- test/spec/spec_helper.rb
 homepage: https://github.com/portertech/kitchen-docker
 licenses:
 - Apache 2.0
@@ -140,13 +211,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.2
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: A Docker Driver for Test Kitchen
 test_files:
 - test/Dockerfile
 - test/integration/capabilities/serverspec/capabilities_drop_spec.rb
-- test/integration/capabilities/serverspec/spec_helper.rb
 - test/integration/default/serverspec/default_spec.rb
-- test/integration/default/serverspec/spec_helper.rb
+- test/integration/inspec/inspec_spec.rb
+- test/spec/docker_spec.rb
+- test/spec/spec_helper.rb

data/test/integration/capabilities/serverspec/spec_helper.rb

@@ -1,3 +0,0 @@
-require 'serverspec' 
-
-set :backend, :exec

data/test/integration/default/serverspec/spec_helper.rb

@@ -1,4 +0,0 @@
-require 'serverspec'
-
-# Required by serverspec
-set :backend, :exec