rocketjob_mission_control 4.3.0 → 5.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d59842cf351b7559812f42f2c3650ab55c319011f9a0fd4994c1945741f629ce
-  data.tar.gz: ddd5ac19c8d8d8c9a7b2b229de298e77719fff27b959776dbaa2e5045e1462e1
+  metadata.gz: 82368e0c44c9e3f00c32855cf6b6b74184eb773d5baea76be898d1bff1895561
+  data.tar.gz: 488fb8ef02166f06ab899f32972ba0e3e8f1b1ac13a581aa908511706463d35f
 SHA512:
-  metadata.gz: 2f41d93ed38b057f3379652a3c05d3f8d57c88b9075ef1b64a706b415cf7200e45a5fc5dbf21833a40e2020d7ef2e3f00ec02a184f56db90fb22ce8dda880354
-  data.tar.gz: dcc5ab82c17212231557566ccee0c691a23b686d7f94f0980a148882f14c4ad778b3b86b8632ae5f85346ebfa74ab309384dc356a86ce1acfce102c9264c9100
+  metadata.gz: f7ce0215da607d10ebc821959f61f28b33a1003b5ab4b44ff346c51abadcf774f39a834920ddd0e1ae22f4eb5f04d5d8b58e2dcc848a770068d733f477027936
+  data.tar.gz: c10e28d4b6aed6887f9457ad0f2fcd62b8f4c7db08829db5a6988391201e6ab431fdba1fdbd256d66ea08b1c6035631c89c034a45d86095a889b474622ad9a8f

data/Rakefile

@@ -1,36 +1,36 @@
 # Setup bundler to avoid having to run bundle exec all the time.
-require 'rubygems'
-require 'bundler/setup'
+require "rubygems"
+require "bundler/setup"
 
-require 'rails/version'
-rakefile     = Rails.version.to_f >= 5.2 ? '../rjmc/Rakefile' : '../rjmc4/Rakefile'
+require "rails/version"
+rakefile     = Rails.version.to_f >= 5.2 ? "../rjmc/Rakefile" : "../rjmc4/Rakefile"
 APP_RAKEFILE = File.expand_path(rakefile, __FILE__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 
-require 'rake/testtask'
-require_relative 'lib/rocket_job_mission_control/version'
+require "rake/testtask"
+require_relative "lib/rocket_job_mission_control/version"
 
 task :gem do
-  system 'gem build rocketjob_mission_control.gemspec'
+  system "gem build rocketjob_mission_control.gemspec"
 end
 
 task publish: :gem do
   system "git tag -a v#{RocketJobMissionControl::VERSION} -m 'Tagging #{RocketJobMissionControl::VERSION}'"
-  system 'git push --tags'
+  system "git push --tags"
   system "gem push rocketjob_mission_control-#{RocketJobMissionControl::VERSION}.gem"
   system "rm rocketjob_mission_control-#{RocketJobMissionControl::VERSION}.gem"
 end
 
 Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
+  t.pattern = "test/**/*_test.rb"
   t.verbose = true
   t.warning = false
 end
 
 # By default run tests against all appraisals
 if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
-  require 'appraisal'
-  task default: 'app:appraisal'
+  require "appraisal"
+  task default: "app:appraisal"
 else
   task default: :test
 end

data/app/controllers/rocket_job_mission_control/application_controller.rb

@@ -7,7 +7,7 @@ module RocketJobMissionControl
     private
 
     def with_time_zone(&block)
-      if time_zone = session['time_zone'] || 'UTC'
+      if time_zone = session["time_zone"] || "UTC"
         Time.use_zone(time_zone, &block)
       end
     end
@@ -30,6 +30,5 @@ module RocketJobMissionControl
         args[:login]
       end
     end
-
   end
 end

data/app/controllers/rocket_job_mission_control/dirmon_entries_controller.rb

@@ -12,32 +12,33 @@ module RocketJobMissionControl
 
     rescue_from AccessGranted::AccessDenied do |exception|
       raise exception if Rails.env.development? || Rails.env.test?
-      redirect_to :back, alert: 'Access not authorized.'
+
+      redirect_to :back, alert: "Access not authorized."
     end
 
     def index
-      @data_table_url = dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.all, 'All')
+      @data_table_url = dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.all, "All")
     end
 
     def disabled
