rocketjob_mission_control 2.1.1 → 3.0.0.rc1

data/app/views/rocket_job_mission_control/{workers → servers}/index.html.haml

@@ -1,25 +1,25 @@
-#workers
-  .worker-list
+#servers
+  .server-list
     .list
       .row
         .col-md-6
           %h2 Servers
         .col-md-6
           .col-sm-10
-            .worker-collection-actions
-              - if @workers.present?
+            .server-collection-actions
+              - if @servers.present?
                 %ol
                   .btn-group
                     - [:stop_all, :pause_all, :resume_all, :destroy_zombies].each do |action|
                       = link_to("#{action.to_s.humanize.capitalize}",
-                        rocket_job_mission_control.update_all_workers_path(worker_action: action),
+                        rocket_job_mission_control.update_all_servers_path(server_action: action),
                         method: :patch,
-                        data: { confirm: t(:confirm, scope: [:worker, :update_all], action: action.to_s.singularize.humanize.downcase) },
+                        data: { confirm: t(:confirm, scope: [:server, :update_all], action: action.to_s.singularize.humanize.downcase) },
                         class: 'btn btn-default')
           .col-sm-2.pull-right
             .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
               %i.fa.fa-refresh
-      %table.table.datatable.workers-datatable{ style: "width: 100%", data: { source: "#{workers_url(format: 'json')}" } }
+      %table.table.datatable.servers-datatable{ style: "width: 100%", data: { source: "#{servers_url(format: 'json')}" } }
         %thead
           %tr
             %th Hostname : PID
