inspec 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a7bd506ba6b5577bc33e6a4421be6891fe2bc664
-  data.tar.gz: dcfde04ac7bc6c6119112d719c2a56a00f324043
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWU1MWE2NmFhMTQ0ODNhZDc2Zjk1YmM2OWNhNzdjNGRhYzBjMzllNA==
+  data.tar.gz: !binary |-
+    NjI5MGVjN2IzM2U4NDczZjU2NGZmZTQxNDJjNTMzN2M3MDc5YTFjMw==
 SHA512:
-  metadata.gz: dca0da99fe77fa5df70d636352b7db12768c566c3eec2d92a16d21c98ab650f642318e681736e9117f005e9322a3cedd9b0a7f28a8aa801ad73d281a4d57567e
-  data.tar.gz: 47cabf8903b98d634bfb158b64eba3e8750d5e24b3fd7cbe2c3d258daece4cf9b32ce257dfa03833c263e5fb6041273e68b630eae48a19d566daf172b33bf678
+  metadata.gz: !binary |-
+    N2EzZTRjZjA4ZDJkNTliM2MxNTJhNzNmMGVmODZlMzNkZWNmNWY2YmVkMDhi
+    MjBlODgzYzc5Njg3MGVjZmQyZjdjNmU4OGYyMGU2MmRhOGYxM2JlN2FjOGUw
+    Yjc1M2UwMjMwNmQ4N2U4YzRlMWUyOGM3Njc4N2VjYjE5NDgxZDg=
+  data.tar.gz: !binary |-
+    OTZkMDUwZGFmZjUxYmU3ZDlhYzQyNDJjMzQ5Y2I1YzUyZDVmZmZiZWU2NDBi
+    YjZmNzBjMGZiYmUxZTc5NjhhMWE4ZmM5NDZjOTk0YjU5ZDdkZTY0ZTdiOTY4
+    ZTM1ZGY3Y2EzYzM2ZWI1NDQ0NjAxOTJlMjk3OWU0NDNjOTI2ZWM=

data/CHANGELOG.md

@@ -1,7 +1,29 @@
 # Change Log
 
