rocketjob_mission_control 2.1.1 → 3.0.0.rc1

data/spec/helpers/servers_helper_spec.rb

@@ -0,0 +1,16 @@
+require 'rails_helper'
+
+module RocketJobMissionControl
+  RSpec.describe ServersHelper, type: :helper do
+    describe '#server_card_class' do
+      context 'when the server is a zombie' do
+        let(:server) { spy(zombie?: true) }
+
+        it 'returns the correct class' do
+          expect(helper.server_card_class(server)).to eq('callout-zombie')
+        end
+      end
+
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require 'rocketjob'
 # Given that it is always loaded, you are encouraged to keep this file as
 # light-weight as possible. Requiring heavyweight dependencies from this file
 # will add to the boot time of your test suite on EVERY test run, even for an
@@ -79,3 +80,5 @@ RSpec.configure do |config|
   Kernel.srand config.seed
 =end
 end
+
+RocketJob::Config.load!('test', 'spec/dummy/config/mongoid.yml', 'spec/dummy/config/symmetric-encryption.yml')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketjob_mission_control
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0.rc1
 platform: ruby
 authors:
 - Michael Cloutier
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,34 +84,20 @@ dependencies:
         version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rocketjob
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0.beta3
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,16 +149,17 @@ files:
 - app/assets/stylesheets/rocket_job_mission_control/jobs.scss
 - app/assets/stylesheets/rocket_job_mission_control/jquery.bootstrap-touchspin.scss
 - app/assets/stylesheets/rocket_job_mission_control/worker_processes.scss
-- app/controllers/rocket_job_mission_control/active_processes_controller.rb
+- app/controllers/rocket_job_mission_control/active_workers_controller.rb
 - app/controllers/rocket_job_mission_control/application_controller.rb
 - app/controllers/rocket_job_mission_control/dirmon_entries/index_filters_controller.rb
 - app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb
 - app/controllers/rocket_job_mission_control/jobs/failures_controller.rb
 - app/controllers/rocket_job_mission_control/jobs/index_filters_controller.rb
 - app/controllers/rocket_job_mission_control/jobs_controller.rb
-- app/controllers/rocket_job_mission_control/workers/index_filters_controller.rb
-- app/controllers/rocket_job_mission_control/workers_controller.rb
-- app/datatables/rocket_job_mission_control/active_processes_datatable.rb
+- app/controllers/rocket_job_mission_control/servers/index_filters_controller.rb
+- app/controllers/rocket_job_mission_control/servers_controller.rb
+- app/datatables/rocket_job_mission_control/abstract_datatable.rb
+- app/datatables/rocket_job_mission_control/active_workers_datatable.rb
 - app/datatables/rocket_job_mission_control/completed_jobs_datatable.rb
 - app/datatables/rocket_job_mission_control/dirmon_entries_datatable.rb
 - app/datatables/rocket_job_mission_control/interrupted_jobs_datatable.rb
@@ -180,22 +167,20 @@ files:
 - app/datatables/rocket_job_mission_control/queued_jobs_datatable.rb
 - app/datatables/rocket_job_mission_control/running_jobs_datatable.rb
 - app/datatables/rocket_job_mission_control/scheduled_jobs_datatable.rb
-- app/datatables/rocket_job_mission_control/workers_datatable.rb
+- app/datatables/rocket_job_mission_control/servers_datatable.rb
 - app/helpers/rocket_job_mission_control/application_helper.rb
 - app/helpers/rocket_job_mission_control/dirmon_entries_helper.rb
 - app/helpers/rocket_job_mission_control/jobs_helper.rb
 - app/helpers/rocket_job_mission_control/pagination_helper.rb
+- app/helpers/rocket_job_mission_control/servers_helper.rb
 - app/helpers/rocket_job_mission_control/slices_helper.rb
-- app/helpers/rocket_job_mission_control/workers_helper.rb
-- app/interactors/rocket_job_mission_control/dirmon_entries/search.rb
-- app/interactors/rocket_job_mission_control/jobs/search.rb
-- app/interactors/rocket_job_mission_control/workers/search.rb
 - app/models/job_failures.rb
 - app/models/job_sanitizer.rb
