cosmos 4.2.3-java → 4.2.4-java

data/lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb

@@ -153,7 +153,7 @@ module Cosmos
             current_interface_or_router.name = interface_name
             @interfaces[interface_name] = current_interface_or_router
 
-          when 'LOG', 'DONT_LOG', 'TARGET', 'PROTOCOL'
+          when 'LOG', 'DONT_LOG', 'TARGET'
             raise parser.error("No current interface for #{keyword}") unless current_interface_or_router and current_type == :INTERFACE
 
             case keyword
@@ -183,22 +183,9 @@ module Cosmos
                 raise parser.error("Unknown target #{target_name} mapped to interface #{current_interface_or_router.name}")
               end
 
-            when 'PROTOCOL'
-              usage = "#{keyword} <READ WRITE READ_WRITE> <protocol filename or classname> <Protocol specific parameters>"
-              parser.verify_num_parameters(2, nil, usage)
-              unless %w(READ WRITE READ_WRITE).include? params[0].upcase
-                raise parser.error("Invalid protocol type: #{params[0]}", usage)
-              end
-              begin
-                klass = Cosmos.require_class(params[1])
-                current_interface_or_router.add_protocol(klass, params[2..-1], params[0].upcase.intern)
-              rescue LoadError, StandardError => error
-                raise parser.error(error.message, usage)
-              end
-
             end # end case keyword for all keywords that require a current interface
 
-          when 'DONT_CONNECT', 'DONT_RECONNECT', 'RECONNECT_DELAY', 'DISABLE_DISCONNECT', 'LOG_RAW', 'ROUTER_LOG_RAW', 'OPTION'
+          when 'DONT_CONNECT', 'DONT_RECONNECT', 'RECONNECT_DELAY', 'DISABLE_DISCONNECT', 'LOG_RAW', 'ROUTER_LOG_RAW', 'OPTION', 'PROTOCOL'
             raise parser.error("No current interface or router for #{keyword}") unless current_interface_or_router
 
             case keyword
@@ -228,6 +215,19 @@ module Cosmos
               parser.verify_num_parameters(2, nil, "#{keyword} <Option Name> <Option Value 1> <Option Value 2 (optional)> <etc>")
               current_interface_or_router.set_option(params[0], params[1..-1])
 
+            when 'PROTOCOL'
+              usage = "#{keyword} <READ WRITE READ_WRITE> <protocol filename or classname> <Protocol specific parameters>"
+              parser.verify_num_parameters(2, nil, usage)
+              unless %w(READ WRITE READ_WRITE).include? params[0].upcase
+                raise parser.error("Invalid protocol type: #{params[0]}", usage)
+              end
+              begin
+                klass = Cosmos.require_class(params[1])
+                current_interface_or_router.add_protocol(klass, params[2..-1], params[0].upcase.intern)
+              rescue LoadError, StandardError => error
+                raise parser.error(error.message, usage)
+              end
+
             end # end case keyword for all keywords that require a current interface or router
 
           when 'ROUTER'

data/lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb

@@ -218,7 +218,7 @@ module Cosmos
         average_request_time = CmdTlmServer.json_drb.average_request_time
         @api_table.item(0,4).setText(sprintf("%0.6f s", average_request_time))
         estimated_utilization = requests_per_second * average_request_time * 100.0
-        @api_table.item(0,5).setText(sprintf("%0.2f %", estimated_utilization))
+        @api_table.item(0,5).setText(sprintf("%0.2f %%", estimated_utilization))
       end
     end
 

data/lib/cosmos/tools/table_manager/table_manager.rb

@@ -164,6 +164,8 @@ module Cosmos
     attr_reader :core
     # @return [Qt::TabWidget] TabWidget which holds the table tabs
     attr_reader :tabbook
+    # @return [Qt::VBoxLayout] Top level vertical layout for the application
+    attr_reader :top_layout
 
     # @return [TableManager] Instance of the TableManager class
     def self.instance
@@ -402,7 +404,7 @@ module Cosmos
     def initialize_central_widget
       central_widget = Qt::Widget.new
       setCentralWidget(central_widget)
-      top_layout = Qt::VBoxLayout.new(central_widget)
+      @top_layout = Qt::VBoxLayout.new(central_widget)
 
       # Create the information pane with the filenames
       filename_layout = Qt::FormLayout.new
