inspec 4.12.0 → 4.16.0

data/lib/plugins/inspec-plugin-manager-cli/test/unit/cli_args_test.rb

@@ -13,13 +13,15 @@ class PluginManagerCliOptions < Minitest::Test
 
   def test_list_args
     arg_config = cli_class.all_commands["list"].options
-    assert_equal 1, arg_config.count, "The list command should have 1 option"
+    assert_equal 4, arg_config.count, "The list command should have 4 options"
 
-    assert_includes arg_config.keys, :all, "The list command should have an --all option"
-    assert_equal :boolean, arg_config[:all].type, "The --all option should be boolean"
-    assert_equal :a, arg_config[:all].aliases.first, "The --all option should be aliased as -a"
-    refute_nil arg_config[:all].description, "The --all option should have a description"
-    refute arg_config[:all].required, "The --all option should not be required"
+    { u: :user, a: :all, c: :core, s: :system }.each do |abbrev, option|
+      assert_includes arg_config.keys, option, "The list command should have an --#{option} option"
+      assert_equal :boolean, arg_config[option].type, "The --#{option} option should be boolean"
+      assert_equal abbrev, arg_config[option].aliases.first, "The --#{option} option should be aliased as -#{abbrev}"
+      refute_nil arg_config[option].description, "The --#{option} option should have a description"
+      refute arg_config[option].required, "The --#{option} option should not be required"
+    end
 
     assert_equal 0, cli_class.instance_method(:list).arity, "The list command should take no arguments"
   end

data/lib/source_readers/inspec.rb

@@ -40,25 +40,27 @@ module SourceReaders
       raise "Unable to parse #{metadata_source}: #{e.class} -- #{e.message}"
     end
 
+    def find_all(regexp)
+      @target.files.grep(regexp)
+    end
+
+    def load_all(regexp)
+      find_all(regexp)
+        .map { |path| file = @target.read(path); [path, file] if file }
+        .compact
+        .to_h
+    end
+
     def load_tests
-      tests = @target.files.find_all do |path|
-        path.start_with?("controls") && path.end_with?(".rb")
-      end
-      Hash[tests.map { |x| [x, @target.read(x)] }.delete_if { |_file, contents| contents.nil? }]
+      load_all(%r{^controls/.*\.rb$})
     end
 
     def load_libs
-      tests = @target.files.find_all do |path|
-        path.start_with?("libraries") && path.end_with?(".rb")
-      end
-      Hash[tests.map { |x| [x, @target.read(x)] }.delete_if { |_file, contents| contents.nil? }]
+      load_all(%r{^libraries/.*\.rb$})
     end
 
     def load_data_files
-      files = @target.files.find_all do |path|
-        path.start_with?("files" + File::SEPARATOR)
-      end
-      Hash[files.map { |x| [x, @target.read(x)] }.delete_if { |_file, contents| contents.nil? }]
+      load_all(%r{^files/})
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 4.12.0
+  version: 4.16.0
 platform: ruby
 authors:
 - Chef InSpec Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -589,6 +589,7 @@ files:
 - lib/inspec/resources/pip.rb
 - lib/inspec/resources/platform.rb
 - lib/inspec/resources/port.rb
+- lib/inspec/resources/postfix_conf.rb
 - lib/inspec/resources/postgres.rb
 - lib/inspec/resources/postgres_conf.rb
 - lib/inspec/resources/postgres_hba_conf.rb