+- app/models/rocket_job_mission_control/query.rb
 - app/views/layouts/rocket_job_mission_control/application.html.haml
 - app/views/layouts/rocket_job_mission_control/partials/_header.html.haml
 - app/views/layouts/rocket_job_mission_control/partials/_sidebar.html.haml
-- app/views/rocket_job_mission_control/active_processes/index.html.haml
+- app/views/rocket_job_mission_control/active_workers/index.html.haml
 - app/views/rocket_job_mission_control/dirmon_entries/_form.html.haml
 - app/views/rocket_job_mission_control/dirmon_entries/_properties.html.haml
 - app/views/rocket_job_mission_control/dirmon_entries/_sidebar.html.haml
@@ -211,6 +196,7 @@ files:
 - app/views/rocket_job_mission_control/jobs/_sidebar.html.haml
 - app/views/rocket_job_mission_control/jobs/_status.html.haml
 - app/views/rocket_job_mission_control/jobs/edit.html.haml
+- app/views/rocket_job_mission_control/jobs/exceptions.html.haml
 - app/views/rocket_job_mission_control/jobs/failures/_pagination.html.haml
 - app/views/rocket_job_mission_control/jobs/failures/index.html.haml
 - app/views/rocket_job_mission_control/jobs/index.html.haml
@@ -222,13 +208,13 @@ files:
 - app/views/rocket_job_mission_control/jobs/index_filters/running.html.haml
 - app/views/rocket_job_mission_control/jobs/index_filters/scheduled.html.haml
 - app/views/rocket_job_mission_control/jobs/show.html.haml
-- app/views/rocket_job_mission_control/workers/_actions.html.haml
-- app/views/rocket_job_mission_control/workers/_sidebar.html.haml
-- app/views/rocket_job_mission_control/workers/index.html.haml
-- app/views/rocket_job_mission_control/workers/index_filters/paused.html.haml
-- app/views/rocket_job_mission_control/workers/index_filters/running.html.haml
-- app/views/rocket_job_mission_control/workers/index_filters/starting.html.haml
-- app/views/rocket_job_mission_control/workers/index_filters/stopping.html.haml
+- app/views/rocket_job_mission_control/servers/_actions.html.haml
+- app/views/rocket_job_mission_control/servers/_sidebar.html.haml
+- app/views/rocket_job_mission_control/servers/index.html.haml
+- app/views/rocket_job_mission_control/servers/index_filters/paused.html.haml
+- app/views/rocket_job_mission_control/servers/index_filters/running.html.haml
+- app/views/rocket_job_mission_control/servers/index_filters/starting.html.haml
+- app/views/rocket_job_mission_control/servers/index_filters/stopping.html.haml
 - config/locales/en.yml
 - config/routes.rb
 - lib/rocket_job_mission_control/engine.rb
@@ -253,18 +239,18 @@ files:
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/mongo.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/symmetric-encryption.yml
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
 - spec/dummy/log/test.log
 - spec/helpers/application_helper_spec.rb
 - spec/helpers/jobs_helper_spec.rb
 - spec/helpers/pagination_helper_spec.rb
+- spec/helpers/servers_helper_spec.rb
 - spec/helpers/slices_helper_spec.rb
-- spec/helpers/workers_helper_spec.rb
-- spec/interactors/jobs/search_spec.rb
 - spec/models/job_failures_spec.rb
 - spec/models/job_sanitizer_spec.rb
 - spec/rails_helper.rb
@@ -293,12 +279,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Enterprise Batch Processing System for Ruby.
@@ -319,9 +305,10 @@ test_files:
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/mongo.yml
+- spec/dummy/config/mongoid.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/symmetric-encryption.yml
 - spec/dummy/config.ru
 - spec/dummy/db/test.sqlite3
 - spec/dummy/log/development.log
@@ -330,9 +317,8 @@ test_files:
 - spec/helpers/application_helper_spec.rb
 - spec/helpers/jobs_helper_spec.rb
 - spec/helpers/pagination_helper_spec.rb
