inspec 0.19.3 → 0.20.0

data/test/functional/inspec_test.rb

@@ -20,6 +20,29 @@ describe 'command tests' do
     end
   end
 
+  describe 'cmd' do
+    it 'can run arbitrary ruby' do
+      x = rand
+      y = rand
+      out = inspec("shell -c '#{x} + #{y}'")
+      out.stderr.must_equal ''
+      out.exit_status.must_equal 0
+      j = JSON.load(out.stdout)
+      j.must_equal x+y
+    end
+
+    it 'retrieves resources in JSON' do
+      out = inspec("shell -c 'os.params'")
+      out.stderr.must_equal ''
+      out.exit_status.must_equal 0
+      j = JSON.load(out.stdout)
+      j.keys.must_include 'name'
+      j.keys.must_include 'family'
+      j.keys.must_include 'arch'
+      j.keys.must_include 'release'
+    end
+  end
+
   describe 'version' do
     it 'provides the version number on stdout' do
       out = inspec('version')

data/test/helper.rb

@@ -55,6 +55,7 @@ class MockLoader
     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 },
   }
 
@@ -242,6 +243,10 @@ class MockLoader
       'find /etc/xinetd.d -type f' => cmd.call('find-xinetd.d'),
       # wmi test
       "Get-WmiObject -class win32_service  -filter \"name like '%winrm%'\" | ConvertTo-Json" => cmd.call('get-wmiobject'),
+      #user info on hpux
+      "logins -x -l root" => cmd.call('logins-x'),
+      #packages on hpux
+      "swlist -l product | grep vim" => cmd.call('swlist-l-product')
     }
 
     @backend

data/test/resource/file_test.rb

@@ -22,8 +22,10 @@ describe file('/proc/version') do
 end
 
 describe file('/dev/stdout') do
-  its(:type) { should eq :symlink }
+  its(:type) { should eq :pipe }
+  its('source.type') { should eq :symlink }
   it { should be_symlink }
+  it { should be_pipe }
   it { should_not be_file }
   it { should_not be_directory }
 end

data/test/unit/{fetchers.rb → fetchers_test.rb}

@@ -51,6 +51,7 @@ describe Inspec::Plugins::RelFetcher do
     # ignore pax_global_header, which are commonly seen in github tars and are not
     # ignored by all tar streaming tools, its not extracted by GNU tar since 1.14
     %w{/pax_global_header /a/b}    => %w{b},
+    %w{pax_global_header a/b}    => %w{b},
   }.each do |ins, outs|
     describe 'empty profile' do
       let(:in_files) { ins }

data/test/unit/mock/cmd/logins-x

@@ -0,0 +1,4 @@
+root            0       sys             3
+                        /
+                        /sbin/sh
+                        PS 000000 -1 -1 -1

data/test/unit/mock/cmd/swlist-l-product

@@ -0,0 +1 @@
+  vim                                   7.4            vim

data/test/unit/mock/profiles/resource-tiny/inspec.yml

@@ -0,0 +1,10 @@
+name: complete
+title: complete example profile
+maintainer: Chef Software, Inc.
+copyright: Chef Software, Inc.
+copyright_email: support@chef.io
+license: Proprietary, All rights reserved
+summary: Testing stub
+version: 1.0.0
+supports:
+- os-family: linux

data/test/unit/mock/profiles/resource-tiny/libraries/resource.rb

@@ -0,0 +1,3 @@
+class Tiny < Inspec.resource(1)
+  name 'tiny'
+end

data/test/unit/resources/file_test.rb

@@ -143,6 +143,27 @@ describe Inspec::Resources::FileResource do
       end
     end
 
+    describe 'when on hpux' do
+      before do
+        MockLoader.mock_os(resource, :hpux)
+      end
+
+      it 'executes a properly formatted command' do
+        MockLoader.mock_command(resource, "su user -c \"test -flag /fakepath/fakefile\"", exit_status: 0)
+        resource.send(:check_file_permission_by_user, 'user', 'flag')
+      end
+
+      it 'returns true when the cmd exits 0' do
+        MockLoader.mock_command(resource, "su user -c \"test -flag /fakepath/fakefile\"", exit_status: 0)
+        resource.send(:check_file_permission_by_user, 'user', 'flag').must_equal(true)
+      end
+
+      it 'returns false when the cmd exits non-zero' do
+        MockLoader.mock_command(resource, "su user -c \"test -flag /fakepath/fakefile\"", exit_status: 1)
+        resource.send(:check_file_permission_by_user, 'user', 'flag').must_equal(false)
+      end
+    end
+
     describe 'when not on linux or freebsd' do
       before do
         MockLoader.mock_os(resource, :undefined)