@@ -410,15 +412,15 @@ module Cosmos
       filename_layout.addRow(tr("Definition File:"), @table_def_label)
       @table_bin_label = Qt::Label.new("")
       filename_layout.addRow(tr("Binary File:"), @table_bin_label)
-      top_layout.addLayout(filename_layout)
+      @top_layout.addLayout(filename_layout)
 
       # Separator before editor
       sep1 = Qt::Frame.new(central_widget)
       sep1.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Sunken)
-      top_layout.addWidget(sep1)
+      @top_layout.addWidget(sep1)
 
       @tabbook = Qt::TabWidget.new
-      top_layout.addWidget(@tabbook)
+      @top_layout.addWidget(@tabbook)
 
       @check_icons = []
       @check_icons << Cosmos.get_icon("CheckBoxEmpty.gif")

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_dart_thread.rb

@@ -50,6 +50,7 @@ module Cosmos
           time_end = Time.now unless time_end
           progress_dialog.set_step_progress(0) if progress_dialog
           index = 0
+          query_string = ""
           required_queries.each do |target_name, packet_name, item_name, value_type, array_index, dart_reduction, dart_reduced_type|
             begin
               break if @cancel
@@ -87,7 +88,7 @@ module Cosmos
             rescue Exception => error
               @errors << error
               break if @cancel
-              progress_dialog.append_text("Error querying #{query_string} : #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n", 2) if progress_dialog
+              progress_dialog.append_text("Error querying #{query_string} : #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n") if progress_dialog
               # If a progress dialog is shown we can't just bail on this error or
               # it will close and the user will have no idea what happened
               # Thus we'll spin here waiting for them to close the dialog
@@ -96,8 +97,8 @@ module Cosmos
                 sleep(0.1) until progress_dialog.complete?
               end
               break # Bail out because something bad happened
-            end  
-            index += 1            
+            end
+            index += 1
           end
           progress_dialog.set_step_progress(1.0) if progress_dialog and not @cancel
           progress_dialog.set_overall_progress(0.5) if progress_dialog and not @cancel
@@ -118,7 +119,7 @@ module Cosmos
         rescue Exception => error
           @errors << error
           return if @cancel
-          progress_dialog.append_text("DART Thread Error #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n", 2) if progress_dialog
+          progress_dialog.append_text("DART Thread Error #{error.class}:#{error.message}\n#{error.backtrace.join("\n")}\n") if progress_dialog
           # If a progress dialog is shown we can't just bail on this error or
           # it will close and the user will have no idea what happened
           # Thus we'll spin here waiting for them to close the dialog

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_logfile_thread.rb

@@ -68,7 +68,7 @@ module Cosmos
             rescue Exception => error
               @errors << error
               break if @cancel
-              progress_dialog.append_text("Error processing #{log_file}:\n#{error.class} : #{error.message}\n#{error.backtrace.join("\n")}\n", 2) if progress_dialog
+              progress_dialog.append_text("Error processing #{log_file}:\n#{error.class} : #{error.message}\n#{error.backtrace.join("\n")}\n") if progress_dialog
               # If a progress dialog is shown we can't just bail on this error or
               # it will close and the user will have no idea what happened
               # Thus we'll spin here waiting for them to close the dialog

data/lib/cosmos/top_level.rb

@@ -113,7 +113,7 @@ module Cosmos
       # Last chance - Check environment
       if ENV['COSMOS_USERPATH']
         disable_warnings do
-          Cosmos.const_set(:USERPATH, ENV['COSMOS_USERPATH'])
+          Cosmos.const_set(:USERPATH, ENV['COSMOS_USERPATH'].gsub("\\", "/"))
         end
       else
         # Give up and assume we are in the tools directory

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.2.3'
+COSMOS_VERSION = '4.2.4'
 module Cosmos
   module Version
     MAJOR = '4'
     MINOR = '2'
-    PATCH = '3'
-    BUILD = '90c87a409582104777955b2fb791e79da5d04e28'
+    PATCH = '4'
+    BUILD = '4c60966285c2f7a5a050bfec88cb081b8662fac9'
   end
-  VERSION = '4.2.3'
+  VERSION = '4.2.4'
 end

data/spec/interfaces/serial_interface_spec.rb

@@ -45,11 +45,24 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
             i = SerialInterface.new('COM1','COM1','9600','NONE','1','0','0','burst')
             expect(i.connected?).to be false
             i.connect
+            expect(i.stream.instance_variable_get(:@flow_control)).to eq :NONE
+            expect(i.stream.instance_variable_get(:@data_bits)).to eq 8
             expect(i.connected?).to be true
             i.disconnect
             expect(i.connected?).to be false
           end
         end
+
+        it "sets options on the interface" do
+          if Kernel.is_windows? && !ENV['APPVEYOR']
+            i = SerialInterface.new('nil','COM1','9600','NONE','1','0','0','burst')
+            i.set_option("FLOW_CONTROL", ["RTSCTS"])
+            i.set_option("DATA_BITS", ["7"])
+            i.connect
+            expect(i.stream.instance_variable_get(:@flow_control)).to eq :RTSCTS
+            expect(i.stream.instance_variable_get(:@data_bits)).to eq 7
+          end
+        end
       end
     end
   end

data/spec/io/json_rpc_spec.rb

@@ -193,6 +193,13 @@ module Cosmos
         expect(request).to eq(JsonRpcRequest.from_hash(request.as_json))
       end
     end
+
+    describe "spaceship" do
+      it "returns nil for incompatible items" do
+        request = JsonRpcRequest.new("puts","test",10)
+        expect(request <=> Marshal).to be nil
+      end
+    end
   end
 
   describe JsonRpcResponse do

data/spec/io/win32_serial_driver_spec.rb

@@ -42,6 +42,14 @@ if RUBY_ENGINE == 'ruby' or Gem.win_platform?
           expect { Win32SerialDriver.new('COM1',9600,:NONE,2) }.to_not raise_error
           expect { Win32SerialDriver.new('COM1',9600,:NONE,3) }.to raise_error(ArgumentError, "Invalid stop bits: 3")
         end
+
+        it "supports 5-8 data bits" do
+          expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,5) }.to_not raise_error
+          expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,6) }.to_not raise_error
+          expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,7) }.to_not raise_error
+          expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,8) }.to_not raise_error
+          expect { Win32SerialDriver.new('COM1',9600,:NONE,1,10,nil,0.01,1000,:NONE,9) }.to raise_error(ArgumentError, "Invalid data bits: 9")
+        end
       end
 
       describe "close, closed?" do

data/spec/packets/structure_item_spec.rb

@@ -182,6 +182,12 @@ module Cosmos
         expect(si1 == si2).to be false
         expect(si1 > si2).to be false
       end
+
+      it "doesn't raise errors on comparing incompatible items" do
+        si1 = StructureItem.new("si1", 16, 8, :UINT, :BIG_ENDIAN, nil)
+        expect{ (si1 > 5) }.to raise_error(StandardError)
+        expect(si1 <=> 5).to be nil
+      end
     end
 
     describe "clone" do

data/spec/script/extract_spec.rb

@@ -151,6 +151,11 @@ module Cosmos
       it "should complain about trying to do an = comparison" do
         expect { extract_fields_from_check_text("TARGET PACKET ITEM = 5") }.to raise_error(/ERROR: Use/)
       end
+
+      it "should handle spaces throughout correctly" do
+        expect(extract_fields_from_check_text("TARGET PACKET ITEM == \"This   is  a test\"")).to eql(['TARGET', 'PACKET', 'ITEM', "== \"This   is  a test\""])
+        expect(extract_fields_from_check_text("TARGET   PACKET  ITEM   ==    'This is  a test   '")).to eql(['TARGET', 'PACKET', 'ITEM', "  ==    'This is  a test   '"])
+      end
     end
 
   end

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -633,6 +633,16 @@ module Cosmos
           expect(config.routers.keys).to eql %w(MY_ROUTER1 MY_ROUTER2)
           tf.unlink
         end
+
+        it "supports protocols" do
+          tf = Tempfile.new('unittest')
+          tf.puts 'ROUTER MY_ROUTER1 cts_config_test_interface.rb'
+          tf.puts '  PROTOCOL READ_WRITE OverrideProtocol'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          expect(config.routers.keys).to eql %w(MY_ROUTER1)
+          tf.unlink
+        end
       end
 
       context "with ROUTE" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.4
 platform: java
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -396,6 +396,7 @@ executables:
 - cstol_converter
 - xtce_converter
 - dart_import