+- spec/helpers/servers_helper_spec.rb
 - spec/helpers/slices_helper_spec.rb
-- spec/helpers/workers_helper_spec.rb
-- spec/interactors/jobs/search_spec.rb
 - spec/models/job_failures_spec.rb
 - spec/models/job_sanitizer_spec.rb
 - spec/rails_helper.rb

data/app/controllers/rocket_job_mission_control/active_processes_controller.rb

@@ -1,27 +0,0 @@
-module RocketJobMissionControl
-  class ActiveProcessesController < RocketJobMissionControl::ApplicationController
-    def index
-      # The list of workers actively processing jobs
-      # [Array[Array<worker_name [String], job [RocketJob::Job], slice_id [String]]]
-      sorted = true
-      busy   = []
-      # Need paused, failed or aborted since workers may still be working on active slices
-      RocketJob::Job.where(state: [:running, :paused, :failed, :aborted]).sort(:worker_name).collect do |job|
-        if job.respond_to?(:input) && job.sub_state == :processing
-          sorted = false
-          job.input.each('state' => 'running') do |slice|
-            busy << {worker_name: slice.worker_name, klass: job.class.name, description: job.description, started_at: slice.started_at, id: job.id}
-          end
-        elsif job.running?
-          busy << {worker_name: job.worker_name, klass: job.class.name, description: job.description, started_at: job.started_at, id: job.id}
-        end
-      end
-      @busy = sorted ? busy : busy.sort_by { |h| h[:worker_name] }
-
-      respond_to do |format|
-        format.html
-        format.json { render(json: ActiveProcessesDatatable.new(view_context, @busy)) }
-      end
-    end
-  end
-end

data/app/controllers/rocket_job_mission_control/workers/index_filters_controller.rb

@@ -1,50 +0,0 @@
-module RocketJobMissionControl
-  module Workers
-    class IndexFiltersController < RocketJobMissionControl::ApplicationController
-      before_filter :load_workers
-      before_filter :show_sidebar
-
-      def starting
-        @workers = @workers.where(state: :starting)
-        respond_to do |format|
-          format.html
-          format.json { render(json: WorkersDatatable.new(view_context, @workers)) }
-        end
-      end
-
-      def running
-        @workers = @workers.where(state: :running)
-        respond_to do |format|
-          format.html
-          format.json { render(json: WorkersDatatable.new(view_context, @workers)) }
-        end
-      end
-
-      def paused
-        @workers = @workers.where(state: :paused)
-        respond_to do |format|
-          format.html
-          format.json { render(json: WorkersDatatable.new(view_context, @workers)) }
-        end
-      end
-
-      def stopping
-        @workers = @workers.where(state: :stopping)
-        respond_to do |format|
-          format.html
-          format.json { render(json: WorkersDatatable.new(view_context, @workers)) }
-        end
-      end
-
-      private
-
-      def load_workers
-        @workers = RocketJob::Worker.sort(:name)
-      end
-
-      def show_sidebar
-        @workers_sidebar = true
-      end
-    end
-  end
-end

data/app/controllers/rocket_job_mission_control/workers_controller.rb