data/test/unit/resources/package_test.rb

@@ -33,6 +33,15 @@ describe 'Inspec::Resources::Package' do
     _(resource.info).must_equal pkg
   end
 
+  # hpux
+  it 'verify hpux package parsing' do
+    resource = MockLoader.new(:hpux).load_resource('package', 'vim')
+    pkg = { name: 'vim', installed: true, version: '7.4', type: 'pkg' }
+    _(resource.installed?).must_equal true
+    _(resource.version).must_equal '7.4'
+    _(resource.info).must_equal pkg
+  end
+
   # wrlinux
   it 'verify wrlinux package parsing' do
     resource = MockLoader.new(:wrlinux).load_resource('package', 'curl')

data/test/unit/resources/user_test.rb

@@ -68,6 +68,12 @@ describe 'Inspec::Resources::User' do
     _(resource.warndays).must_equal 7
   end
 
+  it 'read user on hpux' do
+    resource = MockLoader.new(:hpux).load_resource('user', 'root')
+    _(resource.home).must_equal '/'
+    _(resource.shell).must_equal '/sbin/sh'
+  end
+
   it 'read user on freebsd' do
     resource = MockLoader.new(:freebsd10).load_resource('user', 'root')
     _(resource.exists?).must_equal true

data/test/unit/resources/xinetd_test.rb

@@ -17,7 +17,7 @@ describe 'Inspec::Resources::XinetdConf' do
 
   describe 'with services from child configs' do
     it 'has one service name' do
-      _(resource.services).must_equal %w{chargen}
+      _(resource.services.uniq).must_equal %w{chargen}
     end
 
     it 'has multiple service definitions' do
@@ -25,12 +25,12 @@ describe 'Inspec::Resources::XinetdConf' do
     end
 
     it 'can filter by name' do
-      _(resource.services('not here').params['services']).must_be_empty
+      _(resource.services('not here').services).must_be_empty
     end
 
     it 'can chain filters' do
       one = resource.services('chargen').socket_types('dgram')
-      _(one.params['services'].length).must_equal 1
+      _(one.services.length).must_equal 1
       _(one.ids).must_equal %w{chargen-dgram}
     end
 

data/test/unit/utils/filter_table_test.rb

@@ -0,0 +1,125 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Stephan Renatus
+# author: Christoph Hartmann
+
+require 'helper'
+
+describe FilterTable do
+  let (:data) {[
+    { foo: 3, bar: true, baz: 'yay', num: nil },
+    { foo: 2, bar: false, baz: 'noo', num: 1 },
+    { foo: 2, bar: false, baz: 'whatever', num: 2 },
+  ]}
+
+  let (:resource) {
+    Class.new do
+      attr_reader :data
+      def initialize(data)
+        @data = data
+      end
+    end
+  }
+
+  let (:factory) { FilterTable.create }
+  let (:instance) { resource.new(data) }
+
+  it 'has a create utility which creates a filter factory' do
+    factory.must_be_kind_of FilterTable::Factory
+  end
+
+  describe 'when calling add_accessor' do
+    it 'is chainable' do
+      factory.add_accessor(:sth).must_equal factory
+    end
+
+    it 'wont add nil' do
+      proc { factory.add_accessor(nil) }.must_throw RuntimeError
+    end
+
+    it 'can expose the where method' do
+      factory.add_accessor(:where).connect(resource, :data)
+      _(instance.respond_to?(:where)).must_equal true
+      instance.where({ baz: 'yay' }).params.must_equal [data[0]]
+    end
+
+    it 'will delegate even non-existing methods' do
+      factory.add_accessor(:not_here).connect(resource, :data)
+      _(instance.respond_to?(:not_here)).must_equal true
+    end
+  end
+
+  describe 'when calling add' do
+    it 'is chainable' do
+      factory.add(:sth).must_equal factory
+    end
+
+    it 'wont add nil' do
+      proc { factory.add(nil) }.must_throw RuntimeError
+    end
+
+    it 'can expose a data column' do
+      factory.add(:baz).connect(resource, :data)
+      instance.baz(123).must_be_kind_of(FilterTable::Table)
+    end
+  end
+
+  describe 'when calling entries' do
+    before { factory.add(:baz).connect(resource, :data) }
+    let(:entries) { instance.baz(/.*/).entries }
+    let(:entry) { instance.baz('yay').entries }
+
+    it 'retrieves all entries with this field' do
+      entries.length.must_equal 3
+      entry.length.must_equal 1
+    end
+
+    it 'retrieves all entries with this field' do
+      entry[0].must_be_kind_of(Struct)
+    end
+
+    it 'retrieves all entries with this field' do
+      entry[0].baz.must_equal 'yay'
+    end
+
+    it 'prints nicely' do
+      entry[0].to_s.must_match(/ with baz == "yay" one entry/)
+    end
+  end
+
+  describe 'with the number field' do
+    before { factory.add(:num).connect(resource, :data) }
+
+    it 'filter by nil' do
+      instance.num(nil).params.must_equal [data[0]]
+    end
+
+    it 'filter by existing numbers' do
+      instance.num(1).params.must_equal [data[1]]
+    end
+
+    it 'filter by missing number' do
+      instance.num(-1).params.must_equal []
+    end
+  end
+
+  describe 'with the string field' do
+    before { factory.add(:baz).connect(resource, :data) }
+
+    it 'filter by existing strings' do
+      instance.baz('yay').params.must_equal [data[0]]
+    end
+
+    it 'filter by missing string' do
+      instance.baz('num').params.must_equal []
+    end
+
+    it 'filter by existing regex' do
+      instance.baz(/A/i).params.must_equal [data[0], data[2]]
+    end
+
+    it 'filter by missing regex' do
+      instance.baz(/zzz/).params.must_equal []
+    end
+  end
+end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.20.0
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-22 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: r-train
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: method_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 description: InSpec provides a framework for creating end-to-end infrastructure tests.
@@ -161,7 +161,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .rubocop.yml
+- ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -214,12 +214,16 @@ files:
 - inspec.gemspec
 - lib/bundles/README.md
 - lib/bundles/inspec-compliance.rb
+- lib/bundles/inspec-compliance/.kitchen.yml
 - lib/bundles/inspec-compliance/README.md
 - lib/bundles/inspec-compliance/api.rb
+- lib/bundles/inspec-compliance/bootstrap.sh
 - lib/bundles/inspec-compliance/cli.rb
 - lib/bundles/inspec-compliance/configuration.rb
 - lib/bundles/inspec-compliance/http.rb
+- lib/bundles/inspec-compliance/support.rb
 - lib/bundles/inspec-compliance/target.rb
+- lib/bundles/inspec-compliance/test/integration/default/cli.rb
 - lib/bundles/inspec-init.rb
 - lib/bundles/inspec-init/cli.rb
 - lib/bundles/inspec-init/templates/profile/README.md
@@ -335,10 +339,11 @@ files:
 - lib/utils/base_cli.rb
 - lib/utils/command_wrapper.rb
 - lib/utils/convert.rb
-- lib/utils/detect.rb
+- lib/utils/filter.rb
 - lib/utils/filter_array.rb
 - lib/utils/find_files.rb
 - lib/utils/hash.rb
+- lib/utils/hash_map.rb
 - lib/utils/json_log.rb
 - lib/utils/modulator.rb
 - lib/utils/object_traversal.rb
@@ -412,12 +417,12 @@ files:
 - test/test-extra.yaml
 - test/test.yaml
 - test/unit/control_test.rb
-- test/unit/fetchers.rb
 - test/unit/fetchers/local_test.rb
 - test/unit/fetchers/mock_test.rb
 - test/unit/fetchers/tar_test.rb
 - test/unit/fetchers/url_test.rb
 - test/unit/fetchers/zip_test.rb
+- test/unit/fetchers_test.rb
 - test/unit/metadata_test.rb
 - test/unit/mock/cmd/$env-PATH
 - test/unit/mock/cmd/Get-NetAdapter
@@ -459,6 +464,7 @@ files:
 - test/unit/mock/cmd/initctl-status-ssh
 - test/unit/mock/cmd/iptables-s
 - test/unit/mock/cmd/launchctl-list
+- test/unit/mock/cmd/logins-x
 - test/unit/mock/cmd/ls-1-etc-init.d
 - test/unit/mock/cmd/ls-sys-class-net-br
 - test/unit/mock/cmd/lsmod
@@ -484,6 +490,7 @@ files:
 - test/unit/mock/cmd/service-sshd-status
 - test/unit/mock/cmd/sockstat
 - test/unit/mock/cmd/success
+- test/unit/mock/cmd/swlist-l-product
 - test/unit/mock/cmd/systemctl-show-all-dbus
 - test/unit/mock/cmd/systemctl-show-all-sshd
 - test/unit/mock/cmd/win32_product
@@ -524,6 +531,8 @@ files:
 - test/unit/mock/profiles/legacy-empty-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/test/.gitkeep
+- test/unit/mock/profiles/resource-tiny/inspec.yml
+- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/mock/profiles/skippy-profile-os/controls/one.rb
 - test/unit/mock/profiles/skippy-profile-os/inspec.yml
@@ -585,6 +594,7 @@ files:
 - test/unit/source_readers/flat_test.rb
 - test/unit/source_readers/inspec_test.rb
 - test/unit/utils/filter_array_test.rb
+- test/unit/utils/filter_table_test.rb
 - test/unit/utils/find_files_test.rb
 - test/unit/utils/passwd_parser_test.rb
 - test/unit/utils/simpleconfig_test.rb
@@ -599,17 +609,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.
@@ -680,12 +690,12 @@ test_files:
 - test/test-extra.yaml
 - test/test.yaml
 - test/unit/control_test.rb
-- test/unit/fetchers.rb
 - test/unit/fetchers/local_test.rb
 - test/unit/fetchers/mock_test.rb
 - test/unit/fetchers/tar_test.rb
 - test/unit/fetchers/url_test.rb
 - test/unit/fetchers/zip_test.rb
+- test/unit/fetchers_test.rb
 - test/unit/metadata_test.rb
 - test/unit/mock/cmd/$env-PATH
 - test/unit/mock/cmd/Get-NetAdapter
@@ -727,6 +737,7 @@ test_files:
 - test/unit/mock/cmd/initctl-status-ssh
 - test/unit/mock/cmd/iptables-s
 - test/unit/mock/cmd/launchctl-list
+- test/unit/mock/cmd/logins-x
 - test/unit/mock/cmd/ls-1-etc-init.d
 - test/unit/mock/cmd/ls-sys-class-net-br
 - test/unit/mock/cmd/lsmod
@@ -752,6 +763,7 @@ test_files:
 - test/unit/mock/cmd/service-sshd-status
 - test/unit/mock/cmd/sockstat
 - test/unit/mock/cmd/success
+- test/unit/mock/cmd/swlist-l-product
 - test/unit/mock/cmd/systemctl-show-all-dbus
 - test/unit/mock/cmd/systemctl-show-all-sshd
 - test/unit/mock/cmd/win32_product
@@ -792,6 +804,8 @@ test_files:
 - test/unit/mock/profiles/legacy-empty-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/metadata.rb
 - test/unit/mock/profiles/legacy-simple-metadata/test/.gitkeep
+- test/unit/mock/profiles/resource-tiny/inspec.yml
+- test/unit/mock/profiles/resource-tiny/libraries/resource.rb
 - test/unit/mock/profiles/simple-metadata/inspec.yml
 - test/unit/mock/profiles/skippy-profile-os/controls/one.rb
 - test/unit/mock/profiles/skippy-profile-os/inspec.yml
@@ -853,6 +867,7 @@ test_files:
 - test/unit/source_readers/flat_test.rb
 - test/unit/source_readers/inspec_test.rb
 - test/unit/utils/filter_array_test.rb
+- test/unit/utils/filter_table_test.rb
 - test/unit/utils/find_files_test.rb
 - test/unit/utils/passwd_parser_test.rb
 - test/unit/utils/simpleconfig_test.rb