foreman_remote_execution 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25f04758b068647b6124cb3285bcb3f98ab130f5
-  data.tar.gz: 29f20e013ea7b9f19afe485faf1fafdb0f51fc56
+  metadata.gz: 4e8f5aba0c8857327a44b058d06cb31e6c576de5
+  data.tar.gz: d2c6316d816a5db84313aa90067d87c40a66940c
 SHA512:
-  metadata.gz: ca420660d4db7e9af501f77b6ec8083b2b1014eaf0316bb887179cc491076b3eb6cbe13b255d4e868664e290c7cda18dda1d035d53d577c4f86c2ce4daf844cd
-  data.tar.gz: fa0e3c67c6a03f9afb9084b78c8c4c5666c9d217b1be33c6944fcde3eee2a86d278433c5c8f1d3d72563b389e651ecb60453facbcae4d7302ca5057a672fbce0
+  metadata.gz: 4bd554adff07566ba0e32974f2de649cae60918660b725cb7bdbbebe41a5bf0fa2b8389f4801b121b585c68cc50db01715d787df1a87134551499d69e2c8989d
+  data.tar.gz: 4504b9532f5db6be4c371b435b5edbd230e080c15060d8706f50bc254421f435d244b57b1446220ea7516de1dc571e3b5eb2e7e0a3ff2089a9aecad5498c8842

data/app/helpers/job_invocation_output_helper.rb