-      @data_table_url = disabled_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.disabled, 'Disabled')
+      @data_table_url = disabled_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.disabled, "Disabled")
     end
 
     def enabled
-      @data_table_url = enabled_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.enabled, 'Enabled')
+      @data_table_url = enabled_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.enabled, "Enabled")
     end
 
     def failed
-      @data_table_url = failed_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.failed, 'Failed')
+      @data_table_url = failed_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.failed, "Failed")
     end
 
     def pending
-      @data_table_url = pending_dirmon_entries_url(format: 'json')
-      render_datatable(RocketJob::DirmonEntry.pending, 'Pending')
+      @data_table_url = pending_dirmon_entries_url(format: "json")
+      render_datatable(RocketJob::DirmonEntry.pending, "Pending")
     end
 
     def show
@@ -48,7 +49,7 @@ module RocketJobMissionControl
       @previous_job_class_names = RocketJob::DirmonEntry.distinct(:job_class_name)
 
       if dirmon_params[:job_class_name] && !@dirmon_entry.job_class
-        @dirmon_entry.errors.add(:job_class_name, 'Invalid Job Class')
+        @dirmon_entry.errors.add(:job_class_name, "Invalid Job Class")
       end
     end
 
@@ -94,7 +95,7 @@ module RocketJobMissionControl
         @dirmon_entry.enable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
-        flash[:alert] = t(:failure, scope: [:dirmon_entry, :enable])
+        flash[:alert] = t(:failure, scope: %i[dirmon_entry enable])
         render(:show)
       end
     end
@@ -105,7 +106,7 @@ module RocketJobMissionControl
         @dirmon_entry.disable!
         redirect_to(rocket_job_mission_control.dirmon_entry_path(@dirmon_entry))
       else
-        flash[:alert] = t(:failure, scope: [:dirmon_entry, :disable])
+        flash[:alert] = t(:failure, scope: %i[dirmon_entry disable])
         render(:show)
       end
     end
@@ -127,16 +128,16 @@ module RocketJobMissionControl
 
     def find_entry_or_redirect
       unless @dirmon_entry = RocketJob::DirmonEntry.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: [:dirmon_entry, :find], id: params[:id])
+        flash[:alert] = t(:failure, scope: %i[dirmon_entry find], id: params[:id])
 
         redirect_to(dirmon_entries_path)
       end
     end
 
     def dirmon_params
-      params
-        .fetch(:rocket_job_dirmon_entry, {})
-        .permit(:name, :archive_directory, :pattern, :job_class_name)
+      params.
+        fetch(:rocket_job_dirmon_entry, {}).
+        permit(:name, :archive_directory, :pattern, :job_class_name)
     end
 
     def render_datatable(entries, description)
@@ -147,7 +148,7 @@ module RocketJobMissionControl
         end
         format.json do
           query                 = RocketJobMissionControl::Query.new(entries, name: :asc)
-          query.search_columns  = [:job_class_name, :name, :pattern]
+          query.search_columns  = %i[job_class_name name pattern]
           query.display_columns = %w[name _type pattern]
           render(json: DirmonEntriesDatatable.new(view_context, query))
         end

data/app/controllers/rocket_job_mission_control/jobs_controller.rb

@@ -14,62 +14,62 @@ module RocketJobMissionControl
 
     def index
       jobs            = RocketJob::Job.all.only(JobsDatatable::ALL_FIELDS)
-      @data_table_url = jobs_url(format: 'json')
+      @data_table_url = jobs_url(format: "json")
 
-      render_datatable(jobs, 'All', JobsDatatable::ALL_COLUMNS, id: :desc)
+      render_datatable(jobs, "All", JobsDatatable::ALL_COLUMNS, id: :desc)
     end
 
     def running
       # Prevent throttled jobs from displaying.
       jobs            = RocketJob::Job.
-        running.
-        where(:started_at.lte => (Time.now - 0.1)).
-        only(JobsDatatable::RUNNING_FIELDS)
-      @data_table_url = running_jobs_url(format: 'json')
+                        running.
+                        where(:started_at.lte => (Time.now - 0.1)).
+                        only(JobsDatatable::RUNNING_FIELDS)
+      @data_table_url = running_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Running', JobsDatatable::RUNNING_COLUMNS, priority: :asc, created_at: :asc)
+      render_datatable(jobs, "Running", JobsDatatable::RUNNING_COLUMNS, priority: :asc, created_at: :asc)
     end
 
     def paused
       jobs            = RocketJob::Job.paused.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = paused_jobs_url(format: 'json')
