foreman_openscap 0.7.1 → 0.7.2

data/app/models/foreman_openscap/arf_report.rb

@@ -6,7 +6,7 @@ module ForemanOpenscap
     include OpenscapProxyExtensions
 
     # attr_accessible :host_id, :reported_at, :status, :metrics
-    METRIC = %w(passed othered failed)
+    METRIC = %w(passed othered failed).freeze
     BIT_NUM = 10
     MAX = (1 << BIT_NUM) - 1
 
@@ -30,11 +30,12 @@ module ForemanOpenscap
     scope :of_policy, lambda { |policy_id| joins(:policy_arf_report).merge(PolicyArfReport.of_policy(policy_id)) }
 
     scope :latest, -> {
-       joins('INNER JOIN (SELECT host_id, policy_id, max(reports.id) AS id
-                          FROM reports INNER JOIN foreman_openscap_policy_arf_reports
-                              ON reports.id = foreman_openscap_policy_arf_reports.arf_report_id
-                          GROUP BY host_id, policy_id) latest
-              ON reports.id = latest.id') }
+      joins('INNER JOIN (SELECT host_id, policy_id, max(reports.id) AS id
+                         FROM reports INNER JOIN foreman_openscap_policy_arf_reports
+                             ON reports.id = foreman_openscap_policy_arf_reports.arf_report_id
+                         GROUP BY host_id, policy_id) latest
+             ON reports.id = latest.id')
+    }
 
     scope :latest_of_policy, lambda { |policy|
       joins("INNER JOIN (SELECT host_id, policy_id, max(reports.id) AS id
@@ -63,12 +64,12 @@ module ForemanOpenscap
 
     def status=(st)
       s = case st
-          when Integer, Fixnum
+          when Integer, Integer
             st
           when Hash
             ArfReportStatusCalculator.new(:counters => st).calculate
           else
-            fail Foreman::Exception(N_('Unsupported report status format'))
+            raise Foreman::Exception(N_('Unsupported report status format'))
           end
       write_attribute(:status, s)
     end
@@ -111,10 +112,19 @@ module ForemanOpenscap
         if params[:logs]
           params[:logs].each do |log|
             src = Source.find_or_create(log[:source])
-            digest = Digest::SHA1.hexdigest(log[:title])
-            msg = Message.where(:value => N_(log[:title]), :digest => digest, :severity => log[:severity],
-                                :description => newline_to_space(log[:description]), :rationale => newline_to_space(log[:rationale]),
-                                :scap_references => references_links(log[:references])).first_or_create
+            msg = nil
+            if src.logs.count > 0
+              msg = Log.where(:source_id => src.id).order(:id => :desc).first.message
+              update_msg_with_changes(msg, log)
+            else
+              digest = Digest::SHA1.hexdigest(log[:title])
+              msg = Message.create!(:value => N_(log[:title]),
+                                    :digest => digest,
+                                    :severity => log[:severity],
+                                    :description => newline_to_space(log[:description]),
+                                    :rationale => newline_to_space(log[:rationale]),
+                                    :scap_references => references_links(log[:references]))
+            end
             #TODO: log level
             Log.create!(:source_id => src.id,
                         :message_id => msg.id,
@@ -191,5 +201,17 @@ module ForemanOpenscap
       end
       html_links.join(', ')
     end
+
+    def self.update_msg_with_changes(msg, incoming_data)
+      msg.severity = incoming_data['severity']
+      msg.description = incoming_data['description']
+      msg.rationale = incoming_data['rationale']
+      msg.scap_references = incoming_data['references']
+      msg.value = incoming_data['title']
+
+      return unless msg.changed?
+      msg.digest = Digest::SHA1.hexdigest(msg.value) if msg.value_changed?
+      msg.save
+    end
   end
 end

data/app/models/foreman_openscap/policy.rb

@@ -15,10 +15,10 @@ module ForemanOpenscap
 
     scoped_search :on => :name, :complete_value => true
 
-    SCAP_PUPPET_CLASS        = 'foreman_scap_client'
-    POLICIES_CLASS_PARAMETER = 'policies'
-    SERVER_CLASS_PARAMETER   = 'server'
-    PORT_CLASS_PARAMETER     = 'port'
+    SCAP_PUPPET_CLASS        = 'foreman_scap_client'.freeze
+    POLICIES_CLASS_PARAMETER = 'policies'.freeze
+    SERVER_CLASS_PARAMETER   = 'server'.freeze
+    PORT_CLASS_PARAMETER     = 'port'.freeze
 
     before_validation :update_period_attrs
 
@@ -48,7 +48,7 @@ module ForemanOpenscap
     def to_html
       if scap_content.nil? || scap_content_profile.nil?
         return ("<h2>%s</h2>" % (_('Cannot generate HTML guide for %{scap_content}/%{profile}') %
-          { :scap_content => self.scap_content, :profile => self.scap_content_profile })).html_safe
+          { :scap_content => h(self.scap_content), :profile => h(self.scap_content_profile) })).html_safe
       end
 
       if (proxy = scap_content.proxy_url)
@@ -143,13 +143,15 @@ module ForemanOpenscap
     def used_location_ids
       Location.joins(:taxable_taxonomies).where(
         'taxable_taxonomies.taxable_type' => 'ForemanOpenscap::Policy',
-        'taxable_taxonomies.taxable_id'   => id).pluck("#{Location.arel_table.name}.id")
+        'taxable_taxonomies.taxable_id'   => id
+      ).pluck("#{Location.arel_table.name}.id")
     end
 
     def used_organization_ids
       Organization.joins(:taxable_taxonomies).where(
         'taxable_taxonomies.taxable_type' => 'ForemanOpenscap::Policy',
-        'taxable_taxonomies.taxable_id'   => id).pluck("#{Location.arel_table.name}.id")
+        'taxable_taxonomies.taxable_id'   => id
+      ).pluck("#{Location.arel_table.name}.id")
     end
 
     def used_hostgroup_ids
@@ -197,18 +199,18 @@ module ForemanOpenscap
     def update_period_attrs
       case period
       when 'monthly'
-        erase_period_attrs(['cron_line', 'weekday'])
+        erase_period_attrs(%w(cron_line weekday))
       when 'weekly'
-        erase_period_attrs(['cron_line', 'day_of_month'])
+        erase_period_attrs(%w(cron_line day_of_month))
       when 'custom'
-        erase_period_attrs(['weekday', 'day_of_month'])
+        erase_period_attrs(%w(weekday day_of_month))
       end
     end
 
     private
 
     def erase_period_attrs(attrs)
-       attrs.each { |attr| self.public_send("#{attr}=", nil) }
+      attrs.each { |attr| self.public_send("#{attr}=", nil) }
     end
 
     def period_enc
@@ -221,7 +223,7 @@ module ForemanOpenscap
                    when 'custom'
                      cron_line_split
                    else
-                     fail 'invalid period specification'
+                     raise 'invalid period specification'
                    end
 
       {
@@ -239,12 +241,12 @@ module ForemanOpenscap
     end
 
     def ensure_needed_puppetclasses
-      unless puppetclass = Puppetclass.find_by_name(SCAP_PUPPET_CLASS)
+      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}
         return false
       end
 
-      unless policies_param = puppetclass.class_params.find_by_key(POLICIES_CLASS_PARAMETER)
+      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}
         return false
       end
@@ -270,13 +272,13 @@ module ForemanOpenscap
     end
 
     def valid_weekday
-      if(period == 'weekly' && should_validate?('Schedule'))
+      if period == 'weekly' && should_validate?('Schedule')
         errors.add(:weekday, _("is not a valid value")) unless Date::DAYNAMES.map(&:downcase).include? weekday
       end
     end
 
     def valid_day_of_month
-      if(period == 'monthly' && should_validate?('Schedule'))
+      if period == 'monthly' && should_validate?('Schedule')
         errors.add(:day_of_month, _("must be between 1 and 31")) if !day_of_month || (day_of_month < 1 || day_of_month > 31)
       end
     end
