marty 9.5.1 → 10.0.0

data/spec/dummy/app/jobs/test_failing_job.rb

@@ -5,7 +5,11 @@ class TestFailingJob < Marty::CronJob
   end
 
   def self.trigger_destroy
-    delayed_job.destroy!
+    dj = Marty::BackgroundJob::Schedule.find_by(
+      job_class: 'TestFailingJob'
+    ).delayed_job
+
+    dj.destroy!
   end
 
   def self.trigger_failure

data/spec/dummy/app/models/gemini/my_rule.rb

@@ -1,6 +1,8 @@
 class Gemini::MyRule < Marty::DeloreanRule
   self.table_name = 'gemini_my_rules'
 
+  validates :rule_type, presence: true
+
   gen_mcfly_lookup :lookup, {
     name: false,
   }

data/spec/dummy/app/models/gemini/xyz_rule.rb

@@ -1,6 +1,8 @@
 class Gemini::XyzRule < Marty::DeloreanRule
   self.table_name = 'gemini_xyz_rules'
 
+  validates :rule_type, presence: true
+
   gen_mcfly_lookup :lookup, {
     name: false,
   }

data/spec/dummy/delorean/jobs.dl

@@ -0,0 +1,6 @@
+TestJob1:
+    perform = 1
+
+TestJob2:
+    do_nothing = 2
+

data/spec/features/delayed_jobs_grid_spec.rb

@@ -29,11 +29,12 @@ feature 'Delayed Jobs Dashboard', js: true do
         Marty::BackgroundJob::Schedule.create(
           job_class: klass_name,
           cron: '0 0 * * *',
-          state: 'on'
+          state: 'on',
+          arguments: []
         ).tap do |job|
           Marty::BackgroundJob::UpdateSchedule.call(
             id: job.id,
-            job_class: job.job_class
+            job_class: job.job_class,
           )
         end
       end

data/spec/features/schedule_jobs_dashboard_spec.rb

@@ -28,17 +28,18 @@ feature 'Schedule Jobs Dashboard', js: true do
       Marty::BackgroundJob::Schedule.create(
         job_class: 'Test2Job',
         cron: '0 0 * * *',
-        state: 'on'
+        state: 'on',
+        arguments: []
       ).tap do |job|
         Marty::BackgroundJob::UpdateSchedule.call(
           id: job.id,
-          job_class: job.job_class
+          job_class: job.job_class,
         )
       end
     end
 
     before do
-      expect(Test2Job.scheduled?).to be true
+      expect(Test2Job.scheduled?(schedule_id: schedule.id)).to be true
 
       log_in_as('admin1')
       wait_for_ajax
@@ -52,8 +53,6 @@ feature 'Schedule Jobs Dashboard', js: true do
     end
 
     it 'creates new schedule' do
-      expect(TestJob.scheduled?).to be false
-
       press('Add')
 
       fill_in('Job class', with: 'TestJob')
@@ -69,11 +68,12 @@ feature 'Schedule Jobs Dashboard', js: true do
       expect(crons).to include('1 1 * * *')
       expect(crons).to include('0 0 * * *')
 
-      expect(TestJob.scheduled?).to be true
-      expect(TestJob.delayed_job.cron).to eq '1 1 * * *'
+      new_schedule = Marty::BackgroundJob::Schedule.order(:created_at).last
+      expect(TestJob.scheduled?(schedule_id: new_schedule.id)).to be true
+      expect(new_schedule.delayed_job.cron).to eq '1 1 * * *'
 
-      expect(Test2Job.scheduled?).to be true
-      expect(Test2Job.delayed_job.cron).to eq '0 0 * * *'
+      expect(Test2Job.scheduled?(schedule_id: schedule.id)).to be true
+      expect(schedule.delayed_job.cron).to eq '0 0 * * *'
     end
 
     it 'deletes schedule' do
@@ -83,7 +83,7 @@ feature 'Schedule Jobs Dashboard', js: true do
 
       wait_for_ajax
 
-      expect(Test2Job.scheduled?).to be false
+      expect(Test2Job.scheduled?(schedule_id: schedule.id)).to be false
     end
 
     it 'turns the schedule off' do
@@ -93,7 +93,7 @@ feature 'Schedule Jobs Dashboard', js: true do
 
       press 'OK'
       wait_for_ajax
-      expect(Test2Job.scheduled?).to be false
+      expect(Test2Job.scheduled?(schedule_id: schedule.id)).to be false
     end
 
     it 'shows validation errors' do
@@ -105,7 +105,7 @@ feature 'Schedule Jobs Dashboard', js: true do
 
       press 'OK'
       wait_for_ajax
-      expect(page).to have_content('Job class has already been taken')
+      expect(page).to have_content('Arguments are not unique')
       expect(page).to have_content('Cron is invalid')
     end
   end

data/spec/jobs/cron_job_spec.rb

