kitchen-inspec 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 623f1ada1f944ebc91986e21066ed4b149b2e48f
-  data.tar.gz: d8cd56302ec6f135ef1bbb021485d30c78259a21
+  metadata.gz: 0b9092e5aaf9e8e5afc182fdef46eb884d2228e5
+  data.tar.gz: c6d012ff3e90f865f0103c6c75c6a13a1cc29978
 SHA512:
-  metadata.gz: 4aabb56344883286595083eca39115912ecbdb71f44f2a35b74258fd8299a1d5dcded95f9e08c98d4234b56aa564a71e7fd8b4904857ad8d9d6dcc7a25bcd6e2
-  data.tar.gz: cc3e9207c51bec6b5fb01ec1bfaa1f7282d3da592017ae4fc7c33d4851654f7216b08ef8a9d3b36d690836ce15fdac0d49179ebb6f7a4a4ad5661b20fb2d7e96
+  metadata.gz: d68aaf5daf6acbd5fbfd03fa04dcf0566a36847f19508c57bb737d1815ce0dc8a599b6a71337a6bd07b1f796dc7607da2164788dbec06c3099ba95f7f2b4eb6e
+  data.tar.gz: bf27169f51788ddfbdc179295a50285d2e685d95482a9a1ccb55920cd7257de80914644e69f6de44924baf6c7c1c8a6d1c113500ca80334db6ec71faa6df250e

data/.gitignore

@@ -7,3 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+test/integration/.kitchen
+Berksfile.lock

data/.travis.yml

@@ -1,17 +1,32 @@
+---
+sudo: required
 language: ruby
+cache: bundler
 
-rvm:
-  - 2.2
-  - 2.1
-  - 2.0.0
-  - 1.9.3
-  - ruby-head
+# necessary for docker to work
+dist: trusty
+services:
+  - docker
 
-before_install: gem install bundler -v 1.10.6
-bundler_args: --without guard
+bundler_args: --without integration guard tools
 
-sudo: false
+before_install:
+  - gem install bundler
+  - gem --version
 
 matrix:
