cosmos 4.2.4-java → 4.3.0-java

data/spec/script/scripting_spec.rb

@@ -36,7 +36,7 @@ module Cosmos
     describe "play_wav_file" do
       it "plays a wav file if Qt is available" do
         module Qt
-          def self.execute_in_main_thread(bool); yield; end
+          def self.execute_in_main_thread(bool = true); yield; end
           class CoreApplication; def self.instance; true; end; end;
           class Sound; def self.isAvailable; true; end; end
         end
@@ -670,6 +670,7 @@ module Cosmos
         class ScriptRunnerFrame; def self.instance; true; end; end
         allow(ScriptRunnerFrame).to receive_message_chain(:instance, :pause?).and_return(true)
         expect(ScriptRunnerFrame).to receive_message_chain(:instance, :perform_pause)
+        expect(ScriptRunnerFrame).to receive_message_chain(:instance, :active_script_highlight)
         cosmos_script_sleep(0.1)
       end
     end

data/spec/script/tools_spec.rb

@@ -101,7 +101,6 @@ module Cosmos
         start_new_scriptrunner_message_log
         disable_instrumentation { }
         set_stdout_max_lines(1000)
-        insert_return
         step_mode
         run_mode
         show_backtrace

data/spec/tools/cmd_tlm_server/api_spec.rb

@@ -910,28 +910,34 @@ DOC
         @api.inject_tlm("INST","HEALTH_STATUS",{TEMP1: 0, TEMP2: 0, TEMP3: 0, TEMP4: 0}, :RAW)
 
         vals = @api.get_tlm_packet("INST","HEALTH_STATUS")
-        expect(vals[0][0]).to eql "RECEIVED_TIMESECONDS"
+        expect(vals[0][0]).to eql "PACKET_TIMESECONDS"
         expect(vals[0][1]).to be > 0
         expect(vals[0][2]).to be_nil
-        expect(vals[1][0]).to eql "RECEIVED_TIMEFORMATTED"
+        expect(vals[1][0]).to eql "PACKET_TIMEFORMATTED"
         expect(vals[1][1].split(' ')[0]).to eql Time.now.formatted.split(' ')[0]
         expect(vals[1][2]).to be_nil
-        expect(vals[2][0]).to eql "RECEIVED_COUNT"
+        expect(vals[2][0]).to eql "RECEIVED_TIMESECONDS"
         expect(vals[2][1]).to be > 0
         expect(vals[2][2]).to be_nil
+        expect(vals[3][0]).to eql "RECEIVED_TIMEFORMATTED"
+        expect(vals[3][1].split(' ')[0]).to eql Time.now.formatted.split(' ')[0]
+        expect(vals[3][2]).to be_nil
+        expect(vals[4][0]).to eql "RECEIVED_COUNT"
+        expect(vals[4][1]).to be > 0
+        expect(vals[4][2]).to be_nil
         # Spot check a few more
-        expect(vals[22][0]).to eql "TEMP1"
-        expect(vals[22][1]).to eql -100.0
-        expect(vals[22][2]).to eql :RED_LOW
-        expect(vals[23][0]).to eql "TEMP2"
-        expect(vals[23][1]).to eql -100.0
-        expect(vals[23][2]).to eql :RED_LOW
-        expect(vals[24][0]).to eql "TEMP3"
+        expect(vals[24][0]).to eql "TEMP1"
         expect(vals[24][1]).to eql -100.0
         expect(vals[24][2]).to eql :RED_LOW
-        expect(vals[25][0]).to eql "TEMP4"
+        expect(vals[25][0]).to eql "TEMP2"
         expect(vals[25][1]).to eql -100.0
         expect(vals[25][2]).to eql :RED_LOW
+        expect(vals[26][0]).to eql "TEMP3"
+        expect(vals[26][1]).to eql -100.0
+        expect(vals[26][2]).to eql :RED_LOW
+        expect(vals[27][0]).to eql "TEMP4"
+        expect(vals[27][1]).to eql -100.0
+        expect(vals[27][2]).to eql :RED_LOW
       end
     end
 
