marty 9.5.1 → 10.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e457dd04b51af2cefe76859a59f80b9f7a62b6184825597dab79777147666330
-  data.tar.gz: d891d5effa9cea8092d34c595503dbef827afe86098d25bc109ff58824deb89a
+  metadata.gz: f9a92073fa74d9777548dbafce731dbb8100918a4b3e696cdf00b06b1b20bbd8
+  data.tar.gz: b2b048bd619a886a1ebafbfaba5e73f017c44fdaaa1f55190ade7d7abb32cea7
 SHA512:
-  metadata.gz: fe9bd7f32d4fef940f91ee36c609054fc28d1cf55936c0fccdfad50f212ad8da8dbb771faefb31f94d84cecb633f24694cf2c7a52850180e03e264c7156713fe
-  data.tar.gz: 4ce7a00444928c18ddcdf56eeb6cb6c2a40fc5d0952e545fd3ddb7367fb64bcb838276cdc0bc5677a0daf49ac68b0ceed7a42447420c3d28699e9454afe40598
+  metadata.gz: 82e24b64bee5533356e3c4a0f6d22bb850d9fe24fd300e9d921f98beb7193b119ccc9a31ba11ee766bb0ade94d2fa8a961318b828805ea611dbfedc375c61503
+  data.tar.gz: 76d6757d910bc340d53a4930f846f698a9fa855c8827ec8fff1bd9a82c21346d55f703c41fc5d0f4f7f8871593282125ad628ced7610eee743518a15858dfc49

data/.rubocop.yml

@@ -51,6 +51,8 @@ Security/MarshalLoad:
 
 Rails/TimeZone:
   EnforcedStyle: strict
+  Exclude:
+    - 'lib/marty/delayed_job/queue_adapter.rb'
 
 Rails/OutputSafety:
   Exclude:

data/README.md

@@ -18,44 +18,45 @@ and delorean scripts.
 To create the correct migrations for a Marty-based application (see below for
 getting the internal dummy application to work):
 
-```
-$ rake marty:install:migrations
+```bash
+rake marty:install:migrations
 ```
 
 The Marty database needs to be seeded with specific configuration
 information. Before running your Marty application for the first time you will
 need to run:
 
-```
-$ rake marty:seed
+```bash
+rake marty:seed
 ```
 
 If you are using Delorean scripts in your application you can load them
 with a rake task. By default these scripts will be picked up from
 `app/delorean_scripts`. To load scripts:
 
-```
-$ rake marty:load_scripts
+```bash
+rake marty:load_scripts
 ```
 
 You can override the default directory by setting the `LOAD_DIR` environment
 variable:
 
-```
-$ LOAD_DIR=<delorean script directory> marty:load_scripts
+```bash
+LOAD_DIR=<delorean script directory> marty:load_scripts
 ```
 
 To delete scripts:
 
+``` bash
+rake marty:delete_scripts
 ```
-$ rake marty:delete_scripts
-```
+
 # Scheduled Job
 
-To use scheduled backgroud jobs, add to `config/application.rb`:
+To use scheduled background jobs, add to `config/application.rb`:
 
-```
-  config.active_job.queue_adapter = :delayed_job
+```bash
+config.active_job.queue_adapter = :delayed_job
 ```
 
 # Dummy Application & Testing
@@ -66,45 +67,53 @@ dummy app at spec/dummy/public.
 Docker doesn't support symlinks, so in order to run it in Docker you will have to copy extjs files.
 
 ```bash
-$ cp -r PATH/TO/YOUR/EXTJS/FILES spec/dummy/public/extjs
+cp -r PATH/TO/YOUR/EXTJS/FILES spec/dummy/public/extjs
 ```
 
-You can run it with docker:
+You can run it with Docker:
 
 ```bash
-$ make app-initialise-docker
-
-$ make app-start
+make app-initialise-docker
+make app-start
 ```
 
 To run tests:
 
 ```bash
-$ make app-bash
-
-$ HEADLESS=true rspec
+make app-bash
+HEADLESS=true rspec
 ```
 
-To run without docker:
+To run without Docker:
 
-Marty currently only runs with postgresql. To be able to run the tests
+Marty currently only runs with PostgreSQL. To be able to run the tests
 you will first need to create a `database.yml` file in `spec/dummy/config`.
 You can use the example file by doing:
 
 ```bash
-$ cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
+cp spec/dummy/config/database.yml.example spec/dummy/config/database.yml
 ```
 
 To initialize the dummy application for a demo run:
 
 ```bash
-$ bundle install
-$ bundle exec rake db:create db:migrate db:seed app:marty:load_scripts
-$ cd spec/dummy
-$ rails s
+bundle install
+bundle exec rake db:create db:migrate db:seed app:marty:load_scripts
+cd spec/dummy
+bundle exec rails s
+```
+
+Or, to run the application with the job workers running:
+
+```bash
+bundle install
+bundle exec rake db:create db:migrate db:seed app:marty:load_scripts
+cd spec/dummy
+gem install foreman
+foreman start
 ```
 
