kitchen-inspec 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b9092e5aaf9e8e5afc182fdef46eb884d2228e5
-  data.tar.gz: c6d012ff3e90f865f0103c6c75c6a13a1cc29978
+  metadata.gz: 3f9bc4f575ab5d4bb5c163ef5901e058da4b2ffd
+  data.tar.gz: b4a36fad7ab71d00438a7c632d1108ade8ffce33
 SHA512:
-  metadata.gz: d68aaf5daf6acbd5fbfd03fa04dcf0566a36847f19508c57bb737d1815ce0dc8a599b6a71337a6bd07b1f796dc7607da2164788dbec06c3099ba95f7f2b4eb6e
-  data.tar.gz: bf27169f51788ddfbdc179295a50285d2e685d95482a9a1ccb55920cd7257de80914644e69f6de44924baf6c7c1c8a6d1c113500ca80334db6ec71faa6df250e
+  metadata.gz: c8b0fe1548b0243766c477a3b940411a2d62f8b0c5f01357200de9b614def92292f893aeef69ea09b3305750e0ed691ce3341bf82be8dfd250dc763101b4908a
+  data.tar.gz: 5cacab6d53b19dff229555da70c390a896dbe454889b7a689b35be5695f24b653f33592539cc0526105a2e8b8e0ca2636ff9afbcf453a11256a59c1fa5c711a6

data/.travis.yml

@@ -17,15 +17,10 @@ before_install:
 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:

