kitchen-inspec 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed5b5de805ad3aa42acd9649e2579809d61409f7
-  data.tar.gz: f934130cfc36238f9790cba735efbee0f5662326
+  metadata.gz: 4bc8423e2234f64b59f405374ed6c60f1af1e91f
+  data.tar.gz: 1fb144b60402be43a6740cb05222837bccc28965
 SHA512:
-  metadata.gz: 93fb9ca1b2d228291fb93470460dc64690cd557265a724c7b7b0c001919a672ec97bd59af3140015ac918f706649be5060905f55507ed42332c1b5ee792eb51a
-  data.tar.gz: edd9113f440b7b6b434a26fdccebe2868338f82a5accc5b64c60b504ca11cbe3effafc5d0515a5a5d03e2ca538e00a80e736cca673f89deeb6384e8eda54a6ef
+  metadata.gz: 367b7d059261f715856d82d25d5637c7e311b5bacaaa8d157de83974b53daebb9751589e3c3cb071fcacad53f03704a2314c2437e2c2d57cecd93bf98a031ed1
+  data.tar.gz: 78fa6b26c0293770b8372f192b94c6e3943b36384b4207b4ada35cbebb93962951915dc52a0f645c8296105ef004c1a626aa2d522664479fbe427aa16a97cc0a

data/.travis.yml

@@ -3,23 +3,22 @@ language: ruby
 cache: bundler
 dist: trusty
 services:
-- docker
+  - docker
 bundler_args: "--without integration guard tools"
 before_install:
-- gem install bundler
-- gem --version
+  - gem install bundler
+  - gem --version
 matrix:
   include:
-  - rvm: 1.9.3
-  - rvm: 2.0
-  - rvm: 2.1
-  - rvm: ruby-head
-  - rvm: 2.2
+  - rvm: 2.1.9
+  - rvm: 2.2.5
+  - rvm: 2.3.1
     bundler_args: "--without guard tools"
     script: bundle exec rake test:integration OS='default profile contains_inspec'
-  - rvm: 2.2
+  - rvm: 2.3.1
     bundler_args: "--without guard tools"
     script: bundle exec rake test:integration OS='supermarket'
+  - rvm: ruby-head
   allow_failures:
   - rvm: ruby-head
 deploy:

data/Berksfile

@@ -1,8 +1,8 @@
 # encoding: utf-8
 
-source 'https://supermarket.chef.io'
+source "https://supermarket.chef.io"
 
-cookbook 'apt'
-cookbook 'yum'
-cookbook 'os_prepare', path: './test/cookbooks/os_prepare'
-cookbook 'ssh-hardening', git: 'https://github.com/dev-sec/chef-ssh-hardening.git'
+cookbook "apt"
+cookbook "yum"
+cookbook "os_prepare", path: "./test/cookbooks/os_prepare"
+cookbook "ssh-hardening", git: "https://github.com/dev-sec/chef-ssh-hardening.git"

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 # Change Log
 
