rocketjob_mission_control 3.0.3 → 3.1.0

data/app/views/rocket_job_mission_control/jobs/exception.html.erb

@@ -1,17 +1,21 @@
-<div class="row">
-  <div class="col-md-8">
-    <div class="job-status">
-      <div class="failures">
-        <div class="lead"><%= link_to(@job.class.name, job_path(@job)) %>: <%= @failure_exception.class_name %></div>
-        <div class="pagination-buttons pull-right">
+<div class='row'>
+  <div class='col-md-8'>
+    <div class='job-status'>
+      <div class='failures'>
+        <div class='lead'><%= link_to(@job.class.name, job_path(@job)) %>: <%= @failure_exception.class_name %></div>
+
+        <div class='pagination-buttons pull-right'>
           <%= render partial: 'pagination', locals: {error_type: @failure_exception.class_name, pagination: @pagination} %>
         </div>
-        <div class="clearfix"></div>
-        <div class="message">
+
+        <div class='clearfix'></div>
+
+        <div class='message'>
           <pre><code><%= @failure_exception.message %></code></pre>
         </div>
-        <div class="error">
-          <pre class="small"><%= @failure_exception.backtrace.join("\n") %></pre>
+
+        <div class='error'>
+          <pre class='small'><%= @failure_exception.backtrace.join("\n") %></pre>
         </div>
       </div>
     </div>

data/app/views/rocket_job_mission_control/jobs/exceptions.html.erb

@@ -1,39 +1,41 @@
-<div class="job-list">
-  <div class="list">
-    <div class="row">
-      <div class="col-sm-10">
+<div class='job-list'>
+  <div class='list'>
+    <div class='row'>
+      <div class='col-sm-10'>
         <h2>Exceptions for <%= @job.class.name %></h2>
         <%= link_to(@job.class.name, job_path(@job)) %>
         <%= h(@job.description) %>
       </div>
-      <div class="col-sm-2">
-        <div class="btn btn-default pull-right dt-reload" data-behavior="reload">
-          <i class="fa fa-refresh"></i>
+
+      <div class='col-sm-2'>
+        <div class='btn btn-default pull-right dt-reload' data-behavior='reload'>
+          <i class='fas fa-sync'></i>
         </div>
       </div>
     </div>
+
     <table class='table datatable jobs-datatable' data-source='<%= jobs_url(format: 'json') %>' style='width: 100%'>
       <thead>
-      <tr>
-        <th>Count</th>
-        <th>Exception Class</th>
-        <th>Exception Messages</th>
-      </tr>
-      </thead>
-      <tbody>
-      <% @exceptions.each do |exception| %>
         <tr>
-          <th><%= exception.count %></th>
-          <th>
-            <%= link_to(exception.class_name, exception_job_path(@job, error_type: exception.class_name), class: "card callout") %>
-          </th>
-          <th>
-            <% exception.messages.each do |message| %>
-              <div><%= message %></div>
-            <% end %>
-          </th>
+          <th>Count</th>
+          <th>Exception Class</th>
+          <th>Exception Messages</th>
         </tr>
-      <% end %>
+      </thead>
+
+      <tbody>
+        <% @exceptions.each do |exception| %>
+          <tr>
+            <th><%= exception.count %></th>
+            <th><%= link_to(exception.class_name, exception_job_path(@job, error_type: exception.class_name), class: "card callout") %></th>
+
+            <th>
+              <% exception.messages.each do |message| %>
+                <div><%= message %></div>
+              <% end %>
+            </th>
+          </tr>
+        <% end %>
       </tbody>
     </table>
   </div>

data/app/views/rocket_job_mission_control/jobs/index.html.erb

@@ -1,23 +1,26 @@
-<div class="job-list">
-  <div class="list">
-    <div class="row">
-      <div class="col-sm-10">
+<div class='job-list'>
+  <div class='list'>
+    <div class='row'>
+      <div class='col-sm-10'>
         <h2><%= @description %> Jobs</h2>
       </div>
-      <div class="col-sm-2">
-        <div class="btn btn-default pull-right dt-reload" data-behavior="reload">
-          <i class="fa fa-refresh"></i>
+
+      <div class='col-sm-2'>
+        <div class='btn btn-default pull-right dt-reload' data-behavior='reload'>
+          <i class='fas fa-sync'></i>
         </div>
       </div>
     </div>
+
     <table class='table datatable jobs-datatable' data-source='<%= @data_table_url %>' style='width: 100%'>
       <thead>