@@ -1067,16 +1073,18 @@ DOC
 
       it "returns all the items for a target/packet" do
         items = @api.get_tlm_item_list("INST","HEALTH_STATUS")
-        expect(items[0][0]).to eql "RECEIVED_TIMESECONDS"
-        expect(items[1][0]).to eql "RECEIVED_TIMEFORMATTED"
-        expect(items[2][0]).to eql "RECEIVED_COUNT"
+        expect(items[0][0]).to eql "PACKET_TIMESECONDS"
+        expect(items[1][0]).to eql "PACKET_TIMEFORMATTED"
+        expect(items[2][0]).to eql "RECEIVED_TIMESECONDS"
+        expect(items[3][0]).to eql "RECEIVED_TIMEFORMATTED"
+        expect(items[4][0]).to eql "RECEIVED_COUNT"
         # Spot check a few more
-        expect(items[22][0]).to eql "TEMP1"
-        expect(items[22][1]).to be_nil
-        expect(items[22][2]).to eql "Temperature #1"
-        expect(items[28][0]).to eql "COLLECT_TYPE"
-        expect(items[28][1]).to include("NORMAL"=>0, "SPECIAL"=>1)
-        expect(items[28][2]).to eql "Most recent collect type"
+        expect(items[24][0]).to eql "TEMP1"
+        expect(items[24][1]).to be_nil
+        expect(items[24][2]).to eql "Temperature #1"
+        expect(items[30][0]).to eql "COLLECT_TYPE"
+        expect(items[30][1]).to include("NORMAL"=>0, "SPECIAL"=>1)
+        expect(items[30][2]).to eql "Most recent collect type"
       end
     end
 

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -435,6 +435,39 @@ module Cosmos
         end
       end
 
+      context "with LOG_STORED" do
+        it "complains about too many parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CTSSPEC_INT cts_config_test_interface.rb"
+          tf.puts 'LOG_STORED PacketLogWriter TRUE'
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, /Too many parameters for LOG_STORED./)
+          tf.unlink
+        end
+
+        it "complains about unknown log writers" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CTSSPEC_INT cts_config_test_interface.rb"
+          tf.puts 'LOG_STORED MyLogWriter'
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, /Unknown packet log writer: MYLOGWRITER/)
+          tf.unlink
+        end
+
+        it "adds a packet log writer to the interface" do
+          tf = Tempfile.new('unittest')
+          tf.puts 'PACKET_LOG_WRITER MY_WRITER packet_log_writer.rb'
+          tf.puts "INTERFACE CTSSPEC_INT cts_config_test_interface.rb"
+          tf.puts 'LOG DEFAULT'
+          tf.puts 'LOG_STORED MY_WRITER'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          expect(config.interfaces['CTSSPEC_INT'].packet_log_writer_pairs.length).to eql 1
+          expect(config.interfaces['CTSSPEC_INT'].stored_packet_log_writer_pairs.length).to eql 1
+          tf.unlink
+        end
+      end
+
       context "with DONT_LOG" do
         it "complains about too many parameters" do
           tf = Tempfile.new('unittest')

data/spec/tools/cmd_tlm_server/commanding_spec.rb

@@ -67,7 +67,7 @@ module Cosmos
         expect(interfaces.all["MY_INT"].packet_log_writer_pairs[0].cmd_log_writer).to receive(:write)
 
         # Grab an existing packet
-        pkt = System.commands.packet('SYSTEM','STARTLOGGING')
+        pkt = System.commands.packet('SYSTEM','STARTLOGGING').clone
 
         count = System.targets['SYSTEM'].cmd_cnt
         cmd.send_command_to_target('SYSTEM', pkt)
@@ -77,6 +77,30 @@ module Cosmos
         tf.unlink
       end
 