-## [0.15.0](https://github.com/chef/kitchen-inspec/tree/0.15.0) (2016-07-15)
-[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.14.0...0.15.0)
+## [0.15.1](https://github.com/chef/kitchen-inspec/tree/0.15.1) (2016-09-05)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.15.0...0.15.1)
+
+**Closed issues:**
+
+- Kitchen verify/test fails when using the command resource with curl [\#100](https://github.com/chef/kitchen-inspec/issues/100)
+- Default to \( progress | documentation \) format for test-kitchen inspec verifier [\#91](https://github.com/chef/kitchen-inspec/issues/91)
+
+**Merged pull requests:**
+
+- Require Ruby 2.1+ [\#99](https://github.com/chef/kitchen-inspec/pull/99) ([tas50](https://github.com/tas50))
+- Switch from finstyle / rubocop to chefstyle [\#98](https://github.com/chef/kitchen-inspec/pull/98) ([tas50](https://github.com/tas50))
+- Update winrm password key for winrm-v2 [\#94](https://github.com/chef/kitchen-inspec/pull/94) ([mwrock](https://github.com/mwrock))
+
+## [v0.15.0](https://github.com/chef/kitchen-inspec/tree/v0.15.0) (2016-07-15)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.14.0...v0.15.0)
 
 **Fixed bugs:**
 

data/Gemfile

@@ -1,33 +1,43 @@
 # -*- encoding: utf-8 -*-
-source 'https://rubygems.org'
+source "https://rubygems.org"
 gemspec
 
-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
-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
 
+if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
+  gem 'json', '< 2.0'
+  gem 'rack', '< 2.0'
+  gem 'ruby_dep', '< 1.4.0'
+  gem 'listen', '< 3.0.0'
+end
+
+group :guard do
+  gem "guard-rspec",    :require => nil
+  gem "guard-rubocop",  :require => nil
+end
+
+group :test do
+  gem "bundler", "~> 1.10"
+  gem "minitest", "~> 5.5"
+  gem "rake", "~> 11.0"
+  gem "chefstyle", "0.4.0"
+  gem "concurrent-ruby", "~> 0.9"
+  gem "codeclimate-test-reporter", :require => nil
+  gem "rspec"
+  gem "simplecov", "~> 0.12"
+  gem "countloc", "~> 0.4"
+end
+
 group :integration do
-  gem 'berkshelf', '>= 4.2.3'
-  gem 'kitchen-dokken'
+  gem "berkshelf", ">= 4.3.5"
+  gem "kitchen-dokken"
 end
 
 group :tools do
-  gem 'pry', '~> 0.10'
-  gem 'github_changelog_generator', '1.11.3'
+  gem "pry", "~> 0.10"
+  gem "github_changelog_generator", "1.13.1"
 end

data/Guardfile

@@ -2,18 +2,18 @@
 ignore %r{^\.gem/}
 
 def rspec_opts
-  { cmd: 'bundle exec rspec' }
+  { cmd: "bundle exec rspec" }
 end
 
 def rubocop_opts
-  { all_on_start: false, keep_failed: false, cli: '-r finstyle' }
+  { all_on_start: false, keep_failed: false, cli: "-r chefstyle" }
 end
 
 group :red_green_refactor, halt_on_fail: true do
   guard :rspec, rspec_opts do
     watch(%r{^spec/(.*)_spec\.rb})
     watch(%r{^lib/(.*)([^/]+)\.rb})   { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-    watch(%r{^spec/spec_helper\.rb})  { 'spec' }
+    watch(%r{^spec/spec_helper\.rb})  { "spec" }
   end
 
   guard :rubocop, rubocop_opts do

data/README.md

@@ -1,10 +1,12 @@
 # Kitchen::InSpec - A Test Kitchen Verifier for InSpec
 
+[![Build Status Master](https://travis-ci.org/chef/kitchen-inspec.svg?branch=master)](https://travis-ci.org/chef/kitchen-inspec) [![Gem Version](https://badge.fury.io/rb/kitchen-inspec.svg)](https://badge.fury.io/rb/kitchen-inspec)
+
 This is the kitchen driver for [InSpec](https://github.com/chef/inspec). To see the project in action, we have the following test-kitchen examples available:
 
- - [Chef and InSpec](https://github.com/chef/inspec/tree/master/examples/kitchen-chef)
- - [Puppet and InSpec](https://github.com/chef/inspec/tree/master/examples/kitchen-puppet)
- - [Ansible and InSpec](https://github.com/chef/inspec/tree/master/examples/kitchen-ansible)
+- [Chef and InSpec](https://github.com/chef/inspec/tree/master/examples/kitchen-chef)
+- [Puppet and InSpec](https://github.com/chef/inspec/tree/master/examples/kitchen-puppet)
+- [Ansible and InSpec](https://github.com/chef/inspec/tree/master/examples/kitchen-ansible)
 
 ## Installation
 
@@ -16,22 +18,28 @@ gem 'kitchen-inspec'
 
 And then execute:
 
-    $ bundle
+```shell
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install kitchen-inspec
+```shell
+$ gem install kitchen-inspec
+```
 
 ## Usage
 
 In your .kitchen.yml include
-```
+
+```yaml
 verifier:
   name: inspec
 ```
 
 Optionally specify sudo and sudo_command
-```
+
+```yaml
 verifier:
   name: inspec
   sudo: true
@@ -49,8 +57,8 @@ By default `kitchen-inspec` expects test to be in `test/integration/%suite%` dir
 ├── README.md
 ├── metadata.rb
 ├── recipes
-│   ├── default.rb
-│   └── nginx.rb
+│   ├── default.rb
+│   └── nginx.rb
 └── test
     └── integration
         └── default
@@ -68,13 +76,13 @@ A complete profile is used here, including a custom inspec resource named `gordo
 ├── README.md
 ├── metadata.rb
 ├── recipes
-│   ├── default.rb
-│   └── nginx.rb
+│   ├── default.rb
+│   └── nginx.rb
 └── test
     └── integration
         └── default
             ├── controls
-            │   └── gordon.rb
+            │   └── gordon.rb
             ├── inspec.yml
             └── libraries
                 └── gordon_config.rb
@@ -91,8 +99,8 @@ If you need support with other testing frameworks, we recommend to place the tes
 ├── README.md
 ├── metadata.rb
 ├── recipes
-│   ├── default.rb
-│   └── nginx.rb
+│   ├── default.rb
+│   └── nginx.rb
 └── test
     └── integration
         └── default
@@ -104,7 +112,7 @@ If you need support with other testing frameworks, we recommend to place the tes
 
 In case you want to reuse tests across multiple cookbooks, they should become an extra artifact independent of a Chef cookbook, call [InSpec profiles](https://github.com/chef/inspec/blob/master/docs/profiles.rst). Those can be easiliy added to existing local tests as demonstrated in previous sections. To include remote profiles, adapt the `verifier` attributes in `.kitchen.yml`
 
-```
+```yaml
 suites:
   - name: default
     verifier:
@@ -114,14 +122,14 @@ suites:
 
 `inspec_tests` accepts all values that `inspec exec profile` would expect. We support:
 
-* local directory eg. `/path/to/profile`
-* github url `https://github.com/dev-sec/tests-ssh-hardening`
-* Chef Supermarket `supermarket://hardening/ssh-hardening` (list all available profiles with `inspec supermarket profiles`)
-* Chef Compliance `compliance://base/ssh`
+- local directory eg. `/path/to/profile`
+- github url `https://github.com/dev-sec/tests-ssh-hardening`
+- Chef Supermarket `supermarket://hardening/ssh-hardening` (list all available profiles with `inspec supermarket profiles`)
+- Chef Compliance `compliance://base/ssh`
 
 The following example illustrates the usage in a `.kitchen.yml`
 
-```
+```yaml
 suites:
   - name: contains_inspec
     run_list:
@@ -162,10 +170,10 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/chef/kitchen-inspec.
+Bug reports and pull requests are welcome on GitHub at <https://github.com/chef/kitchen-inspec>.
 
 ## License
 
-Apache 2.0 (see [LICENSE][license])
+Apache 2.0 (see [LICENSE])
 
 [license]: https://github.com/chef/kitchen-inspec/blob/master/LICENSE

data/Rakefile

@@ -2,7 +2,8 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require 'rubocop/rake_task'
+require "chefstyle"
+require "rubocop/rake_task"
 
 # Specs
 RSpec::Core::RakeTask.new(:spec)
@@ -11,13 +12,13 @@ desc "Run all test suites"
 task :test => [:spec]
 
 # Rubocop
-desc 'Run Rubocop lint checks'
+desc "Run Rubocop lint checks"
 task :rubocop do
   RuboCop::RakeTask.new
 end
 
 # lint the project
-desc 'Run robocop linter'
+desc "Run robocop linter"
 task lint: [:rubocop]
 
 desc "Display LOC stats"
@@ -36,20 +37,20 @@ task :default => [:test, :quality]
 # Automatically generate a changelog for this project. Only loaded if
 # the necessary gem is installed.
 begin
-  require 'github_changelog_generator/task'
+  require "github_changelog_generator/task"
   GitHubChangelogGenerator::RakeTask.new :changelog
 rescue LoadError
-  puts '>>>>> GitHub Changelog Generator not loaded, omitting tasks'
+  puts ">>>>> GitHub Changelog Generator not loaded, omitting tasks"
 end
 
 # Print the current version of this gem or update it.
 #
 # @param [Type] target the new version you want to set, or nil if you only want to show
 def kitchen_inspec_version(target = nil)
-  path = 'lib/kitchen/verifier/inspec_version.rb'
-  require_relative path.sub(/.rb$/, '')
+  path = "lib/kitchen/verifier/inspec_version.rb"
+  require_relative path.sub(/.rb$/, "")
 
-  nu_version = target.nil? ? '' : " -> #{target}"
+  nu_version = target.nil? ? "" : " -> #{target}"
   puts "Kitchen-inspec: #{Kitchen::Verifier::INSPEC_VERSION}#{nu_version}"
 
   unless target.nil?
@@ -66,7 +67,7 @@ end
 # @param [Type] msg the message to display if the command is missing
 def require_command(x, msg = nil)
   return if system("command -v #{x} || exit 1")
-  msg ||= 'Please install it first!'
+  msg ||= "Please install it first!"
   puts "\033[31;1mCan't find command #{x.inspect}. #{msg}\033[0m"
   exit 1
 end
@@ -84,11 +85,11 @@ end
 
 # Check the requirements for running an update of this repository.
 def check_update_requirements
-  require_command 'git'
-  require_command 'github_changelog_generator', "\n"\
+  require_command "git"
+  require_command "github_changelog_generator", "\n"\
     "For more information on how to install it see:\n"\
     "  https://github.com/skywinder/github-changelog-generator\n"
-  require_env 'CHANGELOG_GITHUB_TOKEN', "\n"\
+  require_env "CHANGELOG_GITHUB_TOKEN", "\n"\
     "Please configure this token to make sure you can run all commands\n"\
     "against GitHub.\n\n"\
     "See github_changelog_generator homepage for more information:\n"\
@@ -96,33 +97,33 @@ def check_update_requirements
 end
 
 # Show the current version of this gem.
-desc 'Show the version of this gem'
+desc "Show the version of this gem"
 task :version do
   kitchen_inspec_version
 end
 
-desc 'Generate the changelog'
+desc "Generate the changelog"
 task :changelog do
-  require_relative 'lib/kitchen/verifier/inspec_version'
+  require_relative "lib/kitchen/verifier/inspec_version"
   system "github_changelog_generator -u chef -p kitchen-inspec --future-release #{Kitchen::Verifier::INSPEC_VERSION}"
 end
 
 # Update the version of this gem and create an updated
 # changelog. It covers everything short of actually releasing
 # the gem.
-desc 'Bump the version of this gem'
+desc "Bump the version of this gem"
 task :bump_version, [:version] do |_, args|
-  v = args[:version] || ENV['to']
-  fail "You must specify a target version!  rake release[1.2.3]" if v.empty?
+  v = args[:version] || ENV["to"]
+  raise "You must specify a target version!  rake release[1.2.3]" if v.empty?
   check_update_requirements
   kitchen_inspec_version(v)
-  Rake::Task['changelog'].invoke
+  Rake::Task["changelog"].invoke
 end
 
 namespace :test do
   task :integration do
-    concurrency = ENV['CONCURRENCY'] || 1
-    os = ENV['OS'] || ''
-    sh('sh', '-c', "bundle exec kitchen test -c #{concurrency} #{os}")
+    concurrency = ENV["CONCURRENCY"] || 1
+    os = ENV["OS"] || ""
+    sh("sh", "-c", "bundle exec kitchen test -c #{concurrency} #{os}")
   end
 end

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 
-require 'bundler/setup'
-require 'kitchen/inspec'
+require "bundler/setup"
+require "kitchen/inspec"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require 'kitchen/inspec'
 # require 'pry'
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start

data/kitchen-inspec.gemspec

@@ -1,34 +1,26 @@
 # encoding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'kitchen/verifier/inspec_version'
-require 'English'
+require "kitchen/verifier/inspec_version"
+require "English"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'kitchen-inspec'
+  spec.name          = "kitchen-inspec"
   spec.version       = Kitchen::Verifier::INSPEC_VERSION
-  spec.license       = 'Apache-2.0'
-  spec.authors       = ['Fletcher Nichol']
-  spec.email         = ['fnichol@chef.io']
+  spec.license       = "Apache-2.0"
+  spec.authors       = ["Fletcher Nichol"]
+  spec.email         = ["fnichol@chef.io"]
 
-  spec.summary       = 'A Test Kitchen Verifier for InSpec'
+  spec.summary       = "A Test Kitchen Verifier for InSpec"
   spec.description   = spec.summary
-  spec.homepage      = 'http://github.com/chef/kitchen-inspec'
+  spec.homepage      = "http://github.com/chef/kitchen-inspec"
 
   spec.files         = `git ls-files -z`.split("\x0")
     .reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe'
+  spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-  spec.add_dependency 'inspec', '>=0.22.0', '<1.0.0'
-  spec.add_dependency 'test-kitchen', '~> 1.6'
-  spec.add_development_dependency 'countloc', '~> 0.4'
-  spec.add_development_dependency 'bundler', '~> 1.10'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'simplecov', '~> 0.10'
-  # style and complexity libraries are tightly version pinned as newer releases
-  # may introduce new and undesireable style choices which would be immediately
-  # enforced in CI
-  spec.add_development_dependency 'finstyle',  '1.5.0'
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.1.0"
+  spec.add_dependency "inspec", ">=0.22.0", "<1.0.0"
+  spec.add_dependency "test-kitchen", "~> 1.6"
 end

data/lib/kitchen/verifier/inspec.rb

@@ -17,13 +17,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'kitchen/transport/ssh'
-require 'kitchen/transport/winrm'
-require 'kitchen/verifier/inspec_version'
-require 'kitchen/verifier/base'
+require "kitchen/transport/ssh"
+require "kitchen/transport/winrm"
+require "kitchen/verifier/inspec_version"
+require "kitchen/verifier/base"
 
-require 'uri'
-require 'pathname'
+require "uri"
+require "pathname"
 
 module Kitchen
   module Verifier
@@ -53,7 +53,7 @@ module Kitchen
         # Unfortunately there is no way to read `test_base_path` from the
         # .kitchen.yml, it can only be provided on the CLI.
         # See https://github.com/test-kitchen/test-kitchen/issues/1077
-        inspec_test_dir = File.join(config[:kitchen_root], 'test', 'recipes')
+        inspec_test_dir = File.join(config[:kitchen_root], "test", "recipes")
         if File.directory?(inspec_test_dir)
           config[:test_base_path] = inspec_test_dir
         end
@@ -63,7 +63,7 @@ module Kitchen
 
       # (see Base#call)
       def call(state)
-        logger.debug('Initialize InSpec')
+        logger.debug("Initialize InSpec")
         opts = runner_options(instance.transport, state)
         runner = ::Inspec::Runner.new(opts)
 
@@ -74,25 +74,25 @@ module Kitchen
         logger.debug("Running tests from: #{tests.inspect}")
         exit_code = runner.run
         return if exit_code == 0
-        fail ActionFailed, "Inspec Runner returns #{exit_code}"
+        raise ActionFailed, "Inspec Runner returns #{exit_code}"
       end
 
       private
 
       # (see Base#load_needed_dependencies!)
       def load_needed_dependencies!
-        require 'inspec'
+        require "inspec"
         # TODO: this should be easier. I would expect to load a single class here
         # load supermarket plugin, this is part of the inspec gem
-        require 'bundles/inspec-supermarket/api'
-        require 'bundles/inspec-supermarket/target'
+        require "bundles/inspec-supermarket/api"
+        require "bundles/inspec-supermarket/target"
 
         # load the compliance plugin
-        require 'bundles/inspec-compliance/configuration'
-        require 'bundles/inspec-compliance/support'
-        require 'bundles/inspec-compliance/http'
-        require 'bundles/inspec-compliance/api'
-        require 'bundles/inspec-compliance/target'
+        require "bundles/inspec-compliance/configuration"
+        require "bundles/inspec-compliance/support"
+        require "bundles/inspec-compliance/http"
+        require "bundles/inspec-compliance/api"
+        require "bundles/inspec-compliance/target"
       end
 
       # Returns an Array of test suite filenames for the related suite currently
@@ -111,14 +111,14 @@ module Kitchen
         base = File.join(config[:test_base_path], config[:suite_name])
         legacy_mode = false
         # check for testing frameworks, we may need to add more
-        %w{inspec serverspec bats pester rspec cucumber minitest bash}.each { |fw|
+        %w{inspec serverspec bats pester rspec cucumber minitest bash}.each do |fw|
           if Pathname.new(File.join(base, fw)).exist?
             logger.info("Detected alternative framework tests for `#{fw}`")
             legacy_mode = true
           end
-        }
+        end
 
-        base = File.join(base, 'inspec') if legacy_mode
+        base = File.join(base, "inspec") if legacy_mode
         logger.info("Use `#{base}` for testing")
 
         # only return the directory if it exists
@@ -147,13 +147,13 @@ module 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"
+          raise Kitchen::UserError, "Verifier #{name} does not support the #{transport.name} Transport"
         end.tap do |runner_options|
           # default color to true to match InSpec behavior
-          runner_options['color'] = (config[:color].nil? ? true : config[:color])
-          runner_options['format'] = config[:format] unless config[:format].nil?
-          runner_options['output'] = config[:output] unless config[:output].nil?
-          runner_options['profiles_path'] = config[:profiles_path] unless config[:profiles_path].nil?
+          runner_options["color"] = (config[:color].nil? ? true : config[:color])
+          runner_options["format"] = config[:format] unless config[:format].nil?
+          runner_options["output"] = config[:output] unless config[:output].nil?
+          runner_options["profiles_path"] = config[:profiles_path] unless config[:profiles_path].nil?
         end
       end
 
@@ -164,26 +164,26 @@ module Kitchen
       def runner_options_for_ssh(config_data)
         kitchen = instance.transport.send(:connection_options, config_data).dup
         opts = {
-          'backend' => 'ssh',
-          'logger' => logger,
+          "backend" => "ssh",
+          "logger" => logger,
           # pass-in sudo config from kitchen verifier
-          'sudo' => config[:sudo],
-          'sudo_command' => config[:sudo_command],
-          'host' => kitchen[:hostname],
-          'port' => kitchen[:port],
-          'user' => kitchen[:username],
-          'keepalive' => kitchen[:keepalive],
-          'keepalive_interval' => kitchen[:keepalive_interval],
-          '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],
-          'compression' => kitchen[:compression],
-          'compression_level' => kitchen[:compression_level],
-          'keys_only' => true,
+          "sudo" => config[:sudo],
+          "sudo_command" => config[:sudo_command],
+          "host" => kitchen[:hostname],
+          "port" => kitchen[:port],
+          "user" => kitchen[:username],
+          "keepalive" => kitchen[:keepalive],
+          "keepalive_interval" => kitchen[:keepalive_interval],
+          "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],
+          "compression" => kitchen[:compression],
+          "compression_level" => kitchen[:compression_level],
+          "keys_only" => true,
         }
-        opts['key_files'] = kitchen[:keys] unless kitchen[:keys].nil?
-        opts['password'] = kitchen[:password] unless kitchen[:password].nil?
+        opts["key_files"] = kitchen[:keys] unless kitchen[:keys].nil?
+        opts["password"] = kitchen[:password] unless kitchen[:password].nil?
         opts
       end
 
@@ -194,15 +194,15 @@ module Kitchen
       def runner_options_for_winrm(config_data)
         kitchen = instance.transport.send(:connection_options, config_data).dup
         opts = {
-          'backend' => 'winrm',
-          'logger' => logger,
-          'host' => URI(kitchen[:endpoint]).hostname,
-          'port' => URI(kitchen[:endpoint]).port,
-          'user' => kitchen[:user],
-          'password' => kitchen[:pass],
-          'connection_retries' => kitchen[:connection_retries],
-          'connection_retry_sleep' => kitchen[:connection_retry_sleep],
-          'max_wait_until_ready' => kitchen[:max_wait_until_ready],
+          "backend" => "winrm",
+          "logger" => logger,
+          "host" => URI(kitchen[:endpoint]).hostname,
+          "port" => URI(kitchen[:endpoint]).port,
+          "user" => kitchen[:user],
+          "password" => kitchen[:password] || kitchen[:pass],
+          "connection_retries" => kitchen[:connection_retries],
+          "connection_retry_sleep" => kitchen[:connection_retry_sleep],
+          "max_wait_until_ready" => kitchen[:max_wait_until_ready],
         }
         opts
       end
@@ -218,13 +218,13 @@ module Kitchen
         #  - config_data[:data_container][:Id] : (hosts chef-client)
         #  - config_data[:runner_container][:Id] : (the kitchen-container)
         opts = {
-          'backend' => 'docker',
-          'logger' => logger,
-          '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],
+          "backend" => "docker",
+          "logger" => logger,
+          "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

data/lib/kitchen/verifier/inspec_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-15 00:00:00.000000000 Z
+date: 2016-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -44,90 +44,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: countloc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-- !ruby/object:Gem::Dependency
-  name: finstyle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
 description: A Test Kitchen Verifier for InSpec
 email:
 - fnichol@chef.io
@@ -138,7 +54,6 @@ files:
 - ".gitignore"
 - ".kitchen.yml"
 - ".rspec"
-- ".rubocop.yml"
 - ".travis.yml"
 - Berksfile
 - CHANGELOG.md
@@ -164,7 +79,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -172,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Verifier for InSpec

data/.rubocop.yml

@@ -1,65 +0,0 @@
----
-AllCops:
-  Exclude:
-  - Gemfile
-  - Rakefile
-  - 'test/**/*'
-  - 'examples/**/*'
-  - 'vendor/**/*'
-Documentation:
-  Enabled: false
-AlignParameters:
-  Enabled: true
-Encoding:
-  Enabled: true
-HashSyntax:
-  Enabled: true
-LineLength:
-  Enabled: false
-EmptyLinesAroundBlockBody:
-  Enabled: false
-MethodLength:
-  Max: 40
-NumericLiterals:
-  MinDigits: 10
-Metrics/CyclomaticComplexity:
-  Max: 10
-Metrics/PerceivedComplexity:
-  Max: 10
-Metrics/AbcSize:
-  Max: 33
-Style/PercentLiteralDelimiters:
-  PreferredDelimiters:
-    '%':  '{}'
-    '%i': ()
-    '%q': '{}'
-    '%Q': ()
-    '%r': '{}'
-    '%s': ()
-    '%w': '{}'
-    '%W': ()
-    '%x': ()
-Style/AlignHash:
-  Enabled: false
-Style/PredicateName:
-  Enabled: false
-Style/ClassAndModuleChildren:
-  Enabled: false
-Style/BracesAroundHashParameters:
-  Enabled: false
-Style/AndOr:
-  Enabled: false
-Style/Not:
-  Enabled: false
-Style/TrailingComma:
-  EnforcedStyleForMultiline: comma
-Style/NegatedIf:
-  Enabled: false
-Style/UnlessElse:
-  Enabled: false
-BlockDelimiters:
-  Enabled: false
-Style/SpaceAroundOperators:
-  Enabled: false
-Style/IfUnlessModifier:
-  Enabled: false