-The marty dummy app should now be accessible in your browser:
+The Marty dummy app should now be accessible in your browser:
 `localhost:3000`
 
 You can log in using `marty` as both user and password.
@@ -112,13 +121,13 @@ You can log in using `marty` as both user and password.
 To create the test database in prepartion to run your tests:
 
 ```bash
-$ RAILS_ENV=test bundle exec rake db:create
+RAILS_ENV=test bundle exec rake db:create
 ```
 
 Then to run the tests:
 
 ```bash
-$ bundle exec rspec
+bundle exec rspec
 ```
 
 # History & Status

data/app/components/marty/background_job/schedule_jobs_dashboard.rb

@@ -20,8 +20,8 @@ module Marty
           handler_str = dj.handler[/job_class.*\n/]
           job_class = handler_str.gsub('job_class:', '').strip
 
-          "#{job_class} with cron #{dj.cron} is present " \
-            'in delayed_jobs table, but is missing in the Dashboard.'
+          "#{job_class} with cron #{dj.cron} and schedule_id #{dj.schedule_id}" \
+            'is present in delayed_jobs table, but is missing in the Dashboard.'
         end
 
         messages.join('<br>')

data/app/components/marty/background_job/schedule_jobs_grid.rb

@@ -29,6 +29,7 @@ module Marty
 
         c.attributes = [
           :job_class,
+          :arguments,
           :cron,
           :state
         ]
@@ -46,6 +47,19 @@ module Marty
         c.width = 400
       end
 
+      attribute :arguments do |c|
+        c.width = 400
+
+        c.getter = lambda do |record|
+          record.arguments.to_json
+        end
+
+        c.setter = lambda do |record, value|
+          # FIXME: hacky way to parse JSON with single quotes
+          record.arguments = JSON.parse(value.tr("'", '"'))
+        end
+      end
+
       attribute :cron do |c|
         c.width = 400
       end
@@ -76,6 +90,8 @@ module Marty
       end
 
       endpoint :edit_window__edit_form__submit do |params|
+        id = JSON.parse(params['data'])['id']
+
         result = super(params)
         next result if result.empty?
 
@@ -83,7 +99,7 @@ module Marty
 
         Marty::BackgroundJob::UpdateSchedule.call(
           id: obj_hash['id'],
-          job_class: obj_hash['job_class']
+          job_class: obj_hash['job_class'],
         )
 
         result
@@ -97,7 +113,7 @@ module Marty
 
         Marty::BackgroundJob::UpdateSchedule.call(
           id: obj_hash['id'],
-          job_class: obj_hash['job_class']
+          job_class: obj_hash['job_class'],
         )
 
         result
@@ -109,7 +125,8 @@ module Marty
 
       endpoint :destroy do |params|
         res = params.each_with_object({}) do |id, hash|
-          job_class = model.find_by(id: id)&.job_class
+          record = model.find_by(id: id)
+          job_class = record&.job_class
           result = super([id])
 
           # Do nothing If it wasn't destroyed
@@ -117,7 +134,7 @@ module Marty
 
           Marty::BackgroundJob::UpdateSchedule.call(
             id: id,
-            job_class: job_class
+            job_class: job_class,
           )
 
           hash.merge(result)
@@ -130,7 +147,7 @@ module Marty
         begin
           s = Marty::BackgroundJob::Schedule.find(client_config['selected'])
           klass = s.job_class
-          klass.constantize.new.perform
+          klass.constantize.new.perform(*s.arguments)
         rescue StandardError => e
           next client.netzke_notify(e.message)
         end

data/app/components/marty/background_job/schedule_jobs_logs.rb