+      @data_table_url = paused_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Paused', JobsDatatable::PAUSED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Paused", JobsDatatable::PAUSED_COLUMNS, completed_at: :desc)
     end
 
     def completed
       jobs            = RocketJob::Job.completed.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = completed_jobs_url(format: 'json')
+      @data_table_url = completed_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Completed', JobsDatatable::COMPLETED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Completed", JobsDatatable::COMPLETED_COLUMNS, completed_at: :desc)
     end
 
     def aborted
       jobs            = RocketJob::Job.aborted.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = aborted_jobs_url(format: 'json')
+      @data_table_url = aborted_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Aborted', JobsDatatable::ABORTED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Aborted", JobsDatatable::ABORTED_COLUMNS, completed_at: :desc)
     end
 
     def failed
       jobs            = RocketJob::Job.failed.only(JobsDatatable::COMMON_FIELDS)
-      @data_table_url = failed_jobs_url(format: 'json')
+      @data_table_url = failed_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Failed', JobsDatatable::FAILED_COLUMNS, completed_at: :desc)
+      render_datatable(jobs, "Failed", JobsDatatable::FAILED_COLUMNS, completed_at: :desc)
     end
 
     def queued
       jobs            = RocketJob::Job.queued_now.only(JobsDatatable::QUEUED_FIELDS)
-      @data_table_url = queued_jobs_url(format: 'json')
+      @data_table_url = queued_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Queued', JobsDatatable::QUEUED_COLUMNS, priority: :asc, created_at: :asc)
+      render_datatable(jobs, "Queued", JobsDatatable::QUEUED_COLUMNS, priority: :asc, created_at: :asc)
     end
 
     def scheduled
       jobs            = RocketJob::Job.scheduled.only(JobsDatatable::SCHEDULED_FIELDS)
-      @data_table_url = scheduled_jobs_url(format: 'json')
+      @data_table_url = scheduled_jobs_url(format: "json")
 
-      render_datatable(jobs, 'Scheduled', JobsDatatable::SCHEDULED_COLUMNS, run_at: :asc)
+      render_datatable(jobs, "Scheduled", JobsDatatable::SCHEDULED_COLUMNS, run_at: :asc)
     end
 
     def update
@@ -138,7 +138,7 @@ module RocketJobMissionControl
       # Scope: [[slice1], [slice2], [slice(n)]
       authorize! :view_slice, @job
       error_type = params[:error_type]
-      scope      = @job.input.failed.where('exception.class_name' => error_type)
+      scope      = @job.input.failed.where("exception.class_name" => error_type)
 
       # Used by pagination to display the correct slice
       # Offset refers to the slice number from the array "scope".
@@ -149,7 +149,7 @@ module RocketJobMissionControl
       @lines                 = current_failure.records
       @failure_exception     = current_failure.try!(:exception)
       @view_slice_pagination = {
-        record_number: current_failure['exception']['record_number'],
+        record_number: current_failure.processing_record_number,
         offset:        @offset,
         total:         (scope.count - 1)
       }
@@ -162,7 +162,7 @@ module RocketJobMissionControl
       error_type         = params[:error_type]
       @line_index        = params[:line_index].to_i
       @offset            = params.fetch(:offset, 0).to_i
-      scope              = @job.input.failed.where('exception.class_name' => error_type)
+      scope              = @job.input.failed.where("exception.class_name" => error_type)
       current_failure    = scope.order(_id: 1).limit(1).skip(@offset).first
       @lines             = current_failure.records
       @failure_exception = current_failure.try!(:exception)
@@ -174,20 +174,20 @@ module RocketJobMissionControl
       # Params from the edit_slice form
       error_type      = params[:error_type]
       offset          = params[:offset]
-      updated_records = params['job']['records']
+      updated_records = params["job"]["records"]
 
       # Finds specific slice [Array]
-      slice         = @job.input.failed.skip(offset).first
+      slice = @job.input.failed.skip(offset).first
 
       # Assings modified slice (from the form) back to slice
       slice.records = updated_records
 
       if slice.save
         logger.info("Slice Updated By #{login}, job: #{@job.id}, file_name: #{@job.upload_file_name}")