data/CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
-## [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)
+## [0.11.1](https://github.com/chef/kitchen-inspec/tree/0.11.1) (2016-02-15)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.11.0...0.11.1)
+
+**Fixed bugs:**
+
+- bugfix: use the right container in combination with kitchen-dokken [\#43](https://github.com/chef/kitchen-inspec/pull/43) ([chris-rock](https://github.com/chris-rock))
+
+**Merged pull requests:**
+
+- deduplicate Gemfiles [\#41](https://github.com/chef/kitchen-inspec/pull/41) ([srenatus](https://github.com/srenatus))
+- work well with other testing frameworks in test-kitchen [\#40](https://github.com/chef/kitchen-inspec/pull/40) ([chris-rock](https://github.com/chris-rock))
+
+## [v0.11.0](https://github.com/chef/kitchen-inspec/tree/v0.11.0) (2016-02-08)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.10.1...v0.11.0)
 
 **Implemented enhancements:**
 
@@ -12,6 +24,10 @@
 - 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)
 
+**Merged pull requests:**
+
+- 0.11.0 [\#38](https://github.com/chef/kitchen-inspec/pull/38) ([chris-rock](https://github.com/chris-rock))
+
 ## [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)
 

data/Gemfile

@@ -18,6 +18,12 @@ group :test do
   gem 'test-kitchen', git: 'https://github.com/test-kitchen/test-kitchen.git', branch: 'chris-rock/winrm-properties-fix'
 end
 
+# pin dependency for Ruby 1.9.3 since bundler is not
+# detecting that net-ssh 3 does not work with 1.9.3
+if Gem::Version.new(RUBY_VERSION) <= Gem::Version.new('1.9.3')
+  gem 'net-ssh', '~> 2.9'
+end
+
 group :integration do
   gem 'berkshelf'
   gem 'kitchen-dokken'

data/README.md

@@ -30,6 +30,46 @@ verifier:
   name: inspec
 ```
 
+### Directory Structure
+
+By default `kitchen-inspec` expects test to be in `test/integration/%suite%` directory structure (we use Chef as provisioner here):
+
+```
+.
+├── Berksfile
+├── Gemfile
+├── README.md
+├── metadata.rb
+├── recipes
+│   ├── default.rb
+│   └── nginx.rb
+└── test
+    └── integration
+        └── default
+            └── web_spec.rb
+```
+
+
+### Combination with other testing frameworks
+
+If you need support with other testing frameworks, we recommend to place the tests in `test/integration/%suite%/inspec`:
+
+```
+.
+├── Berksfile
+├── Gemfile
+├── README.md
+├── metadata.rb
+├── recipes
+│   ├── default.rb
+│   └── nginx.rb
+└── test
+    └── integration
+        └── default
+            └── inspec
+                └── web_spec.rb
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/kitchen/verifier/inspec.rb

@@ -23,13 +23,14 @@ require 'kitchen/verifier/inspec_version'
 require 'kitchen/verifier/base'
 
 require 'uri'
+require 'pathname'
 
 module Kitchen
   module Verifier
     # InSpec verifier for Kitchen.
     #
     # @author Fletcher Nichol <fnichol@chef.io>
-    class Inspec < Kitchen::Verifier::Base
+    class Inspec < Kitchen::Verifier::Base # rubocop:disable Metrics/ClassLength
       kitchen_verifier_api_version 1
       plugin_version Kitchen::Verifier::INSPEC_VERSION
 
@@ -76,12 +77,30 @@ module Kitchen
       # residing on the local workstation. Any special provisioner-specific
       # directories (such as a Chef roles/ directory) are excluded.
       #
+      # we support the base directories
+      # - test/integration
+      # - test/integration/inspec (prefered if used with other test environments)
+      #
       # @return [Array<String>] array of suite files
       # @api private
       def local_suite_files
         base = File.join(config[:test_base_path], config[:suite_name])
-        glob = File.join(base, '**/*_spec.rb')
-        Dir.glob(glob).reject do |f|
+        legacy_mode = false
+        # check for other testing frameworks, we may need to add more
+        %w{serverspec bats pester rspec cucumber minitest bash}.each { |fw|
+          if Pathname.new(File.join(config[:test_base_path], fw)).exist?
+            logger.info("Detected alternative framework tests for `#{fw}`")
+            legacy_mode = true
+          end
+        }
+
+        base = File.join(base, 'inspec') if legacy_mode
+        logger.info("Search `#{base}` for tests")
+        filter_chef_files(base, '**/*_spec.rb')
+      end
+
+      def filter_chef_files(base, filter)
+        Dir.glob(File.join(base, filter)).reject do |f|
           chef_data_dir?(base, f) || File.directory?(f)
         end
       end
@@ -112,7 +131,6 @@ module Kitchen
       # @api private
       def runner_options_for_ssh(config_data)
         kitchen = instance.transport.send(:connection_options, config_data).dup
-
         opts = {
           'backend' => 'ssh',
           'logger' => logger,
@@ -132,7 +150,6 @@ module Kitchen
         }
         opts['key_files'] = kitchen[:keys] unless kitchen[:keys].nil?
         opts['password'] = kitchen[:password] unless kitchen[:password].nil?
-
         opts
       end
 
@@ -142,7 +159,6 @@ module Kitchen
       # @api private
       def runner_options_for_winrm(config_data)
         kitchen = instance.transport.send(:connection_options, config_data).dup
-
         opts = {
           'backend' => 'winrm',
           'logger' => logger,
@@ -154,7 +170,6 @@ module Kitchen
           'connection_retry_sleep' => kitchen[:connection_retry_sleep],
           'max_wait_until_ready' => kitchen[:max_wait_until_ready],
         }
-
         opts
       end
 
@@ -164,17 +179,20 @@ module Kitchen
       # @api private
       def runner_options_for_docker(config_data)
         kitchen = instance.transport.send(:connection_options, config_data).dup
-
+        #
+        # Note: kitchen-dokken uses two containers the
+        #  - config_data[:data_container][:Id] : (hosts chef-client)
+        #  - config_data[:runner_container][:Id] : (the kitchen-container)
         opts = {
           'backend' => 'docker',
           'logger' => logger,
-          'host' => kitchen[:data_container][:Id],
+          'host' => config_data[:runner_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],
         }
-
+        logger.debug "Connect to Container: #{opts['host']}"
         opts
       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.11.0'
+    INSPEC_VERSION = '0.11.1'
   end
 end

metadata

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

data/Gemfile.193

@@ -1,33 +0,0 @@
-# -*- 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