@@ -26,6 +26,7 @@ module Marty
 
         c.attributes = [
           :job_class,
+          :arguments,
           :status,
           :error,
           :created_at
@@ -47,6 +48,17 @@ module Marty
         c.read_only = true
       end
 
+      attribute :arguments do |c|
+        c.getter = lambda do |record|
+          record.arguments.to_json
+        end
+
+        c.setter = lambda do |record, value|
+          # FIXME: hacky way to parse JSON with single quotes
+          record.arguments = JSON.parse(value.tr("'", '"'))
+        end
+      end
+
       attribute :status do |c|
         c.read_only = true
       end

data/app/components/marty/base_rule_view.rb

@@ -410,10 +410,6 @@ class Marty::BaseRuleView < Marty::McflyGridPanel
     c.format = 'Y-m-d H:i'
   end
 
-  attribute :rule_type do |c|
-    c.width = 200
-  end
-
   def self.init_fields
     klass.guard_info.each do |namestr, h|
       field_maker(namestr, h, :simple_guards)

data/app/components/marty/delorean_rule_view.rb

@@ -6,7 +6,17 @@ class Marty::DeloreanRuleView < Marty::BaseRuleView
   end
 
   def self.base_fields
-    super + [:rule_type, :start_dt, :end_dt]
+    fields = if klass&.column_names&.include?('rule_type')
+               [:rule_type, :start_dt, :end_dt]
+             else
+               [:start_dt, :end_dt]
+             end
+
+    super + fields
+  end
+
+  attribute :rule_type do |c|
+    c.width = 200
   end
 
   attribute :start_dt do |c|
@@ -18,8 +28,4 @@ class Marty::DeloreanRuleView < Marty::BaseRuleView
     c.width = 150
     c.format = 'Y-m-d H:i'
   end
-
-  attribute :rule_type do |c|
-    c.width = 200
-  end
 end

data/app/components/marty/promise_view.rb

@@ -29,9 +29,11 @@ class Marty::PromiseView < Marty::Tree
       :priority,
       :start_dt,
       :end_dt,
+      :total_time,
       :status,
       :cformat,
       :error,
+      :timeout
     ]
     c.root_visible = false
     c.paging = :none
@@ -122,6 +124,19 @@ class Marty::PromiseView < Marty::Tree
     config.text = I18n.t('jobs.end_dt')
   end
 
+  attribute :total_time do |config|
+    config.text = I18n.t('jobs.total_time')
+    config.width = 90
+
+    config.getter = ->(record) do
+      next unless record.start_dt
+      next unless record.end_dt
+
+      time_diff = record.end_dt - record.start_dt
+      Time.zone.at(time_diff.to_i.abs).utc.strftime '%H:%M:%S'
+    end
+  end
+
   attribute :status do |config|
     config.hidden = true
   end

data/app/jobs/marty/cron_job.rb

@@ -1,15 +1,23 @@
 class Marty::CronJob < ActiveJob::Base
-  around_perform do |_job, block|
+  attr_accessor :schedule_id
+
+  def enqueue(options = {})
+    self.cron = options[:cron] if options[:cron]
+    self.schedule_id = options[:schedule_id] if options[:schedule_id]
+    super
+  end
+
+  around_perform do |job, block|
     begin
       block.call
-      log_success
+      log_success(job.arguments)
     rescue StandardError => e
-      log_failure(e)
+      log_failure(e, job.arguments)
       raise e
     end
   end
 
-  def log_failure(exception)
+  def log_failure(exception, arguments)
     error = {
       message: exception.message,
       backtrace: exception.backtrace
@@ -17,55 +25,49 @@ class Marty::CronJob < ActiveJob::Base
 
     ::Marty::BackgroundJob::Log.create!(
       job_class: self.class.name,
+      arguments: arguments,
       status: :failure,
       error: error
     )
   end
 
-  def log_success
+  def log_success(arguments)
     ::Marty::BackgroundJob::Log.create!(
       job_class: self.class.name,
+      arguments: arguments,
       status: :success
     )
   end
 
   class << self
-    def schedule
-      return reschedule if scheduled?
+    def schedule(schedule_obj:)
+      dj = schedule_obj.delayed_job
+
+      return reschedule_obj(schedule_obj: schedule_obj) if dj.present?
 
-      cron = cron_expression
+      cron = schedule_obj.cron
 
       return if cron.blank?
 
-      set(cron: cron).perform_later
+      set(cron: cron, schedule_id: schedule_obj.id).perform_later(*schedule_obj.arguments)
     end
 
-    def reschedule
-      dj = delayed_job
-      return dj.update(cron: cron_expression) if dj.locked_by?
+    def reschedule(schedule_obj:)
+      dj = schedule_obj.delayed_job
+      return dj.update(cron: schedule_obj.cron) if dj.locked_by?
 
-      remove
-      schedule
+      remove(dj)
+      schedule(schedule_obj: schedule_obj)
     end
 
-    def remove
-      delayed_job.destroy if scheduled?
+    def remove(dj)
+      dj.destroy if dj.present?
     end
 
     alias remove_schedule remove
 
-    def scheduled?
-      delayed_job.present?
-    end
-
-    def delayed_job
-      Delayed::Job.
-        where('handler LIKE ?', "%job_class: #{name}\n%").
-        first
-    end
-
-    def cron_expression
-      ::Marty::BackgroundJob::Schedule.on.find_by(job_class: name)&.cron
+    def scheduled?(schedule_id:)
+      Delayed::Job.find_by(schedule_id: schedule_id).present?
     end
   end
 end