openc3 5.17.0 → 5.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d414a88623d811f51dc74da1f49169ca0b0c3ca3ba740e5f70b854e9524824
-  data.tar.gz: ad24c61fe6f733ae07777f3fa4dbe7b2cfd013adf8e22bc8cec63d4c1a3b1684
+  metadata.gz: 8c70541c17780bda9cd1adb897963eb1daedfc459bc2637a511745180430e162
+  data.tar.gz: a6eb2e273a1bb9dd5d849b68e8910b7c8eaaca65cee41eed8bdb155891eec1db
 SHA512:
-  metadata.gz: 8faed944b2e064ecf2a4d55f434dfeb91bf09f5a383aa30bc370f550fc7bc5dccfa9c1d8cf7efdda601887359dc6a44bad84e1eef27dc811341208062b038f23
-  data.tar.gz: 7c50c7428cac1a2c35a5b62121fc5791f90a3d1a6d3c2f00c61b24b2e7ebfa24990bd08c74b0af47a41979b55c41e1cd582d76cf8392260947e7578f47a9eeb2
+  metadata.gz: 60e677a6a9b13c7d94d4f32b70b824509e2c87cf691bebb9285b96c544318a8016f2f98b119c657de1cee77b0ec197301bd040962ec9055afe0cd0ae3228ad74
+  data.tar.gz: a8a9f67755a4768806f92134a42c50a44cd686a95ad55877f66fcc735ceb75741845ffe1e71aaa66f5ac5181cb929f999f808c86abc6a1b9408f44f122933892

data/lib/openc3/microservices/timeline_microservice.rb

@@ -66,16 +66,16 @@ module OpenC3
 
         run_activity(activity)
       end
-      @logger.info "#{@timeline_name} timeine worker exiting"
+      @logger.info "#{@timeline_name} timeline worker exiting"
     end
 
     def run_activity(activity)
-      case activity.kind.upcase
-      when 'COMMAND'
+      case activity.kind.downcase
+      when 'command'
         run_command(activity)
-      when 'SCRIPT'
+      when 'script'
         run_script(activity)
-      when 'EXPIRE'
+      when 'expire'
         clear_expired(activity)
       else
         @logger.error "Unknown kind passed to microservice #{@timeline_name}: #{activity.as_json(:allow_nan => true)}"
@@ -242,7 +242,7 @@ module OpenC3
         scope: @scope,
         start: 0,
         stop: (now - 86_400 * 7),
-        kind: 'EXPIRE',
+        kind: 'expire',
         data: {}
       )
       @queue << activity

data/lib/openc3/models/activity_model.rb

@@ -37,7 +37,7 @@ module OpenC3
     MAX_DURATION = Time::SEC_PER_DAY
     PRIMARY_KEY = '__openc3_timelines'.freeze # MUST be equal to `TimelineModel::PRIMARY_KEY` minus the leading __
     # See run_activity(activity) in openc3/lib/openc3/microservices/timeline_microservice.rb
-    VALID_KINDS = %w(COMMAND SCRIPT RESERVE EXPIRE)
+    VALID_KINDS = %w(command script reserve expire)
 
     # Called via the microservice this gets the previous 00:00:15 to 01:01:00. This should allow
     # for a small buffer around the timeline to make sure the schedule doesn't get stale.
@@ -203,9 +203,9 @@ module OpenC3
       rescue NoMethodError
         raise ActivityInputError.new "start and stop must be seconds: #{start}, #{stop}"
       end
-      if now_i >= start and kind != 'EXPIRE'
+      if now_i >= start and kind != 'expire'
         raise ActivityInputError.new "activity must be in the future, current_time: #{now_i} vs #{start}"
-      elsif duration >= MAX_DURATION
+      elsif duration >= MAX_DURATION and kind != 'expire'
         raise ActivityInputError.new "activity can not be longer than #{MAX_DURATION} seconds"
       elsif duration <= 0
         raise ActivityInputError.new "start: #{start} must be before stop: #{stop}"