@@ -313,7 +315,7 @@ module ForemanOpenscap
     end
 
     def find_scap_puppetclass
-      Puppetclass.find_by_name(SCAP_PUPPET_CLASS)
+      Puppetclass.find_by(name: SCAP_PUPPET_CLASS)
     end
 
     def populate_overrides(puppetclass, hostgroup)

data/app/models/foreman_openscap/scap_content.rb

@@ -21,13 +21,15 @@ module ForemanOpenscap
     def used_location_ids
       Location.joins(:taxable_taxonomies).where(
         'taxable_taxonomies.taxable_type' => 'ForemanOpenscap::ScapContent',
-        'taxable_taxonomies.taxable_id' => id).pluck("#{Location.arel_table.name}.id")
+        'taxable_taxonomies.taxable_id' => id
+      ).pluck("#{Location.arel_table.name}.id")
     end
 
     def used_organization_ids
       Organization.joins(:taxable_taxonomies).where(
         'taxable_taxonomies.taxable_type' => 'ForemanOpenscap::ScapContent',
-        'taxable_taxonomies.taxable_id' => id).pluck("#{Location.arel_table.name}.id")
+        'taxable_taxonomies.taxable_id' => id
+      ).pluck("#{Location.arel_table.name}.id")
     end
 
     def to_label

data/app/services/foreman_openscap/arf_report_status_calculator.rb

@@ -28,7 +28,7 @@ module ForemanOpenscap
     end
 
     def status_of(counter)
-      fail(Foreman::Exception.new(N_("invalid type %s"), counter)) unless ArfReport::METRIC.include?(counter)
+      raise(Foreman::Exception.new(N_("invalid type %s"), counter)) unless ArfReport::METRIC.include?(counter)
       status[counter]
     end
 

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

@@ -4,8 +4,8 @@ module ForemanOpenscap::HostReportDashboard
 
     def initialize(policy, host)
       @latest_report = ::ForemanOpenscap::ArfReport.latest_of_policy(policy)
-        .where(:host_id => host.id)
-        .order('created_at DESC').first
+                                                   .where(:host_id => host.id)
+                                                   .order('created_at DESC').first
       @report = {}
       fetch_data
     end

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

@@ -17,14 +17,15 @@ module ForemanOpenscap::PolicyDashboard
     end
 
     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 => @policy.assets.hosts.count,
-         :unassigned_hosts => hosts.count - @policy.assets.hosts.count
-        })
+         :assigned_hosts => assigned_count,
+         :unassigned_hosts => hosts.count - assigned_count}
+      )
     end
   end
 end

data/app/validators/foreman_openscap/data_stream_validator.rb

@@ -6,12 +6,12 @@ module ForemanOpenscap
       content_type = data_type(data_stream_content)
 
       unless SmartProxy.with_features('Openscap').any?
-        data_stream_content.errors.add(:base, _('No proxy with OpenSCAP features'))
+        data_stream_content.errors.add(:base, _('No proxy with OpenSCAP feature was found.'))
         return false
       end
 
       if data_stream_content.proxy_url.nil?
-        data_stream_content.errors.add(:base, _('No available proxy to validate SCAP data stream file'))
+        data_stream_content.errors.add(:base, _('No proxy with OpenSCAP feature is running.'))
         return false
       end
 

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

@@ -1,12 +1,12 @@
 <div id='status-table'>
   <h4 class="header"><%= _('Hosts Breakdown') %></h4>
   <ul>
