inspec 0.28.1 → 0.29.0

data/test/functional/inspec_exec_test.rb

@@ -60,11 +60,12 @@ Target:  local://
 
 \e[32m  ✔  working should eq \"working\"\e[0m
 \e[37m  ○  skippy This will be skipped intentionally.\e[0m
-\e[31m  ✖  failing should eq \"as intended\"
+\e[31m  ✖  failing should eq \"as intended\" (
      expected: \"as intended\"
           got: \"failing\"
-     \n     (compared using ==)
-     \e[0m
+     
+     (compared using ==)
+     )\e[0m
 
 Summary: \e[32m1 successful\e[0m, \e[31m1 failures\e[0m, \e[37m1 skipped\e[0m
 "

data/test/helper.rb

@@ -38,25 +38,25 @@ TMP_CACHE = {}
 class MockLoader
   # collects emulation operating systems
   OPERATING_SYSTEMS = {
-    arch:       { family: 'arch', release: nil, arch: nil },
-    centos5:    { family: 'redhat', release: '5.11', arch: 'x86_64' },
-    centos6:    { family: 'redhat', release: '6.6', arch: 'x86_64' },
-    centos7:    { family: 'redhat', release: '7.1.1503', arch: 'x86_64' },
-    debian6:    { family: 'debian', release: '6', arch: 'x86_64' },
-    debian7:    { family: 'debian', release: '7', arch: 'x86_64' },
-    debian8:    { family: 'debian', release: '8', arch: 'x86_64' },
-    freebsd9:   { family: 'freebsd', release: '9', arch: 'amd64' },
-    freebsd10:  { family: 'freebsd', release: '10', arch: 'amd64' },
-    osx104:     { family: 'darwin', release: '10.10.4', arch: nil, name: 'mac_os_x' },
-    ubuntu1204: { family: 'ubuntu', release: '12.04', arch: 'x86_64' },
-    ubuntu1404: { family: 'ubuntu', release: '14.04', arch: 'x86_64' },
-    ubuntu1504: { family: 'ubuntu', release: '15.04', arch: 'x86_64' },
-    windows:    { family: 'windows', release: '6.2.9200', arch: 'x86_64' },
-    wrlinux:    { family: 'wrlinux', release: '7.0(3)I2(2)', arch: 'x86_64' },
-    solaris11:  { family: "solaris", release: '11', arch: 'i386'},
-    solaris10:  { family: "solaris", release: '10', arch: 'i386'},
-    hpux:       {family: 'hpux', release: 'B.11.31', arch: 'ia64'},
-    undefined:  { family: nil, release: nil, arch: nil },
+    arch:       { name: 'arch', family: 'arch', release: nil, arch: nil },
+    centos5:    { name: 'centos', family: 'redhat', release: '5.11', arch: 'x86_64' },
+    centos6:    { name: 'centos', family: 'redhat', release: '6.6', arch: 'x86_64' },
+    centos7:    { name: 'centos', family: 'redhat', release: '7.1.1503', arch: 'x86_64' },
+    debian6:    { name: 'debian', family: 'debian', release: '6', arch: 'x86_64' },
+    debian7:    { name: 'debian', family: 'debian', release: '7', arch: 'x86_64' },
+    debian8:    { name: 'debian', family: 'debian', release: '8', arch: 'x86_64' },
+    freebsd9:   { name: 'freebsd', family: 'freebsd', release: '9', arch: 'amd64' },
+    freebsd10:  { name: 'freebsd', family: 'freebsd', release: '10', arch: 'amd64' },
+    osx104:     { name: 'mac_os_x',family: 'darwin', release: '10.10.4', arch: nil },
+    ubuntu1204: { name: 'ubuntu', family: 'debian', release: '12.04', arch: 'x86_64' },
+    ubuntu1404: { name: 'ubuntu', family: 'debian', release: '14.04', arch: 'x86_64' },
+    ubuntu1504: { name: 'ubuntu', family: 'debian', release: '15.04', arch: 'x86_64' },
+    windows:    { name: 'windows', family: 'windows', release: '6.2.9200', arch: 'x86_64' },
+    wrlinux:    { name: 'wrlinux', family: 'redhat', release: '7.0(3)I2(2)', arch: 'x86_64' },
+    solaris11:  { name: "solaris", family: 'solaris', release: '11', arch: 'i386'},
+    solaris10:  { name: "solaris", family: 'solaris', release: '10', arch: 'i386'},
+    hpux:       { name: 'hpux', family: 'hpux', release: 'B.11.31', arch: 'ia64'},
+    undefined:  { name: nil, family: nil, release: nil, arch: nil },
   }
 
   # pass the os identifier to emulate a specific operating system
@@ -123,6 +123,7 @@ class MockLoader
       '/etc/xinetd.d' => mockfile.call('xinetd.d'),
       '/etc/xinetd.d/chargen-stream' => mockfile.call('xinetd.d_chargen-stream'),
       '/etc/xinetd.d/chargen-dgram' => mockfile.call('xinetd.d_chargen-dgram'),
+      '/etc/sysctl.conf' => mockfile.call('sysctl.conf'),
     }
 
     # create all mock commands

data/test/integration/default/_debug_spec.rb

@@ -1 +1,8 @@
-p "You are currently running on OS: #{os[:name] || 'unknown'}, OS release: #{os[:release] || 'unknown'}, OS family: #{os[:family] || 'unknown'}"
+puts "-----------------------------------"
+puts "        TEST ENVIRONMENT           "
+puts "-----------------------------------"
+puts "    Docker: #{!ENV['DOCKER'].nil?}"
+puts "   OS name: #{os[:name] || 'unknown' }"
+puts "OS release: #{os[:release] || 'unknown'}"
+puts " OS family: #{os[:family] || 'unknown'}"
+puts "-----------------------------------"

data/test/integration/default/apache_conf_spec.rb

@@ -1,8 +1,13 @@
 # encoding: utf-8
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
-return unless os.linux?
+if !os.linux?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on linux.\033[0m"
+  return
+end
 
 # direct access to params of apache conf
 describe apache_conf do

data/test/integration/default/apt_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-if os[:family] == 'ubuntu'
+if os[:name] == 'ubuntu'
 
   describe apt('ppa:nginx/stable') do
     it { should exist }
@@ -29,11 +29,6 @@ elsif os[:family] == 'debian'
     it { should be_enabled }
   end
 
-  describe apt('http://nginx.org/packages/debian') do
-    it { should exist }
-    it { should be_enabled }
-  end
-
   describe apt('https://deb.nodesource.com/node_4.x/dists/precise/') do
     it { should_not exist }
     it { should_not be_enabled }

data/test/integration/default/etc_group_spec.rb

@@ -1,7 +1,9 @@
 # encoding: utf-8
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # lets define our own group
 root_group = 'root'

data/test/integration/default/file_spec.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 if os[:family] == 'freebsd'
   filedata = {

data/test/integration/default/iptables_spec.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 case os[:family]
 when 'ubuntu', 'fedora'

data/test/integration/default/kernel_module_spec.rb

@@ -1,8 +1,13 @@
 # encoding: utf-8
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
-return unless os.linux?
+if !os.linux?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on linux.\033[0m"
+  return
+end
 
 # Test kernel modules on all linux systems
 describe kernel_module('video') do

data/test/integration/default/kernel_parameter_spec.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # prepare values
 if ['ubuntu', 'centos', 'fedora', 'opensuse', 'debian'].include?(os[:family])

data/test/integration/default/mount_spec.rb

@@ -1,8 +1,13 @@
 # encoding: utf-8
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
-return unless os.linux?
+if !os.linux?
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__} because we are not on linux.\033[0m"
+  return
+end
 
 # instead of `.with` or `.only_with` we recommend to use the `mount` resource
 describe mount '/mnt/iso-disk' do

data/test/integration/default/package_spec.rb

@@ -11,7 +11,6 @@ when 'aix'
     its('version') { should match /^(6|7)[.|\d]+\d$/ }
   end
 when 'solaris'
-
   if os[:release] == '11'
     pkg = 'system/file-system/zfs'
     ver = /^0\.5.+$/
@@ -24,8 +23,6 @@ when 'solaris'
     it { should be_installed }
     its('version') { should match ver }
   end
-
-
 end
 
 describe package('nginx') do

data/test/integration/default/port_spec.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # check that ssh runs
 if os.unix?

data/test/integration/default/postgres_session_spec.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # postgres-server is installed on these platforms
 if ['ubuntu', 'centos'].include? os['family']

data/test/integration/default/service_spec.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
-
-# TODO: do not run those tests on docker yet
-return if ENV['DOCKER']
+if ENV['DOCKER']
+  STDERR.puts "\033[1;33mTODO: Not running #{__FILE__.split("/").last} because we are running in docker\033[0m"
+  return
+end
 
 # based on operating system we select the available service
 if ['centos', 'fedora', 'freebsd', 'opensuse'].include?(os[:family])

data/test/unit/mock/files/sysctl.conf

@@ -0,0 +1,7 @@
+#
+# /etc/sysctl.conf - Configuration file for setting system variables
+# See /etc/sysctl.d/ for additional system variables.
+# See sysctl.conf (5) for information.
+#
+
+kernel.domainname = example.com

data/test/unit/profile_context_test.rb

@@ -77,7 +77,7 @@ describe Inspec::ProfileContext do
     include DescribeOneTest
 
     it 'must provide os resource' do
-      load('print os[:family]').must_output 'ubuntu'
+      load('print os[:family]').must_output 'debian'
     end
 
     it 'must provide file resource' do
@@ -215,7 +215,7 @@ describe Inspec::ProfileContext do
     describe 'adds a check via describe' do
       let(:check) {
         profile.load(format(context_format,
-          "describe os[:family] { it { must_equal 'ubuntu' } }"
+          "describe os[:family] { it { must_equal 'debian' } }"
           ))
         get_checks[0]
       }
@@ -225,7 +225,7 @@ describe Inspec::ProfileContext do
       end
 
       it 'registers the check with the describe argument' do
-        check[1].must_equal %w{ubuntu}
+        check[1].must_equal %w{debian}
       end
 
       it 'registers the check with the provided proc' do
@@ -236,7 +236,7 @@ describe Inspec::ProfileContext do
     describe 'adds a check via expect' do
       let(:check) {
         profile.load(format(context_format,
-          "expect(os[:family]).to eq('ubuntu')"
+          "expect(os[:family]).to eq('debian')"
           ))
         get_checks[0]
       }
@@ -246,7 +246,7 @@ describe Inspec::ProfileContext do
       end
 
       it 'registers the check with the describe argument' do
-        check[1].must_equal %w{ubuntu}
+        check[1].must_equal %w{debian}
       end
 
       it 'registers the check with the provided proc' do
@@ -258,7 +258,7 @@ describe Inspec::ProfileContext do
       let(:check) {
         profile.load(format(context_format,
           "describe 'the actual test' do
-            expect(os[:family]).to eq('ubuntu')
+            expect(os[:family]).to eq('debian')
           end"
           ))
         get_checks[0]

data/test/unit/resources/os_test.rb

@@ -8,7 +8,7 @@ require 'inspec/resource'
 describe 'Inspec::Resources::Os' do
   it 'verify os parsing on CentOS' do
     resource = MockLoader.new(:centos7).load_resource('os')
-    _(resource.name).must_equal nil
+    _(resource.name).must_equal 'centos'
     _(resource.family).must_equal 'redhat'
     _(resource.release).must_equal '7.1.1503'
     _(resource.arch).must_equal 'x86_64'
@@ -16,7 +16,7 @@ describe 'Inspec::Resources::Os' do
 
   it 'read env variable on Windows' do
     resource = MockLoader.new(:windows).load_resource('os')
-    _(resource.name).must_equal nil
+    _(resource.name).must_equal 'windows'
     _(resource.family).must_equal 'windows'
     _(resource.release).must_equal '6.2.9200'
     _(resource.arch).must_equal 'x86_64'
@@ -24,7 +24,7 @@ describe 'Inspec::Resources::Os' do
 
   it 'verify os parsing on Debian' do
     resource = MockLoader.new(:debian8).load_resource('os')
-    _(resource.name).must_equal nil
+    _(resource.name).must_equal 'debian'
     _(resource.family).must_equal 'debian'
     _(resource.release).must_equal '8'
     _(resource.arch).must_equal 'x86_64'
@@ -32,8 +32,8 @@ describe 'Inspec::Resources::Os' do
 
   it 'verify os parsing on Ubuntu' do
     resource = MockLoader.new(:ubuntu1504).load_resource('os')
-    _(resource.name).must_equal nil
-    _(resource.family).must_equal 'ubuntu'
+    _(resource.name).must_equal 'ubuntu'
+    _(resource.family).must_equal 'debian'
     _(resource.release).must_equal '15.04'
     _(resource.arch).must_equal 'x86_64'
   end

data/test/unit/resources/parse_config_test.rb

@@ -0,0 +1,26 @@
+require 'helper'
+require 'inspec/resource'
+
+describe 'Inspec::Resources::ParseConfig' do
+
+  it 'verify parse_config resource' do
+    options = {
+      assignment_re: /^\s*([^=]*?)\s*=\s*(.*?)\s*$/
+    }
+    resource = MockLoader.new(:centos6).load_resource('parse_config', 'kernel.domainname = example.com', options)
+    result = {"kernel.domainname"=>"example.com"}
+    _(resource.params).must_equal result
+    _(resource.content).must_equal 'kernel.domainname = example.com'
+    _(resource.send('kernel.domainname')).must_equal 'example.com'
+  end
+
+  it 'verify parse_config_file resource' do
+    options = {
+      assignment_re: /^\s*([^=]*?)\s*=\s*(.*?)\s*$/
+    }
+    resource = MockLoader.new(:centos6).load_resource('parse_config_file', '/etc/sysctl.conf', options)
+    result = {"kernel.domainname"=>"example.com"}
+    _(resource.params).must_equal result
+    _(resource.send('kernel.domainname')).must_equal 'example.com'
+  end
+end

data/test/unit/resources/port_test.rb

@@ -44,6 +44,15 @@ describe 'Inspec::Resources::Port' do
     _(resource.addresses).must_equal ["0.0.0.0"]
   end
 
+  it 'accepts the port as a string' do
+    resource = MockLoader.new(:ubuntu1404).load_resource('port', '111')
+    _(resource.listening?).must_equal true
+    _(resource.protocols).must_equal %w{ udp }
+    _(resource.pids).must_equal [545]
+    _(resource.processes).must_equal ['rpcbind']
+    _(resource.addresses).must_equal ["0.0.0.0"]
+  end
+
   it 'verify port on MacOs x' do
     resource = MockLoader.new(:osx104).load_resource('port', 2022)
     _(resource.listening?).must_equal true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.29.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-03 00:00:00.000000000 Z
+date: 2016-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '1.0'
@@ -403,6 +403,7 @@ files:
 - test/cookbooks/os_prepare/recipes/mount.rb
 - test/cookbooks/os_prepare/recipes/package.rb
 - test/cookbooks/os_prepare/recipes/postgres.rb
+- test/cookbooks/os_prepare/recipes/prep_container.rb
 - test/cookbooks/os_prepare/recipes/registry_key.rb
 - test/cookbooks/os_prepare/recipes/service.rb
 - test/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb
@@ -556,6 +557,7 @@ files:
 - test/unit/mock/files/shadow
 - test/unit/mock/files/ssh_config
 - test/unit/mock/files/sshd_config
+- test/unit/mock/files/sysctl.conf
 - test/unit/mock/files/xinetd.conf
 - test/unit/mock/files/xinetd.d/.gitkeep
 - test/unit/mock/files/xinetd.d_chargen-dgram
@@ -618,6 +620,7 @@ files:
 - test/unit/resources/os_env_test.rb
 - test/unit/resources/os_test.rb
 - test/unit/resources/package_test.rb
+- test/unit/resources/parse_config_test.rb
 - test/unit/resources/passwd_test.rb
 - test/unit/resources/pip_test.rb
 - test/unit/resources/port_test.rb
@@ -688,6 +691,7 @@ test_files:
 - test/cookbooks/os_prepare/recipes/mount.rb
 - test/cookbooks/os_prepare/recipes/package.rb
 - test/cookbooks/os_prepare/recipes/postgres.rb
+- test/cookbooks/os_prepare/recipes/prep_container.rb
 - test/cookbooks/os_prepare/recipes/registry_key.rb
 - test/cookbooks/os_prepare/recipes/service.rb
 - test/cookbooks/os_prepare/templates/default/sv-default-svlog-run.erb
@@ -841,6 +845,7 @@ test_files:
 - test/unit/mock/files/shadow
 - test/unit/mock/files/ssh_config
 - test/unit/mock/files/sshd_config
+- test/unit/mock/files/sysctl.conf
 - test/unit/mock/files/xinetd.conf
 - test/unit/mock/files/xinetd.d/.gitkeep
 - test/unit/mock/files/xinetd.d_chargen-dgram
@@ -903,6 +908,7 @@ test_files:
 - test/unit/resources/os_env_test.rb
 - test/unit/resources/os_test.rb
 - test/unit/resources/package_test.rb
+- test/unit/resources/parse_config_test.rb
 - test/unit/resources/passwd_test.rb
 - test/unit/resources/pip_test.rb
 - test/unit/resources/port_test.rb