@@ -220,11 +220,12 @@ module OpenC3
 
     # Set the values of the instance, @start, @kind, @data, @events...
     def set_input(start:, stop:, kind: nil, data: nil, events: nil, fulfillment: nil, recurring: nil)
+      kind = kind.to_s.downcase
       validate_input(start: start, stop: stop, kind: kind, data: data)
       @start = start
       @stop = stop
       @fulfillment = fulfillment.nil? ? false : fulfillment
-      @kind = kind.nil? ? @kind : kind
+      @kind = kind
       @data = data.nil? ? @data : data
       @events = events.nil? ? Array.new : events
       @recurring = recurring.nil? ? @recurring : recurring

data/lib/openc3/script/calendar.rb

@@ -67,8 +67,8 @@ module OpenC3
     end
 
     def create_timeline_activity(name, kind:, start:, stop:, data: {}, scope: $openc3_scope, token: $openc3_token)
-      kind = kind.to_s.upcase()
-      kinds = %w(COMMAND SCRIPT RESERVE)
+      kind = kind.to_s.downcase()
+      kinds = %w(command script reserve)
       unless kinds.include?(kind)
         raise "Unknown kind: #{kind}. Must be one of #{kinds.join(', ')}."
       end

data/lib/openc3/version.rb

@@ -1,14 +1,14 @@
 # encoding: ascii-8bit
 
-OPENC3_VERSION = '5.17.0'
+OPENC3_VERSION = '5.17.1'
 module OpenC3
   module Version
     MAJOR = '5'
     MINOR = '17'
-    PATCH = '0'
+    PATCH = '1'
     OTHER = ''
-    BUILD = 'da4e65bcbe6c1fad00b5eb3499a026c9f75412a1'
+    BUILD = 'd9faf62407367633807c83b60446f92f0c06ecb0'
   end
-  VERSION = '5.17.0'
-  GEM_VERSION = '5.17.0'
+  VERSION = '5.17.1'
+  GEM_VERSION = '5.17.1'
 end

data/templates/tool_angular/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.17.0",
+  "version": "5.17.1",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -23,7 +23,7 @@
     "@angular/platform-browser-dynamic": "^17.0.8",
     "@angular/router": "^17.0.8",
     "@astrouxds/astro-web-components": "7.22.1",
-    "@openc3/tool-common": "5.17.0",
+    "@openc3/tool-common": "5.17.1",
     "rxjs": "~7.8.0",
     "single-spa": "5.9.5",
     "single-spa-angular": "^9.0.1",

data/templates/tool_svelte/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "7.22.1",
-    "@openc3/tool-common": "5.17.0",
+    "@openc3/tool-common": "5.17.1",
     "@smui/button": "^7.0.0-beta.16",
     "@smui/card": "^7.0.0-beta.16",
     "@smui/list": "^7.0.0-beta.16",

data/templates/tool_vue/package.json

@@ -1,6 +1,6 @@
 {
   "name": "<%= tool_name %>",
-  "version": "5.17.0",
+  "version": "5.17.1",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "7.22.1",
-    "@openc3/tool-common": "5.17.0",
+    "@openc3/tool-common": "5.17.1",
     "axios": "1.7.2",
     "date-fns": "3.6.0",
     "portal-vue": "2.1.7",

data/templates/widget/package.json

@@ -1,13 +1,13 @@
 {
   "name": "widget",
-  "version": "5.17.0",
+  "version": "5.17.1",
   "private": true,
   "scripts": {
     "build": "vue-cli-service build --target lib --dest tools/widgets/<%= widget_name %> --formats umd-min <%= widget_path %> --name <%= widget_name %>"
   },
   "dependencies": {
     "@astrouxds/astro-web-components": "7.22.1",
-    "@openc3/tool-common": "5.17.0",
+    "@openc3/tool-common": "5.17.1",
     "vue": "2.7.16",
     "vuetify": "2.7.1"
   },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openc3
 version: !ruby/object:Gem::Version
-  version: 5.17.0
+  version: 5.17.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-26 00:00:00.000000000 Z
+date: 2024-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler