hammer_cli_foreman_openscap 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 897c97b3c9914d7020ad25e8f8184a45ca150b04
-  data.tar.gz: ccecac1ec87de1f4256cd3c2304efab756bb909c
+SHA256:
+  metadata.gz: 678b37b57981936274fec62371d7f0b29e087bd4675e78f2ac80673e4291efb1
+  data.tar.gz: 7951dae03743b2ca635500e61fe7d6197995050f06085ea993cc41c0959e4c8a
 SHA512:
-  metadata.gz: 85d8b7f9aa3f38279c83b40829919030b29db88c5e8cd4cfc2fa7397364b78ddbbf7835c678b94d84039dec1595f68b16c937b3e1074063e5138360c520e79ea
-  data.tar.gz: e6d0c63fb5994b660010766c45f697a46b846188a66217a1a34b77125315a318e76402a4f76fbefc49d6edbf555ed3d8634b8f1489699516536c0373b8178620
+  metadata.gz: 605ff8f09fee4a99649fc1ab3354c1827697334b9bb5b3f80c9fbc491974b0e1be0672f85ae746db0ec5d9fe5e68bd543c5446ef8903c39f872b87d7a9e9ad8c
+  data.tar.gz: d2c0b22b4e4f79d229afaee49f30d0378f9ca71169a3414472da1d7db1a23cc36371dee3c073567e1b44ec640ba9a5603995ab624d43e16bcd58ad8e93ff83f1

data/lib/hammer_cli_foreman_openscap/commands.rb

@@ -50,10 +50,11 @@ module HammerCLIForemanOpenscap
       option("--scap-file", "SCAP_FILE", description, opts, &block)
     end
 
-    def request_params
-      all_options['option_original_filename'] ||= self.class.declared_options.find { |opt| opt.attribute_name == "option_scap_file" }
+    def method_options(params)
+      opts = super params
+      opts[resource.singular_name]['original_filename'] ||= self.class.declared_options.find { |opt| opt.attribute_name == "option_scap_file" }
           .value_formatter.original_filename
-      super
+      opts
     end
   end
 

data/lib/hammer_cli_foreman_openscap/policy.rb

@@ -52,6 +52,22 @@ module HammerCLIForemanOpenscap
       build_options
     end
 
+    class HostsCommand < HammerCLIForeman::AssociatedListSearchCommand
+      command_name 'hosts'
+      search_resource :hosts
+
+      def self.search_options_mapping
+        {
+          'id' => 'compliance_policy_id',
+          'name' => 'compliance_policy'
+        }
+      end
+
+      output HammerCLIForeman::Host::ListCommand.output_definition
+
+      build_options
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_foreman_openscap/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForemanOpenscap
   def self.version
-    @version ||= Gem::Version.new '0.1.8'
+    @version ||= Gem::Version.new '0.1.9'
   end
 end

data/test/compliance_resource_mock.rb

@@ -4,12 +4,19 @@
   def self.arf
     {
       :id => 1,
-      :host => "somewhere.example.com",
+      :host => {
+        :name => "somewhere.example.com"
+      },
       :reported_at => "1916-06-08",
       :passed => 24,
       :failed => 25,
       :othered => 26,
-      :opeancap_proxy_name => "scap_proxy.example.com"
+      :openscap_proxy_name => {
+        :name => "scap_proxy.example.com"
+      },
+      :policy => {
+        :name => "strict policy"
+      }
     }
   end
 

data/test/functional/scap_content_test.rb

@@ -12,9 +12,9 @@ describe 'scap content' do
       expected_result = CommandExpectation.new
       expected_result.expected_err =
         ['Could not download the SCAP content file:',
-         '  Error: Option --path is required',
+         '  Error: Option --path is required.',
          '  ',
-         "  See: 'hammer scap-content download --help'",
+         "  See: 'hammer scap-content download --help'.",
          ''].join("\n")
 
       expected_result.expected_exit_code = HammerCLI::EX_USAGE

data/test/functional/tailoring_file_test.rb

@@ -11,9 +11,7 @@ describe 'tailoring file' do
 
       expected_result = CommandExpectation.new
       expected_result.expected_err =
-        ['Failed to create Tailoring file:',
-         "  Missing arguments for 'tailoring_file[scap_file]'",
-         ''].join("\n")
+        "Failed to create Tailoring file:\n  Missing arguments for '--scap-file'.\n"
       expected_result.expected_exit_code = HammerCLI::EX_USAGE
 
       api_expects_no_call
@@ -45,9 +43,9 @@ describe 'tailoring file' do
       expected_result = CommandExpectation.new
       expected_result.expected_err =
         ['Could not download the Tailoring file:',
-         '  Error: Option --path is required',
+         '  Error: Option --path is required.',
          '  ',
-         "  See: 'hammer tailoring-file download --help'",
+         "  See: 'hammer tailoring-file download --help'.",
          ''].join("\n")
 
       expected_result.expected_exit_code = HammerCLI::EX_USAGE

data/test/test_helper.rb

@@ -4,7 +4,7 @@ FOREMAN_OPENSCAP_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'])
 require 'minitest/autorun'
 require 'minitest/spec'
 require "minitest-spec-context"
-require "mocha/setup"
+require "mocha/minitest"
 require 'hammer_cli'
 
 if HammerCLI.context[:api_connection]

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - The Foreman team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2020-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.19'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.19'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '3.0'
 description: 
 email: 
 executables: []
@@ -96,22 +102,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Foreman OpenSCAP commands for Hammer
 test_files:
-- test/compliance_resource_mock.rb
 - test/data/1.11/foreman_api.json
 - test/data/1.14/foreman_api.json
 - test/data/1.15/foreman_api.json
 - test/data/tailoring.xml
+- test/functional/test_helper.rb
 - test/functional/scap_content_test.rb
 - test/functional/tailoring_file_test.rb
-- test/functional/test_helper.rb
-- test/test_helper.rb
 - test/unit/arf_report_test.rb
 - test/unit/policy_test.rb
 - test/unit/scap_content_test.rb
 - test/unit/tailoring_file_test.rb
 - test/unit/test_helper.rb
+- test/compliance_resource_mock.rb
+- test/test_helper.rb