-      <tr>
-        <% @columns.each do |column| %>
-          <th><%= column[:display] %></th>
-        <% end %>
-      </tr>
+        <tr>
+          <% @columns.each do |column| %>
+            <th><%= column[:display] %></th>
+          <% end %>
+        </tr>
       </thead>
+
       <tbody></tbody>
     </table>
   </div>
@@ -26,7 +29,7 @@
 <script>
   jQuery(function () {
     new RjmcDatatable(
-      $(".jobs-datatable"),
+      $('.jobs-datatable'),
       <%= @table_layout.to_json.html_safe %>
     );
   });

data/app/views/rocket_job_mission_control/jobs/show.html.erb

@@ -1,34 +1,36 @@
-<div class="row">
-  <div class="col-md-14 col-md-offset-1 job-status">
-    <div id="job">
-      <div class="lead"><%= @job.class.name %></div>
-      <div class="job-state inline-block">
-        <div class="left">State</div>
-        <div class="<%= @job.state %> right"><%= @job.state %></div>
+<div class='row'>
+  <div class='col-md-12 job-status'>
+    <div id='job'>
+      <div class='lead'><%= @job.class.name %></div>
+
+      <div class='job-state inline-block'>
+        <div class='left'>State</div>
+        <div class="<%= job_state(@job) %> right"><%= job_state(@job) %></div>
       </div>
 
       <% if sub_state = @job['sub_state'] %>
-        <div class="job-state inline-block">
-          <div class="left">Batch</div>
-          <div class="running right"><%= @job.sub_state %></div>
+        <div class='job-state inline-block'>
+          <div class='left'>Batch</div>
+          <div class='running right'><%= @job.sub_state %></div>
         </div>
       <% end %>
 
-      <div class="btn-toolbar job-actions pull-right">
+      <div class='btn-toolbar job-actions pull-right'>
         <% if @job.respond_to?(:input) && @job.input.failed.count > 0 %>
-          <div class="btn-group">
+          <div class='btn-group'>
             <%= link_to('Show Exceptions', exceptions_job_path(@job), class: 'btn btn-default') %>
           </div>
         <% end %>
 
         <% if @job.scheduled? %>
-          <div class="btn-group">
+          <div class='btn-group'>
             <%= job_action_link('Run', rocket_job_mission_control.run_now_job_path(@job), :patch) %>
           </div>
         <% end %>
 
-        <div class="btn-group">
+        <div class='btn-group'>
           <% valid_events = @job.aasm.events.collect { |e| e.name } %>
+
           <% if valid_events.include?(:pause) %>
             <%= job_action_link('Pause', rocket_job_mission_control.pause_job_path(@job), :patch) %>
           <% end %>
@@ -42,7 +44,7 @@
           <% end %>
         </div>
 
-        <div class="btn-group">
+        <div class='btn-group'>
           <% if valid_events.include?(:fail) %>
             <%= job_action_link('Fail', rocket_job_mission_control.fail_job_path(@job), :patch) %>
           <% end %>
@@ -55,14 +57,17 @@
         </div>
 
         <% unless @job.completed? || @job.aborted? %>
-          <div class="btn-group">
-            <%= link_to "Edit", edit_job_path(@job), class: "btn btn-default" %>
+          <div class='btn-group'>
+            <%= link_to 'Edit', edit_job_path(@job), class: 'btn btn-default' %>
           </div>
         <% end %>
       </div>
-      <div class="col-md-12">
-        <%= render partial: 'status', locals: {job: @job} %>
-      </div>
     </div>
   </div>
 </div>
+
+<div class='row'>
+  <div class='col-md-12'>
+    <%= render partial: 'status', locals: { job: @job } %>
+  </div>
+</div>

data/app/views/rocket_job_mission_control/servers/_sidebar.html.erb

@@ -1,13 +1,14 @@
-<ul class="nav hidden-xs" id="lg-menu">
+<ul class='nav hidden-xs' id='lg-menu'>
   <li>
     <%= link_to(servers_path) do %>
-      <i class="fa fa-list"></i>All
+      <i class='fas fa-list'></i> All
     <% end %>
   </li>
+
   <% @states.each do |state| %>
     <li class="#{state}">
       <%= link_to("#{state}_servers".to_sym) do %>
-        <i class="fa <%= state_icon(state) %>"></i> <%= state.capitalize%> (<%= server_counts_by_state(state)%>)
+        <i class="fas <%= state_icon(state) %>"></i> <%= state.capitalize%> (<%= server_counts_by_state(state)%>)
       <% end %>
     </li>
   <% end %>
@@ -15,16 +16,17 @@
 
 <!-- tiny only nav -->
 
-<ul class="nav visible-xs" id="xs-menu">
+<ul class='nav visible-xs' id='xs-menu'>
   <li>
     <%= link_to(servers_path) do %>
-      <i class="fa fa-list"></i>
+      <i class='fa fa-list'></i>
     <% end %>
   </li>
+
   <% @states.each do |state| %>
     <li class="#{state}">
       <%= link_to("#{state}_servers".to_sym) do %>
-        <i class="fa <%= state_icon(state) %>"></i>
+        <i class="fas <%= state_icon(state) %>"></i>
       <% end %>
     </li>
   <% end %>

data/app/views/rocket_job_mission_control/servers/index.html.erb

@@ -5,6 +5,7 @@
         <div class='col-md-6'>
           <h2><%= @description %> Servers</h2>
         </div>
+
         <div class='col-md-6'>
           <div class='col-sm-10'>
             <div class='server-collection-actions'>
@@ -12,34 +13,37 @@
                 <div class='btn-group'>
                   <% Array(@actions).each do |action| %>
                     <%= link_to(
-                            "#{action.to_s.humanize.capitalize}",
-                            rocket_job_mission_control.update_all_servers_path(server_action: action),
-                            method: :patch,
-                            data:   {confirm: t(:confirm, scope: [:server, :update_all], action: action.to_s.singularize.humanize.downcase)},
-                            class:  'btn btn-default')
-                    %>
+                      "#{action.to_s.humanize.capitalize}",
+                      rocket_job_mission_control.update_all_servers_path(server_action: action),
+                      method: :patch,
+                      data: { confirm: t(:confirm, scope: [:server, :update_all], action: action.to_s.singularize.humanize.downcase) },
+                      class: 'btn btn-default'
+                    )%>
                   <% end %>
                 </div>
               </ol>
             </div>
           </div>
+
           <div class='col-sm-2 pull-right'>
             <div class='btn btn-default pull-right dt-reload' data-behavior='reload'>
-              <i class='fa fa-refresh'></i>
+              <i class='fas fa-sync'></i>
             </div>
           </div>
         </div>
       </div>
+
       <table class='table datatable servers-datatable' data-source='<%= @data_table_url %>' style='width: 100%'>
         <thead>
-        <tr>
-          <th>Hostname : PID</th>
-          <th>Workers (Current/Max)</th>
-          <th>Started</th>
-          <th>Heartbeat</th>
-          <th>Actions</th>
-        </tr>
+          <tr>
+            <th>Hostname : PID</th>
+            <th>Workers (Current/Max)</th>
+            <th>Started</th>
+            <th>Heartbeat</th>
+            <th>Actions</th>
+          </tr>
         </thead>
+
         <tbody></tbody>
       </table>
     </div>

data/config/initializers/assets.rb

@@ -0,0 +1,13 @@
+Rails.application.config.assets.precompile << Proc.new { |path|
+  if path =~ /\.(eot|svg|ttf|woff)\z/
+    true
+  end
+}
+
+Rails.application.config.assets.precompile += %w(
+  rocket_job_mission_control/favicon.png
+  rocket_job_mission_control/safari-pinned-tab.svg
+  rocket_job_mission_control/favicon-16x16.png
+  rocket_job_mission_control/favicon-32x32.png
+  rocket_job_mission_control/apple-touch-icon.png
+)

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '3.0.3'
+  VERSION = '3.1.0'
 end

data/test/controllers/rocket_job_mission_control/dirmon_entries_controller_test.rb

@@ -3,7 +3,6 @@ require_relative '../../compare_hashes'
 
 module RocketJobMissionControl
   class DirmonEntriesControllerTest < ActionController::TestCase
-
     describe DirmonEntriesController do
       before do
         RocketJob::DirmonEntry.delete_all