-    <%= status_link _('Compliant with the policy'), :compliant_hosts, arf_reports_path(:search => "comply_with = #{@policy.name}") %>
-    <%= status_link _('Not compliant with the policy'), :incompliant_hosts, arf_reports_path(:search => "not_comply_with = #{@policy.name}") %>
-    <%= status_link _('Inconclusive results'), :inconclusive_hosts, arf_reports_path(:search => " inconclusive_with = #{@policy.name}") %>
-    <%= status_link _('Never audited'), :report_missing, hosts_path(:search => "compliance_report_missing_for = #{@policy.name}") %>
+    <%= status_link _('Compliant with the policy'), :compliant_hosts, arf_reports_path(:search => "comply_with = \"#{@policy.name}\"") %>
+    <%= status_link _('Not compliant with the policy'), :incompliant_hosts, arf_reports_path(:search => "not_comply_with = \"#{@policy.name}\"") %>
+    <%= status_link _('Inconclusive results'), :inconclusive_hosts, arf_reports_path(:search => " inconclusive_with = \"#{@policy.name}\"") %>
+    <%= status_link _('Never audited'), :report_missing, hosts_path(:search => "compliance_report_missing_for = \"#{@policy.name}\"") %>
     <h4 class="total">
-      <%= link_to(_("Total hosts: %s") % @report[:assigned_hosts], hosts_path(:search => "compliance_policy = #{@policy.name}")) %>
+      <%= link_to(_("Total hosts: %s") % @report[:assigned_hosts], hosts_path(:search => "compliance_policy = \"#{@policy.name}\"")) %>
     </h4>
   </ul>
 </div>

data/config/routes.rb

@@ -2,7 +2,7 @@ Rails.application.routes.draw do
 
   scope '/compliance' do
 
-    resources :arf_reports, :only => [:index, :show, :destroy] do
+    resources :arf_reports, :only => %i(index show destroy) do
       member do
         get 'show_html'
         get 'parse_html'
@@ -18,7 +18,7 @@ Rails.application.routes.draw do
 
     get 'dashboard', :to => 'compliance_dashboard#index', :as => "compliance_dashboard"
 
-    resources :policies, :only => [: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'
@@ -62,23 +62,23 @@ Rails.application.routes.draw do
     scope "(:apiv)", :module => :v2, :defaults => {:apiv => 'v2'},
           :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2) do
       namespace :compliance do
-        resources :scap_contents, :except => [:new, :edit] do
+        resources :scap_contents, :except => %i(new edit) do
           member do
             get 'xml'
           end
         end
-        resources :tailoring_files, :except => [:new, :edit] do
+        resources :tailoring_files, :except => %i(new edit) do
           member do
             get 'xml'
           end
         end
-        resources :policies, :except => [:new, :edit] do
+        resources :policies, :except => %i(new edit) do
           member do
             get 'content'
             get 'tailoring'
           end
         end
-        resources :arf_reports, :only => [:index, :show, :destroy] do
+        resources :arf_reports, :only => %i(index show destroy) do
           member do
             get 'download'
             get 'download_html'

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, [: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

@@ -6,7 +6,7 @@ class CreateScaptimonyScapContentProfiles < ActiveRecord::Migration
       t.string :title
 
     end
-    add_index :scaptimony_scap_content_profiles, [:scap_content_id, :profile_id],
+    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/20141116170632_remove_xccdf_profile_from_scaptimony_policies.rb

@@ -1,5 +1,5 @@
 class RemoveXccdfProfileFromScaptimonyPolicies < ActiveRecord::Migration
   def change
-    remove_column :scaptimony_policies, :xccdf_profile
+    remove_column :scaptimony_policies, :xccdf_profile, :string
   end
 end

data/db/migrate/20141121120326_create_scaptimony_arf_report_breakdowns.rb

@@ -1,20 +1,20 @@
 class CreateScaptimonyArfReportBreakdowns < ActiveRecord::Migration
   def self.up
-    execute <<-SQL
-CREATE VIEW scaptimony_arf_report_breakdowns AS
-  SELECT
-    arf.id as arf_report_id,
-    COUNT(CASE WHEN result.name IN ('pass','fixed') THEN 1 ELSE null END) as passed,
-    COUNT(CASE result.name WHEN 'fail' THEN 1 ELSE null END) as failed,
-    COUNT(CASE WHEN result.name NOT IN ('pass', 'fixed', 'fail', 'notselected', 'notapplicable') THEN 1 ELSE null END) as othered
-  FROM
-    scaptimony_arf_reports arf,
-    scaptimony_xccdf_rule_results rule,
-    scaptimony_xccdf_results result
-  WHERE
-    arf.id = rule.arf_report_id
-    AND rule.xccdf_result_id = result.id
-  GROUP BY arf.id;
+    execute <<-SQL.strip_heredoc
+      CREATE VIEW scaptimony_arf_report_breakdowns AS
+        SELECT
+          arf.id as arf_report_id,
+          COUNT(CASE WHEN result.name IN ('pass','fixed') THEN 1 ELSE null END) as passed,
+          COUNT(CASE result.name WHEN 'fail' THEN 1 ELSE null END) as failed,
+          COUNT(CASE WHEN result.name NOT IN ('pass', 'fixed', 'fail', 'notselected', 'notapplicable') THEN 1 ELSE null END) as othered
+        FROM
+          scaptimony_arf_reports arf,
+          scaptimony_xccdf_rule_results rule,
+          scaptimony_xccdf_results result
+        WHERE
+          arf.id = rule.arf_report_id
+          AND rule.xccdf_result_id = result.id
+        GROUP BY arf.id;
     SQL
   end
 

data/db/migrate/20141121164042_replace_arf_report_breakdown_view.rb

@@ -1,21 +1,21 @@
 class ReplaceArfReportBreakdownView < ActiveRecord::Migration
   def self.up
     execute 'DROP VIEW IF EXISTS scaptimony_arf_report_breakdowns'
-    execute <<-SQL
-CREATE VIEW scaptimony_arf_report_breakdowns AS
-  SELECT
-    arf.id as arf_report_id,
-    COUNT(CASE WHEN result.name IN ('pass','fixed') THEN 1 ELSE null END) as passed,
-    COUNT(CASE result.name WHEN 'fail' THEN 1 ELSE null END) as failed,
-    COUNT(CASE WHEN result.name NOT IN ('pass', 'fixed', 'fail', 'notselected', 'notapplicable') THEN 1 ELSE null END) as othered
-  FROM
-    scaptimony_arf_reports arf
-  LEFT OUTER JOIN
-    scaptimony_xccdf_rule_results rule
-    ON arf.id = rule.arf_report_id
-  LEFT OUTER JOIN scaptimony_xccdf_results result
-    ON rule.xccdf_result_id = result.id
-  GROUP BY arf.id;
+    execute <<-SQL.strip_heredoc
+      CREATE VIEW scaptimony_arf_report_breakdowns AS
+        SELECT
+          arf.id as arf_report_id,
+          COUNT(CASE WHEN result.name IN ('pass','fixed') THEN 1 ELSE null END) as passed,
+          COUNT(CASE result.name WHEN 'fail' THEN 1 ELSE null END) as failed,
+          COUNT(CASE WHEN result.name NOT IN ('pass', 'fixed', 'fail', 'notselected', 'notapplicable') THEN 1 ELSE null END) as othered
+        FROM
+          scaptimony_arf_reports arf
+        LEFT OUTER JOIN
+          scaptimony_xccdf_rule_results rule
+          ON arf.id = rule.arf_report_id
+        LEFT OUTER JOIN scaptimony_xccdf_results result
+          ON rule.xccdf_result_id = result.id
+        GROUP BY arf.id;
     SQL
   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, [: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

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

data/db/migrate/20150821100137_migrate_from_scaptimony.rb

@@ -32,7 +32,7 @@ class MigrateFromScaptimony < ActiveRecord::Migration
           SQL
 
     taxonomies = TaxableTaxonomy.where(:taxable_type => ["Scaptimony::ArfReport", "Scaptimony::Policy", "Scaptimony::ScapContent"])
-    taxonomies.each { |t| t.taxable_type = t.taxable_type.sub(/^Scaptimony/, "ForemanOpenscap")}.map(&:save!)
+    taxonomies.each { |t| t.taxable_type = t.taxable_type.sub(/^Scaptimony/, "ForemanOpenscap") }.map(&:save!)
   ensure
     ActiveRecord::ConnectionAdapters::SchemaStatements.module_eval do
       alias_method :rename_table_indexes, :old_rename_table_indexes

data/db/migrate/20160830113437_remove_deleted_policy.rb

@@ -1,7 +1,7 @@
 class RemoveDeletedPolicy < ActiveRecord::Migration
   def up
     ForemanOpenscap::AssetPolicy.all.collect(&:policy_id).uniq.each do |policy_id|
-      execute("DELETE FROM foreman_openscap_asset_policies WHERE policy_id = '#{policy_id}';") if ForemanOpenscap::Policy.find_by_id(policy_id).nil?
+      execute("DELETE FROM foreman_openscap_asset_policies WHERE policy_id = '#{policy_id}';") if ForemanOpenscap::Policy.find_by(id: policy_id).nil?
     end
   end
 

data/db/migrate/20160925213031_change_scap_widget_names.rb

@@ -1,15 +1,15 @@
 class ChangeScapWidgetNames < ActiveRecord::Migration
   def up
-    Widget.where(:name => 'OpenSCAP Host reports widget').\
-      update_all(:name => 'Latest Compliance Reports')
-    Widget.where(:name => 'OpenSCAP Reports breakdown widget').\
-      update_all(:name => 'Compliance Reports Breakdown')
+    Widget.where(:name => 'OpenSCAP Host reports widget')\
+          .update_all(:name => 'Latest Compliance Reports')
+    Widget.where(:name => 'OpenSCAP Reports breakdown widget')\
+          .update_all(:name => 'Compliance Reports Breakdown')
   end
 
   def down
-    Widget.where(:name => 'Latest Compliance Reports').\
-      update_all(:name => 'OpenSCAP Host reports widget')
-    Widget.where(:name => 'Compliance Reports Breakdown').\
-      update_all(:name => 'OpenSCAP Reports breakdown widget')
+    Widget.where(:name => 'Latest Compliance Reports')\
+          .update_all(:name => 'OpenSCAP Host reports widget')
+    Widget.where(:name => 'Compliance Reports Breakdown')\
+          .update_all(:name => 'OpenSCAP Reports breakdown widget')
   end
 end

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)).
-      update_all(:resource_type => 'ForemanOpenscap::ArfReport')
+    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)).
-      update_all(:resource_type => '')
+    Permission.where(:name => %w(view_arf_reports destroy_arf_reports))
+              .update_all(:resource_type => '')
   end
 end

data/db/seeds.d/75-job_templates.rb

@@ -3,7 +3,12 @@ if ForemanOpenscap.with_remote_execution?
     JobTemplate.without_auditing do
       Dir[File.join("#{ForemanOpenscap::Engine.root}/app/views/job_templates/**/*.erb")].each do |template|
         sync = !Rails.env.test? && Setting[:remote_execution_sync_templates]
-        JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+        # import! was renamed to import_raw! around 1.3.1
+        if JobTemplate.respond_to?('import_raw!')
+          JobTemplate.import_raw!(File.read(template), :default => true, :locked => true, :update => sync)
+        else
+          JobTemplate.import!(File.read(template), :default => true, :locked => true, :update => sync)
+        end
       end
     end
   end

data/db/seeds.d/openscap_feature.rb

@@ -1,2 +1,2 @@
 f = Feature.where(:name => 'Openscap').first_or_create
-fail "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?
+raise "Unable to create proxy feature: #{format_errors f}" if f.nil? || f.errors.any?

data/lib/foreman_openscap/data_migration.rb

@@ -45,7 +45,7 @@ module ForemanOpenscap
 
     def foreman_available?
       foreman_status_url = Setting[:foreman_url] + '/status'
-      response = JSON.parse(RestClient.get foreman_status_url)
+      response = JSON.parse(RestClient.get(foreman_status_url))
       return true if response["status"] == "ok"
     rescue *::ProxyAPI::AvailableProxy::HTTP_ERRORS
       return false
@@ -79,4 +79,3 @@ module ForemanOpenscap
     end
   end
 end
-