@@ -0,0 +1,41 @@
+module JobInvocationOutputHelper
+  CONSOLE_COLOR = {
+    '31' => 'red',
+    '32' => 'lightgreen',
+    '33' => 'orange',
+    '34' => 'deepskyblue',
+    '35' => 'mediumpurple',
+    '36' => 'cyan',
+    '37' => 'grey',
+    '91' => 'red',
+    '92' => 'lightgreen',
+    '93' => 'yellow',
+    '94' => 'lightblue',
+    '95' => 'violet',
+    '96' => 'turquoise',
+    '0'  => 'default',
+  }.tap { |h| h.default = 'default' }.freeze
+
+  def colorize_line(line)
+    line = line.gsub(/\e\[.*?m/) do |seq|
+      color = seq[/(\d+)m/,1]
+      "{{{format color:#{color}}}}"
+    end
+
+    current_color = 'default'
+    out = %{<span style="color: #{@current_color}">}
+    parts = line.split(/({{{format.*?}}})/)
+    parts.each do |console_line|
+      if console_line.include?('{{{format')
+        if (color_index = console_line[/color:(\d+)/, 1]).present?
+          current_color = CONSOLE_COLOR[color_index]
+          out << %{</span><span style="color: #{current_color}">}
+        end
+      else
+        out << h(console_line)
+      end
+    end
+    out << %{</span>}
+    out
+  end
+end

data/app/lib/actions/remote_execution/run_hosts_job.rb

@@ -66,6 +66,12 @@ module Actions
         super unless event == Dynflow::Action::Skip
       end
 
+      def finalize
+        # creating the success notification should be the very last thing this tasks do
+        job_invocation = JobInvocation.find(input[:job_invocation_id])
+        job_invocation.build_notification.deliver!
+      end
+
       def humanized_input
         input.fetch(:job_invocation, {}).fetch(:description, '')
       end

data/app/models/job_invocation.rb

@@ -78,6 +78,14 @@ class JobInvocation < ApplicationRecord
     { :conditions => sanitize_sql_for_conditions(["foreman_tasks_recurring_logics.id IS #{not_operator} NULL"]), :joins => :recurring_logic }
   end
 
+  def notification_recipients_ids
+    [ self.targeting.user_id ]
+  end
+
+  def build_notification
+    UINotifications::RemoteExecutionJobs::BaseJobFinish.new(self)
+  end
+
   def status
     HostStatus::ExecutionStatus::ExecutionTaskStatusMapper.new(task).status
   end

data/app/services/ui_notifications/remote_execution_jobs/base_job_finish.rb

@@ -0,0 +1,31 @@
+module UINotifications
+  module RemoteExecutionJobs
+    class BaseJobFinish < ::UINotifications::Base
+      def initialize(job_invocation)
+        @subject = job_invocation
+      end
+
+      def deliver!
+        ::Notification.create!(
+          :audience => Notification::AUDIENCE_USER,
+          :notification_blueprint => blueprint,
+          :initiator => initiator,
+          :message => message,
+          :subject => subject
+        )
+      end
+
+      def initiator
+        User.anonymous_admin
+      end
+
+      def blueprint
+        @blueprint ||= NotificationBlueprint.unscoped.find_by(:name => 'rex_job_succeeded')
+      end
+
+      def message
+        UINotifications::StringParser.new(blueprint.message, { subject: subject })
+      end
+    end
+  end
+end

data/app/views/job_invocations/_preview_hosts_modal.html.erb

@@ -1,4 +1,4 @@
-<% stylesheet 'modal_window' %>
+<% stylesheet 'foreman_remote_execution/modal_window' %>
 
 <!-- modal window -->
 <div class="modal fade" id="previewHostsModal" role="dialog" aria-hidden="true" data-url="<%= preview_hosts_job_invocations_path %>">

data/app/views/job_invocations/new.html.erb

@@ -1,4 +1,4 @@
-<% javascript 'template_invocation' %>
-<% stylesheet 'template_invocation' %>
+<% javascript 'foreman_remote_execution/template_invocation' %>
+<% stylesheet 'foreman_remote_execution/template_invocation' %>
 <% title _('Job invocation') %>
 <%= render :partial => 'form' %>

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

@@ -1,6 +1,6 @@
 <% title @job_invocation.description, trunc_with_tooltip(@job_invocation.description, 120) %>
-<% stylesheet 'job_invocations' %>
-<% javascript 'charts', 'template_invocation' %>
+<% stylesheet 'foreman_remote_execution/job_invocations' %>
+<% javascript 'charts', 'foreman_remote_execution/template_invocation' %>
 
 <% if @job_invocation.task %>
   <% title_actions(button_group(job_invocation_task_buttons(@job_invocation.task))) %>

data/app/views/job_templates/_import_job_template_modal.html.erb

@@ -1,4 +1,4 @@
-<% stylesheet 'modal_window' %>
+<% stylesheet 'foreman_remote_execution/modal_window' %>
 
 <!-- modal window -->
 <div class="modal fade" id="importJobTemplateModal" role="dialog" aria-hidden="true">

data/app/views/job_templates/edit.html.erb

@@ -1,5 +1,5 @@
 <%= javascript 'lookup_keys' %>
-<%= javascript 'template_input' %>
+<%= javascript 'foreman_remote_execution/template_input' %>
 
 <% title _("Edit Job Template") %>
 

data/app/views/job_templates/index.html.erb

@@ -1,6 +1,6 @@
-<%= javascript 'job_templates' %>
+<%= javascript 'foreman_remote_execution/job_templates' %>
 <%= javascript 'lookup_keys' %>
-<%= javascript 'template_input' %>
+<%= javascript 'foreman_remote_execution/template_input' %>
 
 <% title _("Job Templates") %>
 <% title_actions(documentation_button_rex('3.1JobTemplates'),

data/app/views/job_templates/new.html.erb

@@ -1,5 +1,5 @@
 <%= javascript 'lookup_keys' %>
-<%= javascript 'template_input' %>
+<%= javascript 'foreman_remote_execution/template_input' %>
 
 <% title _("New Job Template") %>
 

data/app/views/template_invocations/_output_line_set.html.erb

@@ -2,6 +2,6 @@
   <%= content_tag :div, :class => 'line ' + output_line_set['output_type'], :data => { :timestamp => output_line_set['timestamp'] } do %>
 
     <%= content_tag(:span, (@line_counter += 1).to_s.rjust(4).gsub(' ', '&nbsp;').html_safe + ':', :class => 'counter', :title => (output_line_set['timestamp'] && Time.at(output_line_set['timestamp']))) %>
-    <%= content_tag(:div, (line.empty? ? '&nbsp;' : h(line)).html_safe, :class => 'content') %>
+    <%= content_tag(:div, (line.empty? ? '&nbsp;' : colorize_line(line)).html_safe, :class => 'content') %>
   <% end %>
 <% end %>

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

@@ -1,6 +1,6 @@
 <% title _('Detail of %s run') % @template_invocation.job_invocation.job_category %>
-<% stylesheet 'template_invocation' %>
-<% javascript 'template_invocation' %>
+<% stylesheet 'foreman_remote_execution/template_invocation' %>
+<% javascript 'foreman_remote_execution/template_invocation' %>
 
 <div id="title_action">
   <div class="btn-toolbar pull-right">

data/db/seeds.d/50-notification_blueprints.rb

@@ -0,0 +1,18 @@
+blueprints = [
+  {
+    group: N_('Jobs'),
+    name: 'rex_job_succeeded',
+    message: N_("A job '%{subject}' has finished successfully"),
+    level: 'success',
+    actions:
+    {
+      links:
+      [
+        path_method: :job_invocation_path,
+        title: N_('Job Details')
+      ]
+    }
+  }
+]
+
+blueprints.each { |blueprint| UINotifications::Seed.new(blueprint).configure }

data/lib/foreman_remote_execution/version.rb

@@ -1,3 +1,3 @@
 module ForemanRemoteExecution
-  VERSION = '1.4.3'.freeze
+  VERSION = '1.4.4'.freeze
 end

data/test/unit/actions/run_hosts_job_test.rb

@@ -119,5 +119,14 @@ module ForemanRemoteExecution
         planned.input[:concurrency_control][:level].wont_be_empty
       end
     end
+
+    describe 'notifications' do
+      it 'creates notification on sucess run' do
+        FactoryBot.create(:notification_blueprint, :name => 'rex_job_succeeded')
+        assert_difference 'NotificationRecipient.where(:user_id => targeting.user.id).count' do
+          finalize_action planned
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_remote_execution
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
 platform: ruby
 authors:
 - Foreman Remote Execution team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -126,13 +126,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/javascripts/execution_interface.js
-- app/assets/javascripts/job_templates.js
-- app/assets/javascripts/template_input.js
-- app/assets/javascripts/template_invocation.js
-- app/assets/stylesheets/job_invocations.css.scss
-- app/assets/stylesheets/modal_window.css.scss
-- app/assets/stylesheets/template_invocation.css.scss
+- app/assets/javascripts/foreman_remote_execution/execution_interface.js
+- app/assets/javascripts/foreman_remote_execution/job_templates.js
+- app/assets/javascripts/foreman_remote_execution/template_input.js
+- app/assets/javascripts/foreman_remote_execution/template_invocation.js
+- app/assets/stylesheets/foreman_remote_execution/job_invocations.css.scss
+- app/assets/stylesheets/foreman_remote_execution/modal_window.css.scss
+- app/assets/stylesheets/foreman_remote_execution/template_invocation.css.scss
 - app/controllers/api/v2/foreign_input_sets_controller.rb
 - app/controllers/api/v2/job_invocations_controller.rb
 - app/controllers/api/v2/job_templates_controller.rb
@@ -149,6 +149,7 @@ files:
 - app/controllers/template_invocations_controller.rb
 - app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
 - app/helpers/concerns/foreman_remote_execution/job_templates_extensions.rb
+- app/helpers/job_invocation_output_helper.rb
 - app/helpers/remote_execution_helper.rb
 - app/lib/actions/middleware/bind_job_invocation.rb
 - app/lib/actions/remote_execution/run_host_job.rb
@@ -190,6 +191,7 @@ files:
 - app/overrides/execution_interface.rb
 - app/overrides/subnet_proxies.rb
 - app/services/remote_execution_proxy_selector.rb
+- app/services/ui_notifications/remote_execution_jobs/base_job_finish.rb
 - app/views/api/v2/foreign_input_sets/base.json.rabl
 - app/views/api/v2/foreign_input_sets/create.json.rabl
 - app/views/api/v2/foreign_input_sets/index.json.rabl
@@ -294,6 +296,7 @@ files:
 - db/migrate/20170613101039_add_timeout_to_job_templates_and_job_invocations.rb
 - db/migrate/20180110104432_rename_template_invocation_permission.rb
 - db/migrate/20180112125015_fix_taxable_taxonomies_job_template.rb
+- db/seeds.d/50-notification_blueprints.rb
 - db/seeds.d/60-ssh_proxy_feature.rb
 - db/seeds.d/70-job_templates.rb
 - db/seeds.d/90-bookmarks.rb