+  include:
+    - rvm: 1.9.3
+      gemfile: Gemfile.193
+    - rvm: 2.0
+      gemfile: Gemfile
+    - rvm: 2.1
+      gemfile: Gemfile
+    - rvm: ruby-head
+      gemfile: Gemfile
+    - rvm: 2.2
+      gemfile: Gemfile
+      bundler_args: --without guard tools
+      script: bundle exec rake test:integration
   allow_failures:
     - rvm: ruby-head

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [0.10.1](https://github.com/chef/kitchen-inspec/tree/0.10.1) (2016-01-15)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.10.0...0.10.1)
+## [0.11.0](https://github.com/chef/kitchen-inspec/tree/0.11.0) (2016-02-02)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.10.1...0.11.0)
+
+**Implemented enhancements:**
+
+- Add integration test with test-kitchen [\#33](https://github.com/chef/kitchen-inspec/pull/33) ([chris-rock](https://github.com/chris-rock))
+
+**Closed issues:**
+
+- Failures should be tagged with the instance they failed against [\#30](https://github.com/chef/kitchen-inspec/issues/30)
+- kitchen verify has exit status 0 with failed examples [\#9](https://github.com/chef/kitchen-inspec/issues/9)
+
+## [v0.10.1](https://github.com/chef/kitchen-inspec/tree/v0.10.1) (2016-01-15)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.10.0...v0.10.1)
 
 **Closed issues:**
 
@@ -10,6 +22,7 @@
 
 **Merged pull requests:**
 
+- 0.10.1 [\#34](https://github.com/chef/kitchen-inspec/pull/34) ([chris-rock](https://github.com/chris-rock))
 - Allow transports which are subclasses of the core ones. [\#32](https://github.com/chef/kitchen-inspec/pull/32) ([coderanger](https://github.com/coderanger))
 
 ## [v0.10.0](https://github.com/chef/kitchen-inspec/tree/v0.10.0) (2016-01-07)

data/Gemfile

@@ -8,13 +8,22 @@ group :guard do
 end
 
 group :test do
+  gem 'bundler', '~> 1.5'
+  gem 'minitest', '~> 5.5'
+  gem 'rake', '~> 10'
+  gem 'rubocop', '~> 0.32'
+  gem 'concurrent-ruby', '~> 0.9'
   gem 'codeclimate-test-reporter', :require => nil
+  # gem 'test-kitchen', '~> 1.5'
+  gem 'test-kitchen', git: 'https://github.com/test-kitchen/test-kitchen.git', branch: 'chris-rock/winrm-properties-fix'
 end
 
-group :tools do
-  gem 'github_changelog_generator', '~> 1'
+group :integration do
+  gem 'berkshelf'
+  gem 'kitchen-dokken'
 end
 
-group :development do
-  gem 'test-kitchen', '~> 1.4', :require => nil
+group :tools do
+  gem 'pry', '~> 0.10'
+  gem 'github_changelog_generator', '~> 1'
 end

data/Gemfile.193

@@ -0,0 +1,33 @@
+# -*- encoding: utf-8 -*-
+source 'https://rubygems.org'
+gemspec
+
+# pin dependency for Ruby 1.9.3 since bundler is not
+# detecting that net-ssh 3 does not work with 1.9.3
+gem 'net-ssh', '~> 2.9'
+
+group :guard do
+  gem 'guard-rspec',    :require => nil
+  gem 'guard-rubocop',  :require => nil
+end
+
+group :test do
+  gem 'bundler', '~> 1.5'
+  gem 'minitest', '~> 5.5'
+  gem 'rake', '~> 10'
+  gem 'rubocop', '~> 0.32'
+  gem 'concurrent-ruby', '~> 0.9'
+  gem 'codeclimate-test-reporter', :require => nil
+  # gem 'test-kitchen', '~> 1.5'
+  gem 'test-kitchen', git: 'https://github.com/test-kitchen/test-kitchen.git', branch: 'chris-rock/winrm-properties-fix'
+end
+
+group :integration do
+  gem 'berkshelf'
+  gem 'kitchen-dokken'
+end
+
+group :tools do
+  gem 'pry', '~> 0.10'
+  gem 'github_changelog_generator', '~> 1'
+end

data/Rakefile

@@ -118,3 +118,11 @@ task :bump_version, [:version] do |_, args|
   kitchen_inspec_version(v)
   Rake::Task['changelog'].invoke
 end
+
+namespace :test do
+  task :integration do
+    concurrency = ENV['CONCURRENCY'] || 1
+    path = File.join(File.dirname(__FILE__), 'test', 'integration')
+    sh('sh', '-c', "cd #{path} && bundle exec kitchen test -c #{concurrency} -t .")
+  end
+end

data/lib/kitchen/verifier/inspec.rb

@@ -96,6 +96,9 @@ module Kitchen
           runner_options_for_ssh(transport_data)
         elsif transport.is_a?(Kitchen::Transport::Winrm)
           runner_options_for_winrm(transport_data)
+        # optional transport which is not in core test-kitchen
+        elsif defined?(Kitchen::Transport::Dokken) && transport.is_a?(Kitchen::Transport::Dokken)
+          runner_options_for_docker(transport_data)
         else
           fail Kitchen::UserError, "Verifier #{name} does not support the #{transport.name} Transport"
         end.tap do |runner_options|
@@ -154,6 +157,26 @@ module Kitchen
 
         opts
       end
+
+      # Returns a configuration Hash that can be passed to a `Inspec::Runner`.
+      #
+      # @return [Hash] a configuration hash of string-based keys
+      # @api private
+      def runner_options_for_docker(config_data)
+        kitchen = instance.transport.send(:connection_options, config_data).dup
+
+        opts = {
+          'backend' => 'docker',
+          'logger' => logger,
+          'host' => kitchen[:data_container][:Id],
+          'connection_timeout' => kitchen[:timeout],
+          'connection_retries' => kitchen[:connection_retries],
+          'connection_retry_sleep' => kitchen[:connection_retry_sleep],
+          'max_wait_until_ready' => kitchen[:max_wait_until_ready],
+        }
+
+        opts
+      end
     end
   end
 end

data/lib/kitchen/verifier/inspec_version.rb

@@ -20,6 +20,6 @@
 module Kitchen
   module Verifier
     # Version string for InSpec Kitchen verifier
-    INSPEC_VERSION = '0.10.1'
+    INSPEC_VERSION = '0.11.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-15 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -121,6 +121,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.193
 - Guardfile
 - LICENSE
 - README.md