rsmp 0.1.21 → 0.1.32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. checksums.yaml +4 -4
  2. data/.gitmodules +0 -4
  3. data/Gemfile.lock +13 -11
  4. data/config/supervisor.yaml +9 -15
  5. data/config/tlc.yaml +9 -8
  6. data/documentation/message_distribution.md +8 -8
  7. data/lib/rsmp.rb +5 -0
  8. data/lib/rsmp/archive.rb +7 -4
  9. data/lib/rsmp/cli.rb +133 -102
  10. data/lib/rsmp/collector.rb +42 -30
  11. data/lib/rsmp/component.rb +2 -0
  12. data/lib/rsmp/components.rb +1 -1
  13. data/lib/rsmp/convert/export/json_schema.rb +204 -0
  14. data/lib/rsmp/convert/import/yaml.rb +38 -0
  15. data/lib/rsmp/deep_merge.rb +11 -0
  16. data/lib/rsmp/inspect.rb +46 -0
  17. data/lib/rsmp/listener.rb +4 -14
  18. data/lib/rsmp/logger.rb +3 -1
  19. data/lib/rsmp/logging.rb +1 -1
  20. data/lib/rsmp/message.rb +22 -31
  21. data/lib/rsmp/node.rb +11 -1
  22. data/lib/rsmp/notifier.rb +7 -2
  23. data/lib/rsmp/proxy.rb +95 -39
  24. data/lib/rsmp/rsmp.rb +34 -23
  25. data/lib/rsmp/site.rb +30 -32
  26. data/lib/rsmp/site_proxy.rb +103 -22
  27. data/lib/rsmp/site_proxy_wait.rb +63 -38
  28. data/lib/rsmp/supervisor.rb +82 -47
  29. data/lib/rsmp/supervisor_proxy.rb +21 -13
  30. data/lib/rsmp/tlc.rb +61 -35
  31. data/lib/rsmp/version.rb +1 -1
  32. data/rsmp.gemspec +3 -14
  33. metadata +13 -113
  34. data/config/site.yaml +0 -40
data/lib/rsmp/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RSMP
2
- VERSION = "0.1.21"
2
+ VERSION = "0.1.32"
3
3
  end
