hammer_cli_foreman_openscap 0.1.13 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9fb22de3dcf5c153f3db8f0b43a85ec8b0774418d50bb6fedc48fcc6b93f85
-  data.tar.gz: 05fbc7be1a7036bea0b65eb9e87c79edff1b59bc5eedd91f90da412363431d37
+  metadata.gz: fea3af3aae27d7256cfd8680552a5ffa609b3444383e26962ac3833d73e53221
+  data.tar.gz: a8896f088e33c09c3608de05f845da0ea38bc55f5a1735bc29ac2db909fe9610
 SHA512:
-  metadata.gz: 8da633b58422dd9b00a48e701df9b28b821ac3d73f64e8f6c48b1b67a01cdfb5ab07f94905dfc5cbadd2982e8dc302c7b789ff7bcdd63a9342970bac2c8f5ae9
-  data.tar.gz: e3598b27e8748998ffe668011ad814f36bbd9016e4d0cace44e2c93e0fc210950854273ab8ae801854c08d10fa90d8ab2e3f78d61cc1163c46a454fd4b98e523
+  metadata.gz: 7633b36819515914138b2a128558301a12a69473676c43c08a8784ffcbf4fd046c5f9ca3fb0b92a45f0c6805e910d645264de21d67661949c64f8468b56d1567
+  data.tar.gz: 0640610fbdd496b420871e04e7451dd25612c6e85572421563d9a26776f27ba9beb065c55082d5621a07b59dd29421b68900896840a34deae1296142e60f328b

data/lib/hammer_cli_foreman_openscap/commands.rb

@@ -27,6 +27,15 @@ module HammerCLIForemanOpenscap
     end
   end
 
+  class AssignCommand < HammerCLIForeman::Command
+    include HammerCLIForemanOpenscap::ResolverCommons
+
+    def print_data(data, opts = {})
+      self.class.success_message(data) if data.is_a? String
+      super data, opts
+    end
+  end
+
   class UpdateCommand < HammerCLIForeman::UpdateCommand
     include HammerCLIForemanOpenscap::ResolverCommons
   end

data/lib/hammer_cli_foreman_openscap/options/normalizers.rb

@@ -9,6 +9,12 @@ module HammerCLIForemanOpenscap
           super path
         end
       end
+
+      class BinaryFile < HammerCLI::Options::Normalizers::File
+        def format(path)
+          ::File.new(::File.expand_path(path), 'rb')
+        end
+      end
     end
   end
 end

data/lib/hammer_cli_foreman_openscap/scap_content.rb

@@ -28,9 +28,22 @@ module HammerCLIForemanOpenscap
       success_message _('Scap Contents uploaded.')
       failure_message _('Could not upload Scap Contents')
 
+      def execute
+        d = send_request
+        any_errors = d['errors'].any?
+        if d['results'].any? || any_errors
+          d.delete('errors') unless any_errors
+          print_data(d)
+          return HammerCLI::EX_SOFTWARE if any_errors
+        else
+          print_success_message(d)
+        end
+        HammerCLI::EX_OK
+      end
+
       output do
-        field :errors, _('Errors'), Fields::List, :on_new_line => true, :separator => "\n"
-        collection :results, _('Uploaded Scap Contents') do
+        field :errors, _('Errors'), Fields::List, :on_new_line => true, :separator => "\n", :hide_blank => true
+        collection :results, _('Uploaded Scap Contents'), :hide_blank => true do
           field :id, _("Id")
           field :title, _("Title")
           field :original_filename, _("Original Filename")

data/lib/hammer_cli_foreman_openscap/version.rb

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

data/locale/Makefile

@@ -1,65 +1,6 @@
 #
 # 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
+# Run make help to list available targets
 #
-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!
+include $(shell bundle exec ruby -e 'require "hammer_cli"; puts HammerCLI::I18n.main_makefile')

data/locale/cs/hammer_cli_foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_openscap 0.1.10\n"
+"Project-Id-Version: hammer_cli_foreman_openscap 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2017-09-08 16:19-0400\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2017\n"
@@ -176,6 +176,9 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
+msgid "Digest"
+msgstr ""
+
 msgid "SCAP content successfully created"
 msgstr ""
 
@@ -185,6 +188,21 @@ msgstr ""
 msgid "SCAP content file"
 msgstr ""
 
