foreman_openscap 0.7.2 → 0.7.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/app/controllers/api/v2/compliance/arf_reports_controller.rb +2 -2
  3. data/app/controllers/api/v2/compliance/policies_controller.rb +2 -2
  4. data/app/controllers/api/v2/compliance/scap_contents_controller.rb +1 -1
  5. data/app/controllers/api/v2/compliance/tailoring_files_controller.rb +2 -2
  6. data/app/controllers/arf_reports_controller.rb +4 -4
  7. data/app/controllers/concerns/foreman/controller/parameters/policy.rb +1 -1
  8. data/app/controllers/openscap_proxies_controller.rb +6 -5
  9. data/app/controllers/policies_controller.rb +2 -2
  10. data/app/controllers/scap_contents_controller.rb +2 -2
  11. data/app/controllers/tailoring_files_controller.rb +2 -2
  12. data/app/helpers/policies_helper.rb +4 -0
  13. data/app/models/concerns/foreman_openscap/host_extensions.rb +1 -1
  14. data/app/models/concerns/foreman_openscap/hostgroup_extensions.rb +9 -0
  15. data/app/models/concerns/foreman_openscap/log_extensions.rb +1 -1
  16. data/app/models/foreman_openscap/arf_report.rb +1 -1
  17. data/app/models/foreman_openscap/asset.rb +1 -1
  18. data/app/models/foreman_openscap/asset_policy.rb +1 -1
  19. data/app/models/foreman_openscap/policy.rb +9 -9
  20. data/app/models/foreman_openscap/policy_revision.rb +1 -1
  21. data/app/models/foreman_openscap/scap_content.rb +1 -1
  22. data/app/models/foreman_openscap/scap_content_profile.rb +1 -1
  23. data/app/models/foreman_openscap/tailoring_file.rb +1 -1
  24. data/app/views/policies/steps/_create_policy_form.html.erb +1 -1
  25. data/app/views/smart_proxies/_openscap_spool.html.erb +5 -1
  26. data/lib/foreman_openscap/engine.rb +22 -23
  27. data/lib/foreman_openscap/version.rb +1 -1
  28. data/locale/de/foreman_openscap.po +13 -4
  29. data/locale/en_GB/foreman_openscap.po +13 -4
  30. data/locale/es/foreman_openscap.po +13 -4
  31. data/locale/foreman_openscap.pot +60 -44
  32. data/locale/fr/foreman_openscap.po +13 -4
  33. data/locale/gl/foreman_openscap.po +13 -4
  34. data/locale/it/foreman_openscap.po +13 -4
  35. data/locale/ja/foreman_openscap.po +13 -4
  36. data/locale/ko/foreman_openscap.po +13 -4
  37. data/locale/pt_BR/foreman_openscap.po +13 -4
  38. data/locale/ru/foreman_openscap.po +13 -4
  39. data/locale/sv_SE/foreman_openscap.po +13 -4
  40. data/locale/zh_CN/foreman_openscap.po +13 -4
  41. data/locale/zh_TW/foreman_openscap.po +13 -4
  42. data/test/test_plugin_helper.rb +1 -1
  43. metadata +2 -3
  44. data/app/controllers/concerns/foreman_openscap/hostgroups_controller_extensions.rb +0 -20
data/locale/zh_TW/foreman_openscap.po CHANGED
@@ -130,6 +130,9 @@ msgstr ""
130
130
  msgid "Create a Tailoring file"
131
131
  msgstr ""
132
132
 
133
+ msgid "Create policy"
134
+ msgstr ""
135
+
133
136
  msgid "Created"
134
137
  msgstr ""
135
138
 
@@ -199,6 +202,9 @@ msgstr ""
199
202
  msgid "Effective Profile"
200
203
  msgstr ""
201
204
 
205
+ msgid "Enable \"logs\" feature on proxy to search for errors"
206
+ msgstr ""
207
+
202
208
  msgid "Failed"
203
209
  msgstr ""
204
210
 
@@ -260,6 +266,9 @@ msgstr ""
260
266
  msgid "Host is deleted"
261
267
  msgstr ""
262
268
 
269
+ msgid "Hostgroups"
270
+ msgstr ""
271
+
263
272
  msgid "Hostname"
264
273
  msgstr ""
265
274
 
@@ -357,9 +366,6 @@ msgstr ""
357
366
  msgid "No OpenSCAP proxy found for %{class} with %{id}"
358
367
  msgstr ""
359
368
 
360
- msgid "No available proxy to validate SCAP data stream file"
361
- msgstr ""
362
-
363
369
  msgid "No available proxy to validate. Returned with error: %s"
364
370
  msgstr ""
365
371
 
@@ -378,7 +384,10 @@ msgstr ""
378
384
  msgid "No hosts were found."
379
385
  msgstr ""
380
386
 
381
- msgid "No proxy with OpenSCAP features"
387
+ msgid "No proxy with OpenSCAP feature is running."
388
+ msgstr ""
389
+
390
+ msgid "No proxy with OpenSCAP feature was found."
382
391
  msgstr ""
383
392
 
384
393
  msgid "No report for this policy"
data/test/test_plugin_helper.rb CHANGED
@@ -18,7 +18,7 @@ module ScapTestProxy
18
18
 
19
19
  def add_smart_proxy
20
20
  FactoryGirl.create(:smart_proxy, :url => 'http://localhost:8443', :features => [FactoryGirl.create(:feature, :name => 'Openscap')])
21
- ProxyAPI::Features.any_instance.stubs(:features).returns(%w(puppet openscap))
21
+ ProxyAPI::Features.any_instance.stubs(:features).returns(%w[puppet openscap])
22
22
  versions = { "version" => "1.11.0", "modules" => { "openscap" => "0.5.3" } }
23
23
  ProxyAPI::Version.any_instance.stubs(:proxy_versions).returns(versions)
24
24
  ProxyAPI::Openscap.any_instance.stubs(:validate_scap_file).returns({'errors' => []})
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_openscap
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.7.2
4
+ version: 0.7.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - slukasik@redhat.com
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-05-31 00:00:00.000000000 Z
11
+ date: 2017-06-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: deface
@@ -54,7 +54,6 @@ files:
54
54
  - app/controllers/concerns/foreman/controller/parameters/scap_content.rb
55
55
  - app/controllers/concerns/foreman/controller/parameters/tailoring_file.rb
56
56
  - app/controllers/concerns/foreman_openscap/arf_reports_controller_common_extensions.rb
57
- - app/controllers/concerns/foreman_openscap/hostgroups_controller_extensions.rb
58
57
  - app/controllers/concerns/foreman_openscap/hosts_controller_extensions.rb
59
58
  - app/controllers/openscap_proxies_controller.rb
60
59
  - app/controllers/policies_controller.rb
data/app/controllers/concerns/foreman_openscap/hostgroups_controller_extensions.rb DELETED
@@ -1,20 +0,0 @@
1
- module ForemanOpenscap
2
- module HostgroupsControllerExtensions
3
- extend ActiveSupport::Concern
4
-
5
- included do
6
- alias_method_chain :load_vars_for_ajax, :openscap
7
- alias_method_chain :inherit_parent_attributes, :openscap
8
- end
9
-
10
- def load_vars_for_ajax_with_openscap
11
- load_vars_for_ajax_without_openscap
12
- @openscap_proxy = @hostgroup.openscap_proxy
13
- end
14
-
15
- def inherit_parent_attributes_with_openscap
16
- inherit_parent_attributes_without_openscap
17
- @hostgroup.openscap_proxy ||= @parent.openscap_proxy
18
- end
19
- end
20
- end