@@ -1,93 +0,0 @@
-module RocketJobMissionControl
-  class WorkersController < RocketJobMissionControl::ApplicationController
-    before_filter :find_worker, only: [:stop, :pause, :resume, :destroy]
-    before_filter :show_sidebar
-
-    def index
-      @workers = RocketJob::Worker.sort(:name)
-      respond_to do |format|
-        format.html
-        format.json { render(json: WorkersDatatable.new(view_context, @workers)) }
-      end
-    end
-
-    VALID_STATES = {
-      stop_all:        'stopped',
-      pause_all:       'paused',
-      resume_all:      'resumed',
-      destroy_zombies: 'destroyed if zombified',
-    }
-
-    def update_all
-      worker_action = params[:worker_action].to_sym
-      if VALID_STATES.keys.include?(worker_action)
-        RocketJob::Worker.send(worker_action.to_sym)
-        flash[:notice] = t(:success, scope: [:worker, :update_all], worker_action: VALID_STATES[worker_action])
-      else
-        flash[:alert] = t(:invalid, scope: [:worker, :update_all])
-      end
-
-      respond_to do |format|
-        format.html { redirect_to workers_path }
-      end
-    end
-
-    def stop
-      if @worker.stop!
-        flash[:notice] = t(:success, scope: [:worker, :stop])
-      else
-        flash[:alert] = t(:failure, scope: [:worker, :stop])
-      end
-
-      respond_to do |format|
-        format.html { redirect_to workers_path }
-      end
-    end
-
-    def destroy
-      if @worker.nil? || @worker.destroy
-        flash[:notice] = t(:success, scope: [:worker, :destroy])
-      else
-        flash[:alert] = t(:failure, scope: [:worker, :destroy])
-      end
-
-      respond_to do |format|
-        format.html { redirect_to workers_path }
-      end
-    end
-
-    def pause
-      if @worker.pause!
-        flash[:notice] = t(:success, scope: [:worker, :pause])
-      else
-        flash[:alert] = t(:failure, scope: [:worker, :pause])
-      end
-
-      respond_to do |format|
-        format.html { redirect_to workers_path }
-      end
-    end
-
-    def resume
-      if @worker.resume!
-        flash[:notice] = t(:success, scope: [:worker, :resume])
-      else
-        flash[:alert] = t(:failure, scope: [:worker, :resume])
-      end
-
-      respond_to do |format|
-        format.html { redirect_to workers_path }
-      end
-    end
-
-    private
-
-    def find_worker
-      @worker = RocketJob::Worker.find(params[:id])
-    end
-
-    def show_sidebar
-      @workers_sidebar = true
-    end
-  end
-end

data/app/datatables/rocket_job_mission_control/active_processes_datatable.rb

@@ -1,79 +0,0 @@
-module RocketJobMissionControl
-  class ActiveProcessesDatatable
-    delegate :params, :link_to, :job_path, :state_icon, to: :@view
-    delegate :h, to: 'ERB::Util'
-
-    def initialize(view, processes)
-      @view = view
-      @unfiltered_processes = processes
-    end
-
-    def as_json(options = {})
-      {
-        :draw => params[:draw].to_i,
-        :recordsTotal =>  get_raw_records.count,
-        :recordsFiltered => get_raw_records.count,
-        :data => data
-      }
-    end
-
-    private
-
-    def data
-      processes.map do |h|
-        {
-          '0' => worker_name_with_icon(h[:worker_name]),
-          '1' => job_name_with_link(h[:klass], h[:id]),
-          '2' => h(h[:description].try!(:truncate, 50)),
-          '3' => h(duration(h[:started_at])),
-          'DT_RowClass' => "card callout callout-running"
-        }
-      end
-    end
-
-    def get_raw_records
-      @unfiltered_processes
-    end
-
-    def processes
-      @processes ||= fetch_processes
-    end
-
-    def fetch_processes
-      records = get_raw_records
-      records = paginate_records(records) unless params[:length].present? && params[:length] == '-1'
-      records
-    end
-
-    def page
-      (params[:start].to_i / per_page) + 1
-    end
-
-    def per_page
-      params.fetch(:length, 10).to_i
-    end
-
-    def paginate_records(records)
-      Kaminari.paginate_array(records).page(page).per(per_page)
-    end
-
-    def worker_name_with_icon(worker_name)
-      <<-EOS
-        <i class="fa #{state_icon(:running)}" style="font-size: 75%" title="running"></i>
-        #{worker_name}
-      EOS
-    end
-
-    def job_name_with_link(job_class_name, job_id)
-      <<-EOS
-        <a href="#{job_path(job_id)}">
-          #{job_class_name}
-        </a>
-      EOS
-    end
-
-    def duration(started_at)
-      "#{RocketJob.seconds_as_duration(Time.now - started_at)} ago" if started_at
-    end
-  end
-end