+msgid "Scap Contents uploaded."
+msgstr ""
+
+msgid "Could not upload Scap Contents"
+msgstr ""
+
+msgid "Errors"
+msgstr ""
+
+msgid "Uploaded Scap Contents"
+msgstr ""
+
+msgid "Original Filename"
+msgstr ""
+
 msgid "SCAP content deleted"
 msgstr ""
 

data/locale/de/hammer_cli_foreman_openscap.po

@@ -3,13 +3,25 @@
 # This file is distributed under the same license as the hammer_cli_foreman_openscap package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
+# Translators:
+# Wiederoder <stefanwiederoder@googlemail.com>, 2017
+# Ettore Atalan <atalanttore@googlemail.com>, 2017
+# simon11 <transifex@stieger.co>, 2017
+# Bryan Kearney <bryan.kearney@gmail.com>, 2017
+# 0868a4d1af5275b3f70b0a6dac4c99a4, 2017
+# mbacovsky <martin.bacovsky@gmail.com>, 2020
+# Crited <Alexander.Stoll@netways.de>, 2020
+# pdolinic, 2023
+#
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_openscap 0.1.10\n"
+"Project-Id-Version: hammer_cli_foreman_openscap 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-08 16:19-0400\n"
-"Last-Translator: Dominic Cleal <dominic@cleal.org>, 2017\n"
-"Language-Team: German (https://www.transifex.com/foreman/teams/114/de/)\n"
+"POT-Creation-Date: 2023-11-08 01:17+0000\n"
+"PO-Revision-Date: 2017-12-01 20:56+0000\n"
+"Last-Translator: pdolinic, 2023\n"
+"Language-Team: German (https://app.transifex.com/foreman/teams/114/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -17,22 +29,22 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 msgid "Manipulate compliance reports"
-msgstr ""
+msgstr "Compliance-Berichte bearbeiten"
 
 msgid "Manipulate policies"
-msgstr ""
+msgstr "Richtlinie bearbeiten"
 
 msgid "Manipulate SCAP contents"
-msgstr ""
+msgstr "SCAP-Inhalt bearbeiten"
 
 msgid "Manipulate Tailoring files"
-msgstr ""
+msgstr "Bearbeiten von Tailoring-Files"
 
 msgid "Manipulate Scap Content Profiles"
-msgstr ""
+msgstr "Scap-Inhaltsprofile manipulieren"
 
 msgid "View policies ENC for host"
-msgstr ""
+msgstr "Richtlinien ENC für Host anzeigen"
 
 msgid "Id"
 msgstr "ID"
@@ -40,12 +52,11 @@ msgstr "ID"
 msgid "Reported at"
 msgstr "Berichtet am"
 
-#, fuzzy
 msgid "Host name"
-msgstr "Host"
+msgstr "Hostname"
 
 msgid "OpenSCAP proxy name"
-msgstr ""
+msgstr "OpenSCAP-Proxy Name"
 
 msgid "Policy name"
 msgstr "Name der Richtlinie"
@@ -60,69 +71,68 @@ msgid "Othered"
 msgstr "Anderweitiges Ergebnis"
 
 msgid "Host Id"
-msgstr ""
+msgstr "Host-Kennung"
 
 msgid "OpenSCAP proxy Id"
-msgstr ""
+msgstr "OpenSCAP-Proxy Kennung"
 
-#, fuzzy
 msgid "Policy Id"
-msgstr "Name der Richtlinie"
+msgstr "Richtlinien-ID"
 
 msgid "ARF report deleted"
-msgstr ""
+msgstr "ARF-Bericht löschen"
 
 msgid "Could not delete the ARF report"
-msgstr ""
+msgstr "ARF-Bericht konnte nicht gelöscht werden"
 
 msgid "ARF report downloaded, saved to: "
-msgstr ""
+msgstr "ARF-Bericht heruntergeladen, gespeichert unter:"
 
 msgid "Could not download the ARF report"
-msgstr ""
+msgstr "ARF-Bericht konnte nicht heruntergeladen werden"
 
 msgid "ARF report in HTML downloaded, saved to: "
-msgstr ""
+msgstr "ARF-Bericht in HTML heruntergeladen, gespeichert unter:"
 
 msgid "Could not download the ARF report in HTML"
