kitchen-inspec 0.11.1 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f9bc4f575ab5d4bb5c163ef5901e058da4b2ffd
-  data.tar.gz: b4a36fad7ab71d00438a7c632d1108ade8ffce33
+  metadata.gz: 89f66fb188fababc91cda971ea797f65f3da9229
+  data.tar.gz: 99c6e5bb4d095f651ab129ab5ecf37e464c60409
 SHA512:
-  metadata.gz: c8b0fe1548b0243766c477a3b940411a2d62f8b0c5f01357200de9b614def92292f893aeef69ea09b3305750e0ed691ce3341bf82be8dfd250dc763101b4908a
-  data.tar.gz: 5cacab6d53b19dff229555da70c390a896dbe454889b7a689b35be5695f24b653f33592539cc0526105a2e8b8e0ca2636ff9afbcf453a11256a59c1fa5c711a6
+  metadata.gz: 7767d067568d8a5fb1051a57b5521812ab9e56062b059ea7521711dd9c9ea973724dddc4f988d3e2e99f87e1f404807654e8eb06a806b959e018a1fac9fdbc6e
+  data.tar.gz: 41340aae6de976c57beb4cfc1ab21f9fd8a160de627bebd4c1a8504172cb8ff1f7a8b824b87e6fbbcef8295bd46bf93723e591540fe89d359189fe1a2dc73e0c

data/.gitignore

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

data/.kitchen.yml

@@ -0,0 +1,32 @@
+---
+driver:
+  name: dokken
+
+transport:
+  name: dokken
+
+provisioner:
+  name: dokken
+
+verifier:
+  name: inspec
+  sudo: true
+
+platforms:
+- name: ubuntu
+  driver:
+    image: ubuntu:14.04
+
+suites:
+  - name: default
+    run_list:
+      - recipe[os_prepare]
+    attributes:
+  - name: profile
+    run_list:
+      - recipe[os_prepare]
+    attributes:
+  - name: contains_inspec
+    run_list:
+      - recipe[os_prepare]
+    attributes:

data/Berksfile

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+source 'https://supermarket.chef.io'
+
+cookbook 'os_prepare', path: './test/cookbooks/os_prepare'

data/CHANGELOG.md

@@ -1,7 +1,35 @@
 # Change Log
 
-## [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)
+## [0.12.1](https://github.com/chef/kitchen-inspec/tree/0.12.1) (2016-02-22)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.12.0...0.12.1)
+
+**Merged pull requests:**
+
+- Support inspec dir in the test suite dir [\#55](https://github.com/chef/kitchen-inspec/pull/55) ([alexpop](https://github.com/alexpop))
+
+## [v0.12.0](https://github.com/chef/kitchen-inspec/tree/v0.12.0) (2016-02-19)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.11.1...v0.12.0)
+
+**Implemented enhancements:**
+
+- move integration tests to top-level [\#50](https://github.com/chef/kitchen-inspec/pull/50) ([chris-rock](https://github.com/chris-rock))
+- support embedded profiles, leave directory checking to inspec [\#49](https://github.com/chef/kitchen-inspec/pull/49) ([chris-rock](https://github.com/chris-rock))
+
+**Fixed bugs:**
+
+- Point test-kitchen to master in Gemfile [\#48](https://github.com/chef/kitchen-inspec/pull/48) ([jaym](https://github.com/jaym))
+
+**Merged pull requests:**
+
+- require latest inspec version [\#53](https://github.com/chef/kitchen-inspec/pull/53) ([chris-rock](https://github.com/chris-rock))
+- 0.12.0 [\#52](https://github.com/chef/kitchen-inspec/pull/52) ([chris-rock](https://github.com/chris-rock))
+
+## [v0.11.1](https://github.com/chef/kitchen-inspec/tree/v0.11.1) (2016-02-15)
+[Full Changelog](https://github.com/chef/kitchen-inspec/compare/v0.11.0...v0.11.1)
+
+**Implemented enhancements:**
+
+- 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))
 
 **Fixed bugs:**
 
@@ -9,8 +37,8 @@
 
 **Merged pull requests:**
 
+- 0.11.1 [\#47](https://github.com/chef/kitchen-inspec/pull/47) ([chris-rock](https://github.com/chris-rock))
 - 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)

data/Gemfile

@@ -14,8 +14,7 @@ group :test do
   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'
+  gem 'test-kitchen', git: 'https://github.com/test-kitchen/test-kitchen.git', branch: 'master'
 end
 
 # pin dependency for Ruby 1.9.3 since bundler is not

data/Rakefile

@@ -123,6 +123,6 @@ 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 .")
+    sh('sh', '-c', "bundle exec kitchen test -c #{concurrency}")
   end
 end

data/kitchen-inspec.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'inspec', '~> 0.9'
+  spec.add_dependency 'inspec', '~> 0.12'
   spec.add_development_dependency 'countloc', '~> 0.4'
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/kitchen/verifier/inspec.rb

@@ -30,13 +30,13 @@ module Kitchen
     # InSpec verifier for Kitchen.
     #
     # @author Fletcher Nichol <fnichol@chef.io>
-    class Inspec < Kitchen::Verifier::Base # rubocop:disable Metrics/ClassLength
+    class Inspec < Kitchen::Verifier::Base
       kitchen_verifier_api_version 1
       plugin_version Kitchen::Verifier::INSPEC_VERSION
 
       # (see Base#call)
       def call(state)
-        tests = helper_files + local_suite_files
+        tests = local_suite_files
 
         runner = ::Inspec::Runner.new(runner_options(instance.transport, state))
         runner.add_tests(tests)
@@ -48,31 +48,11 @@ module Kitchen
 
       private
 
-      # Determines whether or not a local workstation file exists under a
-      # Chef-related directory.
-      #
-      # @return [truthy,falsey] whether or not a given file is some kind of
-      #   Chef-related file
-      # @api private
-      def chef_data_dir?(base, file)
-        file =~ %r{^#{base}/(data|data_bags|environments|nodes|roles)/}
-      end
-
       # (see Base#load_needed_dependencies!)
       def load_needed_dependencies!
         require 'inspec'
       end
 
-      # Returns an Array of common helper filenames currently residing on the
-      # local workstation.
-      #
-      # @return [Array<String>] array of helper files
-      # @api private
-      def helper_files
-        glob = File.join(config[:test_base_path], 'helpers', '*/**/*')
-        Dir.glob(glob).reject { |f| File.directory?(f) }
-      end
-
       # Returns an Array of test suite filenames for the related suite currently
       # residing on the local workstation. Any special provisioner-specific
       # directories (such as a Chef roles/ directory) are excluded.
@@ -86,9 +66,9 @@ module Kitchen
       def local_suite_files
         base = File.join(config[:test_base_path], config[:suite_name])
         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?
+        # check for testing frameworks, we may need to add more
+        %w{inspec serverspec bats pester rspec cucumber minitest bash}.each { |fw|
+          if Pathname.new(File.join(base, fw)).exist?
             logger.info("Detected alternative framework tests for `#{fw}`")
             legacy_mode = true
           end
@@ -96,13 +76,9 @@ module Kitchen
 
         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
+        # we do not filter for specific directories, this is core of inspec
+        [base]
       end
 
       # Returns a configuration Hash that can be passed to a `Inspec::Runner`.

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.1'
+    INSPEC_VERSION = '0.12.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-inspec
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-15 00:00:00.000000000 Z
+date: 2016-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inspec
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -116,9 +116,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".kitchen.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- Berksfile
 - CHANGELOG.md
 - Gemfile
 - Guardfile