hammer_cli_foreman_openscap 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 023f846648269546d90463914a7d24853ea8d40e
-  data.tar.gz: 79f0784f94b2729c38476a0dcf8db1debd9aea15
+  metadata.gz: d97687adbccb06adceff03dfe0168eb82b41f426
+  data.tar.gz: 317708f0cc4013865c8d2eae91a80cc88259a088
 SHA512:
-  metadata.gz: f12a4e5a457d472d6352fe1f22b955a5632b6ce87cc5ad5ca10f35d535cdb57eddab8dbcff3d05779d5ae026340dea718e367c7cc9cd3f9550710e1b88355ac8
-  data.tar.gz: 7cb5ffbd96ffedf477166a29f1d200fbe3725d184fa819e252aed25367ed4c5ab8bdbe725c325cdd3b3f004248ba1828a59fb0356a2f9d3b0c6f1645ad92a05f
+  metadata.gz: b66779accf7d6b1849d6c61341f727604f89570fbae6b544fdbd22e8a99df20d5f7bff5d4b16de9c34d42f65fbbb970d3ff1be2346a9d4f015ed020e8a128aa4
+  data.tar.gz: c41765bceb936bf3cc9c45920b86d2ae8d097e19f0cd675da426e373bdfcd673ef211bc3ef0d32a5685ea15e5b626785efffd4bc13ab4d909d1619a85a550afc

data/lib/hammer_cli_foreman_openscap.rb

@@ -4,25 +4,27 @@ require 'hammer_cli_foreman_openscap/id_resolver'
 require 'hammer_cli_foreman_openscap/commands'
 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'
 
 module HammerCLIForemanOpenscap
   def self.exception_handler_class
     HammerCLIForemanOpenscap::ExceptionHandler
   end
 