-msgstr ""
+msgstr "ARF-Bericht in HTML konnte nicht heruntergeladen werden"
 
 msgid "Path to directory where downloaded file will be saved"
 msgstr ""
+"Pfad zum Verzeichnis, in dem die heruntergeladene Datei gespeichert wird"
 
-#, fuzzy
 msgid "Profile Id"
-msgstr "ID"
+msgstr "Profil ID"
 
 msgid "Content path"
-msgstr ""
+msgstr "Inhaltspfad"
 
 msgid "Content download path"
-msgstr ""
+msgstr "Pfad zum Herunterladen von Inhalten"
 
 msgid "Tailoring path"
-msgstr ""
+msgstr "Tailoring-Pfad"
 
 msgid "Tailoring download path"
-msgstr ""
+msgstr "Anpassen des Downloadpfads"
 
 msgid "Day of month"
-msgstr ""
+msgstr "Monatstag"
 
 msgid "Hour"
-msgstr ""
+msgstr "Stunde"
 
 msgid "Month"
-msgstr ""
+msgstr "Monat"
 
 msgid "Week"
-msgstr ""
+msgstr "Woche"
 
 msgid "OpenSCAP Proxy"
-msgstr ""
+msgstr "OpenSCAP-Proxy"
 
 msgid "SCAP content title"
-msgstr ""
+msgstr "SCAP-Inhalt Titel"
 
 msgid "Name to search by"
 msgstr "Zu suchender Name"
@@ -134,128 +144,142 @@ msgid "Created at"
 msgstr "Erstellt um"
 
 msgid "Period"
-msgstr ""
+msgstr "Zeitraum"
 
 msgid "Weekday"
-msgstr ""
+msgstr "Wochentag"
 
 msgid "Cron line"
 msgstr "Cron-Zeile"
 
 msgid "SCAP content Id"
-msgstr ""
+msgstr "SCAP-Inhaltskennung"
 
 msgid "SCAP Content profile Id"
-msgstr ""
+msgstr "SCAP-Inhaltsprofil-ID"
 
 msgid "Tailoring file Id"
-msgstr ""
+msgstr "Tailoring-Datei-ID"
 
 msgid "Tailoring file profile Id"
-msgstr ""
+msgstr "Anpassen der Tailoring-Profil-ID"
 
 msgid "Deployment option"
-msgstr ""
+msgstr "Bereitstellungsoption"
 
 msgid "Policy has been deleted"
-msgstr ""
+msgstr "Richtlinie wurde gelöscht"
 
 msgid "Could not delete the policy"
-msgstr ""
+msgstr "Richtlinie konnte nicht gelöscht werden"
 
 msgid "Policy created"
-msgstr ""
+msgstr "Richtlinie erstellt"
 
 msgid "Could not create the policy"
-msgstr ""
+msgstr "Richtlinie konnte nicht erstellt werden"
 
 msgid "Policy updated"
-msgstr ""
+msgstr "Richtlinie aktualisiert"
 
 msgid "Could not update the policy"
-msgstr ""
+msgstr "Richtlinie konnte nicht aktualisiert werden"
 
 msgid "Title"
 msgstr "Titel"
 
+msgid "Digest"
+msgstr "Digest"
+
 msgid "SCAP content successfully created"
-msgstr ""
+msgstr "SCAP-Inhalt erfolgreich erstellt"
 
 msgid "Failed to create SCAP content"
-msgstr ""
+msgstr "Fehler beim Erstellen von SCAP-Inhalten"
 
 msgid "SCAP content file"
+msgstr "SCAP-Inhaltsdatei"
+
+msgid "Scap Contents uploaded."
 msgstr ""
 
-msgid "SCAP content deleted"
+msgid "Could not upload Scap Contents"
 msgstr ""
 
-msgid "Could not delete SCAP content"
+msgid "Errors"
 msgstr ""
 
-msgid "Original filename"
+msgid "Uploaded Scap Contents"
 msgstr ""
 
-msgid "SCAP content profiles"
+msgid "Original Filename"
 msgstr ""
 
