openc3 5.17.0 → 5.17.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/openc3/microservices/timeline_microservice.rb +6 -6
- data/lib/openc3/models/activity_model.rb +5 -4
- data/lib/openc3/script/calendar.rb +2 -2
- data/lib/openc3/version.rb +5 -5
- data/templates/tool_angular/package.json +2 -2
- data/templates/tool_svelte/package.json +1 -1
- data/templates/tool_vue/package.json +2 -2
- data/templates/widget/package.json +2 -2
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 8c70541c17780bda9cd1adb897963eb1daedfc459bc2637a511745180430e162
|
4
|
+
data.tar.gz: a6eb2e273a1bb9dd5d849b68e8910b7c8eaaca65cee41eed8bdb155891eec1db
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 60e677a6a9b13c7d94d4f32b70b824509e2c87cf691bebb9285b96c544318a8016f2f98b119c657de1cee77b0ec197301bd040962ec9055afe0cd0ae3228ad74
|
7
|
+
data.tar.gz: a8a9f67755a4768806f92134a42c50a44cd686a95ad55877f66fcc735ceb75741845ffe1e71aaa66f5ac5181cb929f999f808c86abc6a1b9408f44f122933892
|
@@ -66,16 +66,16 @@ module OpenC3
|
|
66
66
|
|
67
67
|
run_activity(activity)
|
68
68
|
end
|
69
|
-
@logger.info "#{@timeline_name}
|
69
|
+
@logger.info "#{@timeline_name} timeline worker exiting"
|
70
70
|
end
|
71
71
|
|
72
72
|
def run_activity(activity)
|
73
|
-
case activity.kind.
|
74
|
-
when '
|
73
|
+
case activity.kind.downcase
|
74
|
+
when 'command'
|
75
75
|
run_command(activity)
|
76
|
-
when '
|
76
|
+
when 'script'
|
77
77
|
run_script(activity)
|
78
|
-
when '
|
78
|
+
when 'expire'
|
79
79
|
clear_expired(activity)
|
80
80
|
else
|
81
81
|
@logger.error "Unknown kind passed to microservice #{@timeline_name}: #{activity.as_json(:allow_nan => true)}"
|
@@ -242,7 +242,7 @@ module OpenC3
|
|
242
242
|
scope: @scope,
|
243
243
|
start: 0,
|
244
244
|
stop: (now - 86_400 * 7),
|
245
|
-
kind: '
|
245
|
+
kind: 'expire',
|
246
246
|
data: {}
|
247
247
|
)
|
248
248
|
@queue << activity
|
@@ -37,7 +37,7 @@ module OpenC3
|
|
37
37
|
MAX_DURATION = Time::SEC_PER_DAY
|
38
38
|
PRIMARY_KEY = '__openc3_timelines'.freeze # MUST be equal to `TimelineModel::PRIMARY_KEY` minus the leading __
|
39
39
|
# See run_activity(activity) in openc3/lib/openc3/microservices/timeline_microservice.rb
|
40
|
-
VALID_KINDS = %w(
|
40
|
+
VALID_KINDS = %w(command script reserve expire)
|
41
41
|
|
42
42
|
# Called via the microservice this gets the previous 00:00:15 to 01:01:00. This should allow
|
43
43
|
# for a small buffer around the timeline to make sure the schedule doesn't get stale.
|
@@ -203,9 +203,9 @@ module OpenC3
|
|
203
203
|
rescue NoMethodError
|
204
204
|
raise ActivityInputError.new "start and stop must be seconds: #{start}, #{stop}"
|
205
205
|
end
|
206
|
-
if now_i >= start and kind != '
|
206
|
+
if now_i >= start and kind != 'expire'
|
207
207
|
raise ActivityInputError.new "activity must be in the future, current_time: #{now_i} vs #{start}"
|
208
|
-
elsif duration >= MAX_DURATION
|
208
|
+
elsif duration >= MAX_DURATION and kind != 'expire'
|
209
209
|
raise ActivityInputError.new "activity can not be longer than #{MAX_DURATION} seconds"
|
210
210
|
elsif duration <= 0
|
211
211
|
raise ActivityInputError.new "start: #{start} must be before stop: #{stop}"
|
@@ -220,11 +220,12 @@ module OpenC3
|
|
220
220
|
|
221
221
|
# Set the values of the instance, @start, @kind, @data, @events...
|
222
222
|
def set_input(start:, stop:, kind: nil, data: nil, events: nil, fulfillment: nil, recurring: nil)
|
223
|
+
kind = kind.to_s.downcase
|
223
224
|
validate_input(start: start, stop: stop, kind: kind, data: data)
|
224
225
|
@start = start
|
225
226
|
@stop = stop
|
226
227
|
@fulfillment = fulfillment.nil? ? false : fulfillment
|
227
|
-
@kind = kind
|
228
|
+
@kind = kind
|
228
229
|
@data = data.nil? ? @data : data
|
229
230
|
@events = events.nil? ? Array.new : events
|
230
231
|
@recurring = recurring.nil? ? @recurring : recurring
|
@@ -67,8 +67,8 @@ module OpenC3
|
|
67
67
|
end
|
68
68
|
|
69
69
|
def create_timeline_activity(name, kind:, start:, stop:, data: {}, scope: $openc3_scope, token: $openc3_token)
|
70
|
-
kind = kind.to_s.
|
71
|
-
kinds = %w(
|
70
|
+
kind = kind.to_s.downcase()
|
71
|
+
kinds = %w(command script reserve)
|
72
72
|
unless kinds.include?(kind)
|
73
73
|
raise "Unknown kind: #{kind}. Must be one of #{kinds.join(', ')}."
|
74
74
|
end
|
data/lib/openc3/version.rb
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
# encoding: ascii-8bit
|
2
2
|
|
3
|
-
OPENC3_VERSION = '5.17.
|
3
|
+
OPENC3_VERSION = '5.17.1'
|
4
4
|
module OpenC3
|
5
5
|
module Version
|
6
6
|
MAJOR = '5'
|
7
7
|
MINOR = '17'
|
8
|
-
PATCH = '
|
8
|
+
PATCH = '1'
|
9
9
|
OTHER = ''
|
10
|
-
BUILD = '
|
10
|
+
BUILD = 'd9faf62407367633807c83b60446f92f0c06ecb0'
|
11
11
|
end
|
12
|
-
VERSION = '5.17.
|
13
|
-
GEM_VERSION = '5.17.
|
12
|
+
VERSION = '5.17.1'
|
13
|
+
GEM_VERSION = '5.17.1'
|
14
14
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "<%= tool_name %>",
|
3
|
-
"version": "5.17.
|
3
|
+
"version": "5.17.1",
|
4
4
|
"scripts": {
|
5
5
|
"ng": "ng",
|
6
6
|
"start": "ng serve",
|
@@ -23,7 +23,7 @@
|
|
23
23
|
"@angular/platform-browser-dynamic": "^17.0.8",
|
24
24
|
"@angular/router": "^17.0.8",
|
25
25
|
"@astrouxds/astro-web-components": "7.22.1",
|
26
|
-
"@openc3/tool-common": "5.17.
|
26
|
+
"@openc3/tool-common": "5.17.1",
|
27
27
|
"rxjs": "~7.8.0",
|
28
28
|
"single-spa": "5.9.5",
|
29
29
|
"single-spa-angular": "^9.0.1",
|
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "<%= tool_name %>",
|
3
|
-
"version": "5.17.
|
3
|
+
"version": "5.17.1",
|
4
4
|
"private": true,
|
5
5
|
"scripts": {
|
6
6
|
"serve": "vue-cli-service serve",
|
@@ -12,7 +12,7 @@
|
|
12
12
|
},
|
13
13
|
"dependencies": {
|
14
14
|
"@astrouxds/astro-web-components": "7.22.1",
|
15
|
-
"@openc3/tool-common": "5.17.
|
15
|
+
"@openc3/tool-common": "5.17.1",
|
16
16
|
"axios": "1.7.2",
|
17
17
|
"date-fns": "3.6.0",
|
18
18
|
"portal-vue": "2.1.7",
|
@@ -1,13 +1,13 @@
|
|
1
1
|
{
|
2
2
|
"name": "widget",
|
3
|
-
"version": "5.17.
|
3
|
+
"version": "5.17.1",
|
4
4
|
"private": true,
|
5
5
|
"scripts": {
|
6
6
|
"build": "vue-cli-service build --target lib --dest tools/widgets/<%= widget_name %> --formats umd-min <%= widget_path %> --name <%= widget_name %>"
|
7
7
|
},
|
8
8
|
"dependencies": {
|
9
9
|
"@astrouxds/astro-web-components": "7.22.1",
|
10
|
-
"@openc3/tool-common": "5.17.
|
10
|
+
"@openc3/tool-common": "5.17.1",
|
11
11
|
"vue": "2.7.16",
|
12
12
|
"vuetify": "2.7.1"
|
13
13
|
},
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: openc3
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.17.
|
4
|
+
version: 5.17.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ryan Melton
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2024-06-
|
12
|
+
date: 2024-06-27 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: bundler
|