+      it "sends already identified stored commands" do
+        tf = Tempfile.new('unittest')
+        tf.puts 'PACKET_LOG_WRITER MY_WRITER packet_log_writer.rb'
+        tf.puts 'INTERFACE MY_INT interface.rb'
+        tf.puts '  LOG_STORED MY_WRITER'
+        tf.close
+        config = CmdTlmServerConfig.new(tf.path)
+        cmd = Commanding.new(config)
+        interfaces = Interfaces.new(config)
+        interfaces.map_target("SYSTEM","MY_INT")
+        expect(interfaces.all["MY_INT"]).to receive(:write)
+        expect(interfaces.all["MY_INT"].stored_packet_log_writer_pairs[0].cmd_log_writer).to receive(:write)
+
+        # Grab an existing packet
+        pkt = System.commands.packet('SYSTEM','STARTLOGGING').clone
+        pkt.stored = true
+
+        count = System.targets['SYSTEM'].cmd_cnt
+        cmd.send_command_to_target('SYSTEM', pkt)
+        # Verify the SYSTEM STARTLOGGING packet has been updated
+        expect(System.commands.packet("SYSTEM","STARTLOGGING").buffer).to eql pkt.buffer
+        expect(System.targets['SYSTEM'].cmd_cnt).to eq count + 1
+        tf.unlink
+      end
 
       it "logs unknown commands" do
         Logger.level = Logger::DEBUG

data/spec/tools/cmd_tlm_server/interface_thread_spec.rb

@@ -41,6 +41,7 @@ module Cosmos
 
       allow(System).to receive_message_chain(:telemetry,:identify!).and_return(nil)
       allow(System).to receive_message_chain(:telemetry,:update!).and_return(@packet)
+      allow(System).to receive_message_chain(:telemetry,:identify_and_define_packet).and_return(@packet)
       targets = {'TGT'=>Target.new('TGT')}
       allow(System).to receive(:targets).and_return(targets)
     end
@@ -298,6 +299,20 @@ module Cosmos
         expect(running_threads.length).to eql(1)
       end
 
+      it "handles stored packet log writers" do
+        writer = double("LogWriter")
+        allow(writer).to receive_message_chain(:tlm_log_writer,:write)
+        @interface.stored_packet_log_writer_pairs = [writer]
+        @packet.stored = true
+        thread = InterfaceThread.new(@interface)
+        thread.start
+        sleep 0.1
+        expect(running_threads.length).to eql(2)
+        thread.stop
+        sleep 0.2
+        expect(running_threads.length).to eql(1)
+      end
+
     end
   end
 end

data/tasks/gemfile_stats.rake

@@ -27,8 +27,8 @@ task :gemfile_stats do
   # This is useful for testing to prevent server round trips
   #File.open("gemdata.marshall", 'w') {|file| file.write(Marshal.dump(get_latest_gem_data)) }
   gem_data = Marshal.load(File.read("gemdata.marshall"))
-
   #gem_data = get_latest_gem_data()
+
   # Convert all the date text into Ruby Dates
   gem_data.map! {|x| [Date.strptime(x[0], "%Y-%m"), x[1], x[2]]}
   # Sort first by date and then version number
@@ -68,7 +68,8 @@ task :gemfile_stats do
 
   # Reduce the number of labels due to overlap
   labels.each do |i, label|
-    labels[i] = '' if i % 2 == 0
+    # Increase the modulus value if you get an ArgumentError: no text to measure
+    labels[i] = '' if i % 4 != 0
   end
   g.labels = labels
   g.marker_font_size = 12

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.2.4
+  version: 4.3.0
 platform: java
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-05-16 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -771,6 +771,7 @@ files:
 - demo/config/data/vswitchon.gif
 - demo/config/system/system.txt
 - demo/config/system/system2.txt
+- demo/config/system/system_alt_ports.txt
 - demo/config/targets/DART/cmd_tlm/dart_cmds.txt
 - demo/config/targets/DART/cmd_tlm/dart_tlm.txt
 - demo/config/targets/DART/cmd_tlm_server.txt
@@ -837,6 +838,7 @@ files:
 - demo/config/tools/cmd_sequence/cmd_sequence.txt
 - demo/config/tools/cmd_tlm_server/cmd_tlm_server.txt
 - demo/config/tools/cmd_tlm_server/cmd_tlm_server2.txt