data/rsmp.gemspec CHANGED
@@ -26,26 +26,15 @@ Gem::Specification.new do |spec|
26
26
  `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
27
27
  end
28
28
 
29
- # Add schema files in rsmp_schema submodule
30
- gem_dir = Pathname.new(__dir__).expand_path
31
- submodule_path = File.expand_path 'lib/rsmp_schema/schema'
32
- Dir.chdir(submodule_path) do
33
- submodule_relative_path = Pathname.new(submodule_path).relative_path_from(gem_dir)
34
- `git ls-files`.split($\).each do |filename|
35
- # for each git file, prepend relative submodule path and add to spec
36
- spec.files << submodule_relative_path.join(filename).to_s
37
- end
38
- end
39
-
40
29
  spec.bindir = "exe"
41
30
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
42
31
  spec.require_paths = ["lib"]
43
32
 
44
- spec.add_dependency "async", "~> 1.28.3"
45
- spec.add_dependency "async-io", "~> 1.30.1"
33
+ spec.add_dependency "async", "~> 1.28.7"
34
+ spec.add_dependency "async-io", "~> 1.30.2"
46
35
  spec.add_dependency "colorize", "~> 0.8.1"
47
36
  spec.add_dependency "thor", "~> 1.0.1"
48
- spec.add_dependency "json_schemer", "~> 0.2.17"
37
+ spec.add_dependency "rsmp_schemer", "~> 0.2.0"
49
38
 
50
39
  spec.add_development_dependency "bundler", "~> 2.2.3"
51
40
  spec.add_development_dependency "rake", "~> 13.0.1"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rsmp
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.21
4
+ version: 0.1.32
5
5
  platform: ruby
6
6
  authors:
7
7
  - Emil Tin
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-01-13 00:00:00.000000000 Z
11
+ date: 2021-06-02 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: async
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - "~>"
18
18
  - !ruby/object:Gem::Version
19
- version: 1.28.3
19
+ version: 1.28.7
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - "~>"
25
25
  - !ruby/object:Gem::Version
26
- version: 1.28.3
26
+ version: 1.28.7
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: async-io
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - "~>"
32
32
  - !ruby/object:Gem::Version
33
- version: 1.30.1
33
+ version: 1.30.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - "~>"
39
39
  - !ruby/object:Gem::Version
40
- version: 1.30.1
40
+ version: 1.30.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: colorize
43
43
  requirement: !ruby/object:Gem::Requirement
@@ -67,19 +67,19 @@ dependencies:
67
67
  - !ruby/object:Gem::Version
68
68
  version: 1.0.1
69
69
  - !ruby/object:Gem::Dependency
70
- name: json_schemer
70
+ name: rsmp_schemer
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - "~>"
74
74
  - !ruby/object:Gem::Version
75
- version: 0.2.17
75
+ version: 0.2.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
80
  - - "~>"
81
81
  - !ruby/object:Gem::Version
82
- version: 0.2.17
82
+ version: 0.2.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: bundler
85
85
  requirement: !ruby/object:Gem::Requirement
@@ -197,7 +197,6 @@ files:
197
197
  - Rakefile
198
198
  - bin/console
199
199
  - bin/setup
200
- - config/site.yaml
201
200
  - config/supervisor.yaml
202
201
  - config/tlc.yaml
203
202
  - documentation/classes_and_modules.md
@@ -210,7 +209,11 @@ files:
210
209
  - lib/rsmp/collector.rb
211
210
  - lib/rsmp/component.rb
212
211
  - lib/rsmp/components.rb
212
+ - lib/rsmp/convert/export/json_schema.rb
213
+ - lib/rsmp/convert/import/yaml.rb
214
+ - lib/rsmp/deep_merge.rb
213
215
  - lib/rsmp/error.rb
216
+ - lib/rsmp/inspect.rb
214
217
  - lib/rsmp/listener.rb
215
218
  - lib/rsmp/logger.rb
216
219
  - lib/rsmp/logging.rb
@@ -227,109 +230,6 @@ files:
227
230
  - lib/rsmp/tlc.rb
228
231
  - lib/rsmp/version.rb
229
232
  - lib/rsmp/wait.rb
230
- - lib/rsmp_schema/schema/core/aggregated_status.json
231
- - lib/rsmp_schema/schema/core/alarm.json
232
- - lib/rsmp_schema/schema/core/command_request.json
233
- - lib/rsmp_schema/schema/core/command_response.json
234
- - lib/rsmp_schema/schema/core/core.json
235
- - lib/rsmp_schema/schema/core/definitions.json
236
- - lib/rsmp_schema/schema/core/message_ack.json
237
- - lib/rsmp_schema/schema/core/message_not_ack.json
238
- - lib/rsmp_schema/schema/core/rsmp.json
239
- - lib/rsmp_schema/schema/core/status.json
240
- - lib/rsmp_schema/schema/core/status_request.json
241
- - lib/rsmp_schema/schema/core/status_response.json
242
- - lib/rsmp_schema/schema/core/status_subscribe.json
243
- - lib/rsmp_schema/schema/core/status_unsubscribe.json
244
- - lib/rsmp_schema/schema/core/status_update.json
245
- - lib/rsmp_schema/schema/core/version.json
246
- - lib/rsmp_schema/schema/core/watchdog.json
247
- - lib/rsmp_schema/schema/tlc/alarms/A0001.json
248
- - lib/rsmp_schema/schema/tlc/alarms/A0002.json
249
- - lib/rsmp_schema/schema/tlc/alarms/A0003.json
250
- - lib/rsmp_schema/schema/tlc/alarms/A0004.json
251
- - lib/rsmp_schema/schema/tlc/alarms/A0005.json
252
- - lib/rsmp_schema/schema/tlc/alarms/A0006.json
253
- - lib/rsmp_schema/schema/tlc/alarms/A0007.json
254
- - lib/rsmp_schema/schema/tlc/alarms/A0008.json
255
- - lib/rsmp_schema/schema/tlc/alarms/A0009.json
256
- - lib/rsmp_schema/schema/tlc/alarms/A0101.json
257
- - lib/rsmp_schema/schema/tlc/alarms/A0201.json
258
- - lib/rsmp_schema/schema/tlc/alarms/A0202.json
259
- - lib/rsmp_schema/schema/tlc/alarms/A0301.json
260
- - lib/rsmp_schema/schema/tlc/alarms/A0302.json
261
- - lib/rsmp_schema/schema/tlc/alarms/alarms.json
262
- - lib/rsmp_schema/schema/tlc/commands/M0001.json
263
- - lib/rsmp_schema/schema/tlc/commands/M0002.json
264
- - lib/rsmp_schema/schema/tlc/commands/M0003.json
265
- - lib/rsmp_schema/schema/tlc/commands/M0004.json
266
- - lib/rsmp_schema/schema/tlc/commands/M0005.json
267
- - lib/rsmp_schema/schema/tlc/commands/M0006.json
268
- - lib/rsmp_schema/schema/tlc/commands/M0007.json
269
- - lib/rsmp_schema/schema/tlc/commands/M0008.json
270
- - lib/rsmp_schema/schema/tlc/commands/M0010.json
271
- - lib/rsmp_schema/schema/tlc/commands/M0011.json
272
- - lib/rsmp_schema/schema/tlc/commands/M0012.json
273
- - lib/rsmp_schema/schema/tlc/commands/M0013.json
274
- - lib/rsmp_schema/schema/tlc/commands/M0014.json
275
- - lib/rsmp_schema/schema/tlc/commands/M0015.json
276
- - lib/rsmp_schema/schema/tlc/commands/M0016.json
277
- - lib/rsmp_schema/schema/tlc/commands/M0017.json
278
- - lib/rsmp_schema/schema/tlc/commands/M0018.json
279
- - lib/rsmp_schema/schema/tlc/commands/M0019.json
280
- - lib/rsmp_schema/schema/tlc/commands/M0020.json
281
- - lib/rsmp_schema/schema/tlc/commands/M0021.json
282
- - lib/rsmp_schema/schema/tlc/commands/M0103.json
283
- - lib/rsmp_schema/schema/tlc/commands/M0104.json
284
- - lib/rsmp_schema/schema/tlc/commands/command_requests.json
285
- - lib/rsmp_schema/schema/tlc/commands/command_responses.json
286
- - lib/rsmp_schema/schema/tlc/commands/commands.json
287
- - lib/rsmp_schema/schema/tlc/statuses/S0001.json
288
- - lib/rsmp_schema/schema/tlc/statuses/S0002.json
289
- - lib/rsmp_schema/schema/tlc/statuses/S0003.json
290
- - lib/rsmp_schema/schema/tlc/statuses/S0004.json
291
- - lib/rsmp_schema/schema/tlc/statuses/S0005.json
292
- - lib/rsmp_schema/schema/tlc/statuses/S0006.json
293
- - lib/rsmp_schema/schema/tlc/statuses/S0007.json
294
- - lib/rsmp_schema/schema/tlc/statuses/S0008.json
295
- - lib/rsmp_schema/schema/tlc/statuses/S0009.json
296
- - lib/rsmp_schema/schema/tlc/statuses/S0010.json
297
- - lib/rsmp_schema/schema/tlc/statuses/S0011.json
298
- - lib/rsmp_schema/schema/tlc/statuses/S0012.json
299
- - lib/rsmp_schema/schema/tlc/statuses/S0013.json
300
- - lib/rsmp_schema/schema/tlc/statuses/S0014.json
301
- - lib/rsmp_schema/schema/tlc/statuses/S0015.json
302
- - lib/rsmp_schema/schema/tlc/statuses/S0016.json
303
- - lib/rsmp_schema/schema/tlc/statuses/S0017.json
304
- - lib/rsmp_schema/schema/tlc/statuses/S0018.json
305
- - lib/rsmp_schema/schema/tlc/statuses/S0019.json
306
- - lib/rsmp_schema/schema/tlc/statuses/S0020.json
307
- - lib/rsmp_schema/schema/tlc/statuses/S0021.json
308
- - lib/rsmp_schema/schema/tlc/statuses/S0022.json
309
- - lib/rsmp_schema/schema/tlc/statuses/S0023.json
310
- - lib/rsmp_schema/schema/tlc/statuses/S0024.json
311
- - lib/rsmp_schema/schema/tlc/statuses/S0025.json
312
- - lib/rsmp_schema/schema/tlc/statuses/S0026.json
313
- - lib/rsmp_schema/schema/tlc/statuses/S0027.json
314
- - lib/rsmp_schema/schema/tlc/statuses/S0028.json
315
- - lib/rsmp_schema/schema/tlc/statuses/S0029.json
316
- - lib/rsmp_schema/schema/tlc/statuses/S0030.json
317
- - lib/rsmp_schema/schema/tlc/statuses/S0031.json
318
- - lib/rsmp_schema/schema/tlc/statuses/S0091.json
319
- - lib/rsmp_schema/schema/tlc/statuses/S0092.json
320
- - lib/rsmp_schema/schema/tlc/statuses/S0095.json
321
- - lib/rsmp_schema/schema/tlc/statuses/S0096.json
322
- - lib/rsmp_schema/schema/tlc/statuses/S0097.json
323
- - lib/rsmp_schema/schema/tlc/statuses/S0201.json
324
- - lib/rsmp_schema/schema/tlc/statuses/S0202.json
325
- - lib/rsmp_schema/schema/tlc/statuses/S0203.json
326
- - lib/rsmp_schema/schema/tlc/statuses/S0204.json
327
- - lib/rsmp_schema/schema/tlc/statuses/S0205.json
328
- - lib/rsmp_schema/schema/tlc/statuses/S0206.json
329
- - lib/rsmp_schema/schema/tlc/statuses/S0207.json
330
- - lib/rsmp_schema/schema/tlc/statuses/S0208.json
331
- - lib/rsmp_schema/schema/tlc/statuses/statuses.json
332
- - lib/rsmp_schema/schema/tlc/sxl.json
333
233
  - rsmp.gemspec
334
234
  homepage: https://github.com/rsmp-nordic/rsmp
335
235
  licenses:
data/config/site.yaml DELETED
@@ -1,40 +0,0 @@
1
- site_id: RN+SI0001
2
- supervisors:
3
- - ip: 127.0.0.1
4
- port: 12111
5
-
6
- sxl: traffic_light_controller
7
-
8
- rsmp_versions:
9
- - 3.1.1
10
- - 3.1.2
11
- - 3.1.3
12
- - 3.1.4
13
-
14
- components:
15
- main:
16
- C1:
17
-
18
- watchdog_interval: 1
19
- watchdog_timeout: 2
20
- acknowledgement_timeout: 1
21
- command_response_timeout: 1
22
- status_response_timeout: 1
23
- status_update_timeout: 1
24
- reconnect_interval: 0.1
25
-
26
- log:
27
- active: true
28
- color: true
29
- timestamp: true
30
- id: true
31
- component: true
32
- ip: false
33
- site_id: true
34
- level: false
35
- text: true
36
- direction: true
37
- json: true
38
- acknowledgements: false
39
- watchdogs: false
40
-