@@ -7,20 +7,21 @@ describe 'Cron jobs' do
     Marty::BackgroundJob::Schedule.create!(
       job_class: klass.name,
       cron: '* * * * *',
-      state: 'on'
+      state: 'on',
+      arguments: []
     ).tap do |job|
       Marty::BackgroundJob::UpdateSchedule.call(
         id: job.id,
-        job_class: job.job_class
+        job_class: job.job_class,
       )
 
-      dj = klass.delayed_job
+      dj = job.delayed_job
       dj.update!(run_at: 1.minute.ago)
     end
   end
 
   def run_job
-    expect(klass.delayed_job).to be_present
+    expect(schedule.delayed_job).to be_present
     expect(Delayed::Job.count).to eq 1
     worker = Delayed::Worker.new
     worker.work_off
@@ -34,8 +35,8 @@ describe 'Cron jobs' do
         end
 
         it 'job is recreated' do
-          expect(klass).to be_scheduled
-          expect(klass.delayed_job).to be_present
+          expect(klass.scheduled?(schedule_id: schedule.id)).to be true
+          expect(schedule.delayed_job).to be_present
         end
       end
 
@@ -46,8 +47,8 @@ describe 'Cron jobs' do
         end
 
         it 'job is not recreated' do
-          expect(klass).to_not be_scheduled
-          expect(klass.delayed_job).to_not be_present
+          expect(klass.scheduled?(schedule_id: schedule.id)).to be false
+          expect(schedule.reload.delayed_job).to_not be_present
         end
       end
     end
@@ -59,8 +60,8 @@ describe 'Cron jobs' do
       end
 
       it 'job is not recreated' do
-        expect(klass).to_not be_scheduled
-        expect(klass.delayed_job).to_not be_present
+        expect(klass.scheduled?(schedule_id: schedule.id)).to be false
+        expect(schedule.reload.delayed_job).to_not be_present
       end
     end
   end
@@ -75,7 +76,7 @@ describe 'Cron jobs' do
       log = Marty::BackgroundJob::Log.find_by(job_class: klass.name)
       expect(log.error).to be_present
       expect(log.failure?).to be true
-      expect(klass).to be_scheduled
+      expect(klass.scheduled?(schedule_id: schedule.id)).to be true
     end
 
     it 'logs success' do
@@ -85,7 +86,10 @@ describe 'Cron jobs' do
       log = Marty::BackgroundJob::Log.find_by(job_class: klass.name)
       expect(log.error).to_not be_present
       expect(log.success?).to be true
-      expect(klass).to be_scheduled
+      expect(klass.scheduled?(schedule_id: schedule.id)).to be true
+
+      dj = schedule.reload.delayed_job
+      expect(dj.schedule_id).to eq schedule.id
     end
   end
 end

data/spec/jobs/delorean_background_job_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+
+# Most of the code is tested in cron_job_spec.rb
+describe 'Delorean Background Jobs' do
+  let(:klass) { Marty::DeloreanBackgroundJob }
+
+  before do
+    Marty::Script.load_scripts(nil)
+  end
+
+  let!(:schedule) do
+    Marty::BackgroundJob::Schedule.create!(
+      job_class: klass.name,
+      cron: '* * * * *',
+      state: 'on',
+      arguments: ['Jobs', 'TestJob1', 'perform']
+    ).tap do |job|
+      Marty::BackgroundJob::UpdateSchedule.call(
+        id: job.id,
+        job_class: job.job_class,
+      )
+
+      dj = job.delayed_job
+      dj.update!(run_at: 1.minute.ago)
+    end
+  end
+
+  def run_job
+    expect(schedule.delayed_job).to be_present
+    expect(Delayed::Job.count).to eq 1
+    worker = Delayed::Worker.new
+    worker.work_off
+  end
+
+  describe 'logs' do
+    it 'logs success' do
+      allow(klass).to receive(:trigger_failure).and_return(nil)
+
+      expect { run_job }.to change { Marty::BackgroundJob::Log.count }.by 1
+      log = Marty::BackgroundJob::Log.find_by(job_class: klass.name)
+      expect(log.error).to_not be_present
+      expect(log.arguments).to eq ['Jobs', 'TestJob1', 'perform']
+      expect(log.success?).to be true
+      expect(klass.scheduled?(schedule_id: schedule.id)).to be true
+
+      dj = schedule.reload.delayed_job
+      expect(dj.schedule_id).to eq schedule.id
+    end
+  end
+end

data/spec/models/promise_spec.rb

@@ -92,6 +92,7 @@ describe Marty::Promise, slow: true, retry: 3 do
         expect(runtime > expected_time).to be true
         expect(runtime < expected_time + 0.5).to be true
         expect(error).to be_present
+        expect(error).to include('Triggered by Delayed::WorkerTimeout')
       end
     end
 

data/spec/services/background_job/fetch_missing_in_schedule_cron_jobs_spec.rb

