cosmos 3.8.2 → 3.8.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Manifest.txt +5 -5
- data/Rakefile +8 -2
- data/autohotkey/tools/autohotkey.rb +3 -3
- data/data/crc.txt +27 -27
- data/demo/Launcher.bat +3 -3
- data/demo/config/data/crc.txt +27 -27
- data/demo/{procedures → config/targets/INST/procedures}/checks.rb +0 -0
- data/demo/{procedures → config/targets/INST/procedures}/collect.rb +2 -2
- data/demo/{procedures → config/targets/INST/procedures}/disconnect.rb +0 -0
- data/demo/{procedures/clear_util.rb → config/targets/INST/procedures/utilities/clear.rb} +0 -0
- data/demo/{procedures/collect_util.rb → config/targets/INST/procedures/utilities/collect.rb} +2 -2
- data/demo/config/targets/INST/screens/commanding.txt +3 -3
- data/demo/config/tools/table_manager/ExampleTableDefinition.txt +7 -7
- data/demo/procedures/plot_test.rb +1 -1
- data/demo/tools/CmdExtractor.bat +3 -3
- data/demo/tools/CmdSender.bat +3 -3
- data/demo/tools/CmdTlmServer.bat +3 -3
- data/demo/tools/DataViewer.bat +3 -3
- data/demo/tools/ExampleTarget.bat +3 -3
- data/demo/tools/HandbookCreator.bat +3 -3
- data/demo/tools/Launcher.bat +3 -3
- data/demo/tools/LimitsMonitor.bat +3 -3
- data/demo/tools/OpenGLBuilder.bat +3 -3
- data/demo/tools/PacketViewer.bat +3 -3
- data/demo/tools/Replay.bat +3 -3
- data/demo/tools/ScpiTarget.bat +3 -3
- data/demo/tools/ScriptRunner.bat +3 -3
- data/demo/tools/TableManager.bat +3 -3
- data/demo/tools/TestRunner.bat +3 -3
- data/demo/tools/TlmExtractor.bat +3 -3
- data/demo/tools/TlmGrapher.bat +3 -3
- data/demo/tools/TlmViewer.bat +3 -3
- data/demo/tools/ToolLaunch.bat +3 -6
- data/ext/cosmos/ext/packet/packet.c +10 -0
- data/install/config/data/crc.txt +17 -17
- data/install/tools/CmdExtractor.bat +3 -3
- data/install/tools/CmdSender.bat +3 -3
- data/install/tools/CmdTlmServer.bat +3 -3
- data/install/tools/DataViewer.bat +3 -3
- data/install/tools/HandbookCreator.bat +3 -3
- data/install/tools/Launcher.bat +3 -3
- data/install/tools/LimitsMonitor.bat +3 -3
- data/install/tools/OpenGLBuilder.bat +3 -3
- data/install/tools/PacketViewer.bat +3 -3
- data/install/tools/Replay.bat +3 -3
- data/install/tools/ScriptRunner.bat +3 -3
- data/install/tools/TableManager.bat +3 -3
- data/install/tools/TestRunner.bat +3 -3
- data/install/tools/TlmExtractor.bat +3 -3
- data/install/tools/TlmGrapher.bat +3 -3
- data/install/tools/TlmViewer.bat +3 -3
- data/install/tools/ToolLaunch.bat +3 -6
- data/lib/cosmos/config/config_parser.rb +10 -2
- data/lib/cosmos/gui/qt_tool.rb +6 -0
- data/lib/cosmos/gui/utilities/screenshot.rb +8 -0
- data/lib/cosmos/gui/utilities/script_module_gui.rb +37 -11
- data/lib/cosmos/interfaces/cmd_tlm_server_interface.rb +3 -3
- data/lib/cosmos/interfaces/udp_interface.rb +9 -2
- data/lib/cosmos/packet_logs/packet_log_reader.rb +1 -0
- data/lib/cosmos/packets/commands.rb +70 -74
- data/lib/cosmos/packets/packet.rb +14 -7
- data/lib/cosmos/script/scripting.rb +9 -7
- data/lib/cosmos/system/system.rb +4 -0
- data/lib/cosmos/system/target.rb +2 -0
- data/lib/cosmos/tools/cmd_tlm_server/api.rb +10 -10
- data/lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb +2 -2
- data/lib/cosmos/tools/cmd_tlm_server/interface_thread.rb +1 -1
- data/lib/cosmos/tools/packet_viewer/packet_viewer.rb +5 -15
- data/lib/cosmos/tools/script_runner/script_runner.rb +40 -21
- data/lib/cosmos/tools/table_manager/table.rb +2 -2
- data/lib/cosmos/tools/table_manager/table_config.rb +18 -10
- data/lib/cosmos/tools/table_manager/table_manager.rb +61 -59
- data/lib/cosmos/tools/table_manager/table_manager_core.rb +24 -56
- data/lib/cosmos/tools/test_runner/test_runner.rb +15 -10
- data/lib/cosmos/tools/tlm_viewer/widgets/checkbutton_widget.rb +9 -2
- data/lib/cosmos/tools/tlm_viewer/widgets/combobox_widget.rb +1 -1
- data/lib/cosmos/tools/tlm_viewer/widgets/radiobutton_widget.rb +9 -1
- data/lib/cosmos/top_level.rb +5 -5
- data/lib/cosmos/version.rb +4 -4
- data/spec/config/config_parser_spec.rb +40 -2
- data/spec/packet_logs/packet_log_reader_spec.rb +66 -2
- data/spec/packets/packet_spec.rb +27 -0
- data/spec/script/scripting_spec.rb +7 -2
- data/spec/spec_helper.rb +4 -5
- data/spec/system/system_spec.rb +18 -0
- metadata +7 -7
data/spec/spec_helper.rb
CHANGED
|
@@ -46,13 +46,12 @@ end
|
|
|
46
46
|
require 'rspec'
|
|
47
47
|
require 'ruby-prof'
|
|
48
48
|
require 'benchmark/ips'
|
|
49
|
-
require 'cosmos'
|
|
50
|
-
require 'cosmos/utilities/logger'
|
|
51
49
|
|
|
52
50
|
# Set the user path to our COSMOS configuration in the spec directory
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
51
|
+
ENV['COSMOS_USERPATH'] = File.join(File.dirname(File.expand_path(__FILE__)), 'install')
|
|
52
|
+
|
|
53
|
+
require 'cosmos'
|
|
54
|
+
require 'cosmos/utilities/logger'
|
|
56
55
|
|
|
57
56
|
DEFAULT_USERPATH = Cosmos::USERPATH
|
|
58
57
|
|
data/spec/system/system_spec.rb
CHANGED
|
@@ -291,6 +291,24 @@ module Cosmos
|
|
|
291
291
|
Dir.rmdir(File.join(@config_targets, 'XYZ'))
|
|
292
292
|
tf.unlink
|
|
293
293
|
end
|
|
294
|
+
|
|
295
|
+
it "ignores previous DECLARE_TARGET directories" do
|
|
296
|
+
tf = Tempfile.new('unittest')
|
|
297
|
+
tf.puts("DECLARE_TARGET ABC CBA")
|
|
298
|
+
tf.puts("AUTO_DECLARE_TARGETS")
|
|
299
|
+
tf.close
|
|
300
|
+
FileUtils.mkdir_p(File.join(@config_targets, 'ABC'))
|
|
301
|
+
FileUtils.mkdir_p(File.join(@config_targets, 'SYSTEM'))
|
|
302
|
+
FileUtils.mkdir_p(File.join(@config_targets, 'XYZ'))
|
|
303
|
+
System.instance.process_file(tf.path)
|
|
304
|
+
# Since Ruby 1.9+ uses ordered Hashes we can ask for the keys and
|
|
305
|
+
# SYSTEM should be last
|
|
306
|
+
expect(System.instance.targets.keys).to eql %w(CBA XYZ SYSTEM)
|
|
307
|
+
Dir.rmdir(File.join(@config_targets, 'ABC'))
|
|
308
|
+
Dir.rmdir(File.join(@config_targets, 'SYSTEM'))
|
|
309
|
+
Dir.rmdir(File.join(@config_targets, 'XYZ'))
|
|
310
|
+
tf.unlink
|
|
311
|
+
end
|
|
294
312
|
end
|
|
295
313
|
|
|
296
314
|
context "with DECLARE_TARGET" do
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cosmos
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.8.
|
|
4
|
+
version: 3.8.3
|
|
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: 2016-06
|
|
12
|
+
date: 2016-12-06 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: bundler
|
|
@@ -767,6 +767,11 @@ files:
|
|
|
767
767
|
- demo/config/targets/INST/doc/README.txt
|
|
768
768
|
- demo/config/targets/INST/lib/example_limits_response.rb
|
|
769
769
|
- demo/config/targets/INST/lib/sim_inst.rb
|
|
770
|
+
- demo/config/targets/INST/procedures/checks.rb
|
|
771
|
+
- demo/config/targets/INST/procedures/collect.rb
|
|
772
|
+
- demo/config/targets/INST/procedures/disconnect.rb
|
|
773
|
+
- demo/config/targets/INST/procedures/utilities/clear.rb
|
|
774
|
+
- demo/config/targets/INST/procedures/utilities/collect.rb
|
|
770
775
|
- demo/config/targets/INST/screens/adcs.txt
|
|
771
776
|
- demo/config/targets/INST/screens/array.txt
|
|
772
777
|
- demo/config/targets/INST/screens/block.txt
|
|
@@ -850,12 +855,7 @@ files:
|
|
|
850
855
|
- demo/outputs/saved_config/README.txt
|
|
851
856
|
- demo/outputs/tables/README.txt
|
|
852
857
|
- demo/outputs/tmp/README.txt
|
|
853
|
-
- demo/procedures/checks.rb
|
|
854
|
-
- demo/procedures/clear_util.rb
|
|
855
|
-
- demo/procedures/collect.rb
|
|
856
|
-
- demo/procedures/collect_util.rb
|
|
857
858
|
- demo/procedures/cosmos_api_test.rb
|
|
858
|
-
- demo/procedures/disconnect.rb
|
|
859
859
|
- demo/procedures/example_test.rb
|
|
860
860
|
- demo/procedures/plot_test.rb
|
|
861
861
|
- demo/procedures/run_example_test.rb
|