-  HammerCLI::MainCommand.lazy_subcommand("arf-report", _("Manipulate compliance reports."),
+  HammerCLI::MainCommand.lazy_subcommand("arf-report", _("Manipulate compliance reports"),
                                          "HammerCLIForemanOpenscap::ArfReport",
                                          "hammer_cli_foreman_openscap/arf_report")
 
-  HammerCLI::MainCommand.lazy_subcommand("policy", _("Manipulate policies."),
+  HammerCLI::MainCommand.lazy_subcommand("policy", _("Manipulate policies"),
                                          "HammerCLIForemanOpenscap::Policy",
                                          "hammer_cli_foreman_openscap/policy")
 
-  HammerCLI::MainCommand.lazy_subcommand("scap-content", _("Manipulate Scap contents."),
+  HammerCLI::MainCommand.lazy_subcommand("scap-content", _("Manipulate SCAP contents"),
                                          "HammerCLIForemanOpenscap::ScapContent",
                                          "hammer_cli_foreman_openscap/scap_content")
 
-  HammerCLI::MainCommand.lazy_subcommand("tailoring-file", _("Manipulate Tailoring files."),
+  HammerCLI::MainCommand.lazy_subcommand("tailoring-file", _("Manipulate Tailoring files"),
                                          "HammerCLIForemanOpenscap::TailoringFile",
                                          "hammer_cli_foreman_openscap/tailoring_file")
 end

data/lib/hammer_cli_foreman_openscap/arf_report.rb

@@ -6,8 +6,16 @@ module HammerCLIForemanOpenscap
     class ListCommand < HammerCLIForeman::ListCommand
       output do
         field :id, _("Id")
-        field :host, _("Host")
         field :reported_at, _("Reported at")
+        from :host do
+          field :name, _("Host name")
+        end
+        from :openscap_proxy do
+          field :name, _("OpenSCAP proxy name")
+        end
+        from :policy do
+          field :name, _("Policy name")
+        end
         field :passed, _("Passed")
         field :failed, _("Failed")
         field :othered, _("Othered")
@@ -17,33 +25,39 @@ module HammerCLIForemanOpenscap
 
     class InfoCommand < HammerCLIForemanOpenscap::InfoCommand
       output ListCommand.output_definition do
-        field :host_id, _("Host Id")
-        field :openscap_proxy_id, _("Openscap proxy Id")
-        field :openscap_proxy_name, _("Openscap proxy name")
+        from :host do
+          field :id, _("Host Id")
+        end
+        from :openscap_proxy do
+          field :id, _("OpenSCAP proxy Id")
+        end
+        from :policy do
+          field :id, _("Policy Id")
+        end
         HammerCLIForeman::References.taxonomies(self)
       end
 
       build_options
     end
 
-    class DeleteCommand < HammerCLIForeman::DeleteCommand
-      success_message _("Arf report deleted")
-      failure_message _("Could not delete the Arf report")
+    class DeleteCommand < HammerCLIForemanOpenscap::DeleteCommand
+      success_message _("ARF report deleted")
+      failure_message _("Could not delete the ARF report")
 
       build_options
     end
 
     class DownloadCommand < HammerCLIForemanOpenscap::DownloadCommand
-      success_message _("Arf report downloaded, saved to: ")
-      failure_message _("Could not download the Arf report")
+      success_message _("ARF report downloaded, saved to: ")
+      failure_message _("Could not download the ARF report")
 
       build_options
     end
 
     class DownloadHtmlCommand < HammerCLIForemanOpenscap::DownloadCommand
       action :download_html
-      success_message _("Arf report in HTML downloaded, saved to: ")
-      failure_message _("Could not download the Arf report in HTML")
+      success_message _("ARF report in HTML downloaded, saved to: ")
+      failure_message _("Could not download the ARF report in HTML")
 
       def self.command_name(name = "download-html")
         super(name)

data/lib/hammer_cli_foreman_openscap/host.rb

@@ -0,0 +1,2 @@
+require 'hammer_cli_foreman/host'
+require 'hammer_cli_foreman_openscap/host_extensions'

data/lib/hammer_cli_foreman_openscap/host_extensions.rb

@@ -0,0 +1,9 @@
+require 'hammer_cli_foreman/host'
+
+module HammerCLIForemanOpenscap
+  ::HammerCLIForeman::Host::InfoCommand.instance_eval do
+    output do
+      field :openscap_proxy_id, _('OpenSCAP Proxy')
+    end
+  end
+end

data/lib/hammer_cli_foreman_openscap/hostgroup.rb

@@ -0,0 +1,2 @@
+require 'hammer_cli_foreman/hostgroup'
+require 'hammer_cli_foreman_openscap/hostgroup_extensions'

data/lib/hammer_cli_foreman_openscap/hostgroup_extensions.rb

@@ -0,0 +1,9 @@
+require 'hammer_cli_foreman/hostgroup'
+
+module HammerCLIForemanOpenscap
+  ::HammerCLIForeman::Hostgroup::InfoCommand.instance_eval do
+    output do
+      field :openscap_proxy_id, _('OpenSCAP Proxy')
+    end
+  end
+end

data/lib/hammer_cli_foreman_openscap/i18n.rb

@@ -0,0 +1,24 @@
+require 'hammer_cli/i18n'
+
+module HammerCLIForemanOpenscap
+  module I18n
+
+    class LocaleDomain < HammerCLI::I18n::LocaleDomain
+
+      def translated_files
+        Dir.glob(File.join(File.dirname(__FILE__), '../**/*.rb'))
+      end
+
+      def locale_dir
+        File.join(File.dirname(__FILE__), '../../locale')
+      end
+
+      def domain_name
+        'hammer_cli_foreman_openscap'
+      end
+    end
+
+  end
+end
+
+HammerCLI::I18n.add_domain(HammerCLIForemanOpenscap::I18n::LocaleDomain.new)

data/lib/hammer_cli_foreman_openscap/id_resolver.rb

@@ -1,7 +1,7 @@
 module HammerCLIForemanOpenscap
   class Searchables < HammerCLIForeman::Searchables
     SEARCHABLES = {
-      :scap_content => [s("title", _("Scap content title"))],
+      :scap_content => [s("title", _("SCAP content title"))],
       :arf_report => [],
       :policy => [s_name(_("Policy name"))],
       :tailoring_file => [s_name('Tailoring file name')]

data/lib/hammer_cli_foreman_openscap/policy.rb

@@ -16,12 +16,14 @@ module HammerCLIForemanOpenscap
       output ListCommand.output_definition do
         field :period, _("Period")
         field :weekday, _("Weekday")
+        field :day_of_month, _("Day of month")
         field :cron_line, _("Cron line")
-        field :scap_content_id, _("Scap content Id")
-        field :scap_content_profile_id, _("Scap Content profile Id")
+        field :scap_content_id, _("SCAP content Id")
+        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")
         HammerCLIForeman::References.taxonomies(self)
+        HammerCLIForeman::References.hostgroups(self)
       end
       build_options
     end

data/lib/hammer_cli_foreman_openscap/scap_content.rb

@@ -12,17 +12,17 @@ module HammerCLIForemanOpenscap
     end
 
     class CreateCommand < HammerCLIForemanOpenscap::CreateWithScapFileCommand
-      success_message _("Scap content successfully created")
-      failure_message _("Failed to create Scap content")
+      success_message _("SCAP content successfully created")
+      failure_message _("Failed to create SCAP content")
 
-      scap_file_option _("Scap content file")
+      scap_file_option _("SCAP content file")
 
       build_options
     end
 
     class DeleteCommand < HammerCLIForemanOpenscap::DeleteCommand
-      success_message _("Scap content deleted")
-      failure_message _("Could not delete Scap content")
+      success_message _("SCAP content deleted")
+      failure_message _("Could not delete SCAP content")
 
       build_options
     end
@@ -32,7 +32,7 @@ module HammerCLIForemanOpenscap
         field :created_at, _("Created at")
         field :original_filename, _("Original filename")
 
-        collection :scap_content_profiles, _("Scap content profiles") do
+        collection :scap_content_profiles, _("SCAP content profiles") do
           field :id, _("Id")
           field :profile_id, _("Profile id")
           field :title, _("Title")
@@ -43,15 +43,22 @@ module HammerCLIForemanOpenscap
     end
 
     class UpdateCommand < HammerCLIForemanOpenscap::UpdateCommand
-      success_message _("Scap content updated")
-      failure_message _("Could not update Scap content")
+      success_message _("SCAP content updated")
+      failure_message _("Could not update SCAP content")
 
-      option "--scap-file", "SCAP_FILE", _("Scap content file"),
+      option "--scap-file", "SCAP_FILE", _("SCAP content file"),
                    :attribute_name => :option_scap_file,
                    :format => HammerCLI::Options::Normalizers::File.new
       build_options
     end
 
+    class DownloadCommand < HammerCLIForemanOpenscap::DownloadXmlCommand
+      success_message _("SCAP content file downloaded, saved to: ")
+      failure_message _("Could not download the SCAP content file")
+
+      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.4'
+    @version ||= Gem::Version.new '0.1.5'
   end
 end

data/locale/Makefile

@@ -0,0 +1,65 @@
+#
+# Makefile for PO merging and MO generation. More info in the README.
+#
+# make all-mo (default) - generate MO files
+# make check - check translations using translate-tool
+# make tx-update - download and merge translations from Transifex
+# make clean - clean everything
+#
+DOMAIN = hammer_cli_foreman_openscap
+VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load("../hammer_cli_foreman_openscap.gemspec");puts spec.version')
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+POFILES = $(shell find . -name '*.po')
+MOFILES = $(patsubst %.po,%.mo,$(POFILES))
+POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+
+%.mo: %.po
+	mkdir -p $(shell dirname $@)/LC_MESSAGES
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+
+# Generate MO files from PO files
+all-mo: $(MOFILES)
+
+# Check for malformed strings
+%.pox: %.po
+	msgfmt -c $<
+	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
+	cat $@
+	! grep -q msgid $@
+
+check: $(POXFILES)
+	msgfmt -c ${POTFILE}
+
+# Merge PO files
+update-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msgmerge -N --backup=none -U $$f ${POTFILE} ; \
+	done
+
+# Unify duplicate translations
+uniq-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msguniq $$f -o $$f ; \
+	done
+
+tx-pull:
+	tx pull -f
+	for f in $(POFILES) ; do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+	-git commit -a -m "i18n - extracting new, pulling from tx"
+
+extract-strings:
+	bundle exec rake gettext:find
+
+reset-po:
+	# merging po files is unnecessary when using transifex.com
+	git checkout -- ../locale/*/*po
+
+tx-update: tx-pull extract-strings reset-po $(MOFILES)
+	# amend mo files
+	git add ../locale/*/LC_MESSAGES
+	git commit -a --amend -m "i18n - extracting new, pulling from tx"
+	-echo Changes commited!

data/locale/README.md

@@ -0,0 +1,18 @@
+Updating the translations
+-------------------------
+
+  1. Check if there are any new languages with progress more than 50% on [transifex](https://www.transifex.com/projects/p/foreman/resource/hammer-cli-foreman-openscap/). If so, do the following for each of the new languages:
+
+  ```
+    mkdir locale/<lang>
+    cp locale/hammer_cli_foreman_openscap.pot locale/<lang>/hammer_cli_foreman_discovery.po
+  ```
+  2. Make sure you have `transifex-client` installed
+
+  3. Update the translations. From GIT repo root directory run:
+
+  ```
+    make -C locale tx-update
+  ```
+
+  It will download translations from transifex, generates `mo` files, updates strings in `pot` file and wraps all the changes in a new commit. Transifex automatically updates its strings when the commit is pushed to Github.

data/locale/en/hammer_cli_foreman_openscap.po

@@ -0,0 +1,204 @@
+# English translations for hammer_cli_foreman_openscap package.
+# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the hammer_cli_foreman_openscap package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hammer_cli_foreman_openscap 0.1.4\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2017-09-08 15:57-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
+
+msgid "Manipulate compliance reports"
+msgstr ""
+
+msgid "Manipulate policies"
+msgstr ""
+
+msgid "Manipulate SCAP contents"
+msgstr ""
+
+msgid "Manipulate Tailoring files"
+msgstr ""
+
+msgid "Id"
+msgstr ""
+
+msgid "Host"
+msgstr ""
+
+msgid "Reported at"
+msgstr ""
+
+msgid "Passed"
+msgstr ""
+
+msgid "Failed"
+msgstr ""
+
+msgid "Othered"
+msgstr ""
+
+msgid "Host Id"
+msgstr ""
+
+msgid "OpenSCAP proxy Id"
+msgstr ""
+
+msgid "OpenSCAP proxy name"
+msgstr ""
+
+msgid "ARF report deleted"
+msgstr ""
+
+msgid "Could not delete the ARF report"
+msgstr ""
+
+msgid "ARF report downloaded, saved to: "
+msgstr ""
+
+msgid "Could not download the ARF report"
+msgstr ""
+
+msgid "ARF report in HTML downloaded, saved to: "
+msgstr ""
+
+msgid "Could not download the ARF report in HTML"
+msgstr ""
+
+msgid "Path to directory where downloaded file will be saved"
+msgstr ""
+
+msgid "SCAP content title"
+msgstr ""
+
+msgid "Policy name"
+msgstr ""
+
+msgid "Name to search by"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "Created at"
+msgstr ""
+
+msgid "Period"
+msgstr ""
+
+msgid "Weekday"
+msgstr ""
+
+msgid "Day of month"
+msgstr ""
+
+msgid "Cron line"
+msgstr ""
+
+msgid "SCAP content Id"
+msgstr ""
+
+msgid "SCAP Content profile Id"
+msgstr ""
+
+msgid "Tailoring file Id"
+msgstr ""
+
+msgid "Tailoring file profile Id"
+msgstr ""
+
+msgid "Policy has been deleted"
+msgstr ""
+
+msgid "Could not delete the policy"
+msgstr ""
+
+msgid "Policy created"
+msgstr ""
+
+msgid "Could not create the policy"
+msgstr ""
+
+msgid "Policy updated"
+msgstr ""
+
+msgid "Could not update the policy"
+msgstr ""
+
+msgid "Title"
+msgstr ""
+
+msgid "SCAP content successfully created"
+msgstr ""
+
+msgid "Failed to create SCAP content"
+msgstr ""
+
+msgid "SCAP content file"
+msgstr ""
+
+msgid "SCAP content deleted"
+msgstr ""
+
+msgid "Could not delete SCAP content"
+msgstr ""
+
+msgid "Original filename"
+msgstr ""
+
+msgid "SCAP content profiles"
+msgstr ""
+
+msgid "Profile id"
+msgstr ""
+
+msgid "SCAP content updated"
+msgstr ""
+
+msgid "Could not update SCAP content"
+msgstr ""
+
+msgid "SCAP content file downloaded, saved to: "
+msgstr ""
+
+msgid "Could not download the SCAP content file"
+msgstr ""
+
+msgid "Tailoring file successfully created"
+msgstr ""
+
+msgid "Failed to create Tailoring file"
+msgstr ""
+
+msgid "Tailoring file content"
+msgstr ""
+
+msgid "Tailoring file deleted"
+msgstr ""
+
+msgid "Could not delete Tailoring file"
+msgstr ""
+
+msgid "Tailoring file profiles"
+msgstr ""
+
+msgid "Tailoring file updated"
+msgstr ""
+
+msgid "Could not update Tailoring file"
+msgstr ""
+
+msgid "Tailoring file downloaded, saved to: "
+msgstr ""
+
+msgid "Could not download the Tailoring file"
+msgstr ""

data/locale/hammer_cli_foreman_openscap.pot

@@ -0,0 +1,281 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the hammer_cli_foreman_openscap package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: hammer_cli_foreman_openscap 0.1.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-09-08 16:19-0400\n"
+"PO-Revision-Date: 2017-09-08 16:19-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: ../lib/hammer_cli_foreman_openscap.rb:13
+msgid "Manipulate compliance reports"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:17
+msgid "Manipulate policies"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:21
+msgid "Manipulate SCAP contents"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:25
+msgid "Manipulate Tailoring files"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:8
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:8
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:8
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:36
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:8
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:36
+msgid "Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:9
+msgid "Host"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:10
+msgid "Reported at"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:11
+msgid "Passed"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:12
+msgid "Failed"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:13
+msgid "Othered"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:20
+msgid "Host Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:21
+msgid "OpenSCAP proxy Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:22
+msgid "OpenSCAP proxy name"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:30
+msgid "ARF report deleted"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:31
+msgid "Could not delete the ARF report"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:37
+msgid "ARF report downloaded, saved to: "
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:38
+msgid "Could not download the ARF report"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:45
+msgid "ARF report in HTML downloaded, saved to: "
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:46
+msgid "Could not download the ARF report in HTML"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/commands.rb:81
+msgid "Path to directory where downloaded file will be saved"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/id_resolver.rb:4
+msgid "SCAP content title"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/id_resolver.rb:6
+msgid "Policy name"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/id_resolver.rb:10
+msgid "Name to search by"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:9
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:9
+msgid "Name"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:10
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:32
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:32
+msgid "Created at"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:17
+msgid "Period"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:18
+msgid "Weekday"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:19
+msgid "Day of month"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:20
+msgid "Cron line"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:21
+msgid "SCAP content Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:22
+msgid "SCAP Content profile Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:23
+msgid "Tailoring file Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:24
+msgid "Tailoring file profile Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:32
+msgid "Policy has been deleted"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:33
+msgid "Could not delete the policy"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:40
+msgid "Policy created"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:41
+msgid "Could not create the policy"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:48
+msgid "Policy updated"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:49
+msgid "Could not update the policy"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:9
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:38
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:38
+msgid "Title"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:15
+msgid "SCAP content successfully created"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:16
+msgid "Failed to create SCAP content"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:18
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:49
+msgid "SCAP content file"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:24
+msgid "SCAP content deleted"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:25
+msgid "Could not delete SCAP content"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:33
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:33
+msgid "Original filename"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:35
+msgid "SCAP content profiles"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:37
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:37
+msgid "Profile id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:46
+msgid "SCAP content updated"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:47
+msgid "Could not update SCAP content"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:56
+msgid "SCAP content file downloaded, saved to: "
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:57
+msgid "Could not download the SCAP content file"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:15
+msgid "Tailoring file successfully created"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:16
+msgid "Failed to create Tailoring file"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:18
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:49
+msgid "Tailoring file content"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:24
+msgid "Tailoring file deleted"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:25
+msgid "Could not delete Tailoring file"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:35
+msgid "Tailoring file profiles"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:46
+msgid "Tailoring file updated"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:47
+msgid "Could not update Tailoring file"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:57
+msgid "Tailoring file downloaded, saved to: "
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:58
+msgid "Could not download the Tailoring file"
+msgstr ""

data/test/functional/scap_content_test.rb

@@ -0,0 +1,27 @@
+require File.join(File.dirname(__FILE__), './test_helper')
+
+describe 'scap content' do
+  describe 'download' do
+    before do
+      @cmd = %w(scap-content download)
+    end
+
+    it "should require --path for download" do
+      params = ["--id=42"]
+
+      expected_result = CommandExpectation.new
+      expected_result.expected_err =
+        ['Could not download the SCAP content file:',
+         '  Error: Option --path is required',
+         '  ',
+         "  See: 'hammer scap-content download --help'",
+         ''].join("\n")
+
+      expected_result.expected_exit_code = HammerCLI::EX_USAGE
+
+      api_expects_no_call
+      result = run_cmd(@cmd + params)
+      assert_cmd(expected_result, result)
+    end
+  end
+end

data/test/unit/arf_report_test.rb

@@ -19,7 +19,7 @@ describe HammerCLIForemanOpenscap::ArfReport do
     context "output" do
       let(:expected_record_count) { cmd.resource.call(:index).length }
       it_should_print_n_records
-      it_should_print_columns ["Id", "Host", "Reported at", "Passed", "Failed", "Othered"]
+      it_should_print_columns ["Id", "Reported at", "Host name", "OpenSCAP proxy name", "Policy name", "Passed", "Failed", "Othered"]
     end
   end
 
@@ -33,7 +33,7 @@ describe HammerCLIForemanOpenscap::ArfReport do
     context "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
-        it_should_print_columns ["Id", "Host", "Reported at", "Passed", "Failed", "Othered", "Host Id", "Openscap proxy Id", "Openscap proxy name"]
+        it_should_print_columns ["Id", "Reported at", "Host name", "OpenSCAP proxy name", "Policy name", "Passed", "Failed", "Othered", "Host Id", "OpenSCAP proxy Id", "Policy Id"]
       end
     end
   end
@@ -43,6 +43,7 @@ describe HammerCLIForemanOpenscap::ArfReport do
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
+      it_should_fail_with "name", ["--name=something"]
     end
   end
 

data/test/unit/policy_test.rb

@@ -34,7 +34,9 @@ describe HammerCLIForemanOpenscap::Policy do
     context "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
-        it_should_print_columns ["Id", "Name", "Created at", "Period", "Weekday", "Cron line", "Scap content Id", "Scap Content profile Id"]
+        it_should_print_columns ["Id", "Name", "Created at", "Period", "Weekday",
+                                 "Day of month", "Cron line", "SCAP content Id",
+                                 "SCAP Content profile Id", "Hostgroups"]
       end
     end
   end

data/test/unit/scap_content_test.rb

@@ -49,7 +49,7 @@ describe HammerCLIForemanOpenscap::ScapContent do
     context "output" do
       with_params ["--id=1"] do
         it_should_print_n_records 1
-        it_should_print_columns ["Id", "Title", "Created at", "Original filename", "Scap content profiles", "Organizations"]
+        it_should_print_columns ["Id", "Title", "Created at", "Original filename", "SCAP content profiles", "Organizations"]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - The Foreman team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -38,17 +38,27 @@ files:
 - lib/hammer_cli_foreman_openscap/commands.rb
 - lib/hammer_cli_foreman_openscap/error.rb
 - lib/hammer_cli_foreman_openscap/exception_handler.rb
+- lib/hammer_cli_foreman_openscap/host.rb
+- lib/hammer_cli_foreman_openscap/host_extensions.rb
+- lib/hammer_cli_foreman_openscap/hostgroup.rb
+- lib/hammer_cli_foreman_openscap/hostgroup_extensions.rb
+- lib/hammer_cli_foreman_openscap/i18n.rb
 - lib/hammer_cli_foreman_openscap/id_resolver.rb
 - 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/tailoring_file.rb
 - lib/hammer_cli_foreman_openscap/version.rb
+- locale/Makefile
+- locale/README.md
+- locale/en/hammer_cli_foreman_openscap.po
+- locale/hammer_cli_foreman_openscap.pot
 - 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/scap_content_test.rb
 - test/functional/tailoring_file_test.rb
 - test/functional/test_helper.rb
 - test/test_helper.rb
@@ -88,6 +98,7 @@ test_files:
 - 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