@@ -11,16 +11,18 @@ module Marty
 
       Marty::Jobs::Schedule.call
 
-      dj = TestJob.delayed_job
+      dj = schedule.delayed_job
 
-      TestJob.delayed_job.dup.tap do |new_dj|
+      schedule.delayed_job.dup.tap do |new_dj|
         new_dj.handler = new_dj.handler.gsub('TestJob', 'Test2Job')
+        new_dj.schedule_id = nil
         new_dj.cron = nil
         new_dj.save!
       end
 
-      TestJob.delayed_job.dup.tap do |new_dj|
+      schedule.delayed_job.dup.tap do |new_dj|
         new_dj.handler = new_dj.handler.gsub('TestJob', 'MissingJob')
+        new_dj.schedule_id = nil
         new_dj.save!
       end
     end

data/spec/services/jobs/schedule_spec.rb

@@ -5,20 +5,21 @@ module Marty
     let!(:schedule) do
       Marty::BackgroundJob::Schedule.create!(
         job_class: 'TestJob',
+        arguments: [],
         cron: '0 0 * * *',
         state: 'on'
       )
     end
 
     it 'schedules jobs' do
-      expect(TestJob).to_not be_scheduled
+      expect(TestJob.scheduled?(schedule_id: schedule.id)).to be false
       described_class.call
-      expect(TestJob).to be_scheduled
+      expect(TestJob.scheduled?(schedule_id: schedule.id)).to be true
     end
 
     it 'deletes previously scheduled jobs' do
       described_class.call
-      expect(TestJob).to be_scheduled
+      expect(TestJob.scheduled?(schedule_id: schedule.id)).to be true
       schedule.destroy!
 
       non_cron_job = Delayed::Job.create!(handler: 'Non cron job')
@@ -29,7 +30,7 @@ module Marty
 
       described_class.call
 
-      expect(TestJob).to_not be_scheduled
+      expect(TestJob.scheduled?(schedule_id: schedule.id)).to be false
       any_old_scheduled_jobs = Delayed::Job.where('handler ILIKE ?', '%WrongTestJob%').any?
       expect(any_old_scheduled_jobs).to be false
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 9.5.1
+  version: 10.0.0
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-18 00:00:00.000000000 Z
+date: 2020-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actioncable
@@ -391,6 +391,7 @@ files:
 - app/helpers/marty/enum_helper.rb
 - app/helpers/marty/script_set.rb
 - app/jobs/marty/cron_job.rb
+- app/jobs/marty/delorean_background_job.rb
 - app/jobs/marty/remove_old_promises_job.rb
 - app/models/marty/api_auth.rb
 - app/models/marty/api_config.rb
@@ -512,6 +513,10 @@ files:
 - db/migrate/520_create_marty_notifications.rb
 - db/migrate/521_create_marty_notifications_deliveries.rb
 - db/migrate/522_create_marty_notifications_config.rb
+- db/migrate/523_add_timeout_to_promises.rb
+- db/migrate/524_add_timeout_to_promise_view.rb
+- db/migrate/525_add_arguments_to_jobs_schedules.rb
+- db/migrate/526_add_schedule_id_to_delayed_jobs.rb
 - db/seeds.rb
 - db/sql/lookup_grid_distinct_v1.sql
 - db/sql/query_grid_dir_v1.sql
@@ -538,6 +543,7 @@ files:
 - lib/marty/data_conversion.rb
 - lib/marty/data_exporter.rb
 - lib/marty/data_importer.rb
+- lib/marty/delayed_job/queue_adapter.rb
 - lib/marty/delayed_job/scheduled_job_plugin.rb
 - lib/marty/diagnostic/aws/ec2_instance.rb
 - lib/marty/diagnostic/aws/error.rb
@@ -594,6 +600,8 @@ files:
 - spec/controllers/job_controller_spec.rb
 - spec/controllers/rpc_controller_spec.rb
 - spec/controllers/rpc_import_spec.rb
+- spec/dummy/.foreman
+- spec/dummy/Procfile
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
@@ -683,6 +691,7 @@ files:
 - spec/dummy/delorean/delorean_fn.dl
 - spec/dummy/delorean/enum_report.dl
 - spec/dummy/delorean/fields.dl
+- spec/dummy/delorean/jobs.dl
 - spec/dummy/delorean/styles.dl
 - spec/dummy/delorean/table_report.dl
 - spec/dummy/delorean/test_namespace/nested_namespace/test.dl
@@ -1753,6 +1762,7 @@ files:
 - spec/fixtures/scripts/load_tests/script2.dl
 - spec/job_helper.rb
 - spec/jobs/cron_job_spec.rb
+- spec/jobs/delorean_background_job_spec.rb
 - spec/lib/data_blame_spec.rb
 - spec/lib/data_conversion_spec.rb
 - spec/lib/data_exporter_spec.rb