web47command 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e041303b05e1d85a36072634de3396c6722b8b4789b7fcc78d9099f876c208f8
-  data.tar.gz: 64c78bc05a3a2fcb38c164186558aeab8e4cffad9b880ce0974769eab4fbbc08
+  metadata.gz: 3ec04e840dab56171aaa7e29aab015888e461d1f2487f53dc854b86baebe799f
+  data.tar.gz: 2cf3644fbd84c46a0caaf5c271ebe293a4a608181bc3ef7ecf189a6090490e63
 SHA512:
-  metadata.gz: '08bd97add54ae82aa6b3f9ce6de8a4947275b2065c286eb8d049c6b4e75705d29cd6a713c0b37a6e45d14f4bc3be9ed0ab6ac764c51a5db5270ea28ca5416d10'
-  data.tar.gz: 4ed492b6ad8442e267a5430acde97a86ef464d05dbc7b3c9fa38736ab154327188bb745c566a3e146f0a8e1a7c6a39ce9185f56309c9b1e292f9f7eb738a9062
+  metadata.gz: 1840d4ca423bb53b9b86e091f51ee146a444b7bf44dc2904a073f3e9fb8a3cbca247a93dc4d409177f83098ae4ae1ab8e371918f59671e524e054b0aecdb8180
+  data.tar.gz: 4fe65ce773a652b7cd77954fa35a2aff89d58e54dc00b72ef701f10303b6186b86595b6489560e75132610edc48fa935510702f8fe447d85fe31668a9d78d510

data/lib/app/models/command_job.rb

@@ -13,7 +13,10 @@ class CommandJob
   STATE_RETRYING = 'retrying' unless defined? STATE_RETRYING
   STATE_SUCCESS = 'success' unless defined? STATE_SUCCESS
   STATE_FAIL = 'failure' unless defined? STATE_FAIL
-  ALL_STATES = [STATE_NEW, STATE_WIP, STATE_RETRYING, STATE_SUCCESS, STATE_FAIL].freeze unless defined? ALL_STATES
+  STATE_CANCELLED = 'cancelled' unless defined? STATE_CANCELLED
+  unless defined? ALL_STATES
+    ALL_STATES = [STATE_NEW, STATE_WIP, STATE_RETRYING, STATE_CANCELLED, STATE_SUCCESS, STATE_FAIL].freeze
+  end
   #
   # Fields
   #
@@ -48,43 +51,68 @@ class CommandJob
   #
   # True if in new status
   #
-  def new?
+  def new_job?
     STATE_NEW.eql?(state)
   end
 
   #
   # True if in WIP status
   #
-  def wip?
+  def work_in_progress?
     [STATE_RETRYING, STATE_WIP].include?(state)
   end
 
   #
   # True if in success status
   #
-  def success?
+  def succeeded?
     STATE_SUCCESS.eql?(state)
   end
 
   #
   # True if in fail status
   #
-  def fail?
+  def failed?
     STATE_FAIL.eql?(state)
   end
 
   #
   # If we is finished, failed or success
   #
-  def finished?
-    [STATE_FAIL, STATE_SUCCESS].include?(state)
+  def completed?
+    [STATE_CANCELLED, STATE_FAIL, STATE_SUCCESS].include?(state)
+  end
+
+  #
+  # Job has not finished, failure or success
+  #
+  def incomplete?
+    !completed?
   end
 
+  alias running? incomplete?
+
   #
-  # If we are still running
+  # If we are cancelled
   #
-  def running?
-    !finished?
+  def cancelled?
+    STATE_CANCELLED.eql?(state)
+  end
+
+  def job_cancelled?(job = self)
+    job.reload
+    job.cancelled?
+  rescue StandardError => error
+    App47Logger.log_warn "Unable to check job cancelled #{job}", error
+    true
+  end
+
+  def failure_or_cancelled?(job = self)
+    job.reload
+    job.failure? || job.cancelled?
+  rescue StandardError => error
+    App47Logger.log_warn "Unable to check job cancelled #{job}", error
+    true
   end
 
   #
@@ -266,4 +294,11 @@ class CommandJob
   def add_log(message)
     logs.create!(message: message)
   end
+
+  #
+  # Which to sort by
+  #
+  def sort_fields
+    %i[created_at]
+  end
 end

data/lib/web47command/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47command
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web47command
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Chris Schroeder