-## [0.19.1](https://github.com/chef/inspec/tree/0.19.1) (2016-04-18)
-[Full Changelog](https://github.com/chef/inspec/compare/v0.19.0...0.19.1)
+## [0.19.2](https://github.com/chef/inspec/tree/0.19.2) (2016-04-21)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.19.1...0.19.2)
+
+**Implemented enhancements:**
+
+- Fix indenting for translated loops and ors [\#673](https://github.com/chef/inspec/pull/673) ([alexpop](https://github.com/alexpop))
+- add regexp to cmp matcher [\#667](https://github.com/chef/inspec/pull/667) ([arlimus](https://github.com/arlimus))
+- remodel bash and shell wrappers [\#662](https://github.com/chef/inspec/pull/662) ([arlimus](https://github.com/arlimus))
+
+**Fixed bugs:**
+
+- bugfix: fix formatting of cmp expectations [\#668](https://github.com/chef/inspec/pull/668) ([arlimus](https://github.com/arlimus))
+
+**Closed issues:**
+
+- Octal Permissions Match [\#666](https://github.com/chef/inspec/issues/666)
+- file permissions for symlinked files are not checked correctly [\#665](https://github.com/chef/inspec/issues/665)
+
+**Merged pull requests:**
+
+- release via travis + test via rubygems [\#663](https://github.com/chef/inspec/pull/663) ([arlimus](https://github.com/arlimus))
+
+## [v0.19.1](https://github.com/chef/inspec/tree/v0.19.1) (2016-04-18)
+[Full Changelog](https://github.com/chef/inspec/compare/v0.19.0...v0.19.1)
 
 **Implemented enhancements:**
 
@@ -18,6 +40,7 @@
 
 **Merged pull requests:**
 
+- version bump: 0.19.1 [\#661](https://github.com/chef/inspec/pull/661) ([srenatus](https://github.com/srenatus))
 - add requirements for gem installation to readme [\#655](https://github.com/chef/inspec/pull/655) ([arlimus](https://github.com/arlimus))
 
 ## [v0.19.0](https://github.com/chef/inspec/tree/v0.19.0) (2016-04-17)

data/Gemfile

@@ -2,10 +2,6 @@
 source 'https://rubygems.org'
 gemspec
 
-group :development do
-  gem 'r-train', github: 'chef/train'
-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')

data/docs/matchers.rst

@@ -70,6 +70,14 @@ Unlike ``eq``, cmp is a matcher for less-restrictive comparisons. It will try to
       its('users') { should cmp ['root'] }
     end
 
+* Single-value arrays of strings may also be compared to a regex
+
+  .. code-block:: ruby
+
+    describe auditd_conf do
+      its('log_format') { should cmp /raw/i }
+    end
+
 * Improved printing of octal comparisons
 
   .. code-block:: ruby

data/lib/inspec/objects/each_loop.rb

@@ -25,7 +25,7 @@ module Inspec
 
     def to_ruby
       obj = super
-      all_tests = @tests.map(&:to_ruby).join("\n")
+      all_tests = @tests.map(&:to_ruby).join("\n").gsub("\n", "\n  ")
       format("%s.each do |entry|\n  %s\nend", obj, all_tests)
     end
   end

data/lib/inspec/objects/or_test.rb

@@ -11,8 +11,8 @@ module Inspec
     end
 
     def to_ruby
-      format("describe.one do\n  %s\nend",
-             @tests.map(&:to_ruby).join("\n"))
+      all_tests = @tests.map(&:to_ruby).join("\n").gsub("\n", "\n  ")
+      format("describe.one do\n  %s\nend", all_tests)
     end
 
     def to_hash

data/lib/inspec/resource.rb

@@ -54,6 +54,7 @@ require 'resources/apt'
 require 'resources/audit_policy'
 require 'resources/auditd_conf'
 require 'resources/auditd_rules'
+require 'resources/bash'
 require 'resources/bond'
 require 'resources/bridge'
 require 'resources/command'

data/lib/inspec/version.rb

@@ -3,5 +3,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '0.19.1'.freeze
+  VERSION = '0.19.2'.freeze
 end

data/lib/matchers/matchers.rb

@@ -240,13 +240,16 @@ RSpec::Matchers.define :cmp do |first_expected|
   end
 
   def octal?(value)
+    return false unless value.is_a?(String)
     !(value =~ /\A0+\d+\Z/).nil?
   end
 
-  def try_match(actual, op, expected) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+  def try_match(actual, op, expected) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/AbcSize
     # if actual and expected are strings
     if expected.is_a?(String) && actual.is_a?(String)
       return actual.casecmp(expected) == 0 if op == :==
+    elsif expected.is_a?(Regexp) && (actual.is_a?(String) || actual.is_a?(Integer))
+      return !actual.to_s.match(expected).nil?
     elsif expected.is_a?(String) && integer?(expected) && actual.is_a?(Integer)
       return actual.method(op).call(expected.to_i)
     elsif expected.is_a?(Integer) && integer?(actual)
@@ -274,21 +277,27 @@ RSpec::Matchers.define :cmp do |first_expected|
     try_match(actual, @operation, @expected)
   end
 
-  [:==, :<, :<=, :>=, :>, :===, :=~].each do |op|
+  [:==, :'!=', :<, :<=, :>=, :>, :===, :=~].each do |op|
     chain(op) do |x|
       @operation = op
       @expected = x
     end
   end
 
+  def format_expectation(negate)
+    return 'expected: '+@expected.inspect if @operation == :== && !negate
+    negate_str = negate ? 'not ' : ''
+    "expected it #{negate_str}to be #{@operation} #{@expected.inspect}"
+  end
+
   failure_message do |actual|
     actual = '0' + actual.to_s(8) if octal?(@expected)
-    "\nexpected: value #{@operation} #{@expected}\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
+    "\n" + format_expectation(false) + "\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
   end
 
   failure_message_when_negated do |actual|
     actual = '0' + actual.to_s(8) if octal?(@expected)
-    "\nexpected: value ! #{@operation} #{@expected}\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
+    "\n" + format_expectation(true) + "\n     got: #{actual}\n\n(compared using `cmp` matcher)\n"
   end
 end
 

data/lib/resources/bash.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+require 'utils/command_wrapper'
+require 'resources/command'
+
+module Inspec::Resources
+  class Bash < Cmd
+    name 'bash'
+    desc 'Run a command or script in BASH.'
+    example "
+      describe bash('ls -al /') do
+        its('stdout') { should match /bin/ }
+        its('stderr') { should eq '' }
+        its('exit_status') { should eq 0 }
+      end
+
+      # Specify the path of the executable:
+      bash('...', path: '/bin/bash')
+
+      # Specify arguments (defaults to -c)
+      bash('...', args: '-x -c')
+    "
+
+    def initialize(command, options = {})
+      @raw_command = command
+      options[:shell] = 'bash' if options.is_a?(Hash)
+      super(CommandWrapper.wrap(command, options))
+    end
+
+    def to_s
+      "Bash command #{@raw_command}"
+    end
+  end
+end

data/lib/resources/command.rb

@@ -4,8 +4,6 @@
 # author: Christoph Hartmann
 # license: All rights reserved
 
-require 'shellwords'
-
 module Inspec::Resources
   class Cmd < Inspec.resource(1)
     name 'command'
@@ -13,31 +11,20 @@ module Inspec::Resources
     example "
       describe command('ls -al /') do
         it { should exist }
-        its(:stdout) { should match /bin/ }
+        its('stdout') { should match /bin/ }
         its('stderr') { should eq '' }
-        its(:exit_status) { should eq 0 }
+        its('exit_status') { should eq 0 }
       end
     "
 
-    SHELLS = {
-      'sh'   => ->(x, path = 'sh')   { path + ' -c ' + Shellwords.escape(x) },
-      'bash' => ->(x, path = 'bash') { path + ' -c ' + Shellwords.escape(x) },
-      'zsh'  => ->(x, path = 'zsh')  { path + ' -c ' + Shellwords.escape(x) },
-    }.freeze
-
     attr_reader :command
 
-    def initialize(cmd, opts = {})
+    def initialize(cmd)
       @command = cmd
-      unless opts.is_a?(Hash)
-        skip_resource "Called #{self} with invalid command options. See the resource help for valid examples."
-        opts = {}
-      end
-      @opts = opts
     end
 
     def result
-      @result ||= inspec.backend.run_command(wrap_cmd)
+      @result ||= inspec.backend.run_command(@command)
     end
 
     def stdout
@@ -72,18 +59,5 @@ module Inspec::Resources
     def to_s
       "Command #{@command}"
     end
-
-    private
-
-    def wrap_cmd
-      shell = @opts[:shell]
-      return @command if shell.nil?
-
-      wrapper = SHELLS[shell]
-      # TODO: fail with an error if the command isn't found
-      return @command if wrapper.nil?
-
-      wrapper.call(@command)
-    end
   end
 end

data/lib/resources/file.rb

@@ -17,7 +17,7 @@ module Inspec::Resources
         it { should be_readable }
         it { should be_writable }
         it { should be_owned_by 'root' }
-        its('mode') { should eq 0644 }
+        its('mode') { should cmp '0644' }
       end
     "
     include MountParser

data/lib/resources/shadow.rb

@@ -27,7 +27,7 @@ module Inspec::Resources
       end
 
       describe shadow.users('bin') do
-        its('password') { should cmp 'x' }
+        its('passwords') { should cmp 'x' }
         its('count') { should eq 1 }
       end
     "

data/lib/utils/command_wrapper.rb

@@ -0,0 +1,32 @@
+# encoding: utf-8
+# author: Dominik Richter
+# author: Christoph Hartmann
+
+require 'shellwords'
+
+class CommandWrapper
+  UNIX_SHELLS = %w{sh bash zsh}.freeze
+
+  def self.wrap(cmd, options)
+    unless options.is_a?(Hash)
+      fail 'All options for the command wrapper must be provided as a hash. '\
+        "You entered: #{options.inspect}. Please consult the documentation."
+    end
+
+    wrap = options[:wrap]
+    if !wrap.nil? && !wrap.is_a?(Proc)
+      fail "Called command wrapper with wrap: #{wrap.inspect}. It must be called with a Proc."
+    elsif !wrap.nil?
+      return wrap.call(cmd)
+    end
+
+    shell = options[:shell]
+    unless UNIX_SHELLS.include?(shell)
+      fail "Don't know how to wrap commands for shell: #{shell.inspect}."
+    end
+
+    path = options[:path] || shell
+    args = options[:args] || '-c'
+    path.to_s + ' ' + args + ' ' + Shellwords.escape(cmd)
+  end
+end

data/test/integration/default/compare_matcher_spec.rb

@@ -35,24 +35,64 @@ if os.linux?
     it { should cmp len.to_s }
   end
 
+  describe 122 do
+    it { should cmp 122 }
+    it { should cmp < 133 }
+    it { should cmp > 111 }
+    it { should_not cmp < 122 }
+    it { should_not cmp > 122 }
+    it { should cmp <= 122 }
+    it { should cmp >= 122 }
+    it { should cmp >= -666 }
+    it { should_not cmp <= 111 }
+    it { should_not cmp >= 133 }
+    it { should cmp /122/ }
+    it { should_not cmp /133/ }
+  end
+
+  describe 0o640 do
+    it { should cmp 0o640 }
+    it { should cmp > 100 }
+    it { should_not cmp <= 0 }
+    it { should cmp == '416' }
+    it { should cmp /416$/ }
+  end
+
   describe '12' do
+    it { should cmp 12 }
     it { should cmp < 13 }
     it { should cmp > 11 }
     it { should_not cmp < 12 }
     it { should_not cmp > 12 }
     it { should cmp <= 12 }
     it { should cmp >= 12 }
+    it { should cmp >= -666 }
     it { should_not cmp <= 11 }
     it { should_not cmp >= 13 }
   end
 
+  describe 'some 123' do
+    it { should cmp 'some 123' }
+    it { should cmp /^SOME\s\d+(1|2|3)3/i }
+    it { should_not cmp /^SOME/ }
+  end
+
+  describe ['some-array'] do
+    it { should cmp 'some-array' }
+    it { should cmp /.+/ }
+    it { should_not cmp /^SOME/ }
+  end
+
   describe '' do
     it { should_not cmp >= 3 }
     it { should_not cmp < 3 }
+    it { should_not cmp /.+/ }
   end
 
   describe nil do
+    it { should cmp nil }
     it { should_not cmp >= 3 }
     it { should_not cmp < 3 }
+    it { should_not cmp /something/ }
   end
 end

data/test/unit/resources/bash_test.rb

@@ -0,0 +1,29 @@
+# encoding: utf-8
+# author: Christoph Hartmann
+# author: Dominik Richter
+
+require 'helper'
+require 'inspec/resource'
+
+describe Inspec::Resources::Bash do
+  let(:x) { rand.to_s }
+  let(:resource) { load_resource('bash', '$("'+x+'")') }
+
+  it 'prints as a bash command' do
+    resource.to_s.must_equal 'Bash command $("'+x+'")'
+  end
+
+  it 'wraps the command' do
+    resource.command.must_equal "bash -c \\$\\(\\\"#{x}\\\"\\)"
+  end
+
+  it 'can specify an executable path' do
+    resource = load_resource('bash', '$("'+x+'")', path: '/bin/bash')
+    resource.command.must_equal "/bin/bash -c \\$\\(\\\"#{x}\\\"\\)"
+  end
+
+  it 'can specify a arguments' do
+    resource = load_resource('bash', '$("'+x+'")', args: '-x -c')
+    resource.command.must_equal "bash -x -c \\$\\(\\\"#{x}\\\"\\)"
+  end
+end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-21 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
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.10.5
 - !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
@@ -278,6 +278,7 @@ files:
 - lib/resources/audit_policy.rb
 - lib/resources/auditd_conf.rb
 - lib/resources/auditd_rules.rb
+- lib/resources/bash.rb
 - lib/resources/bond.rb
 - lib/resources/bridge.rb
 - lib/resources/command.rb
@@ -332,12 +333,12 @@ files:
 - lib/source_readers/flat.rb
 - lib/source_readers/inspec.rb
 - lib/utils/base_cli.rb
+- lib/utils/command_wrapper.rb
 - lib/utils/convert.rb
 - lib/utils/detect.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
@@ -523,8 +524,6 @@ 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
@@ -539,9 +538,9 @@ files:
 - test/unit/resources/audit_policy_test.rb
 - test/unit/resources/auditd_conf_test.rb
 - test/unit/resources/auditd_rules_test.rb
+- test/unit/resources/bash_test.rb
 - test/unit/resources/bond_test.rb
 - test/unit/resources/bridge_test.rb
-- test/unit/resources/command_test.rb
 - test/unit/resources/csv_test.rb
 - test/unit/resources/etc_group_test.rb
 - test/unit/resources/file_test.rb
@@ -587,7 +586,6 @@ files:
 - test/unit/source_readers/inspec_test.rb
 - test/unit/utils/filter_array_test.rb
 - test/unit/utils/find_files_test.rb
-- test/unit/utils/hash_map_test.rb
 - test/unit/utils/passwd_parser_test.rb
 - test/unit/utils/simpleconfig_test.rb
 - test/unit/utils/solaris_netstat_parser.rb
@@ -601,17 +599,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.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Infrastructure and compliance testing.
@@ -794,8 +792,6 @@ 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
@@ -810,9 +806,9 @@ test_files:
 - test/unit/resources/audit_policy_test.rb
 - test/unit/resources/auditd_conf_test.rb
 - test/unit/resources/auditd_rules_test.rb
+- test/unit/resources/bash_test.rb
 - test/unit/resources/bond_test.rb
 - test/unit/resources/bridge_test.rb
-- test/unit/resources/command_test.rb
 - test/unit/resources/csv_test.rb
 - test/unit/resources/etc_group_test.rb
 - test/unit/resources/file_test.rb
@@ -858,7 +854,6 @@ test_files:
 - test/unit/source_readers/inspec_test.rb
 - test/unit/utils/filter_array_test.rb
 - test/unit/utils/find_files_test.rb
-- test/unit/utils/hash_map_test.rb
 - test/unit/utils/passwd_parser_test.rb
 - test/unit/utils/simpleconfig_test.rb
 - test/unit/utils/solaris_netstat_parser.rb

data/lib/utils/hash_map.rb

@@ -1,37 +0,0 @@
-# encoding: utf-8
-# author: Dominik Richter
-# author: Christoph Hartmann
-
-class HashMap
-  class << self
-    def [](hash, *keys)
-      return hash if keys.empty? || hash.nil?
-      key = keys.shift
-      if hash.is_a?(Array)
-        map = hash.map { |i| [i, key] }
-      else
-        map = hash[key]
-      end
-      [map, *keys]
-    rescue NoMethodError => _
-      nil
-    end
-  end
-end
-
-class StringMap
-  class << self
-    def [](hash, *keys)
-      return hash if keys.empty? || hash.nil?
-      key = keys.shift
-      if hash.is_a?(Array)
-        map = hash.map { |i| [i, key] }
-      else
-        map = hash[key]
-      end
-      [map, *keys]
-    rescue NoMethodError => _
-      nil
-    end
-  end
-end

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

@@ -1,10 +0,0 @@
-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

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

data/test/unit/resources/command_test.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-# author: Christoph Hartmann
-# author: Dominik Richter
-
-require 'helper'
-require 'inspec/resource'
-
-describe Inspec::Resources::Cmd do
-  it 'runs regular commands' do
-    x = rand.to_s
-    load_resource('command', x).method(:wrap_cmd).call
-      .must_equal x
-  end
-
-  it 'runs sh commands' do
-    x = rand.to_s
-    load_resource('command', '$("'+x+'")', {shell: 'sh'})
-    .method(:wrap_cmd).call
-    .must_equal "sh -c \\$\\(\\\"#{x}\\\"\\)"
-  end
-
-  it 'runs bash commands' do
-    x = rand.to_s
-    load_resource('command', '$("'+x+'")', {shell: 'bash'})
-      .method(:wrap_cmd).call
-      .must_equal "bash -c \\$\\(\\\"#{x}\\\"\\)"
-  end
-
-  it 'runs zsh commands' do
-    x = rand.to_s
-    load_resource('command', '$("'+x+'")', {shell: 'zsh'})
-      .method(:wrap_cmd).call
-      .must_equal "zsh -c \\$\\(\\\"#{x}\\\"\\)"
-  end
-end

data/test/unit/utils/hash_map_test.rb

@@ -1,63 +0,0 @@
-# encoding: utf-8
-# author: Dominik Richter
-# author: Christoph Hartmann
-
-require 'helper'
-require 'utils/hash_map'
-
-describe HashMap do
-  describe '#get_value' do
-    it 'returns the source value if no keys are given' do
-      x = rand
-      HashMap[x].must_equal x
-    end
-
-    it 'retrieves a key from a map' do
-      x = { a: rand }
-      HashMap[x, :a].must_equal x[:a]
-    end
-
-    it 'returns nil if the key doesnt exist' do
-      x = { a: rand }
-      HashMap[x, :b].must_be :nil?
-    end
-
-    it 'can extract a nil key' do
-      x = { nil => rand }
-      HashMap[x, nil].must_equal x[nil]
-    end
-
-    it 'extracts multiple keys' do
-      y = rand
-      x = { a: { b: { c: y }}}
-      HashMap[x, :a, :b, :c].must_equal y
-    end
-
-    it 'returns nil if a key in a list doesnt exist' do
-      x = { a: { b: { c: rand }}}
-      HashMap[x, :d, :b, :c].must_be :nil?
-    end
-
-    it 'retrieves exact keys by string' do
-      x = { a: rand }
-      HashMap[x, :a].must_equal x[:a]
-      HashMap[x, 'a'].must_be :nil?
-    end
-
-    it 'retrieves exact keys by string' do
-      x = { 'a' => rand }
-      HashMap[x, 'a'].must_equal x['a']
-      HashMap[x, :a].must_be :nil?
-    end
-
-    it 'con retrieve string keys' do
-      x = { 'a' => rand }
-      HashMap.extract_keys(x, ['a'], string_keys: true).must_equal x['a']
-      HashMap.extract_keys(x, [:a], string_keys: true).must_equal x['a']
-    end
-  end
-
-  describe 'as an instance' do
-    
-  end
-end