+- dart_util
 extensions: []
 extra_rdoc_files: []
 files:
@@ -612,6 +613,7 @@ files:
 - bin/cosmos
 - bin/cstol_converter
 - bin/dart_import
+- bin/dart_util
 - bin/exchndl20-x64.dll
 - bin/exchndl20.dll
 - bin/exchndl21-x64.dll
@@ -769,6 +771,11 @@ files:
 - demo/config/data/vswitchon.gif
 - demo/config/system/system.txt
 - demo/config/system/system2.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
+- demo/config/targets/DART/screens/status.txt
+- demo/config/targets/DART/target.txt
 - demo/config/targets/EXAMPLE/cmd_tlm/example_cmds.txt
 - demo/config/targets/EXAMPLE/cmd_tlm/example_tlm.txt
 - demo/config/targets/EXAMPLE/cmd_tlm_server.txt
@@ -1302,7 +1309,6 @@ files:
 - lib/cosmos/dart/app/channels/application_cable/channel.rb
 - lib/cosmos/dart/app/channels/application_cable/connection.rb
 - lib/cosmos/dart/app/controllers/application_controller.rb
-- lib/cosmos/dart/app/helpers/application_helper.rb
 - lib/cosmos/dart/app/jobs/application_job.rb
 - lib/cosmos/dart/app/mailers/application_mailer.rb
 - lib/cosmos/dart/app/models/application_record.rb
@@ -1312,6 +1318,7 @@ files:
 - lib/cosmos/dart/app/models/packet_config.rb
 - lib/cosmos/dart/app/models/packet_log.rb
 - lib/cosmos/dart/app/models/packet_log_entry.rb
+- lib/cosmos/dart/app/models/status.rb
 - lib/cosmos/dart/app/models/system_config.rb
 - lib/cosmos/dart/app/models/target.rb
 - lib/cosmos/dart/app/views/layouts/application.html.erb
@@ -1369,6 +1376,11 @@ files:
 - lib/cosmos/dart/db/migrate/20170919210307_add_max_table_index_to_packet_configs.rb
 - lib/cosmos/dart/db/migrate/20171215225546_add_ready_to_packet_log_entries.rb
 - lib/cosmos/dart/db/migrate/20180116214338_add_index_for_ple_ready_to_packet_log_entries.rb
+- lib/cosmos/dart/db/migrate/20180423205644_create_statuses.rb
+- lib/cosmos/dart/db/migrate/20180425211340_add_decom_state_index.rb
+- lib/cosmos/dart/db/migrate/20180509204705_remove_indexes.rb
+- lib/cosmos/dart/db/migrate/20180510160002_remove_timestamps_from_ples.rb
+- lib/cosmos/dart/db/migrate/20180511194944_add_packet_log_id_to_tables.rb
 - lib/cosmos/dart/db/schema.rb
 - lib/cosmos/dart/db/seeds.rb
 - lib/cosmos/dart/examples/dart_decom_client.rb
@@ -1389,6 +1401,7 @@ files:
 - lib/cosmos/dart/processes/dart_ingester.rb
 - lib/cosmos/dart/processes/dart_reducer.rb
 - lib/cosmos/dart/processes/dart_stream_server.rb
+- lib/cosmos/dart/processes/dart_util.rb
 - lib/cosmos/dart/processes/dart_worker.rb
 - lib/cosmos/dart/spec/dart/dart_common_spec.rb
 - lib/cosmos/dart/spec/dart/dart_database_cleaner_spec.rb
@@ -1467,6 +1480,7 @@ files:
 - lib/cosmos/gui/widgets/realtime_button_bar.rb
 - lib/cosmos/interfaces.rb
 - lib/cosmos/interfaces/cmd_tlm_server_interface.rb
+- lib/cosmos/interfaces/dart_status_interface.rb
 - lib/cosmos/interfaces/interface.rb
 - lib/cosmos/interfaces/linc_interface.rb
 - lib/cosmos/interfaces/protocols/burst_protocol.rb

data/lib/cosmos/dart/app/helpers/application_helper.rb

@@ -1,2 +0,0 @@
-module ApplicationHelper
-end