web47core 3.2.7 → 3.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a2f6513fc3ea7307fc8b715807aaeef3ac0c63151bec753ecde3e5233742da5
-  data.tar.gz: 2d27d9d04e23dfd8e71ae2f6fb6080567cbab65f1af0f98ce09c5a34f0e90dfd
+  metadata.gz: d49fb16ecfe61d18dbc79f37425422d9e7655db689aae499816be0d145c3922a
+  data.tar.gz: 0125066bb00ecfdb0b423d09493fbd34ed457b8805a7e400f82b0bcf5d78458f
 SHA512:
-  metadata.gz: 42801f50f150d8d47db4833cd7c5aff6a7f4743cd6a60797000c331f1815cc57ce6f844933dc7424343962f3363c3b0d9af0a2ac257dd0ff2c6bd1c9ca0a232c
-  data.tar.gz: 8fca8b55c877d788266c5628b59d820b0e147393fd138db16e8bca762dd2a396801fd0701b7a32e0cc56b4fa5c6ae97e45597701f1714787f1892987608378bd
+  metadata.gz: f64b6ef1ff5cb4c9bdd72a87d2f4fc3a6fe04a29959ef16704bb3cd3d9b5099dbdc3eb2b43122fec0c47d57d3457aacba57ae5dc8bda37377d3cdb7b07d1127a
+  data.tar.gz: ecc76a77d5fda33705260ef6de28b34bca7bdc456587b9124b87c3463e53318e1529a9aa298a513140f9de4d14a2a880341f975600217bec93ec7769263d5a08

data/lib/app/models/command_job.rb

@@ -41,8 +41,8 @@ class CommandJob
 
   # @abstract cancel the current job
   def cancel!(actor)
-    update! cancelled_by: actor, cancelled_at: Time.now.utc, state: STATE_CANCELLED
-    child_jobs.map { |j| j.cancel!(actor) }
+    update!(cancelled_by: actor, cancelled_at: Time.now.utc, state: STATE_CANCELLED) unless completed?
+    child_jobs.each { |j| j.cancel!(actor) }
   end
 
   def child_jobs

data/lib/app/models/redis_configuration.rb

@@ -124,7 +124,7 @@ class RedisConfiguration
       config = nil
       file_path = config_file_path
       if File.exist? file_path
-        yaml_data = YAML.load_file(file_path)
+        yaml_data = YAML.load(ERB.new(File.read(file_path)).result)
         config = yaml_data[Rails.env] if yaml_data
       end
 

data/lib/web47core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Web47core
-  VERSION = '3.2.7'
+  VERSION = '3.2.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: web47core
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.2.9
 platform: ruby
 authors:
 - Chris Schroeder
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-11 00:00:00.000000000 Z
+date: 2024-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -430,6 +416,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 7.2.2
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement