web47command 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b814dd9f0d828dafba8d68fbc7afdd1b201a1d9ecb6dac8b844d93ae07025b3a
-  data.tar.gz: 21c18f8d721ae3a2e65f60d9dd39a67e61e2e64b41de447a77a2eb7e15d3cf35
+  metadata.gz: e041303b05e1d85a36072634de3396c6722b8b4789b7fcc78d9099f876c208f8
+  data.tar.gz: 64c78bc05a3a2fcb38c164186558aeab8e4cffad9b880ce0974769eab4fbbc08
 SHA512:
-  metadata.gz: 7807c3c193bcb942db4c70da4c0474635813d4c67cba2ebac356a03529f01e963f1d5a4b083e9edbdc25e97107c8765d44072af917c7d9966acbbac8854213c6
-  data.tar.gz: cebde8c5a6d33d0d514ed31fe7682296d1d922ac619f717ee0c69b7c258193887e31a32f298d4a07c5ee0069774b4a0afb49f9c16d87588233adb62d05ace6e8
+  metadata.gz: '08bd97add54ae82aa6b3f9ce6de8a4947275b2065c286eb8d049c6b4e75705d29cd6a713c0b37a6e45d14f4bc3be9ed0ab6ac764c51a5db5270ea28ca5416d10'
+  data.tar.gz: 4ed492b6ad8442e267a5430acde97a86ef464d05dbc7b3c9fa38736ab154327188bb745c566a3e146f0a8e1a7c6a39ce9185f56309c9b1e292f9f7eb738a9062

data/lib/app/models/command_job.rb

@@ -25,7 +25,7 @@ class CommandJob
   #
   # Relationships
   #
-  has_many :logs, class_name: 'JobLog', dependent: :destroy
+  has_many :logs, class_name: 'CommandJobLog', dependent: :destroy
   #
   # Validations
   #
@@ -225,7 +225,7 @@ class CommandJob
     end
     output = 'Success' if output.blank?
     command = mask_keywords(command, options[:mask_texts])
-    CommandJobLog.create!(job: self, dir: dir, command: command, message: output)
+    logs.create!(dir: dir, command: command, message: output)
     check_for_text(output, options[:error_texts], true)
     check_for_text(output, options[:required_texts], false)
     output
@@ -264,6 +264,6 @@ class CommandJob
   # Add a job log message
   #
   def add_log(message)
-    JobLog.create!(job: self, message: message)
+    logs.create!(message: message)
   end
 end

data/lib/app/models/command_job_log.rb

@@ -3,21 +3,31 @@
 #
 # Capture command log messages for a given job
 #
-class CommandJobLog < JobLog
+class CommandJobLog
+  include StandardModel
   #
   # Fields
   #
+  field :message, type: String
   field :command, type: String
   field :dir, type: String
   #
+  # Relationships
+  #
+  belongs_to :job, inverse_of: :logs, class_name: 'CommandJob'
+  #
   # Validations
   #
-  validates :command, presence: true
+  validates :message, presence: true
 
   #
   # Display message
   #
   def display_message
-    "Dir: #{dir}\nCommand: #{command}\nOutput: #{message}"
+    if dir.present?
+      "Dir: #{dir}\nCommand: #{command}\nOutput: #{message}"
+    else
+      message
+    end
   end
 end

data/lib/web47command.rb

@@ -1,5 +1,4 @@
 require 'web47command/version'
-require 'app/models/job_log'
 require 'app/models/command_job_log'
 require 'app/models/command_job'
 #

data/lib/web47command/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47command
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-10 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -314,7 +314,6 @@ files:
 - lib/app/jobs/cron/trim_jobs.rb
 - lib/app/models/command_job.rb
 - lib/app/models/command_job_log.rb
-- lib/app/models/job_log.rb
 - lib/web47command.rb
 - lib/web47command/version.rb
 homepage: https://app47.com

data/lib/app/models/job_log.rb

@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-#
-# Capture log messages for a given job
-#
-class JobLog
-  include StandardModel
-  #
-  # Fields
-  #
-  field :message, type: String
-  #
-  # Relationships
-  #
-  belongs_to :job, inverse_of: :logs, class_name: 'CommandJob'
-  #
-  # Validations
-  #
-  validates :message, presence: true
-
-  #
-  # Display message
-  #
-  def display_message
-    message
-  end
-end