@@ -32,6 +32,6 @@
 :javascript
   jQuery(function() {
     new RjmcDatatable(
-      $('.workers-datatable'),
-      [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
+      $('.servers-datatable'),
+      [{data: '0'}, {data: '1'}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/{workers → servers}/index_filters/paused.html.haml

@@ -1,25 +1,25 @@
-#workers
-  .worker-list
+#servers
+  .server-list
     .list
       .row
         .col-md-6
           %h2 Paused Servers
         .col-md-6
           .col-sm-10
-            .worker-collection-actions
-              - if @workers.present?
+            .server-collection-actions
+              - if @servers.present?
                 %ol.pull-right
                   .btn-group
                     - [:stop_all, :resume_all, :destroy_zombies].each do |action|
                       = link_to("#{action.to_s.humanize.capitalize}",
-                        rocket_job_mission_control.update_all_workers_path(worker_action: action),
+                        rocket_job_mission_control.update_all_servers_path(server_action: action),
                         method: :patch,
-                        data: { confirm: t(:confirm, scope: [:worker, :update_all], action: action.to_s.singularize.humanize.downcase) },
+                        data: { confirm: t(:confirm, scope: [:server, :update_all], action: action.to_s.singularize.humanize.downcase) },
                         class: 'btn btn-default')
           .col-sm-2.pull-right
             .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
               %i.fa.fa-refresh
-      %table.table.datatable.workers-datatable{ style: "width: 100%", data: { source: "#{paused_workers_url(format: 'json')}" } }
+      %table.table.datatable.servers-datatable{ style: "width: 100%", data: { source: "#{paused_servers_url(format: 'json')}" } }
         %thead
           %tr
             %th Hostname : PID
@@ -32,6 +32,6 @@
 :javascript
   jQuery(function() {
     new RjmcDatatable(
-      $('.workers-datatable'),
+      $('.servers-datatable'),
       [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/{workers → servers}/index_filters/running.html.haml

@@ -1,25 +1,25 @@
-#workers
-  .worker-list
+#servers
+  .server-list
     .list
       .row
         .col-md-6
           %h2 Running Servers
         .col-md-6
           .col-sm-10
-            .worker-collection-actions
-              - if @workers.present?
+            .server-collection-actions
+              - if @servers.present?
                 %ol.pull-right
                   .btn-group
                     - [:stop_all, :pause_all, :resume_all, :destroy_zombies].each do |action|
                       = link_to("#{action.to_s.humanize.capitalize}",
-                        rocket_job_mission_control.update_all_workers_path(worker_action: action),
+                        rocket_job_mission_control.update_all_servers_path(server_action: action),
                         method: :patch,
-                        data: { confirm: t(:confirm, scope: [:worker, :update_all], action: action.to_s.singularize.humanize.downcase) },
+                        data: { confirm: t(:confirm, scope: [:server, :update_all], action: action.to_s.singularize.humanize.downcase) },
                         class: 'btn btn-default')
           .col-sm-2.pull-right
             .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
               %i.fa.fa-refresh
-      %table.table.datatable.workers-datatable{ style: "width: 100%", data: { source: "#{running_workers_url(format: 'json')}" } }
+      %table.table.datatable.servers-datatable{ style: "width: 100%", data: { source: "#{running_servers_url(format: 'json')}" } }
         %thead
           %tr
             %th Hostname : PID
@@ -32,6 +32,6 @@
 :javascript
   jQuery(function() {
     new RjmcDatatable(
-      $('.workers-datatable'),
+      $('.servers-datatable'),
       [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/{workers → servers}/index_filters/starting.html.haml

@@ -1,25 +1,25 @@
-#workers
-  .worker-list
+#servers
+  .server-list
     .list
       .row
         .col-md-6
           %h2 Starting Servers
         .col-md-6
           .col-sm-10
-            .worker-collection-actions
-              - if @workers.present?
+            .server-collection-actions
+              - if @servers.present?
                 %ol.pull-right
                   .btn-group
                     - [:stop_all, :pause_all, :resume_all, :destroy_zombies].each do |action|
                       = link_to("#{action.to_s.humanize.capitalize}",
-                        rocket_job_mission_control.update_all_workers_path(worker_action: action),
+                        rocket_job_mission_control.update_all_servers_path(server_action: action),
                         method: :patch,
-                        data: { confirm: t(:confirm, scope: [:worker, :update_all], action: action.to_s.singularize.humanize.downcase) },
+                        data: { confirm: t(:confirm, scope: [:server, :update_all], action: action.to_s.singularize.humanize.downcase) },
                         class: 'btn btn-default')
           .col-sm-2.pull-right
             .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
               %i.fa.fa-refresh
-      %table.table.datatable.workers-datatable{ style: "width: 100%", data: { source: "#{starting_workers_url(format: 'json')}" } }
+      %table.table.datatable.servers-datatable{ style: "width: 100%", data: { source: "#{starting_servers_url(format: 'json')}" } }
         %thead
           %tr
             %th Hostname : PID
@@ -32,6 +32,6 @@
 :javascript
   jQuery(function() {
     new RjmcDatatable(
-      $('.workers-datatable'),
+      $('.servers-datatable'),
       [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/app/views/rocket_job_mission_control/{workers → servers}/index_filters/stopping.html.haml

@@ -1,25 +1,25 @@
-#workers
-  .worker-list
+#servers
+  .server-list
     .list
       .row
         .col-md-6
           %h2 Stopping Servers
         .col-md-6
           .col-sm-10
-            .worker-collection-actions
-              - if @workers.present?
+            .server-collection-actions
+              - if @servers.present?
                 %ol.pull-right
                   .btn-group
                     - [:pause_all, :resume_all, :destroy_zombies].each do |action|
                       = link_to("#{action.to_s.humanize.capitalize}",
-                        rocket_job_mission_control.update_all_workers_path(worker_action: action),
+                        rocket_job_mission_control.update_all_servers_path(server_action: action),
                         method: :patch,
-                        data: { confirm: t(:confirm, scope: [:worker, :update_all], action: action.to_s.singularize.humanize.downcase) },
+                        data: { confirm: t(:confirm, scope: [:server, :update_all], action: action.to_s.singularize.humanize.downcase) },
                         class: 'btn btn-default')
           .col-sm-2.pull-right
             .btn.btn-default.pull-right.dt-reload{ data: { behavior: 'reload' } }
               %i.fa.fa-refresh
-      %table.table.datatable.workers-datatable{ style: "width: 100%", data: { source: "#{stopping_workers_url(format: 'json')}" } }
+      %table.table.datatable.servers-datatable{ style: "width: 100%", data: { source: "#{stopping_servers_url(format: 'json')}" } }
         %thead
           %tr
             %th Hostname : PID
@@ -32,6 +32,6 @@
 :javascript
   jQuery(function() {
     new RjmcDatatable(
-      $('.workers-datatable'),
+      $('.servers-datatable'),
       [{data: '0'}, {data: '1', orderable: false}, {data: '2'}, {data: '3'}, {data: '4', orderable: false}]);
   });

data/config/locales/en.yml

@@ -36,7 +36,7 @@ en:
       almost_x_years:
         one:   "1 year" # default was: "almost 1 year"
         other: "%{count} years" # default was: "almost %{count} years"
-  worker:
+  server:
     stop:
       success: "Server successfully stopped."
       failure: "Error attempting to stop server."
@@ -50,7 +50,7 @@ en:
       success: "Server successfully resumed."
       failure: "Error attempting to resume server."
     update_all:
-      success: "Servers have been %{worker_action}."
+      success: "Servers have been %{server_action}."
       invalid: "Action not allowed."
       confirm: "Are you sure you want to %{action} servers?"
   job:

data/config/routes.rb

@@ -18,18 +18,19 @@ RocketJobMissionControl::Engine.routes.draw do
       patch :resume
       patch :retry
       patch :run_now
+      get   :exceptions
     end
     resources :failures, controller: 'jobs/failures', only: :index
   end
 
-  resources :active_processes, only: :index
+  resources :active_workers, only: :index
 
-  resources :workers, only: [:index, :destroy] do
+  resources :servers, only: [:index, :destroy] do
     collection do
-      get :starting, to: 'workers/index_filters#starting'
-      get :running, to: 'workers/index_filters#running'
-      get :paused, to: 'workers/index_filters#paused'
-      get :stopping, to: 'workers/index_filters#stopping'
+      get :starting, to: 'servers/index_filters#starting'
+      get :running, to: 'servers/index_filters#running'
+      get :paused, to: 'servers/index_filters#paused'
+      get :stopping, to: 'servers/index_filters#stopping'
     end
 
     member do

data/lib/rocket_job_mission_control/engine.rb

@@ -2,18 +2,6 @@ module RocketJobMissionControl
   class Engine < ::Rails::Engine
     isolate_namespace RocketJobMissionControl
 
-    require 'rocketjob'
-    require 'jquery-rails'
-    require 'haml'
-    require 'mongo'
-    require 'mongo_mapper'
-    require 'mongo_ha'
-    require 'bootstrap-sass'
-    require 'sass-rails'
-    require 'coffee-rails'
-    require 'kaminari'
-    require 'jquery-datatables-rails'
-
     config.to_prepare do
       Rails.application.config.assets.precompile += %w(
         rocket_job_mission_control/rocket-icon-64x64.png

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '2.1.1'
+  VERSION = '3.0.0.rc1'
 end

data/spec/controllers/dirmon_entries/index_filters_controller_spec.rb

@@ -1,8 +1,8 @@
 require 'rails_helper'
 
 class AJob < RocketJob::Job
-  def perform(id)
-    id
+  def perform
+    23
   end
 end
 
@@ -39,7 +39,6 @@ module RocketJobMissionControl
               RocketJob::DirmonEntry.create!(
                 state:          state,
                 pattern:        '21',
-                arguments:      ['42'],
                 job_class_name: 'AJob'
               )
             }
@@ -48,7 +47,6 @@ module RocketJobMissionControl
               RocketJob::DirmonEntry.create!(
                 name:           'Test',
                 state:          not_state,
-                arguments:      ['42'],
                 pattern:        '21',
                 job_class_name: 'AJob'
               )

data/spec/controllers/dirmon_entries_controller_spec.rb

@@ -1,11 +1,5 @@
 require_relative '../rails_helper'
 
-class OneParamJob < RocketJob::Job
-  def perform(id)
-    id
-  end
-end
-
 class NoParamsJob < RocketJob::Job
   def perform
     100_000
@@ -30,9 +24,8 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'OneParamJob',
+          job_class_name: 'NoParamsJob',
           pattern:        'the_path',
-          arguments:      ['42'],
           state:          starting_state,
         )
       end
@@ -62,9 +55,8 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'OneParamJob',
+          job_class_name: 'NoParamsJob',
           pattern:        'the_path',
-          arguments:      ['42'],
           state:          starting_state,
         )
       end
@@ -119,13 +111,13 @@ module RocketJobMissionControl
         end
 
         context 'with a valid job_class_name' do
-          let(:entry_params) { {rocket_job_dirmon_entry: {job_class_name: 'OneParamJob'}} }
+          let(:entry_params) { {rocket_job_dirmon_entry: {job_class_name: 'NoParamsJob'}} }
 
           it { expect(response.status).to eq(200) }
 
           it 'assigns the job class' do
             expect(assigns(:dirmon_entry)).to be_present
-            expect(assigns(:dirmon_entry).job_class).to eq(OneParamJob)
+            expect(assigns(:dirmon_entry).job_class).to eq(NoParamsJob)
           end
         end
 
@@ -147,9 +139,8 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'OneParamJob',
+          job_class_name: 'NoParamsJob',
           pattern:        'the_path',
-          arguments:      ['{"argument1":"value1", "argument2":"value2", "argument3":"value3"}']
         )
       end
 
@@ -161,8 +152,7 @@ module RocketJobMissionControl
         let(:dirmon_params) do
           {
             pattern:        'the_path2',
-            job_class_name: 'OneParamJob',
-            arguments:      ['42']
+            job_class_name: 'NoParamsJob',
           }
         end
 
@@ -195,24 +185,6 @@ module RocketJobMissionControl
           expect(assigns(:dirmon_entry)).to_not be_valid
         end
 
-        context 'with invalid arguments json' do
-          let(:dirmon_params) do
-            {
-              name:           'Test',
-              job_class_name: 'OneParamJob',
-              arguments:      [],
-            }
-          end
-
-          it 'renders the new template' do
-            expect(response.status).to eq(200)
-            expect(response).to render_template(:edit)
-          end
-
-          it 'has errors on arguments' do
-            expect(assigns(:dirmon_entry).errors[:arguments]).to be_present
-          end
-        end
       end
     end
 
@@ -220,9 +192,7 @@ module RocketJobMissionControl
       context 'with valid parameters' do
 
         [
-          {job_class_name: 'OneParamJob', argument: ['42'], expected_value: [42]},
-          {job_class_name: 'OneParamJob', argument: ['{"argument1":"value1", "argument2":"value2", "argument3":"value3"}'], expected_value: [{"argument1" => "value1", "argument2" => "value2", "argument3" => "value3"}]},
-          {job_class_name: 'NoParamsJob', argument: [], expected_value: []}
+          {job_class_name: 'NoParamsJob', expected_value: []}
         ].each do |arguments|
           context "and arguments are '#{arguments}'" do
             let(:dirmon_params) do
@@ -230,8 +200,7 @@ module RocketJobMissionControl
                 name:           'Test',
                 pattern:        '/files/*',
                 job_class_name: arguments[:job_class_name],
-                arguments:      arguments[:argument],
-                properties:     {description: '', priority: 42},
+                properties:     {description: '', priority: '42'}
               }
             end
 
@@ -268,10 +237,6 @@ module RocketJobMissionControl
                 expect(assigns(:dirmon_entry)[attribute]).to eq(dirmon_params[attribute])
               end
             end
-
-            it 'persists arguments correctly' do
-              expect(assigns(:dirmon_entry).arguments).to eq(arguments[:expected_value])
-            end
           end
         end
       end
@@ -280,8 +245,7 @@ module RocketJobMissionControl
         let(:dirmon_params) do
           {
             name:           'Test',
-            job_class_name: 'FakeAndBadJob',
-            arguments:      [[42].to_json],
+            job_class_name: 'FakeAndBadJob'
           }
         end
 
@@ -299,25 +263,6 @@ module RocketJobMissionControl
             expect(assigns(:dirmon_entry)).to_not be_valid
           end
         end
-
-        context 'with invalid arguments json' do
-          let(:dirmon_params) do
-            {
-              name:           'Test',
-              job_class_name: 'OneParamJob',
-              arguments:      ['{"bad" "json"}'],
-            }
-          end
-
-          it 'renders the new template' do
-            expect(response.status).to eq(200)
-            expect(response).to render_template(:new)
-          end
-
-          it 'has errors on arguments' do
-            expect(assigns(:dirmon_entry).errors[:arguments]).to be_present
-          end
-        end
       end
     end
 
@@ -326,8 +271,7 @@ module RocketJobMissionControl
         @entry = RocketJob::DirmonEntry.create(
           name:           'Test',
           pattern:        '/files/',
-          job_class_name: 'OneParamJob',
-          arguments:      [42]
+          job_class_name: 'NoParamsJob'
         )
         get :edit, id: @entry.id
       end
@@ -376,9 +320,8 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'OneParamJob',
-          pattern:        'the_path',
-          arguments:      [42].to_json
+          job_class_name: 'NoParamsJob',
+          pattern:        'the_path'
         )
       end
 
@@ -394,7 +337,7 @@ module RocketJobMissionControl
         end
 
         it 'deletes the entry' do
-          expect(RocketJob::DirmonEntry.find(existing_dirmon.id)).to eq(nil)
+          expect(RocketJob::DirmonEntry.where(id: existing_dirmon.id).exists?).to eq(false)
         end
       end
     end
@@ -419,7 +362,7 @@ module RocketJobMissionControl
         let(:dirmons) { ['fake_dirmon1', 'fake_dirmon2'] }
 
         before do
-          allow(RocketJob::DirmonEntry).to receive(:where).and_return(dirmons)
+          allow(RocketJob::DirmonEntry).to receive(:all).and_return(dirmons)
           get :index
         end
 
@@ -428,7 +371,7 @@ module RocketJobMissionControl
         end
 
         it 'grabs all dirmons with empty where' do
-          expect(RocketJob::DirmonEntry).to have_received(:where)
+          expect(RocketJob::DirmonEntry).to have_received(:all)
         end
 
         it 'returns the entries' do