foreman_openscap 0.8.3 → 0.8.4

data/app/models/foreman_openscap/policy.rb

@@ -26,8 +26,8 @@ module ForemanOpenscap
 
     validates :name, :presence => true, :uniqueness => true, :length => { :maximum => 255 }
     validate :ensure_needed_puppetclasses
-    validates :period, :inclusion => {:in => %w[weekly monthly custom], :message => _('is not a valid value')},
-              :if => Proc.new { |policy| policy.should_validate?('Schedule') }
+    validates :period, :inclusion => { :in => %w[weekly monthly custom], :message => _('is not a valid value') },
+                       :if => Proc.new { |policy| policy.should_validate?('Schedule') }
 
     validates :scap_content_id, presence: true, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
     validate :matching_content_profile, if: Proc.new { |policy| policy.should_validate?('SCAP Content') }
@@ -101,7 +101,7 @@ module ForemanOpenscap
       base_steps = [N_('Create policy'), N_('SCAP Content'), N_('Schedule')]
       base_steps << N_('Locations') if SETTINGS[:locations_enabled]
       base_steps << N_('Organizations') if SETTINGS[:organizations_enabled]
-      base_steps << N_('Hostgroups') #always be last.
+      base_steps << N_('Hostgroups') # always be last.
     end
 
     def current_step
@@ -249,12 +249,12 @@ module ForemanOpenscap
 
     def ensure_needed_puppetclasses
       unless puppetclass = Puppetclass.find_by(name: SCAP_PUPPET_CLASS)
-        errors[:base] << _("Required Puppet class %{class} is not found, please ensure it imported first.") % {:class => SCAP_PUPPET_CLASS}
+        errors[:base] << _("Required Puppet class %{class} is not found, please ensure it imported first.") % { :class => SCAP_PUPPET_CLASS }
         return false
       end
 
       unless policies_param = puppetclass.class_params.find_by(key: POLICIES_CLASS_PARAMETER)
-        errors[:base] << _("Puppet class %{class} does not have %{parameter} class parameter.") % {:class => SCAP_PUPPET_CLASS, :parameter => POLICIES_CLASS_PARAMETER}
+        errors[:base] << _("Puppet class %{class} does not have %{parameter} class parameter.") % { :class => SCAP_PUPPET_CLASS, :parameter => POLICIES_CLASS_PARAMETER }
         return false
       end
 
@@ -263,7 +263,7 @@ module ForemanOpenscap
       policies_param.default_value = '<%= @host.policies_enc %>'
 
       if policies_param.changed? && !policies_param.save
-        errors[:base] << _("%{parameter} class parameter for class %{class} could not be configured.") % {:class => SCAP_PUPPET_CLASS, :parameter => POLICIES_CLASS_PARAMETER}
+        errors[:base] << _("%{parameter} class parameter for class %{class} could not be configured.") % { :class => SCAP_PUPPET_CLASS, :parameter => POLICIES_CLASS_PARAMETER }
         return false
       end
     end

data/app/models/foreman_openscap/scap_content.rb

@@ -3,12 +3,12 @@ module ForemanOpenscap
     include Authorizable
     include Taxonomix
     include DataStreamContent
-    audited :except => [ :scap_file ]
+    audited :except => [:scap_file]
 
     has_many :scap_content_profiles, :dependent => :destroy
     has_many :policies
 
-    validates :title, :presence => true, :length => { :maximum => 255 }
+    validates :title, :presence => true, :length => { :maximum => 255 }, uniqueness: true
     validates :original_filename, :length => { :maximum => 255 }
 
     scoped_search :on => :title,             :complete_value => true

data/app/models/foreman_openscap/tailoring_file.rb

@@ -3,7 +3,7 @@ module ForemanOpenscap
     include Authorizable
     include Taxonomix
     include DataStreamContent
-    audited :except => [ :scap_file ]
+    audited :except => [:scap_file]
 
     has_many :policies
     has_many :scap_content_profiles, :dependent => :destroy

data/app/services/foreman_openscap/arf_report_status_calculator.rb

@@ -1,6 +1,5 @@
 module ForemanOpenscap
   class ArfReportStatusCalculator
-
     def initialize(options = {})
       @counters   = options[:counters]  || {}
       @raw_status = options[:bit_field] || 0

data/app/services/foreman_openscap/host_report_dashboard/data.rb