@@ -396,25 +395,25 @@ module RocketJobMissionControl
                 json          = JSON.parse(response.body)
                 expected_data = {
                   pending:  {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.pending.first.id}\">\n          <i class=\"fa fa-inbox pending\" style=\"font-size: 75%\" title=\"pending\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.pending.first.id}\">\n          <i class=\"fas fa-inbox pending\" style=\"font-size: 75%\" title=\"pending\"></i>\n          Test\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
                     "2"           => "the_path",
                     "DT_RowClass" => "card callout callout-pending"
                   },
                   enabled:  {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.enabled.first.id}\">\n          <i class=\"fa fa-check enabled\" style=\"font-size: 75%\" title=\"enabled\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.enabled.first.id}\">\n          <i class=\"fas fa-check enabled\" style=\"font-size: 75%\" title=\"enabled\"></i>\n          Test\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
                     "2"           => "the_path",
                     "DT_RowClass" => "card callout callout-enabled"
                   },
                   failed:   {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.failed.first.id}\">\n          <i class=\"fa fa-exclamation-triangle failed\" style=\"font-size: 75%\" title=\"failed\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.failed.first.id}\">\n          <i class=\"fas fa-exclamation-triangle failed\" style=\"font-size: 75%\" title=\"failed\"></i>\n          Test\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
                     "2"           => "the_path",
                     "DT_RowClass" => "card callout callout-failed"
                   },
                   disabled: {
-                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.disabled.first.id}\">\n          <i class=\"fa fa-stop disabled\" style=\"font-size: 75%\" title=\"disabled\"></i>\n          Test\n        </a>\n",
+                    "0"           => "        <a href=\"/dirmon_entries/#{RocketJob::DirmonEntry.disabled.first.id}\">\n          <i class=\"fas fa-stop disabled\" style=\"font-size: 75%\" title=\"disabled\"></i>\n          Test\n        </a>\n",
                     "1"           => "RocketJob::Jobs::SimpleJob",
                     "2"           => "the_path",
                     "DT_RowClass" => "card callout callout-disabled"
@@ -435,7 +434,6 @@ module RocketJobMissionControl
               end
             end
           end
-
         end
       end
     end

data/test/controllers/rocket_job_mission_control/jobs_controller_test.rb

@@ -26,30 +26,33 @@ module RocketJobMissionControl
       end
 
       let :failed_job do
-        job = KaboomBatchJob.new(slice_size: 1)
-        job.upload do |stream|
-          stream << 'first record'
-          stream << 'second record'
-          stream << 'third record'
-        end
-        job.save!
+        if defined?(RocketJobPro)
+          job = KaboomBatchJob.new(slice_size: 1)
+          job.upload do |stream|
+            stream << 'first record'
+            stream << 'second record'
+            stream << 'third record'
+          end
+          job.save!
 
-        # Run all 3 slices now to get exceptions for each.
-        3.times do
-          begin
-            job.perform_now
-          rescue ArgumentError, RuntimeError
+          # Run all 3 slices now to get exceptions for each.
+          3.times do
+            begin
+              job.perform_now
+            rescue ArgumentError, RuntimeError
+            end
           end
+          job
+        else
+          RocketJob::Job::SimpleJob.new.fail!('Oh no', 'bad_worker')
         end
-
-        job
       end
 
       job_states = RocketJob::Job.aasm.states.collect(&:name)
 
       let :one_job_for_every_state do
         job_states.collect do |state|
-          RocketJob::Jobs::SimpleJob.create!(state: state)
+          RocketJob::Jobs::SimpleJob.create!(state: state, worker_name: 'worker')
         end
       end
 

data/test/helpers/rocket_job_mission_control/jobs_helper_test.rb

@@ -2,8 +2,8 @@ require_relative '../../test_helper'
 
 module RocketJobMissionControl
   JobsHelper.include(RocketJobMissionControl::ApplicationHelper)
-  class JobsHelperTest < ActionView::TestCase
 
+  class JobsHelperTest < ActionView::TestCase
     describe JobsHelper do
       describe '#jobs_icon' do
         let :job do
@@ -11,29 +11,35 @@ module RocketJobMissionControl
         end
 
         it 'shows queued' do
-          assert_equal 'fa-inbox queued', job_icon(job)
+          assert_equal 'fas fa-inbox queued', job_icon(job)
         end
 
         it 'shows running' do
           job.start
-          assert_equal 'fa-play running', job_icon(job)
+          job.worker_name = 'test_worker'
+          assert_equal 'fas fa-play running', job_icon(job)
+        end
+
+        it 'shows sleeping' do
+          job.start
+          assert_equal 'fas fa-hourglass sleeping', job_icon(job)
         end
 
         it 'shows failed' do
           job.start
           job.fail
-          assert_equal 'fa-exclamation-triangle failed', job_icon(job)
+          assert_equal 'fas fa-exclamation-triangle failed', job_icon(job)
         end
 
         it 'shows aborted' do
           job.start
           job.abort
-          assert_equal 'fa-stop aborted', job_icon(job)
+          assert_equal 'fas fa-stop aborted', job_icon(job)
         end
 
         it 'handles scheduled special case' do
           job.run_at = 1.day.from_now
-          assert_equal 'fa-clock-o scheduled', job_icon(job)
+          assert_equal 'fas fa-clock scheduled', job_icon(job)
         end
       end