hammer_cli_foreman_openscap 0.1.6 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 279200fb303663c4973029e17e35033f14cba0fc
-  data.tar.gz: 7ae54e0d0f7c15eb42c22de1271363bcd3a02977
+SHA256:
+  metadata.gz: 26f5ac7c0c6d03de357a8d903cc1f642f17748821d6f6c06011ecde5330a2bba
+  data.tar.gz: deb6a45e5359cff52e0b9dc2670a084c4ddde5cb884ae2cdf6052740d75b4457
 SHA512:
-  metadata.gz: f369a7635fd37de7435c2d391b0b8b8d9f57b219d10b89fd6641ffcbbd9946ce3092fe4adb40e100ba59cb97499f1cefca0a700fdd566279df9efd759986c37f
-  data.tar.gz: 0050bf0670d93f0a5ab2a819ae8474a094fae7abf77c71cc985b608934436759052c61785e68db68e6bccefd8c768ee77ba92201836a905cbb1ce2ed01107ae1
+  metadata.gz: a83f3ebe046effbab0fd17bb02e322c50bec587b2347420b19aa84376d446d95649804b359ee77fd9b10d1e32f599b36ff9a87c733d77e0e603e81c65e34311b
+  data.tar.gz: 8e9ecd49d0ccc090dd3a24c4b8d13edb1d50c67242f89ccf0fef54e82fb8c82c7d410f891396c518eb33fb5b40b1b30a9ce5a7cdefa9fe8661b012ab9fac5572

data/lib/hammer_cli_foreman_openscap.rb

@@ -1,4 +1,5 @@
 require 'hammer_cli_foreman'
+require 'hammer_cli_foreman/host'
 require 'hammer_cli_foreman_openscap/options/normalizers'
 require 'hammer_cli_foreman_openscap/id_resolver'
 require 'hammer_cli_foreman_openscap/commands'
@@ -6,6 +7,7 @@ require 'hammer_cli_foreman_openscap/error'
 require 'hammer_cli_foreman_openscap/exception_handler'
 require 'hammer_cli_foreman_openscap/hostgroup'
 require 'hammer_cli_foreman_openscap/host'
+require 'hammer_cli_foreman_openscap/scap_content_profile'
 
 module HammerCLIForemanOpenscap
   require 'hammer_cli_foreman_openscap/version'
@@ -29,4 +31,12 @@ module HammerCLIForemanOpenscap
   HammerCLI::MainCommand.lazy_subcommand("tailoring-file", _("Manipulate Tailoring files"),
                                          "HammerCLIForemanOpenscap::TailoringFile",
                                          "hammer_cli_foreman_openscap/tailoring_file")
+
+  HammerCLI::MainCommand.lazy_subcommand("scap-content-profile", _("Manipulate Scap Content Profiles"),
+                                         "HammerCLIForemanOpenscap::ScapContentProfile",
+                                         "hammer_cli_foreman_openscap/scap_content_profile")
+
+  HammerCLIForeman::Host.lazy_subcommand(Host::PoliciesEnc.command_name, _('View policies ENC for host'),
+                                        "HammerCLIForemanOpenscap::Host::PoliciesEnc",
+                                        "hammer_cli_foreman_openscap/host")
 end

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
 
@@ -87,7 +88,7 @@ module HammerCLIForemanOpenscap
         return
       end
       # get file name from header, remove leading and trailing quotes
-      filename = response.headers[:content_disposition].match(/filename=(.*)/)[1].chop.reverse.chop.reverse
+      filename = response.headers[:content_disposition].match(/filename=(.*);/)[1].chop.reverse.chop.reverse
       path = option_path.dup
       path << '/' unless path.end_with? '/'
       raise HammerCLIForemanOpenscap::DownloadError.new "Cannot save file: #{path} does not exist" unless File.directory?(path)

data/lib/hammer_cli_foreman_openscap/host.rb

@@ -1,2 +1,34 @@
 require 'hammer_cli_foreman/host'
 require 'hammer_cli_foreman_openscap/host_extensions'
+
+module HammerCLIForemanOpenscap
+  class Host < HammerCLIForeman::Command
+    resource :hosts
+
+    class PoliciesEnc < HammerCLIForeman::ListCommand
+      command_name "policies-enc"
+      action :policies_enc
+
+      output do
+        field :id, _('Id')
+        field :profile_id, _('Profile Id')
+        field :content_path, _('Content path')
+        field :download_path, _('Content download path')
+        field :tailoring_path, _('Tailoring path')
+        field :tailoring_download_path, _('Tailoring download path')
+        field :monthday, _('Day of month')
+        field :hour, _('Hour')
+        field :minute, ('Minute')
+        field :month, _('Month')
+        field :week, _('Week')
+      end
+
+      def adapter
+        @context[:adapter] || :base
+      end
+
+      build_options
+    end
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_foreman_openscap/policy.rb

@@ -22,6 +22,7 @@ module HammerCLIForemanOpenscap
         field :scap_content_profile_id, _("SCAP Content profile Id")
         field :tailoring_file_id, _("Tailoring file Id")
         field :tailoring_file_profile_id, _("Tailoring file profile Id")
+        field :deploy_by, _("Deployment option")
         HammerCLIForeman::References.taxonomies(self)
         HammerCLIForeman::References.hostgroups(self)
       end
@@ -51,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/scap_content_profile.rb

@@ -0,0 +1,29 @@
+module HammerCLIForemanOpenscap
+  class ScapContentProfile < HammerCLIForeman::Command
+    resource :scap_content_profiles
+
+    class ListCommand < HammerCLIForeman::ListCommand
+      output do
+        field :id, _("Id")
+        field :title, _("Title")
+        field :profile_id, _("Profile Id")
+        from :scap_content do
+          field :id, _("Scap Content Id")
+          field :title, _("Scap Content Title")
+        end
+        from :tailoring_file do
+          field :id, _("Tailoring File Id")
+          field :name, _("Tailoring File Name")
+        end
+      end
+
+      def adapter
+        @context[:adapter] || :base
+      end
+
+      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.6'
+    @version ||= Gem::Version.new '0.1.11'
   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.6
+  version: 0.1.11
 platform: ruby
 authors:
 - The Foreman team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2020-07-28 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: []
@@ -47,6 +53,7 @@ files:
 - lib/hammer_cli_foreman_openscap/options/normalizers.rb
 - lib/hammer_cli_foreman_openscap/policy.rb
 - lib/hammer_cli_foreman_openscap/scap_content.rb
+- lib/hammer_cli_foreman_openscap/scap_content_profile.rb
 - lib/hammer_cli_foreman_openscap/tailoring_file.rb
 - lib/hammer_cli_foreman_openscap/version.rb
 - locale/Makefile
@@ -95,23 +102,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Foreman OpenSCAP commands for Hammer
 test_files:
-- test/unit/scap_content_test.rb
-- test/unit/tailoring_file_test.rb
-- test/unit/test_helper.rb
-- test/unit/policy_test.rb
-- test/unit/arf_report_test.rb
-- test/test_helper.rb
-- test/functional/scap_content_test.rb
-- test/functional/tailoring_file_test.rb
-- test/functional/test_helper.rb
-- test/data/1.14/foreman_api.json
+- 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/compliance_resource_mock.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