@@ -1,6 +1,6 @@
 module ForemanOpenscap::HostReportDashboard
   class Data
-    attr_reader :report
+    attr_reader :report, :latest_report
 
     def initialize(policy, host)
       @latest_report = ::ForemanOpenscap::ArfReport.latest_of_policy(policy)
@@ -15,8 +15,8 @@ module ForemanOpenscap::HostReportDashboard
     end
 
     private
+
     attr_writer :report
-    attr_accessor :latest_report
 
     def fetch_data
       report.update(
@@ -39,6 +39,5 @@ module ForemanOpenscap::HostReportDashboard
     def report_othered
       has_data? ? @latest_report.othered : 0
     end
-
   end
 end

data/app/services/foreman_openscap/openscap_proxy_version_check.rb

@@ -1,6 +1,5 @@
 module ForemanOpenscap
   class OpenscapProxyVersionCheck
-
     def initialize
       @versions = {}
       @message = ''

data/app/services/foreman_openscap/policy_dashboard/data.rb

@@ -10,6 +10,7 @@ module ForemanOpenscap::PolicyDashboard
     end
 
     private
+
     attr_writer :report
 
     def hosts
@@ -19,12 +20,12 @@ module ForemanOpenscap::PolicyDashboard
     def fetch_data
       assigned_count = Host::Managed.assigned_to_policy(@policy).count
       report.update(
-        {:compliant_hosts => Host::Managed.comply_with(@policy).count,
-         :incompliant_hosts => Host::Managed.incomply_with(@policy).count,
-         :inconclusive_hosts => Host::Managed.inconclusive_with(@policy).count,
-         :report_missing => Host::Managed.policy_reports_missing(@policy).count,
-         :assigned_hosts => assigned_count,
-         :unassigned_hosts => hosts.count - assigned_count}
+        { :compliant_hosts => Host::Managed.comply_with(@policy).count,
+          :incompliant_hosts => Host::Managed.incomply_with(@policy).count,
+          :inconclusive_hosts => Host::Managed.inconclusive_with(@policy).count,
+          :report_missing => Host::Managed.policy_reports_missing(@policy).count,
+          :assigned_hosts => assigned_count,
+          :unassigned_hosts => hosts.count - assigned_count }
       )
     end
   end

data/app/services/foreman_openscap/report_dashboard/data.rb

@@ -9,6 +9,7 @@ module ForemanOpenscap::ReportDashboard
     end
 
     private
+
     attr_writer :report
     attr_accessor :filter
 

data/app/views/api/v2/compliance/common/_loc.json.rabl

@@ -1,3 +1,3 @@
 child :locations => :locations do |loc|
-  attributes :id, :name
+  attributes :id, :name, :title
 end

data/app/views/api/v2/compliance/common/_org.json.rabl

@@ -1,3 +1,3 @@
 child :organizations => :organizations do |org|
-  attributes :id, :name
+  attributes :id, :name, :title
 end

data/app/views/api/v2/compliance/policies/base.json.rabl

@@ -4,4 +4,4 @@ extends "api/v2/compliance/common/org"
 extends "api/v2/compliance/common/loc"
 
 attributes :id, :name, :period, :weekday, :description, :scap_content_id, :scap_content_profile_id, :day_of_month, :cron_line,
-  :tailoring_file_id, :tailoring_file_profile_id
+           :tailoring_file_id, :tailoring_file_profile_id

data/app/views/arf_reports/_list.html.erb

@@ -24,7 +24,7 @@
                              :onclick => 'hostChecked(this)' %>
         </td>
       <td class="elipsis"><%= name_column(arf_report.host) %></td>
-      <td><%= display_link_if_authorized(_("%s ago") % time_ago_in_words(arf_report.reported_at), hash_for_arf_report_path(:id => arf_report.id)) %></td>
+      <td><%= display_link_if_authorized(date_time_relative_value(arf_report.reported_at), hash_for_arf_report_path(:id => arf_report.id)) %></td>
       <td class="ellipsis"><%= arf_report.policy.present? ? display_link_if_authorized(arf_report.policy.name, hash_for_edit_policy_path(:id => arf_report.policy.id)) : _('Deleted policy') %></th>
       <td class="ellipsis"><%= openscap_proxy_link arf_report %></th>
       <td><%= report_arf_column(arf_report.passed, "label-info") %></th>

data/app/views/arf_reports/delete_multiple.html.erb

@@ -25,5 +25,5 @@
 
 <%= form_tag submit_delete_multiple_arf_reports_path({:arf_report_ids => params[:arf_report_ids]}) do %>
   <span class="label label-danger"><%= _('Delete') %></span>
-  <%= _('these Complianace reports') %>
+  <%= _('these Compliance reports') %>
 <% end %>

data/app/views/arf_reports/welcome.html.erb

@@ -0,0 +1,12 @@
+<div class="blank-slate-pf">
+  <div class="blank-slate-pf-icon">
+    <%= icon_text("book", "", :kind => "fa") %>
+  </div>
+  <h1><%= _('Compliance Reports') %></h1>
+  <p>
+    <%= _("You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy.") %></br>
+  </p>
+  <div class="blank-slate-pf-main-action">
+    <%= link_to _('Documentation'), documentation_url("4.4ARFReports", :root_url => "https://www.theforeman.org/plugins/foreman_openscap/0.8/index.html#"), :rel => 'external', :class => 'btn btn-primary btn-lg'  %>
+  </div>
+</div>

data/app/views/compliance_hosts/show.html.erb

@@ -8,7 +8,9 @@
     <% if data.has_data? %>
     <div class="col-md-4">
       <div class="stats-well">
-        <h4 class="header ca"><%= _('%s latest report') % policy.name %></h4>
+        <h4 class="header ca"><%= link_to_if_authorized(_('%s latest report') % policy.name,
+                                                        hash_for_arf_report_path(:id => data.latest_report.id)
+                                                          .merge(:auth_object => data.latest_report)) %></h4>
         <% report = data.report %>
         <%= host_policy_breakdown_chart(report, :class => 'statistics-pie small') %>
       </div>

data/app/views/policy_dashboard/_policy_reports.html.erb

@@ -10,7 +10,7 @@
   <% for arf_report in @policy.arf_reports.latest %>
     <tr>
       <td><%= name_column(arf_report.host) %></td>
-      <td><%= _("%s ago") % time_ago_in_words(arf_report.reported_at) %></td>
+      <td><%= date_time_relative_value(arf_report.reported_at) %></td>
       <td><%= report_arf_column(arf_report.passed, "label-info") %></th>
       <td><%= report_arf_column(arf_report.failed, "label-danger") %></th>
       <td><%= report_arf_column(arf_report.othered, "label-warning") %></th>

data/app/views/scap_contents/_list.html.erb

@@ -10,7 +10,7 @@
       <td class="ellipsis"><%= content.title %></td>
       <td class="ellipsis"><%= content.original_filename %></td>
       <td>
-        <%= _("%s ago") % time_ago_in_words(content.created_at.getlocal) %>
+        <%= date_time_relative_value(content.created_at.getlocal) %>
       </td>
       <td>
         <%= action_buttons(

data/app/views/smart_proxies/_openscap_spool.html.erb

@@ -1,7 +1,7 @@
 <span>
   <% if last_error && last_error.has_key?('timestamp') %>
     <span>
-      <a href="#logs" onclick="findSpoolLogs();"><%= _('%s ago') % time_ago_in_words(Time.at(last_error["timestamp"])) %></a>
+      <a href="#logs" onclick="findSpoolLogs();"><%= date_time_relative_value(Time.at(last_error["timestamp"])) %></a>
     </span>
   <% elsif !last_error.nil? && last_error.empty? %>
     <span>

data/app/views/tailoring_files/_list.html.erb

@@ -14,7 +14,7 @@
         <%= file.original_filename %>
       </td>
       <td>
-        <%= _("%s ago") % time_ago_in_words(file.created_at.getlocal) %>
+        <%= date_time_relative_value(file.created_at.getlocal) %>
       </td>
       <td>
         <%= action_buttons(

data/config/routes.rb

@@ -1,8 +1,6 @@
 Rails.application.routes.draw do
-
   scope '/compliance' do
-
-    resources :arf_reports, :only => %i(index show destroy) do
+    resources :arf_reports, :only => %i[index show destroy] do
       member do
         get 'show_html'
         get 'parse_html'
@@ -18,7 +16,7 @@ Rails.application.routes.draw do
 
     get 'dashboard', :to => 'compliance_dashboard#index', :as => "compliance_dashboard"
 
-    resources :policies, :only => %i(index new show create edit update destroy) do
+    resources :policies, :only => %i[index new show create edit update destroy] do
       member do
         get 'parse', :to => 'policies#parse'
         get 'dashboard', :to => 'policy_dashboard#index', :as => 'policy_dashboard'
@@ -59,33 +57,33 @@ Rails.application.routes.draw do
   end
 
   namespace :api do
-    scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'},
-          :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
+    scope "(:apiv)", :module => :v2, :defaults => { :apiv => 'v2' },
+                     :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
       namespace :compliance do
-        resources :scap_contents, :except => %i(new edit) do
+        resources :scap_contents, :except => %i[new edit] do
           member do
             get 'xml'
           end
         end
-        resources :tailoring_files, :except => %i(new edit) do
+        resources :tailoring_files, :except => %i[new edit] do
           member do
             get 'xml'
           end
         end
-        resources :policies, :except => %i(new edit) do
+        resources :policies, :except => %i[new edit] do
           member do
             get 'content'
             get 'tailoring'
           end
         end
-        resources :arf_reports, :only => %i(index show destroy) do
+        resources :arf_reports, :only => %i[index show destroy] do
           member do
             get 'download'
             get 'download_html'
           end
         end
         post 'arf_reports/:cname/:policy_id/:date', \
-              :constraints => { :cname => /[^\/]+/ }, :to => 'arf_reports#create'
+             :constraints => { :cname => /[^\/]+/ }, :to => 'arf_reports#create'
       end
     end
   end

data/db/migrate/20141015115511_add_arf_report_unique_constraint.rb

@@ -1,6 +1,6 @@
 class AddArfReportUniqueConstraint < ActiveRecord::Migration
   def change
-    add_index :scaptimony_arf_reports, %i(asset_id policy_id date digest),
+    add_index :scaptimony_arf_reports, %i[asset_id policy_id date digest],
               :unique => true, :name => :index_scaptimony_arf_reports_unique_set
   end
 end

data/db/migrate/20141113221054_create_scaptimony_scap_content_profiles.rb

@@ -4,9 +4,8 @@ class CreateScaptimonyScapContentProfiles < ActiveRecord::Migration
       t.references :scap_content, :index => true
       t.string :profile_id
       t.string :title
-
     end
-    add_index :scaptimony_scap_content_profiles, %i(scap_content_id profile_id),
-      :unique => true, :name => :index_scaptimony_scap_content_profiles_scipi
+    add_index :scaptimony_scap_content_profiles, %i[scap_content_id profile_id],
+              :unique => true, :name => :index_scaptimony_scap_content_profiles_scipi
   end
 end

data/db/migrate/20141206211151_create_scaptimony_assets_policies.rb

@@ -4,6 +4,6 @@ class CreateScaptimonyAssetsPolicies < ActiveRecord::Migration
       t.references :asset, :index => true, :null => false
       t.references :policy, :index => true, :null => false
     end
-    add_index :scaptimony_assets_policies, %i(asset_id policy_id), :unique => true
+    add_index :scaptimony_assets_policies, %i[asset_id policy_id], :unique => true
   end
 end

data/db/migrate/20150115155947_add_scaptimony_scap_content_digest.rb

@@ -12,7 +12,7 @@ class AddScaptimonyScapContentDigest < ActiveRecord::Migration
     end
   end
 
-  class ScapContentHack < ActiveRecord::Base
+  class ScapContentHack < ApplicationRecord
     self.table_name = 'scaptimony_scap_contents'
     def digest
       self[:digest] ||= Digest::SHA256.hexdigest scap_file.to_s

data/db/migrate/20150821100137_migrate_from_scaptimony.rb

@@ -3,7 +3,7 @@ class MigrateFromScaptimony < ActiveRecord::Migration
     ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
       # rename_tables renames the indexes, and their new names overflow, we cancel out the renaming of the indexes
       alias_method :old_rename_table_indexes, :rename_table_indexes
-      def rename_table_indexes(a,b)
+      def rename_table_indexes(a, b)
       end
     end
 

data/db/migrate/20150929152345_move_arf_reports_to_reports_table.rb

@@ -1,5 +1,4 @@
 class MoveArfReportsToReportsTable < ActiveRecord::Migration
-
   # rubocop:disable Metrics/MethodLength
   # rubocop:disable Metrics/AbcSize
   def up

data/db/migrate/20161223153249_add_permissions_to_arf_report.rb

@@ -1,11 +1,11 @@
 class AddPermissionsToArfReport < ActiveRecord::Migration
   def up
-    Permission.where(:name => %w(view_arf_reports destroy_arf_reports))
+    Permission.where(:name => %w[view_arf_reports destroy_arf_reports])
               .update_all(:resource_type => 'ForemanOpenscap::ArfReport')
   end
 
   def down
-    Permission.where(:name => %w(view_arf_reports destroy_arf_reports))
+    Permission.where(:name => %w[view_arf_reports destroy_arf_reports])
               .update_all(:resource_type => '')
   end
 end

data/db/migrate/20171016125613_add_content_title_unique_constraint.foreman_openscap.rb

@@ -0,0 +1,6 @@
+class AddContentTitleUniqueConstraint < ActiveRecord::Migration
+  def change
+    remove_index :foreman_openscap_scap_contents, :name => 'index_scaptimony_scap_contents_on_title'
+    add_index :foreman_openscap_scap_contents, :title, :unique => true
+  end
+end

data/lib/foreman_openscap/bulk_upload.rb

@@ -50,7 +50,7 @@ module ForemanOpenscap
     def extract_name_from_file(file)
       # SCAP datastream files are in format of ssg-<OS>-ds.xml
       # We wish to extract the <OS> and create a name of it
-      original_filename(file).gsub('ssg-','').gsub('-ds.xml', '')
+      original_filename(file).gsub('ssg-', '').gsub('-ds.xml', '')
     end
 
     def original_filename(file)

data/lib/foreman_openscap/engine.rb

@@ -33,7 +33,7 @@ module ForemanOpenscap
 
     initializer 'foreman_openscap.configure_assets', :group => :assets do
       SETTINGS[:foreman_openscap] =
-        {:assets => {:precompile => assets_to_precompile}}
+        { :assets => { :precompile => assets_to_precompile } }
     end
 
     initializer 'foreman_openscap.apipie' do
@@ -51,106 +51,105 @@ module ForemanOpenscap
 
         # Add permissions
         security_block :foreman_openscap do
-          permission :view_arf_reports, {:arf_reports => %i[index show parse_html show_html
-parse_bzip auto_complete_search download_html],
-                                         'api/v2/compliance/arf_reports' => %i[index show download download_html],
-                                         :compliance_hosts => [:show]},
+          permission :view_arf_reports, { :arf_reports => %i[index show parse_html show_html
+                                                             parse_bzip auto_complete_search download_html],
+                                          'api/v2/compliance/arf_reports' => %i[index show download download_html],
+                                          :compliance_hosts => [:show] },
                      :resource_type => 'ForemanOpenscap::ArfReport'
-          permission :destroy_arf_reports, {:arf_reports => %i[destroy delete_multiple submit_delete_multiple],
-                                            'api/v2/compliance/arf_reports' => [:destroy]},
+          permission :destroy_arf_reports, { :arf_reports => %i[destroy delete_multiple submit_delete_multiple],
+                                             'api/v2/compliance/arf_reports' => [:destroy] },
                      :resource_type => 'ForemanOpenscap::ArfReport'
-          permission :create_arf_reports, {'api/v2/compliance/arf_reports' => [:create]},
+          permission :create_arf_reports, { 'api/v2/compliance/arf_reports' => [:create] },
                      :resource_type => 'ForemanOpenscap::ArfReport'
 
-          permission :view_policies, {:policies => %i[index show parse auto_complete_search],
-                                                 :policy_dashboard => [:index],
-                                                 :compliance_dashboard        => [:index],
-                                                 'api/v2/compliance/policies' => %i[index show content]},
+          permission :view_policies, { :policies => %i[index show parse auto_complete_search],
+                                       :policy_dashboard => [:index],
+                                       :compliance_dashboard        => [:index],
+                                       'api/v2/compliance/policies' => %i[index show content] },
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :edit_policies, {:policies => %i[edit update scap_content_selected],
-                                                 'api/v2/compliance/policies' => [:update]},
+          permission :edit_policies, { :policies => %i[edit update scap_content_selected],
+                                       'api/v2/compliance/policies' => [:update] },
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :create_policies, {:policies => %i[new create],
-                                                   'api/v2/compliance/policies' => [:create]},
+          permission :create_policies, { :policies => %i[new create],
+                                         'api/v2/compliance/policies' => [:create] },
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :destroy_policies, {:policies => [:destroy],
-                                                    'api/v2/compliance/policies' => [:destroy]},
+          permission :destroy_policies, { :policies => [:destroy],
+                                          'api/v2/compliance/policies' => [:destroy] },
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :assign_policies, {:policies => %i[select_multiple_hosts update_multiple_hosts
-disassociate_multiple_hosts
-remove_policy_from_multiple_hosts]},
+          permission :assign_policies, { :policies => %i[select_multiple_hosts update_multiple_hosts
+                                                         disassociate_multiple_hosts
+                                                         remove_policy_from_multiple_hosts] },
                      :resource_type => 'ForemanOpenscap::Policy'
-          permission :view_scap_contents, {:scap_contents => %i[index show auto_complete_search],
-                                                      'api/v2/compliance/scap_contents' => %i[index show xml]},
+          permission :view_scap_contents, { :scap_contents => %i[index show auto_complete_search],
+                                            'api/v2/compliance/scap_contents' => %i[index show xml] },
                      :resource_type => 'ForemanOpenscap::ScapContent'
-          permission :edit_scap_contents, {:scap_contents => %i[edit update],
-                                                      'api/v2/compliance/scap_contents' => [:update]},
+          permission :edit_scap_contents, { :scap_contents => %i[edit update],
+                                            'api/v2/compliance/scap_contents' => [:update] },
                      :resource_type => 'ForemanOpenscap::ScapContent'
-          permission :create_scap_contents, {:scap_contents => %i[new create],
-                                                        'api/v2/compliance/scap_contents' => [:create]},
+          permission :create_scap_contents, { :scap_contents => %i[new create],
+                                              'api/v2/compliance/scap_contents' => [:create] },
                      :resource_type => 'ForemanOpenscap::ScapContent'
-          permission :destroy_scap_contents, {:scap_contents => [:destroy],
-                                                         'api/v2/compliance/scap_contents' => [:destroy]},
+          permission :destroy_scap_contents, { :scap_contents => [:destroy],
+                                               'api/v2/compliance/scap_contents' => [:destroy] },
                      :resource_type => 'ForemanOpenscap::ScapContent'
           permission :edit_hosts, { :hosts => [:openscap_proxy_changed] }, :resource_type => "Host"
           permission :edit_hostgroups, { :hostgroups => [:openscap_proxy_changed] }, :resource_type => "Hostgroup"
           permission :create_tailoring_files, { :tailoring_files => %i[create new],
-                                                'api/v2/compliance/tailoring_files' => [:create]},
+                                                'api/v2/compliance/tailoring_files' => [:create] },
                      :resource_type => 'ForemanOpenscap::TailoringFile'
           permission :view_tailoring_files, { :tailoring_files => %i[index auto_complete_search xml],
                                               :policies => [:tailoring_file_selected],
                                               'api/v2/compliance/tailoring_files' => %i[show xml index],
                                               'api/v2/compliance/policies' => [:tailoring] },
-                      :resource_type => 'ForemanOpenscap::TailoringFile'
+                     :resource_type => 'ForemanOpenscap::TailoringFile'
           permission :edit_tailoring_files, { :tailoring_files => %i[edit update],
                                               'api/v2/compliance/tailoring_files' => [:update] },
-                      :resource_type => 'ForemanOpenscap::TailoringFile'
+                     :resource_type => 'ForemanOpenscap::TailoringFile'
           permission :destroy_tailoring_files, { :tailoring_files => [:destroy],
                                                  'api/v2/compliance/tailoring_files' => [:destroy] },
-                      :resource_type => 'ForemanOpenscap::TailoringFile'
+                     :resource_type => 'ForemanOpenscap::TailoringFile'
           permission :view_openscap_proxies, { :openscap_proxies => [:openscap_spool] },
-                      :resource_type => 'SmartProxy'
+                     :resource_type => 'SmartProxy'
         end
 
         role "Compliance viewer", %i[view_arf_reports view_policies view_scap_contents view_tailoring_files view_openscap_proxies]
         role "Compliance manager", %i[view_arf_reports view_policies view_scap_contents
-destroy_arf_reports edit_policies edit_scap_contents assign_policies
-create_policies create_scap_contents destroy_policies destroy_scap_contents
-create_tailoring_files view_tailoring_files edit_tailoring_files destroy_tailoring_files
-view_openscap_proxies]
+                                      destroy_arf_reports edit_policies edit_scap_contents assign_policies
+                                      create_policies create_scap_contents destroy_policies destroy_scap_contents
+                                      create_tailoring_files view_tailoring_files edit_tailoring_files destroy_tailoring_files
+                                      view_openscap_proxies]
         role "Create ARF report", [:create_arf_reports] # special as only Proxy can create
 
         add_all_permissions_to_default_roles
 
-        #add menu entries
+        # add menu entries
         divider :top_menu, :caption => N_('Compliance'), :parent => :hosts_menu
         menu :top_menu, :compliance_policies, :caption => N_('Policies'),
-             :url_hash => {:controller => :policies, :action => :index},
-             :parent => :hosts_menu
+                                              :url_hash => { :controller => :policies, :action => :index },
+                                              :parent => :hosts_menu
         menu :top_menu, :compliance_contents, :caption => N_('SCAP contents'),
-             :url_hash => {:controller => :scap_contents, :action => :index},
-             :parent => :hosts_menu
+                                              :url_hash => { :controller => :scap_contents, :action => :index },
+                                              :parent => :hosts_menu
         menu :top_menu, :compliance_reports, :caption => N_('Reports'),
-             :url_hash => {:controller => :arf_reports, :action => :index},
-             :parent => :hosts_menu
+                                             :url_hash => { :controller => :arf_reports, :action => :index },
+                                             :parent => :hosts_menu
         menu :top_menu, :compliance_files, :caption => N_('Tailoring Files'),
-             :url_hash => {:controller => :tailoring_files, :action => :index},
-             :parent => :hosts_menu
-
+                                           :url_hash => { :controller => :tailoring_files, :action => :index },
+                                           :parent => :hosts_menu
 
         # add dashboard widget
         widget 'compliance_host_reports_widget',
-          :name => N_('Latest Compliance Reports'), :sizex => 6, :sizey => 1
+               :name => N_('Latest Compliance Reports'), :sizex => 6, :sizey => 1
         widget 'compliance_reports_breakdown_widget',
-          :name => N_('Compliance Reports Breakdown'), :sizex => 6, :sizey => 1
+               :name => N_('Compliance Reports Breakdown'), :sizex => 6, :sizey => 1
 
         # As 'arf_report_breakdowns' is a view and does not appear in schema.rb, db:test:prepare will not create the view
         # which will make the following tests fail.
         tests_to_skip({ "DashboardIntegrationTest" => ["dashboard page", "dashboard link hosts that had performed modifications",
-                           "dashboard link hosts in error state", "dashboard link good host reports",
-                           "dashboard link hosts that had pending changes", "dashboard link out of sync hosts",
-                           "dashboard link hosts with no reports", "dashboard link hosts with alerts disabled",
-                           "widgets not in dashboard show up in list"]})
+                                                       "dashboard link hosts in error state", "dashboard link good host reports",
+                                                       "dashboard link hosts that had pending changes", "dashboard link out of sync hosts",
+                                                       "dashboard link hosts with no reports", "dashboard link hosts with alerts disabled",
+                                                       "widgets not in dashboard show up in list"] })
         # strong params
         parameter_filter Host::Managed, :openscap_proxy_id, :openscap_proxy
         parameter_filter Hostgroup, :openscap_proxy_id, :openscap_proxy
@@ -167,7 +166,6 @@ view_openscap_proxies]
                         :description => N_('OpenSCAP Proxy to use for fetching SCAP content and uploading ARF reports'),
                         :api_description => N_('ID of OpenSCAP Proxy')
 
-
         if ForemanOpenscap.with_remote_execution?
           options = {
             :description => N_("Run OpenSCAP scan"),
@@ -197,7 +195,7 @@ view_openscap_proxies]
       Foreman::Gettext::Support.add_text_domain locale_domain, locale_dir
     end
 
-    #Include concerns in this config.to_prepare block
+    # Include concerns in this config.to_prepare block
     config.to_prepare do
       Host::Managed.send(:include, ForemanOpenscap::OpenscapProxyExtensions)
       Host::Managed.send(:include, ForemanOpenscap::OpenscapProxyCoreExtensions)

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "0.8.3".freeze
+  VERSION = "0.8.4".freeze
 end