+- demo/config/tools/cmd_tlm_server/cmd_tlm_server_chain.txt
 - demo/config/tools/data_viewer/data_viewer.txt
 - demo/config/tools/example_application.css
 - demo/config/tools/handbook_creator/default_toc.xsl
@@ -907,6 +909,7 @@ files:
 - demo/outputs/tmp/README.txt
 - demo/procedures/cosmos_api_test.rb
 - demo/procedures/example_test.rb
+- demo/procedures/local_screen_example.rb
 - demo/procedures/plot_test.rb
 - demo/procedures/replay_test.rb
 - demo/procedures/run_example_test.rb
@@ -1272,6 +1275,8 @@ files:
 - lib/cosmos/conversions/conversion.rb
 - lib/cosmos/conversions/generic_conversion.rb
 - lib/cosmos/conversions/new_packet_log_conversion.rb
+- lib/cosmos/conversions/packet_time_formatted_conversion.rb
+- lib/cosmos/conversions/packet_time_seconds_conversion.rb
 - lib/cosmos/conversions/polynomial_conversion.rb
 - lib/cosmos/conversions/processor_conversion.rb
 - lib/cosmos/conversions/received_count_conversion.rb
@@ -1471,6 +1476,7 @@ files:
 - lib/cosmos/gui/text/completion_text_edit.rb
 - lib/cosmos/gui/text/ruby_editor.rb
 - lib/cosmos/gui/utilities/analyze_log.rb
+- lib/cosmos/gui/utilities/classification_banner.rb
 - lib/cosmos/gui/utilities/screenshot.rb
 - lib/cosmos/gui/utilities/script_module_gui.rb
 - lib/cosmos/gui/widgets/dart_frame.rb
@@ -1486,6 +1492,7 @@ files:
 - lib/cosmos/interfaces/protocols/burst_protocol.rb
 - lib/cosmos/interfaces/protocols/crc_protocol.rb
 - lib/cosmos/interfaces/protocols/fixed_protocol.rb
+- lib/cosmos/interfaces/protocols/ignore_packet_protocol.rb
 - lib/cosmos/interfaces/protocols/length_protocol.rb
 - lib/cosmos/interfaces/protocols/override_protocol.rb
 - lib/cosmos/interfaces/protocols/preidentified_protocol.rb
@@ -1671,6 +1678,7 @@ files:
 - lib/cosmos/tools/tlm_viewer/widgets/canvas_clickable.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvas_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvasdot_widget.rb
+- lib/cosmos/tools/tlm_viewer/widgets/canvasellipse_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvasimage_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvasimagevalue_widget.rb
 - lib/cosmos/tools/tlm_viewer/widgets/canvaslabel_widget.rb
@@ -1742,6 +1750,7 @@ files:
 - lib/cosmos/win32/excel.rb
 - lib/cosmos/win32/win32.rb
 - lib/cosmos/win32/win32_main.rb
+- make_gems.sh
 - roodi.yml
 - run_gui_tests.bat
 - spec/ccsds/ccsds_packet_spec.rb
@@ -1750,6 +1759,8 @@ files:
 - spec/conversions/conversion_spec.rb
 - spec/conversions/generic_conversion_spec.rb
 - spec/conversions/new_packet_log_conversion_spec.rb
+- spec/conversions/packet_time_formatted_conversion_spec.rb
+- spec/conversions/packet_time_seconds_conversion_spec.rb
 - spec/conversions/polynomial_conversion_spec.rb
 - spec/conversions/processor_conversion_spec.rb
 - spec/conversions/received_count_conversion_spec.rb
@@ -1802,6 +1813,7 @@ files:
 - spec/interfaces/protocols/burst_protocol_spec.rb
 - spec/interfaces/protocols/crc_protocol_spec.rb
 - spec/interfaces/protocols/fixed_protocol_spec.rb
+- spec/interfaces/protocols/ignore_packet_protocol_spec.rb
 - spec/interfaces/protocols/length_protocol_spec.rb
 - spec/interfaces/protocols/override_protocol_spec.rb
 - spec/interfaces/protocols/preidentified_protocol_spec.rb