rocketjob_mission_control 1.2.4 → 2.0.0.rc1

data/app/views/rocket_job_mission_control/workers/index_filters/running.html.haml

@@ -0,0 +1,37 @@
+#workers
+  .worker-list
+    .list
+      .row
+        .col-md-6
+          %h2 Running Worker Processes
+        .col-md-6
+          .col-sm-10
+            .worker-collection-actions
+              - if @workers.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),
+                        method: :patch,
+                        data: { confirm: t(:confirm, scope: [:worker, :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')}" } }
+        %thead
+          %tr
+            %th Hostname : PID
+            %th Workers (Current/Max)
+            %th Started
+            %th Heartbeat
+            %th Actions
+        %tbody
+
+:javascript
+  jQuery(function() {
+    new RjmcDatatable(
+      $('.workers-datatable'),
+      [{data: '0'}, {data: '1', orderable: false}, {data: '2', orderable: false}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
+  });

data/app/views/rocket_job_mission_control/workers/index_filters/starting.html.haml

@@ -0,0 +1,37 @@
+#workers
+  .worker-list
+    .list
+      .row
+        .col-md-6
+          %h2 Starting Worker Processes
+        .col-md-6
+          .col-sm-10
+            .worker-collection-actions
+              - if @workers.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),
+                        method: :patch,
+                        data: { confirm: t(:confirm, scope: [:worker, :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')}" } }
+        %thead
+          %tr
+            %th Hostname : PID
+            %th Workers (Current/Max)
+            %th Started
+            %th Heartbeat
+            %th Actions
+        %tbody
+
+:javascript
+  jQuery(function() {
+    new RjmcDatatable(
+      $('.workers-datatable'),
+      [{data: '0'}, {data: '1', orderable: false}, {data: '2', orderable: false}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
+  });

data/app/views/rocket_job_mission_control/workers/index_filters/stopping.html.haml

@@ -0,0 +1,37 @@
+#workers
+  .worker-list
+    .list
+      .row
+        .col-md-6
+          %h2 Stopping Worker Processes
+        .col-md-6
+          .col-sm-10
+            .worker-collection-actions
+              - if @workers.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),
+                        method: :patch,
+                        data: { confirm: t(:confirm, scope: [:worker, :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')}" } }
+        %thead
+          %tr
+            %th Hostname : PID
+            %th Workers (Current/Max)
+            %th Started
+            %th Heartbeat
+            %th Actions
+        %tbody
+
+:javascript
+  jQuery(function() {
+    new RjmcDatatable(
+      $('.workers-datatable'),
+      [{data: '0'}, {data: '1', orderable: false}, {data: '2', orderable: false}, {data: '3', orderable: false}, {data: '4', orderable: false}]);
+  });

data/config/routes.rb

@@ -1,6 +1,16 @@
 RocketJobMissionControl::Engine.routes.draw do
 
   resources :jobs, only: [:index, :show, :update, :destroy] do
+    collection do
+      get :running,   to: 'jobs/index_filters#running'
+      get :scheduled, to: 'jobs/index_filters#scheduled'
+      get :completed, to: 'jobs/index_filters#completed'
+      get :queued,    to: 'jobs/index_filters#queued'
+      get :paused,    to: 'jobs/index_filters#paused'
+      get :failed,    to: 'jobs/index_filters#failed'
+      get :aborted,   to: 'jobs/index_filters#aborted'
+    end
+
     member do
       patch :abort
       patch :fail
@@ -8,13 +18,19 @@ RocketJobMissionControl::Engine.routes.draw do
       patch :resume
       patch :retry
     end
-    collection do
-      get :running
-    end
-    resources :failures, controller: 'jobs/failures', only: [:index]
+    resources :failures, controller: 'jobs/failures', only: :index
   end
 
+  resources :active_processes, only: :index
+
   resources :workers, 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'
+    end
+
     member do
       patch :stop
       patch :pause
@@ -26,11 +42,18 @@ RocketJobMissionControl::Engine.routes.draw do
   end
 
   resources :dirmon_entries do
+    collection do
+      get :pending,   to: 'dirmon_entries/index_filters#pending'
+      get :enabled, to: 'dirmon_entries/index_filters#enabled'
+      get :failed, to: 'dirmon_entries/index_filters#failed'
+      get :disabled,    to: 'dirmon_entries/index_filters#disabled'
+    end
+
     member do
       put :enable
       put :disable
     end
   end
 
-  root to: "jobs#index"
+  root to: "jobs/index_filters#running"
 end

data/lib/rocket_job_mission_control/engine.rb

@@ -11,5 +11,7 @@ module RocketJobMissionControl
     require 'bootstrap-sass'
     require 'sass-rails'
     require 'coffee-rails'
+    require 'kaminari'
+    require 'jquery-datatables-rails'
   end
 end

data/lib/rocket_job_mission_control/version.rb

@@ -1,3 +1,3 @@
 module RocketJobMissionControl
-  VERSION = '1.2.4'
+  VERSION = '2.0.0.rc1'
 end

data/spec/controllers/application_controller_spec.rb

@@ -29,7 +29,7 @@ module RocketJobMissionControl
         end
 
         context 'that does not contain a time zone' do
-          let(:session_params) { { 'user_id' => '42' } }
+          let(:session_params) { {'user_id' => '42'} }
 
           it 'sets the time zone correctly' do
             expect(assigns(:time_zone).name).to eq(expected_time_zone)

data/spec/controllers/dirmon_entries_controller_spec.rb

@@ -1,15 +1,15 @@
 require_relative '../rails_helper'
 
-class FakeButGoodJob < RocketJob::Job
-
+class OneParamJob < RocketJob::Job
   def perform(id)
     id
   end
+end
 
-  def perform_with_no_params
+class NoParamsJob < RocketJob::Job
+  def perform
     100_000
   end
-
 end
 
 module RocketJobMissionControl
@@ -30,7 +30,7 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'FakeButGoodJob',
+          job_class_name: 'OneParamJob',
           pattern:        'the_path',
           arguments:      ['42'],
           state:          starting_state,
@@ -62,7 +62,7 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'FakeButGoodJob',
+          job_class_name: 'OneParamJob',
           pattern:        'the_path',
           arguments:      ['42'],
           state:          starting_state,
@@ -109,7 +109,7 @@ module RocketJobMissionControl
       end
 
       context 'with form params' do
-        let(:entry_params) { { rocket_job_dirmon_entry: { name: 'new entry' } } }
+        let(:entry_params) { {rocket_job_dirmon_entry: {name: 'new entry'}} }
 
         it { expect(response.status).to eq(200) }
 
@@ -119,18 +119,18 @@ module RocketJobMissionControl
         end
 
         context 'with a valid job_class_name' do
-          let(:entry_params) { { rocket_job_dirmon_entry: { job_class_name: 'FakeButGoodJob' } } }
+          let(:entry_params) { {rocket_job_dirmon_entry: {job_class_name: 'OneParamJob'}} }
 
           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(FakeButGoodJob)
+            expect(assigns(:dirmon_entry).job_class).to eq(OneParamJob)
           end
         end
 
         context 'with an invalid job_class_name' do
-          let(:entry_params) { { rocket_job_dirmon_entry: { job_class_name: 'BadJob' } } }
+          let(:entry_params) { {rocket_job_dirmon_entry: {job_class_name: 'BadJob'}} }
 
           it { expect(response.status).to eq(200) }
 
@@ -147,7 +147,7 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'FakeButGoodJob',
+          job_class_name: 'OneParamJob',
           pattern:        'the_path',
           arguments:      ['{"argument1":"value1", "argument2":"value2", "argument3":"value3"}']
         )
@@ -161,7 +161,7 @@ module RocketJobMissionControl
         let(:dirmon_params) do
           {
             pattern:        'the_path2',
-            job_class_name: 'FakeButGoodJob',
+            job_class_name: 'OneParamJob',
             arguments:      ['42']
           }
         end
@@ -195,15 +195,11 @@ module RocketJobMissionControl
           expect(assigns(:dirmon_entry)).to_not be_valid
         end
 
-        it 'loads the other entries' do
-          expect(dirmon_list).to have_received(:sort)
-        end
-
         context 'with invalid arguments json' do
           let(:dirmon_params) do
             {
               name:           'Test',
-              job_class_name: 'FakeButGoodJob',
+              job_class_name: 'OneParamJob',
               arguments:      [],
             }
           end
@@ -216,10 +212,6 @@ module RocketJobMissionControl
           it 'has errors on arguments' do
             expect(assigns(:dirmon_entry).errors[:arguments]).to be_present
           end
-
-          it 'loads the other entries' do
-            expect(dirmon_list).to have_received(:sort)
-          end
         end
       end
     end
@@ -227,20 +219,19 @@ module RocketJobMissionControl
     describe 'POST #create' do
       context 'with valid parameters' do
 
-        {
-          perform:                {argument: ['42'], expected_value: [42]},
-          perform:                {argument: ['{"argument1":"value1", "argument2":"value2", "argument3":"value3"}'], expected_value: [{"argument1" => "value1", "argument2" => "value2", "argument3" => "value3"}]},
-          perform_with_no_params: {argument: [], expected_value: []},
-        }.each_pair do |perform_method, arguments|
+        [
+          {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: []}
+        ].each do |arguments|
           context "and arguments are '#{arguments}'" do
             let(:dirmon_params) do
               {
                 name:           'Test',
                 pattern:        '/files/*',
-                job_class_name: 'FakeButGoodJob',
+                job_class_name: arguments[:job_class_name],
                 arguments:      arguments[:argument],
                 properties:     {description: '', priority: 42},
-                perform_method: perform_method,
               }
             end
 
@@ -307,17 +298,13 @@ module RocketJobMissionControl
           it 'has errors on the entry' do
             expect(assigns(:dirmon_entry)).to_not be_valid
           end
-
-          it 'loads the other entries' do
-            expect(dirmon_list).to have_received(:sort)
-          end
         end
 
         context 'with invalid arguments json' do
           let(:dirmon_params) do
             {
               name:           'Test',
-              job_class_name: 'FakeButGoodJob',
+              job_class_name: 'OneParamJob',
               arguments:      ['{"bad" "json"}'],
             }
           end
@@ -330,10 +317,6 @@ module RocketJobMissionControl
           it 'has errors on arguments' do
             expect(assigns(:dirmon_entry).errors[:arguments]).to be_present
           end
-
-          it 'loads the other entries' do
-            expect(dirmon_list).to have_received(:sort)
-          end
         end
       end
     end
@@ -343,7 +326,7 @@ module RocketJobMissionControl
         @entry = RocketJob::DirmonEntry.create(
           name:           'Test',
           pattern:        '/files/',
-          job_class_name: 'FakeButGoodJob',
+          job_class_name: 'OneParamJob',
           arguments:      [42]
         )
         get :edit, id: @entry.id
@@ -386,14 +369,6 @@ module RocketJobMissionControl
         it 'assigns the entry' do
           expect(assigns(:dirmon_entry)).to be_present
         end
-
-        it 'assigns the entries' do
-          expect(assigns(:dirmons)).to eq([])
-        end
-
-        it 'grabs a sorted list' do
-          expect(dirmon_list).to have_received(:sort).with(created_at: :desc)
-        end
       end
     end
 
@@ -401,7 +376,7 @@ module RocketJobMissionControl
       let(:existing_dirmon) do
         RocketJob::DirmonEntry.create!(
           name:           'Test',
-          job_class_name: 'FakeButGoodJob',
+          job_class_name: 'OneParamJob',
           pattern:        'the_path',
           arguments:      [42].to_json
         )
@@ -427,6 +402,7 @@ module RocketJobMissionControl
     describe 'GET #index' do
       describe 'with no entries' do
         before do
+          RocketJob::DirmonEntry.destroy_all
           get :index
         end
 
@@ -434,67 +410,29 @@ module RocketJobMissionControl
           expect(response.status).to be(200)
         end
 
-        it 'grabs a sorted list of entries' do
-          expect(dirmon_list).to have_received(:sort).with(created_at: :desc)
-        end
-
         it 'returns no entries' do
-          expect(assigns(:dirmons)).to eq([])
+          expect(assigns(:dirmons).count).to eq(0)
         end
       end
 
       describe 'with jobs' do
-        let(:dirmon_list) { spy(sort: dirmons) }
         let(:dirmons) { ['fake_dirmon1', 'fake_dirmon2'] }
 
-        describe 'with no parameters' do
-          before { get :index }
-
-          it 'succeeds' do
-            expect(response.status).to be(200)
-          end
-
-          it 'grabs a sorted list of entries' do
-            expect(dirmon_list).to have_received(:sort).with(created_at: :desc)
-          end
-
-          it 'returns the entries' do
-            expect(assigns(:dirmons)).to match_array(dirmons)
-          end
+        before do
+          allow(RocketJob::DirmonEntry).to receive(:where).and_return(dirmons)
+          get :index
         end
 
-        describe 'with a state filter' do
-          before { get :index, states: states }
-
-          context 'that is empty' do
-            let(:states) { [] }
-
-            it { expect(response.status).to be(200) }
-
-            it 'grabs a sorted list' do
-              expect(dirmon_list).to have_received(:sort).with(created_at: :desc)
-            end
-
-            it 'returns the entries' do
-              expect(assigns(:dirmons)).to match_array(dirmons)
-            end
-          end
-
-          context 'with a state' do
-            let(:query_spy) { spy(where: dirmons) }
-            let(:dirmon_list) { spy(sort: query_spy) }
-            let(:states) { ['enabled'] }
-
-            it { expect(response.status).to be(200) }
+        it 'succeeds' do
+          expect(response.status).to be(200)
+        end
 
-            it 'grabs a filtered list' do
-              expect(query_spy).to have_received(:where).with(state: ['enabled'])
-            end
+        it 'grabs all dirmons with empty where' do
+          expect(RocketJob::DirmonEntry).to have_received(:where)
+        end
 
-            it 'returns the entries' do
-              expect(assigns(:dirmons)).to match_array(dirmons)
-            end
-          end
+        it 'returns the entries' do
+          expect(assigns(:dirmons)).to eq(dirmons)
         end
       end
     end

data/spec/controllers/jobs/failures_controller_spec.rb

@@ -10,10 +10,10 @@ module RocketJobMissionControl
         let(:slice_errors) do
           [
             {
-              '_id' =>
-              {
-                'error_class' => 'BoomError',
-              },
+              '_id'     =>
+                {
+                  'error_class' => 'BoomError',
+                },
               'message' => ['boom'],
               'count'   => '1337',
             },

data/spec/controllers/jobs_controller_spec.rb

@@ -104,40 +104,12 @@ module RocketJobMissionControl
         it "assigns the job" do
           expect(assigns(:job)).to be_present
         end
-
-        it "assigns the jobs" do
-          expect(assigns(:jobs)).to eq([])
-        end
-
-        it "grabs a sorted list of rocket jobs" do
-          expect(result).to have_received(:sort).with(created_at: :desc)
-        end
-      end
-    end
-
-    describe "GET #running" do
-      before do
-        allow(RocketJob::Job).to receive(:where).and_return([])
-        get :running
-      end
-
-      it { expect(response.status).to be(200) }
-
-      it "queries for running jobs" do
-        expect(RocketJob::Job).to have_received(:where).with(state: 'running')
-      end
-
-      it "returns expected jobs" do
-        expect(assigns[:jobs]).to eq([])
       end
     end
 
     describe "GET #index" do
       describe "with no jobs" do
-        let(:result) { spy(sort: []) }
-
         before do
-          allow(RocketJob::Job).to receive(:limit).and_return(result)
           get :index
         end
 
@@ -145,71 +117,29 @@ module RocketJobMissionControl
           expect(response.status).to be(200)
         end
 
-        it "grabs a sorted list of rocket jobs" do
-          expect(result).to have_received(:sort).with(created_at: :desc)
-        end
-
         it "returns no jobs" do
-          expect(assigns(:jobs)).to eq([])
+          expect(assigns(:jobs).count).to eq(0)
         end
       end
 
       describe "with jobs" do
-        let(:result) { spy(sort: jobs) }
         let(:jobs) { ['fake_job1', 'fake_job2'] }
 
         before do
-          allow(RocketJob::Job).to receive(:limit).and_return(result)
+          allow(RocketJob::Job).to receive(:sort).and_return(jobs)
+          get :index
         end
 
-        describe "with no parameters" do
-          before { get :index }
-
-          it "succeeds" do
-            expect(response.status).to be(200)
-          end
-
-          it "grabs a sorted list of rocket jobs" do
-            expect(result).to have_received(:sort).with(created_at: :desc)
-          end
-
-          it "returns the jobs" do
-            expect(assigns(:jobs)).to match_array(jobs)
-          end
+        it "succeeds" do
+          expect(response.status).to be(200)
         end
 
-        describe "with a state filter" do
-          before { get :index, states: states}
-
-          context "that is empty" do
-            let(:states) { [] }
-
-            it { expect(response.status).to be(200) }
-
-            it "grabs a sorted list of rocket jobs" do
-              expect(result).to have_received(:sort).with(created_at: :desc)
-            end
-
-            it "returns the jobs" do
-              expect(assigns(:jobs)).to match_array(jobs)
-            end
-          end
-
-          context "with a state" do
-            let(:query_spy) { spy(where: jobs) }
-            let(:result) { spy(sort: query_spy) }
-            let(:states) { ['completed', 'running'] }
-
-            it { expect(response.status).to be(200) }
-
-            it "grabs a filtered list of rocket jobs" do
-              expect(query_spy).to have_received(:where).with(state: states)
-            end
+        it "grabs a sorted list of rocket jobs" do
+          expect(RocketJob::Job).to have_received(:sort).with(_id: :desc)
+        end
 
-            it "returns the jobs" do
-              expect(assigns(:jobs)).to match_array(jobs)
-            end
-          end
+        it "returns the jobs" do
+          expect(assigns(:jobs)).to eq(jobs)
         end
       end
     end

data/spec/dummy/config/environments/development.rb

@@ -4,30 +4,30 @@ Rails.application.configure do
   # In the development environment your application's code is reloaded on
   # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  config.cache_classes                       = false
 
   # Do not eager load code on boot.
-  config.eager_load = false
+  config.eager_load                          = false
 
   # Show full error reports and disable caching.
-  config.consider_all_requests_local       = true
-  config.action_controller.perform_caching = false
+  config.consider_all_requests_local         = true
+  config.action_controller.perform_caching   = false
 
   # Don't care if the mailer can't send.
   config.action_mailer.raise_delivery_errors = false
 
   # Print deprecation notices to the Rails logger.
-  config.active_support.deprecation = :log
+  config.active_support.deprecation          = :log
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
-  config.assets.debug = true
+  config.assets.debug                        = true
 
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.
   # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
+  config.assets.raise_runtime_errors         = true
 
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true