-        flash[:success] = 'slice updated'
+        flash[:success] = "slice updated"
         redirect_to view_slice_job_path(@job, error_type: error_type)
       else
-        flash[:danger] = 'Error updating slice.'
+        flash[:danger] = "Error updating slice."
       end
     end
 
@@ -200,7 +200,7 @@ module RocketJobMissionControl
       line_index = params[:line_index].to_i
 
       # Finds specific slice [Array]
-      scope = @job.input.failed.where('exception.class_name' => error_type)
+      scope = @job.input.failed.where("exception.class_name" => error_type)
       slice = scope.order(_id: 1).limit(1).skip(offset).first
 
       # Finds and deletes line
@@ -213,9 +213,9 @@ module RocketJobMissionControl
       if slice.save
         logger.info("Line Deleted By #{login}, job: #{@job.id}, file_name: #{@job.upload_file_name}")
         redirect_to view_slice_job_path(@job, error_type: error_type)
-        flash[:success] = 'line removed'
+        flash[:success] = "line removed"
       else
-        flash[:danger] = 'Error removing line.'
+        flash[:danger] = "Error removing line."
       end
     end
 
@@ -229,9 +229,9 @@ module RocketJobMissionControl
         redirect_to(job_path(@job))
       end
 
-      scope = @job.input.failed.where('exception.class_name' => error_type)
+      scope = @job.input.failed.where("exception.class_name" => error_type)
       count = scope.count
-      unless count > 0
+      unless count.positive?
         flash[:notice] = t(:no_errors, scope: %i[job failures])
         redirect_to(job_path(@job))
       end
@@ -269,18 +269,19 @@ module RocketJobMissionControl
 
     def error_occurred(exception)
       if defined?(SemanticLogger::Logger) && logger.is_a?(SemanticLogger::Logger)
-        logger.error 'Error loading a job', exception
+        logger.error "Error loading a job", exception
       else
         logger.error "Error loading a job. #{exception.class}: #{exception.message}\n#{(exception.backtrace || []).join("\n")}"
       end
 
       flash[:danger] = if exception.is_a?(AccessGranted::AccessDenied)
-                         'Access not authorized.'
+                         "Access not authorized."
                        else
-                         'Error loading jobs.'
+                         "Error loading jobs."
                        end
 
       raise exception if Rails.env.development? || Rails.env.test?
+
       redirect_to :back
     end
 
@@ -307,7 +308,7 @@ module RocketJobMissionControl
         h             = {data: index.to_s}
         h[:width]     = column[:width] if column.key?(:width)
         h[:orderable] = column[:orderable] if column.key?(:orderable)
-        index         += 1
+        index += 1
         h
       end
     end

data/app/controllers/rocket_job_mission_control/servers_controller.rb

@@ -12,56 +12,59 @@ module RocketJobMissionControl
 
     rescue_from AccessGranted::AccessDenied do |exception|
       raise exception if Rails.env.development? || Rails.env.test?
-      redirect_to :back, alert: 'Access not authorized.'
+
+      redirect_to :back, alert: "Access not authorized."
     end
 
     def index
-      @data_table_url = servers_url(format: 'json')
-      @actions        = [:pause, :resume, :stop, :kill, :destroy_zombies]
-      render_datatable(RocketJob::Server.all, 'All')
+      @data_table_url = servers_url(format: "json")
+      @actions        = %i[pause resume stop kill destroy_zombies]
+      render_datatable(RocketJob::Server.all, "All")
     end
 
     def starting
-      @data_table_url = starting_servers_url(format: 'json')
-      @actions        = [:pause, :stop, :kill]
-      render_datatable(RocketJob::Server.starting, 'Starting')
+      @data_table_url = starting_servers_url(format: "json")
+      @actions        = %i[pause stop kill]
+      render_datatable(RocketJob::Server.starting, "Starting")
     end
 
     def running
-      @data_table_url = running_servers_url(format: 'json')
-      @actions        = [:pause, :stop, :kill, :destroy_zombies]
-      render_datatable(RocketJob::Server.running, 'Running')
+      @data_table_url = running_servers_url(format: "json")
+      @actions        = %i[pause stop kill destroy_zombies]
+      render_datatable(RocketJob::Server.running, "Running")
     end
 
     def paused
