hammer_cli_foreman_openscap 0.1.13 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9fb22de3dcf5c153f3db8f0b43a85ec8b0774418d50bb6fedc48fcc6b93f85
-  data.tar.gz: 05fbc7be1a7036bea0b65eb9e87c79edff1b59bc5eedd91f90da412363431d37
+  metadata.gz: bdbd278c4075447f2b9d26c09ca6f23f5da8bf7c5d5613f1a089972759ab5b81
+  data.tar.gz: 487ada4bdcd263516068aa4afd9f0e2cc664258b2930ec2ecbde5990a642f6c3
 SHA512:
-  metadata.gz: 8da633b58422dd9b00a48e701df9b28b821ac3d73f64e8f6c48b1b67a01cdfb5ab07f94905dfc5cbadd2982e8dc302c7b789ff7bcdd63a9342970bac2c8f5ae9
-  data.tar.gz: e3598b27e8748998ffe668011ad814f36bbd9016e4d0cace44e2c93e0fc210950854273ab8ae801854c08d10fa90d8ab2e3f78d61cc1163c46a454fd4b98e523
+  metadata.gz: 80f52e48728014668533bd1bdede623897c5510176441fc7a397ec808c5bed69394194e4b76f6bc5246e337f568cc4dd9e067a694dd870f7c3417cbdbe79400f
+  data.tar.gz: 8b77568f88a6d756a6fe3814c7db9d09e6675ba73a0d9c2cdc43b3dc1d85c7cb091143cba0fbb94b047ac63f1a934fc5f9acf3595e7a765af1f590d1913cb6a3

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.0'
   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.edit.po

@@ -0,0 +1,358 @@
+# 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.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: hammer_cli_foreman_openscap 0.1.13\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"
+"Language-Team: Czech (https://www.transifex.com/foreman/teams/114/cs/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: cs\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: ../lib/hammer_cli_foreman_openscap.rb:19
+msgid "Manipulate compliance reports"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:23
+msgid "Manipulate policies"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:27
+msgid "Manipulate SCAP contents"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:31
+msgid "Manipulate Tailoring files"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:35
+msgid "Manipulate Scap Content Profiles"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap.rb:39
+msgid "View policies ENC for host"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:8 ../lib/hammer_cli_foreman_openscap/host.rb:13 ../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:47 ../lib/hammer_cli_foreman_openscap/scap_content.rb:69 ../lib/hammer_cli_foreman_openscap/scap_content_profile.rb:7 ../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 "Reported at"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:11
+#, fuzzy
+msgid "Host name"
+msgstr "Hostitel"
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:14
+msgid "OpenSCAP proxy name"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:17 ../lib/hammer_cli_foreman_openscap/id_resolver.rb:6
+msgid "Policy name"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:19
+msgid "Passed"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:20
+msgid "Failed"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:21
+msgid "Othered"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:29
+msgid "Host Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:32
+msgid "OpenSCAP proxy Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:35
+msgid "Policy Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:44
+msgid "ARF report deleted"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:45
+msgid "Could not delete the ARF report"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:51
+msgid "ARF report downloaded, saved to: "
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:52
+msgid "Could not download the ARF report"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:59
+msgid "ARF report in HTML downloaded, saved to: "
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/arf_report.rb:60
+msgid "Could not download the ARF report in HTML"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/commands.rb:91
+msgid "Path to directory where downloaded file will be saved"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:14 ../lib/hammer_cli_foreman_openscap/scap_content_profile.rb:9
+msgid "Profile Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:15
+msgid "Content path"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:16
+msgid "Content download path"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:17
+msgid "Tailoring path"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:18
+msgid "Tailoring download path"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:19 ../lib/hammer_cli_foreman_openscap/policy.rb:19
+msgid "Day of month"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:20
+msgid "Hour"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:22
+msgid "Month"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host.rb:23
+msgid "Week"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/host_extensions.rb:6 ../lib/hammer_cli_foreman_openscap/hostgroup_extensions.rb:6
+msgid "OpenSCAP Proxy"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/id_resolver.rb:4
+msgid "SCAP content title"
+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:65 ../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: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:25
+msgid "Deployment option"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:33
+msgid "Policy has been deleted"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:34
+msgid "Could not delete the policy"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:41
+msgid "Policy created"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:42
+msgid "Could not create the policy"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:49
+msgid "Policy updated"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/policy.rb:50
+msgid "Could not update the policy"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:9 ../lib/hammer_cli_foreman_openscap/scap_content.rb:48 ../lib/hammer_cli_foreman_openscap/scap_content.rb:71 ../lib/hammer_cli_foreman_openscap/scap_content_profile.rb:8 ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:38
+msgid "Title"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:10
+msgid "Digest"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:16
+msgid "SCAP content successfully created"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:17
+msgid "Failed to create SCAP content"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:19 ../lib/hammer_cli_foreman_openscap/scap_content.rb:82
+msgid "SCAP content file"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:28
+msgid "Scap Contents uploaded."
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:29
+msgid "Could not upload Scap Contents"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:45
+msgid "Errors"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:46
+msgid "Uploaded Scap Contents"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:49
+msgid "Original Filename"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:57
+msgid "SCAP content deleted"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:58
+msgid "Could not delete SCAP content"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:66 ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:33
+msgid "Original filename"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:68
+msgid "SCAP content profiles"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:70 ../lib/hammer_cli_foreman_openscap/tailoring_file.rb:37
+msgid "Profile id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:79
+msgid "SCAP content updated"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:80
+msgid "Could not update SCAP content"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:89
+msgid "SCAP content file downloaded, saved to: "
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content.rb:90
+msgid "Could not download the SCAP content file"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content_profile.rb:11
+msgid "Scap Content Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content_profile.rb:12
+msgid "Scap Content Title"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content_profile.rb:15
+msgid "Tailoring File Id"
+msgstr ""
+
+#: ../lib/hammer_cli_foreman_openscap/scap_content_profile.rb:16
+msgid "Tailoring File Name"
+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/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.1.13\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 ""