+msgid "SCAP content deleted"
+msgstr "SCAP-Inhalt gelöscht"
+
+msgid "Could not delete SCAP content"
+msgstr "SCAP-Inhalt konnte nicht gelöscht werden"
+
+msgid "Original filename"
+msgstr "Ursprünglicher Dateiname"
+
+msgid "SCAP content profiles"
+msgstr "SCAP-Inhaltsprofile"
+
 msgid "Profile id"
-msgstr ""
+msgstr "Profil-Kennung"
 
 msgid "SCAP content updated"
-msgstr ""
+msgstr "SCAP-Inhalte aktualisiert"
 
 msgid "Could not update SCAP content"
-msgstr ""
+msgstr "SCAP-Inhalt konnte nicht aktualisiert werden"
 
 msgid "SCAP content file downloaded, saved to: "
-msgstr ""
+msgstr "SCAP-Inhaltsdatei heruntergeladen, gespeichert unter:"
 
 msgid "Could not download the SCAP content file"
-msgstr ""
+msgstr "Die SCAP-Inhaltsdatei konnte nicht heruntergeladen werden"
 
-#, fuzzy
 msgid "Scap Content Id"
-msgstr "ID"
+msgstr "Scap-Inhalts-ID"
 
-#, fuzzy
 msgid "Scap Content Title"
-msgstr "Titel"
+msgstr "Inhaltstitel ausblenden"
 
-#, fuzzy
 msgid "Tailoring File Id"
-msgstr "ID"
+msgstr "Tailoring-Datei-ID"
 
-#, fuzzy
 msgid "Tailoring File Name"
-msgstr "Name"
+msgstr "Tailoring Datei Name"
 
 msgid "Tailoring file successfully created"
-msgstr ""
+msgstr "Tailoring-Datei erfolgreich erstellt"
 
 msgid "Failed to create Tailoring file"
-msgstr ""
+msgstr "Fehler beim Erstellen der Tailoring-Datei"
 
 msgid "Tailoring file content"
-msgstr ""
+msgstr "Tailoring-Datei Inhalt"
 
 msgid "Tailoring file deleted"
-msgstr ""
+msgstr "Tailoring-Datei gelöscht"
 
 msgid "Could not delete Tailoring file"
-msgstr ""
+msgstr "Tailoring-Datei konnte nicht gelöscht werden"
 
 msgid "Tailoring file profiles"
-msgstr ""
+msgstr "Anpassen von Tailoring-Datei Profilen"
 
 msgid "Tailoring file updated"
-msgstr ""
+msgstr "Tailoring-Datei aktualisiert"
 
 msgid "Could not update Tailoring file"
-msgstr ""
+msgstr "Tailoring-Datei konnte nicht aktualisiert werden"
 
 msgid "Tailoring file downloaded, saved to: "
-msgstr ""
+msgstr "Tailoring-Datei heruntergeladen, gespeichert unter:"
 
 msgid "Could not download the Tailoring file"
-msgstr ""
+msgstr "Die Tailoring-Datei konnte nicht heruntergeladen werden"

data/locale/en/hammer_cli_foreman_openscap.po

@@ -1,21 +1,21 @@
-# English translations for hammer_cli_foreman_openscap package.
-# Copyright (C) 2017 THE PACKAGE'S COPYRIGHT HOLDER
+# 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>, 2017.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer_cli_foreman_openscap 0.1.10\n"
+"Project-Id-Version: hammer_cli_foreman_openscap 0.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-09-08 15:57-0400\n"
+"POT-Creation-Date: 2024-01-06 00:16+0000\n"
+"PO-Revision-Date: 2023-11-08 01:17+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English\n"
-"Language: en\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=2; plural=n != 1;\n"
-"\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 msgid "Manipulate compliance reports"
 msgstr ""
@@ -176,6 +176,9 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
+msgid "Digest"
+msgstr ""
+
 msgid "SCAP content successfully created"
 msgstr ""
 
@@ -185,6 +188,21 @@ msgstr ""
 msgid "SCAP content file"
 msgstr ""
 
+msgid "Scap Contents uploaded."
+msgstr ""
+
+msgid "Could not upload Scap Contents"
+msgstr ""
+
+msgid "Errors"
+msgstr ""
+
+msgid "Uploaded Scap Contents"
+msgstr ""
+
+msgid "Original Filename"
+msgstr ""
+
 msgid "SCAP content deleted"
 msgstr ""