-      @data_table_url = paused_servers_url(format: 'json')
-      @actions        = [:resume, :destroy_zombies]
-      render_datatable(RocketJob::Server.paused, 'Paused')
+      @data_table_url = paused_servers_url(format: "json")
+      @actions        = %i[resume destroy_zombies]
+      render_datatable(RocketJob::Server.paused, "Paused")
     end
 
     def stopping
-      @data_table_url = stopping_servers_url(format: 'json')
+      @data_table_url = stopping_servers_url(format: "json")
       @actions        = [:destroy_zombies]
-      render_datatable(RocketJob::Server.stopping, 'Stopping')
+      render_datatable(RocketJob::Server.stopping, "Stopping")
     end
 
     def zombie
-      @data_table_url = zombie_servers_url(format: 'json')
+      @data_table_url = zombie_servers_url(format: "json")
       @actions        = [:destroy_zombies]
-      render_datatable(RocketJob::Server.zombies, 'Zombie')
+      render_datatable(RocketJob::Server.zombies, "Zombie")
     end
 
-    VALID_ACTIONS = [:stop, :kill, :pause, :resume, :thread_dump]
+    VALID_ACTIONS = %i[stop kill pause resume thread_dump].freeze
 
     def update_all
-      authorize! :update_all, RocketJob::Server
       server_action = params[:server_action].to_sym
+      authorize! server_action, RocketJob::Server
+
       if server_action == :destroy_zombies
         RocketJob::Server.destroy_zombies
       elsif VALID_ACTIONS.include?(server_action)
         RocketJob::Subscribers::Server.publish(server_action)
+        flash[:notice] = t(:success, scope: %i[server update_all], action: server_action.to_s)
       else
-        flash[:alert] = t(:invalid, scope: [:server, :update_all])
+        flash[:alert] = t(:invalid, scope: %i[server update_all])
       end
 
       # TODO: Refresh the same page it was on
@@ -72,11 +75,8 @@ module RocketJobMissionControl
 
     def stop
       authorize! :stop, @server
-      if @server.may_stop?
-        @server.stop!
-      else
-        flash[:alert] = t(:failure, scope: [:server, :stop])
-      end
+      RocketJob::Subscribers::Server.publish(:stop, server_id: @server.id)
+      flash[:notice] = t(:success, scope: %i[server update_one], action: "stop", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -86,7 +86,7 @@ module RocketJobMissionControl
     def destroy
       authorize! :destroy, @server
       @server.destroy
-      flash[:notice] = t(:success, scope: [:server, :destroy])
+      flash[:notice] = t(:success, scope: %i[server destroy])
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -95,11 +95,8 @@ module RocketJobMissionControl
 
     def pause
       authorize! :pause, @server
-      if @server.may_pause?
-        @server.pause!
-      else
-        flash[:alert] = t(:failure, scope: [:server, :pause])
-      end
+      RocketJob::Subscribers::Server.publish(:pause, server_id: @server.id)
+      flash[:notice] = t(:success, scope: %i[server update_one], action: "pause", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -108,11 +105,8 @@ module RocketJobMissionControl
 
     def resume
       authorize! :resume, @server
-      if @server.may_resume?
-        @server.resume!
-      else
-        flash[:alert] = t(:failure, scope: [:server, :resume])
-      end
+      RocketJob::Subscribers::Server.publish(:resume, server_id: @server.id)
+      flash[:notice] = t(:success, scope: %i[server update_one], action: "resume", name: @server.name)
 
       respond_to do |format|
         format.html { redirect_to servers_path }
@@ -130,7 +124,7 @@ module RocketJobMissionControl
         format.html do
           @description = description
           @states      = RocketJob::Server.aasm.states.map { |s| s.name.to_s }
-          @states << 'zombie'
+          @states << "zombie"
 
           @server_counts          = RocketJob::Server.counts_by_state
           # TODO: Move into RocketJob
@@ -146,7 +140,7 @@ module RocketJobMissionControl
 
     def find_server_or_redirect
       unless @server = RocketJob::Server.where(id: params[:id]).first
-        flash[:alert] = t(:failure, scope: [:server, :find], id: params[:id])
+        flash[:alert] = t(:failure, scope: %i[server find], id: params[:id])
 
         redirect_to(servers_path)
       end