cosmos 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03a5fb5559e97c328a048705f0e90a85f3655899
-  data.tar.gz: e3c8be6334821135b794171b088571c6dbb75062
+  metadata.gz: a73e644c741cdb4b6c8ee2bcc036cc82cb9156e2
+  data.tar.gz: 60c9ba5fd730651c722969b6a4609c72fde6cdf0
 SHA512:
-  metadata.gz: ce712ead10d1c094ca7e811705036e66e3c9b279059f91bae5b7c5e90ae4dfc15d95be6802a467dea693b1ff957b36182f89e742b0f22e7ad723ad83f26642ea
-  data.tar.gz: e8ce4d0a58e565a328c7d42cf821f86fdb26cc5a397ca7e3bb449c94e0f02b2aab6a93288e1342dc97d205a886f623453895ef3a6f05a024470f895efe38386b
+  metadata.gz: c6054c51d2b5d87f0e8932c5a70877b18b66783006082e34bfd853a9f48d5af634a5167b4c9503f6f4393f764a0d530977cd006d6151461ac17fe806ff47c2b7
+  data.tar.gz: 3e34446fe6492174c11f196be43c9528341713eb75b8834609da6d8594b7da371c771f1a9429a73569d3a34f3a2028b24e3a1096ccbf4423d2915421a6faf1ae

data/Manifest.txt

@@ -189,6 +189,7 @@ cosmos.gemspec
 data/COSMOS_64x64.bmp
 data/COSMOS_64x64.ico
 data/COSMOS_64x64.png
+data/COSMOS_Architecture.png
 data/CheckBoxCheck.gif
 data/CheckBoxEmpty.gif
 data/Earthmap1024x512.gif

data/README.md

@@ -10,6 +10,8 @@ So what can you use this for?  We use it to test about everything we create and
 
 After configuring COSMOS to talk to your hardware, you immediately can use the following 15 tools:
 
+![COSMOS Architecture](data/COSMOS_Architecture.png)
+
 1. **Command and Telemetry Server**
     * This is the heart of the realtime functionality within the Ball Aerospace COSMOS system.  It maintains realtime connections to each target in your system and is the single point for all outgoing commands and incoming telemetry packets.  By default, it logs all commands and telemetry sent/received for later review and analysis.  The Command and Telemetry Server also monitors limits on all telemetry packets received.
 

data/autohotkey/tools/script_runner.ahk

@@ -404,11 +404,7 @@ WinWaitActive Script Runner
 WinWaitActive Hazardous
 Sleep 500
 Send n
-WinWaitActive Script Runner
-WinWaitActive Pause or Stop
-Sleep 500
-Send {Enter} ; Pause
-WinWaitActive Script Runner
+WinWaitActive Script Runner ; Now paused since we said no
 Sleep 500
 Click 400 90 ; Go
 WinWaitActive Hazardous
@@ -419,6 +415,10 @@ WinWaitActive Hazardous
 Sleep 500
 Send {Enter}
 WinWaitActive Script Runner
+WinWaitActive Hazardous
+Sleep 500
+Send {Enter}
+WinWaitActive Script Runner
 Sleep 2000
 
 Send ^t ; Toggle Disconnect

data/data/crc.txt

@@ -18,7 +18,7 @@
 "lib/cosmos/conversions/polynomial_conversion.rb" 0xF6440F21
 "lib/cosmos/conversions/received_count_conversion.rb" 0xD61BEB37
 "lib/cosmos/utilities.rb" 0xBE9CEAF4
-"lib/cosmos/top_level.rb" 0x4306956B
+"lib/cosmos/top_level.rb" 0x1623E285
 "lib/cosmos/packet_logs/meta_packet_log_writer.rb" 0x860D1FD8
 "lib/cosmos/packet_logs/packet_log_writer.rb" 0x7C6FCFEC
 "lib/cosmos/packet_logs/packet_log_writer_pair.rb" 0xB4DCA156
@@ -53,7 +53,7 @@
 "lib/cosmos/gui/dialogs/tlm_details_dialog.rb" 0xCAD1848F
 "lib/cosmos/gui/dialogs/calendar_dialog.rb" 0x688D3D3B
 "lib/cosmos/gui/qt_tool.rb" 0x840EF801
-"lib/cosmos/gui/utilities/script_module_gui.rb" 0xBD605F5C
+"lib/cosmos/gui/utilities/script_module_gui.rb" 0x0FFA7712
 "lib/cosmos/gui/utilities/screenshot.rb" 0x65F75371
 "lib/cosmos/gui/widgets/full_text_search_line_edit.rb" 0x7AAF694C
 "lib/cosmos/gui/widgets/realtime_button_bar.rb" 0xEB0CE858
@@ -90,7 +90,7 @@
 "lib/cosmos/gui/choosers/combobox_chooser.rb" 0xAD5383D5
 "lib/cosmos/gui/choosers/float_chooser.rb" 0x23B2FA77
 "lib/cosmos/tools/script_runner/script_runner_config.rb" 0x1E46E8AA
-"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0x51512C6A
+"lib/cosmos/tools/script_runner/script_runner_frame.rb" 0xEF604AAE
 "lib/cosmos/tools/script_runner/script_runner.rb" 0x61FFB8A2
 "lib/cosmos/tools/script_runner/script_audit.rb" 0xC4543FBA
 "lib/cosmos/tools/cmd_extractor/cmd_extractor.rb" 0xEECB31B8
@@ -99,7 +99,7 @@
 "lib/cosmos/tools/data_viewer/data_viewer.rb" 0x0F59420B
 "lib/cosmos/tools/launcher/launcher_multitool.rb" 0x1020A3D0
 "lib/cosmos/tools/launcher/launcher_tool.rb" 0x0501F2F4
-"lib/cosmos/tools/launcher/launcher_config.rb" 0xFF0CB90A
+"lib/cosmos/tools/launcher/launcher_config.rb" 0x37573A87
 "lib/cosmos/tools/launcher/launcher.rb" 0x0FFB42EC
 "lib/cosmos/tools/replay/replay_server.rb" 0x307A7329
 "lib/cosmos/tools/replay/replay.rb" 0xB8521242
@@ -107,7 +107,7 @@
 "lib/cosmos/tools/tlm_extractor/tlm_extractor.rb" 0xC6B38C94
 "lib/cosmos/tools/tlm_extractor/tlm_extractor_config.rb" 0x7779DCEC
 "lib/cosmos/tools/tlm_extractor/text_item_chooser.rb" 0x587768C6
-"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0x167BC6BD
+"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_config.rb" 0xA1C38662
 "lib/cosmos/tools/cmd_tlm_server/api.rb" 0xB1819524
 "lib/cosmos/tools/cmd_tlm_server/connections.rb" 0x6657A0FB
 "lib/cosmos/tools/cmd_tlm_server/background_task.rb" 0x448A2191
@@ -123,8 +123,8 @@
 "lib/cosmos/tools/cmd_tlm_server/packet_logging.rb" 0x166BE402
 "lib/cosmos/tools/cmd_tlm_server/commanding.rb" 0xC7C76CD8
 "lib/cosmos/tools/cmd_tlm_server/interfaces.rb" 0x10BC320E
-"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x38ED08CB
-"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x138FCD7A
+"lib/cosmos/tools/cmd_tlm_server/interface_thread.rb" 0x5144683A
+"lib/cosmos/tools/cmd_tlm_server/cmd_tlm_server_gui.rb" 0x0542EE44
 "lib/cosmos/tools/limits_monitor/limits_monitor.rb" 0xF155D8CC
 "lib/cosmos/tools/packet_viewer/packet_viewer.rb" 0x12D1B643
 "lib/cosmos/tools/table_manager/table_manager.rb" 0x4FC4AE95
@@ -134,12 +134,12 @@
 "lib/cosmos/tools/table_manager/table_config.rb" 0x177F0B14
 "lib/cosmos/tools/opengl_builder/scene_config.rb" 0x15B59793
 "lib/cosmos/tools/opengl_builder/opengl_builder.rb" 0xB161B0F9
-"lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0x0D57B917
+"lib/cosmos/tools/cmd_sender/cmd_sender.rb" 0xDA26A1FB
 "lib/cosmos/tools/cmd_sender/cmd_sender_item_delegate.rb" 0x8297CC9D
 "lib/cosmos/tools/cmd_sender/cmd_sender_text_edit.rb" 0xB192AF6E
 "lib/cosmos/tools/test_runner/test_runner_chooser.rb" 0x182F00C6
 "lib/cosmos/tools/test_runner/results_writer.rb" 0xF8CF9306
-"lib/cosmos/tools/test_runner/test_runner.rb" 0x4165ADBC
+"lib/cosmos/tools/test_runner/test_runner.rb" 0x19B1D251
 "lib/cosmos/tools/test_runner/test.rb" 0xD2BE7F1C
 "lib/cosmos/tools/tlm_grapher/plots/xy_plot.rb" 0x98F7712F
 "lib/cosmos/tools/tlm_grapher/plots/singlexy_plot.rb" 0xA01649EC
@@ -234,7 +234,7 @@
 "lib/cosmos/tools/tlm_viewer/tlm_viewer.rb" 0x03D59CCB
 "lib/cosmos/system.rb" 0x735DFB42
 "lib/cosmos/conversions.rb" 0x43679D05
-"lib/cosmos/version.rb" 0x3FF1E990
+"lib/cosmos/version.rb" 0x50C04271
 "lib/cosmos/core_ext.rb" 0x1951B346
 "lib/cosmos/interfaces.rb" 0x7E3EA326
 "lib/cosmos/processors.rb" 0x5241327D
@@ -246,8 +246,8 @@
 "lib/cosmos/streams/serial_stream.rb" 0x9F0BBA1D
 "lib/cosmos/streams/stream_protocol.rb" 0x5EA23890
 "lib/cosmos/streams/fixed_stream_protocol.rb" 0x5F6F224B
-"lib/cosmos/streams/tcpip_client_stream.rb" 0x974ED23F
-"lib/cosmos/streams/tcpip_socket_stream.rb" 0xD635732F
+"lib/cosmos/streams/tcpip_client_stream.rb" 0xA644ADBA
+"lib/cosmos/streams/tcpip_socket_stream.rb" 0xA6A94616
 "lib/cosmos/streams/preidentified_stream_protocol.rb" 0xC258238E
 "lib/cosmos/script.rb" 0x25BB611B
 "lib/cosmos/config/config_parser.rb" 0x89526FF1
@@ -277,16 +277,16 @@
 "lib/cosmos/processors/watermark_processor.rb" 0xDADF4580
 "lib/cosmos/io/stdout.rb" 0xAC9CC4B1
 "lib/cosmos/io/buffered_file.rb" 0x70A3B880
-"lib/cosmos/io/json_drb_object.rb" 0xD48FA273
+"lib/cosmos/io/json_drb_object.rb" 0x58BE861D
 "lib/cosmos/io/cosmos_snmp.rb" 0x64541158
 "lib/cosmos/io/json_rpc.rb" 0x8EAA13F8
-"lib/cosmos/io/tcpip_server.rb" 0xAB7A0F48
+"lib/cosmos/io/tcpip_server.rb" 0xBAA24660
 "lib/cosmos/io/posix_serial_driver.rb" 0x6DD5B8B4
 "lib/cosmos/io/udp_sockets.rb" 0xB1B138CD
 "lib/cosmos/io/serial_driver.rb" 0x9A2515F4
 "lib/cosmos/io/raw_logger_pair.rb" 0x7A0A3F00
 "lib/cosmos/io/raw_logger.rb" 0x42BC42CC
-"lib/cosmos/io/json_drb.rb" 0xEF9BDF14
+"lib/cosmos/io/json_drb.rb" 0x00FC5705
 "lib/cosmos/io/stderr.rb" 0x401624AF
 "lib/cosmos/io/io_multiplexer.rb" 0xD183938D
 "lib/cosmos/io/win32_serial_driver.rb" 0xA7E055CA
@@ -297,9 +297,9 @@
 "lib/cosmos/interfaces/simulated_target_interface.rb" 0x15DC496F
 "lib/cosmos/interfaces/serial_interface.rb" 0xC376DDA0
 "lib/cosmos/interfaces/tcpip_client_interface.rb" 0x5F0DB50D
-"lib/cosmos/interfaces/udp_interface.rb" 0xA991C213
+"lib/cosmos/interfaces/udp_interface.rb" 0xCE4532AD
 "lib/cosmos/interfaces/tcpip_server_interface.rb" 0xC8F6E908
-"lib/cosmos/script/script.rb" 0x139256FE
+"lib/cosmos/script/script.rb" 0x2F64B04D
 "lib/cosmos/script/extract.rb" 0xF3243476
 "lib/cosmos/core_ext/range.rb" 0x0D55D9D1
 "lib/cosmos/core_ext/stringio.rb" 0x28B64FB4

data/lib/cosmos/gui/utilities/script_module_gui.rb

@@ -21,8 +21,15 @@ module Cosmos
 
     @@qt_boolean = Qt::Boolean.new
 
-    def ask_string(question, allow_blank = false, password = false)
-      answer = ""
+    def ask_string(question, blank_or_default = false, password = false)
+      answer = ''
+      if blank_or_default != true && blank_or_default != false
+        default = blank_or_default.to_s
+        allow_blank = false
+      else
+        default = ''
+        allow_blank = blank_or_default
+      end
       loop do
         canceled = false
         Qt.execute_in_main_thread(true, 0.05) do
@@ -30,9 +37,9 @@ module Cosmos
           window = get_cmd_tlm_gui_window() if get_cmd_tlm_gui_window()
           # Create a special mutable QT variable that can return what button was pressed
           if password
-            answer = Qt::InputDialog::getText(window, "Ask", question, Qt::LineEdit::Password, "", @@qt_boolean)
+            answer = Qt::InputDialog::getText(window, "Ask", question, Qt::LineEdit::Password, default, @@qt_boolean)
           else
-            answer = Qt::InputDialog::getText(window, "Ask", question, Qt::LineEdit::Normal, "", @@qt_boolean)
+            answer = Qt::InputDialog::getText(window, "Ask", question, Qt::LineEdit::Normal, default, @@qt_boolean)
           end
           # @@qt_boolean is nil if the user presses cancel in the dialog
           # Note that it is not actually nil, just the nil? method returns true
@@ -86,42 +93,7 @@ module Cosmos
     end
 
     def prompt_for_script_abort
-      result = nil
-      Qt.execute_in_main_thread(true, 0.05) do
-        window = nil
-        window = get_cmd_tlm_gui_window() if get_cmd_tlm_gui_window()
-        dialog = Qt::Dialog.new(window, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
-        dialog.window_title = "Pause or Stop"
-        dialog_layout = Qt::VBoxLayout.new
-        dialog_layout.addWidget(Qt::Label.new('Pause or Stop Script?'))
-        pause = Qt::PushButton.new("Pause")
-        button_layout = Qt::HBoxLayout.new
-        pause.connect(SIGNAL('clicked()')) do
-          dialog.reject()
-        end
-        button_layout.addWidget(pause)
-        stop = Qt::PushButton.new("Stop")
-        stop.connect(SIGNAL('clicked()')) do
-          dialog.accept()
-        end
-        button_layout.addWidget(stop)
-        dialog_layout.addLayout(button_layout)
-
-        dialog.setLayout(dialog_layout)
-        dialog.raise
-        if dialog.exec == Qt::Dialog::Accepted
-          Logger.info "User pressed 'Stop'"
-          result = 'stop'
-        else
-          Logger.info "User pressed 'Pause'"
-          result = 'pause'
-        end
-        dialog.dispose
-      end
-      raise StopScript if result == 'stop'
-      if result == 'pause' &&  defined? ScriptRunnerFrame
-        ScriptRunnerFrame.instance.perform_pause
-      end
+      return true # Aborted - Don't retry
     end
 
     def prompt_to_continue(string)
@@ -157,6 +129,7 @@ module Cosmos
           window = nil
           window = get_cmd_tlm_gui_window() if get_cmd_tlm_gui_window()
           msg = Qt::MessageBox.new(window)
+
           msg.setText(string)
           msg.setWindowTitle("Message Box")
           buttons.each {|text| msg.addButton(text, Qt::MessageBox::AcceptRole)}

data/lib/cosmos/interfaces/udp_interface.rb

@@ -91,22 +91,10 @@ module Cosmos
 
     # Close the active ports (read and/or write) and set the sockets to nil.
     def disconnect
-      begin
-        if @write_socket
-          @write_socket.close unless @write_socket.closed?
-          @write_socket = nil
-        end
-      rescue IOError
-        @write_socket = nil
-      end
-      begin
-        if @read_socket
-          @read_socket.close unless @read_socket.closed?
-          @read_socket = nil
-        end
-      rescue IOError
-        @read_socket = nil
-      end
+      Cosmos.close_socket(@write_socket)
+      @write_socket = nil
+      Cosmos.close_socket(@read_socket)
+      @read_socket = nil
     end
 
     # If the read port was given, the read_socket is read and the data returned

data/lib/cosmos/io/json_drb.rb

@@ -55,7 +55,7 @@ module Cosmos
     def stop_service
       Cosmos.kill_thread(self, @thread)
       @thread = nil
-      @listen_socket.close if @listen_socket and !@listen_socket.closed?
+      Cosmos.close_socket(@listen_socket)
       @listen_socket = nil
     end
 
@@ -116,7 +116,7 @@ module Cosmos
               end
 
               if @acl and !@acl.allow_socket?(socket)
-                socket.close
+                Cosmos.close_socket(socket)
                 next
               end
               # Create new thread for new connection
@@ -270,7 +270,7 @@ module Cosmos
               break unless process_request(request_data, my_socket, start_time)
             else
               # Socket was closed by client
-              my_socket.close unless my_socket.closed?
+              Cosmos.close_socket(my_socket)
               break
             end
           end

data/lib/cosmos/io/json_drb_object.rb

@@ -57,8 +57,7 @@ module Cosmos
 
     # Disconnects from the JSON server
     def disconnect
-      socket = @socket
-      socket.close if socket and !socket.closed?
+      Cosmos.close_socket(@socket)
     end
 
     # Permanently disconnects from the JSON server
@@ -92,7 +91,7 @@ module Cosmos
             rescue IO::WaitWritable
               begin
                 _, sockets, _ = IO.select(nil, [@socket], nil, @connect_timeout) # wait 3-way handshake completion
-              rescue Errno::ENOTSOCK
+              rescue IOError, Errno::ENOTSOCK
                 disconnect()
                 @socket = nil
                 raise "Connect canceled"
@@ -100,13 +99,23 @@ module Cosmos
               if sockets and !sockets.empty?
                 begin
                   @socket.connect_nonblock(addr) # check connection failure
-                rescue Errno::EISCONN
+                rescue IOError, Errno::ENOTSOCK
+                  disconnect()
+                  @socket = nil
+                  raise "Connect canceled"
+                rescue Errno::EINPROGRESS
+                  retry
+                rescue Errno::EISCONN, Errno::EALREADY
                 end
               else
                 disconnect()
                 @socket = nil
                 raise "Connect timeout"
               end
+            rescue IOError, Errno::ENOTSOCK
+              disconnect()
+              @socket = nil
+              raise "Connect canceled"
             end
           rescue => e
             raise DRb::DRbConnError, e.message

data/lib/cosmos/io/tcpip_server.rb

@@ -187,7 +187,7 @@ module Cosmos
       # Shutdown Listen Socket(s)
       @listen_sockets.each do |listen_socket|
         begin
-          listen_socket.close unless listen_socket.closed?
+          Cosmos.close_socket(listen_socket)
         rescue IOError
           # Ok may have been closed by the thread
         end
@@ -374,9 +374,7 @@ module Cosmos
         addr = ["AF_INET", 10, "lc630", host_ip.to_s]
         if not System.instance.acl.allow_addr?(addr)
           # Reject connection
-          if not socket.closed?
-            socket.close()
-          end
+          Cosmos.close_socket(socket)
           Logger.instance.info "Tcpip server rejected connection from #{hostname}(#{host_ip}):#{port}"
           return
         end

data/lib/cosmos/script/script.rb

@@ -54,8 +54,7 @@ module Cosmos
             $cmd_tlm_server.cmd_no_hazardous_check(*args)
           Logger.info build_cmd_output_string(target_name, cmd_name, cmd_params)
         else
-          Logger.warn "Hazardous command not sent"
-          prompt_for_script_abort
+          retry unless prompt_for_script_abort()
         end
       end
     end
@@ -79,8 +78,7 @@ module Cosmos
           Logger.warn "Command #{target_name} #{cmd_name} being sent ignoring range checks"
           Logger.info build_cmd_output_string(target_name, cmd_name, cmd_params)
         else
-          Logger.warn "Hazardous command not sent"
-          prompt_for_script_abort
+          retry unless prompt_for_script_abort()
         end
       end
     end
@@ -126,8 +124,7 @@ module Cosmos
             $cmd_tlm_server.cmd_raw_no_hazardous_check(*args)
           Logger.info build_cmd_output_string(target_name, cmd_name, cmd_params, true)
         else
-          Logger.warn "Hazardous command not sent"
-          prompt_for_script_abort
+          retry unless prompt_for_script_abort()
         end
       end
     end
@@ -151,8 +148,7 @@ module Cosmos
           Logger.warn "Command #{target_name} #{cmd_name} being sent ignoring range checks"
           Logger.info build_cmd_output_string(target_name, cmd_name, cmd_params, true)
         else
-          Logger.warn "Hazardous command not sent"
-          prompt_for_script_abort
+          retry unless prompt_for_script_abort()
         end
       end
     end
@@ -438,19 +434,27 @@ module Cosmos
       script_runner.script_set_status(message) if script_runner
     end
 
-    def ask_string(question, allow_blank = false, password = false)
+    def ask_string(question, blank_or_default = false, password = false)
       answer = ''
+      default = ''
+      if blank_or_default != true && blank_or_default != false
+        question << " (default = #{blank_or_default})"
+        allow_blank = true
+      else
+        allow_blank = blank_or_default
+      end
       while answer.empty?
         print question + " "
         answer = gets
         answer.chomp!
         break if allow_blank
       end
+      answer = default if answer.empty? and !default.empty?
       return answer
     end
 
-    def ask(question, allow_blank = false, password = false)
-      string = ask_string(question, allow_blank, password)
+    def ask(question, blank_or_default = false, password = false)
+      string = ask_string(question, blank_or_default, password)
       value = string.convert_to_value
       return value
     end
@@ -1454,7 +1458,7 @@ module Cosmos
       if answer.downcase == 'y'
         exit
       else
-        return false
+        return false # Not aborted - Retry
       end
     end
 

data/lib/cosmos/streams/tcpip_client_stream.rb

@@ -88,17 +88,23 @@ module Cosmos
       rescue IO::WaitWritable
         begin
           _, sockets, _ = IO.select(nil, [socket], nil, @connect_timeout) # wait 3-way handshake completion
-        rescue Errno::ENOTSOCK
+        rescue IOError, Errno::ENOTSOCK
           raise "Connect canceled"
         end
         if sockets and !sockets.empty?
           begin
             socket.connect_nonblock(addr) # check connection failure
-          rescue Errno::EISCONN
+          rescue IOError, Errno::ENOTSOCK
+            raise "Connect canceled"
+          rescue Errno::EINPROGRESS
+            retry
+          rescue Errno::EISCONN, Errno::EALREADY
           end
         else
           raise "Connect timeout"
         end
+      rescue IOError, Errno::ENOTSOCK
+        raise "Connect canceled"
       end
     end
 

data/lib/cosmos/streams/tcpip_socket_stream.rb

@@ -66,7 +66,7 @@ module Cosmos
           # These can happen with the socket being closed while waiting on select
           data = ''
         end
-      rescue Errno::ECONNRESET, Errno::ECONNABORTED
+      rescue Errno::ECONNRESET, Errno::ECONNABORTED, IOError, Errno::ENOTSOCK
         data = ''
       end
 
@@ -132,8 +132,8 @@ module Cosmos
 
     # Disconnect by closing the sockets
     def disconnect
-      @write_socket.close if @write_socket and !@write_socket.closed?
-      @read_socket.close if @read_socket and !@read_socket.closed?
+      Cosmos.close_socket(@write_socket)
+      Cosmos.close_socket(@read_socket)
       @connected = false
     end
 

data/lib/cosmos/tools/cmd_sender/cmd_sender.rb

@@ -28,6 +28,7 @@ module Cosmos
       def prompt_for_script_abort
         window = get_cmd_tlm_gui_window()
         window.statusBar.showMessage(tr("Hazardous command not sent"))
+        return true # Aborted - Don't retry
       end
     end #module Script
   end

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

@@ -120,6 +120,8 @@ module Cosmos
           when 'INTERFACE'
             usage = "INTERFACE <Name> <Filename> <Specific Parameters>"
             parser.verify_num_parameters(2, nil, usage)
+            interface_name = params[0].upcase
+            raise parser.error("Interface '#{interface_name}' defined twice") if @interfaces[interface_name]
             interface_class = Cosmos.require_class(params[1])
             if params[2]
               current_interface_or_router = interface_class.new(*params[2..-1])
@@ -129,8 +131,8 @@ module Cosmos
             current_type = :INTERFACE
             current_interface_log_added = false
             current_interface_or_router.packet_log_writer_pairs << @packet_log_writer_pairs['DEFAULT']
-            current_interface_or_router.name = params[0].upcase
-            @interfaces[params[0].upcase] = current_interface_or_router
+            current_interface_or_router.name = interface_name
+            @interfaces[interface_name] = current_interface_or_router
 
           when 'LOG', 'DONT_LOG', 'TARGET'
             raise parser.error("No current interface for #{keyword}") unless current_interface_or_router and current_type == :INTERFACE
@@ -197,6 +199,8 @@ module Cosmos
           when 'ROUTER'
             usage = "ROUTER <Name> <Filename> <Specific Parameters>"
             parser.verify_num_parameters(2, nil, usage)
+            router_name = params[0].upcase
+            raise parser.error("Router '#{router_name}' defined twice") if @routers[router_name]
             router_class = Cosmos.require_class(params[1])
             if params[2]
               current_interface_or_router = router_class.new(*params[2..-1])
@@ -204,8 +208,8 @@ module Cosmos
               current_interface_or_router = router_class.new
             end
             current_type = :ROUTER
-            current_interface_or_router.name = params[0].upcase
-            @routers[params[0].upcase] = current_interface_or_router
+            current_interface_or_router.name = router_name
+            @routers[router_name] = current_interface_or_router
 
           when 'ROUTE'
             raise parser.error("No current router for #{keyword}") unless current_interface_or_router and current_type == :ROUTER

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

@@ -58,6 +58,7 @@ module Cosmos
       @no_prompt = options.no_prompt
       @message_log = nil
       @output_sleeper = Sleeper.new
+      @first_output = 0
       @interfaces_tab = InterfacesTab.new
       @targets_tab = TargetsTab.new
       @packets_tab = PacketsTab.new(self)
@@ -192,6 +193,7 @@ module Cosmos
     def kill_tab_thread
       @tab_sleeper ||= nil
       @tab_sleeper.cancel if @tab_sleeper
+      Qt::CoreApplication.instance.processEvents
       Cosmos.kill_thread(self, @tab_thread)
       @tab_thread = nil
     end
@@ -296,6 +298,12 @@ module Cosmos
           @string_output.string = @string_output.string[string.length..-1]
           string.each_line {|out_line| @output.add_formatted_text(out_line); lines_to_write += out_line }
           @output.flush
+          if @first_output < 2
+            # Scroll to the bottom on the first two outputs for Linux
+            # Otherwise it does not stay at the bottom
+            @output.verticalScrollBar.value = @output.verticalScrollBar.maximum
+            @first_output += 1
+          end
           @message_log.write(lines_to_write)
         end
       end

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

@@ -44,6 +44,8 @@ module Cosmos
       @fatal_exception_callback = nil
       @thread = nil
       @thread_sleeper = Sleeper.new
+      @connection_failed_messages = []
+      @connection_lost_messages = []
     end
 
     # Create and start the Ruby thread that will encapsulate the interface.
@@ -183,15 +185,19 @@ module Cosmos
       if @connection_failed_callback
         @connection_failed_callback.call(connect_error)
       else
-        Logger.error "#{@interface.name} Connection Failed: #{connect_error.class}:#{connect_error.message}"
+        Logger.error "#{@interface.name} Connection Failed: #{connect_error.formatted(false, false)}"
         case connect_error
-        when Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENOTSOCK
+        when Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENOTSOCK, Errno::EHOSTUNREACH
           # Do not write an exception file for these extremely common cases
         else
           if RuntimeError === connect_error and (connect_error.message =~ /canceled/ or connect_error.message =~ /timeout/)
             # Do not write an exception file for these extremely common cases
           else
-            Cosmos.write_exception_file(connect_error)
+            Logger.error connect_error.formatted
+            unless @connection_failed_messages.include?(connect_error.message)
+              Cosmos.write_exception_file(connect_error)
+              @connection_failed_messages << connect_error.message
+            end
           end
         end
       end
@@ -202,16 +208,20 @@ module Cosmos
       if @connection_lost_callback
         @connection_lost_callback.call(err)
       else
-        Logger.info "Connection Lost for #{@interface.name}"
         if err
+          Logger.info "Connection Lost for #{@interface.name}: #{err.formatted(false, false)}"
           case err
           when Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EBADF
             # Do not write an exception file for these extremely common cases
-            Logger.error err.formatted(false, false)
           else
-            Cosmos.write_exception_file(err)
             Logger.error err.formatted
+            unless @connection_lost_messages.include?(err.message)
+              Cosmos.write_exception_file(err)
+              @connection_lost_messages << err.message
+            end
           end
+        else
+          Logger.info "Connection Lost for #{@interface.name}"
         end
       end
       disconnect()

data/lib/cosmos/tools/launcher/launcher_config.rb

@@ -169,6 +169,13 @@ module Cosmos
         # Nothing to do if they aren't using our keywords
         formatted_command = shell_command
       end
+      if Kernel.is_windows?
+        rubyw_sub = 'rubyw'
+      else
+        rubyw_sub = 'ruby'
+      end
+
+      formatted_command.gsub!('RUBYW', rubyw_sub)
       formatted_command
     end
 
@@ -191,14 +198,6 @@ module Cosmos
       else
         formatted = "gnome-terminal -e \"ruby tools/#{split[1]} #{split[2..-1].join(' ')}\""
       end
-
-      if Kernel.is_windows?
-        rubyw_sub = 'rubyw'
-      else
-        rubyw_sub = 'ruby'
-      end
-
-      formatted.gsub!('RUBYW', rubyw_sub)
       formatted
     end
 

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -25,6 +25,15 @@ require 'cosmos/io/stderr'
 
 module Cosmos
 
+  Cosmos.disable_warnings do
+    module Script
+      def prompt_for_script_abort
+        ScriptRunnerFrame.instance.perform_pause
+        return false # Not aborted - Retry
+      end
+    end
+  end
+
   class ScriptRunnerDialog < Qt::Dialog
     attr_reader :script_runner_frame
 

data/lib/cosmos/tools/test_runner/test_runner.rb

@@ -428,11 +428,15 @@ module Cosmos
 
       # TODO: This can take a while depending on the number of tests and their
       # complexity. Consider making a progress bar for this.
-      require_utilities()
-      handle_check_buttons()
-      @script_runner_frame.stop_message_log
-      yield
-      @script_runner_frame.run
+      begin
+        require_utilities()
+        handle_check_buttons()
+        @script_runner_frame.stop_message_log
+        yield
+        @script_runner_frame.run
+      rescue Exception => error
+        ExceptionDialog.new(self, error, "Error starting test", false)
+      end
     end
 
     def handle_start(test_suite, test = nil, test_case = nil)

data/lib/cosmos/top_level.rb

@@ -16,6 +16,7 @@ require 'open3'
 require 'cosmos/core_ext'
 require 'cosmos/version'
 require 'cosmos/utilities/logger'
+require 'socket'
 
 # If a hazardous command is sent through the {Cosmos::Api} this error is raised.
 # {Cosmos::Script} rescues the error and prompts the user to continue.
@@ -642,7 +643,7 @@ module Cosmos
       end
       if thread.alive?
         # Graceful failed
-        Logger.warn "Failed to gracefully kill thread:\n  #{thread.backtrace.join("\n  ")}\n"
+        Logger.warn "Failed to gracefully kill thread:\n  Caller Backtrace:\n  #{caller().join("\n  ")}\n  \n  Thread Backtrace:\n  #{thread.backtrace.join("\n  ")}\n\n"
         thread.kill
         end_time = Time.now + hard_timeout
         while thread.alive? && ((end_time - Time.now) > 0)
@@ -655,4 +656,25 @@ module Cosmos
     end
   end
 
+  # Close a socket in a manner that ensures that any reads blocked in select
+  # will unblock across platforms
+  # @param socket The socket to close
+  def self.close_socket(socket)
+    if socket
+      # Calling shutdown and then sleep seems to be required
+      # to get select to reliably unblock on linux
+      begin
+        socket.shutdown(:RDWR)
+        sleep(0)
+      rescue Exception
+        # Oh well we tried
+      end
+      begin
+        socket.close unless socket.closed?
+      rescue Exception
+        # Oh well we tried
+      end
+    end
+  end
+
 end

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.2.0'
+COSMOS_VERSION = '3.2.1'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '2'
-    PATCH = '0'
-    BUILD = '29c04013a08ebeab57b88412820e0cd79782c49f'
+    PATCH = '1'
+    BUILD = '3b192982d9c44a1e0bef7c7a1d8c730d17a5beb3'
   end
-  VERSION = '3.2.0'
+  VERSION = '3.2.1'
 end

data/spec/script/script_spec.rb

@@ -70,14 +70,13 @@ module Cosmos
           cmd("INST COLLECT with TYPE SPECIAL")
 
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match /cmd\(\'INST COLLECT/
+          stdout.string.should match /cmd\(\'INST COLLECT/ # '
           stdout.rewind
 
           expect(self).to receive(:gets) { 'n' } # Don't send hazardous
-          expect(self).to receive(:gets) { 'n' } # Don't stop running script
+          expect(self).to receive(:gets) { 'y' } # Stop running script
           cmd("INST COLLECT with TYPE SPECIAL")
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match "WARN: Hazardous command not sent"
         end
       end
     end
@@ -93,14 +92,13 @@ module Cosmos
           cmd_no_range_check("INST COLLECT with TYPE SPECIAL")
 
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match /cmd\(\'INST COLLECT/
+          stdout.string.should match /cmd\(\'INST COLLECT/ # '
           stdout.rewind
 
           expect(self).to receive(:gets) { 'n' } # Don't send hazardous
-          expect(self).to receive(:gets) { 'n' } # Don't stop running script
+          expect(self).to receive(:gets) { 'y' } # Stop running script
           cmd_no_range_check("INST COLLECT with TYPE SPECIAL")
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match "WARN: Hazardous command not sent"
         end
       end
     end
@@ -115,7 +113,7 @@ module Cosmos
           cmd_no_hazardous_check("INST COLLECT with TYPE SPECIAL")
 
           stdout.string.should match "Command INST COLLECT being sent ignoring hazardous warnings"
-          stdout.string.should match /cmd\(\'INST COLLECT/
+          stdout.string.should match /cmd\(\'INST COLLECT/ # '
         end
       end
     end
@@ -126,7 +124,7 @@ module Cosmos
           cmd_no_checks("INST COLLECT with TYPE SPECIAL, DURATION 20")
 
           stdout.string.should match "Command INST COLLECT being sent ignoring hazardous warnings"
-          stdout.string.should match /cmd\(\'INST COLLECT/
+          stdout.string.should match /cmd\(\'INST COLLECT/ # '
         end
       end
     end
@@ -135,12 +133,12 @@ module Cosmos
       it "should send a command" do
         capture_io do |stdout|
           cmd_raw("INST ABORT")
-          stdout.string.should match /cmd_raw\(\'INST ABORT\'\)/
+          stdout.string.should match /cmd_raw\(\'INST ABORT\'\)/ # '
         end
       end
 
       it "should check parameter ranges" do
-        expect { cmd_raw("INST COLLECT with TYPE 0, DURATION 20") }.to raise_error(/Command parameter 'INST COLLECT DURATION' = 20 not in valid range/) #'
+        expect { cmd_raw("INST COLLECT with TYPE 0, DURATION 20") }.to raise_error(/Command parameter 'INST COLLECT DURATION' = 20 not in valid range/) # '
       end
 
       it "should prompt for a hazardous command" do
@@ -149,14 +147,13 @@ module Cosmos
           cmd_raw("INST COLLECT with TYPE 1")
 
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match /cmd_raw\(\'INST COLLECT/
+          stdout.string.should match /cmd_raw\(\'INST COLLECT/ # '
           stdout.rewind
 
           expect(self).to receive(:gets) { 'n' } # Don't send hazardous
-          expect(self).to receive(:gets) { 'n' } # Don't stop running script
+          expect(self).to receive(:gets) { 'y' } # Stop running script
           cmd_raw("INST COLLECT with TYPE 1")
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match "WARN: Hazardous command not sent"
         end
       end
     end
@@ -172,14 +169,13 @@ module Cosmos
           cmd_raw_no_range_check("INST COLLECT with TYPE 1")
 
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match /cmd_raw\(\'INST COLLECT/
+          stdout.string.should match /cmd_raw\(\'INST COLLECT/ # '
           stdout.rewind
 
           expect(self).to receive(:gets) { 'n' } # Don't send hazardous
-          expect(self).to receive(:gets) { 'n' } # Don't stop running script
+          expect(self).to receive(:gets) { 'y' } # Stop running script
           cmd_raw_no_range_check("INST COLLECT with TYPE 1")
           stdout.string.should match "Warning: Command INST COLLECT is Hazardous"
-          stdout.string.should match "WARN: Hazardous command not sent"
         end
       end
     end

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -361,6 +361,28 @@ module Cosmos
         end
       end
 
+      context "with two interfaces with the same name" do
+        it "should complain about duplicate interface names" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, "Interface 'CTSCONFIGTESTINTERFACE' defined twice")
+          tf.unlink
+        end
+      end
+
+      context "with two routers with the same name" do
+        it "should complain about duplicate router names" do
+          tf = Tempfile.new('unittest')
+          tf.puts "ROUTER MY_ROUTER1 cts_config_test_interface.rb"
+          tf.puts "ROUTER MY_ROUTER1 cts_config_test_interface.rb"
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, "Router 'MY_ROUTER1' defined twice")
+          tf.unlink
+        end
+      end
+
       context "with ROUTER" do
         it "should create a new router" do
           tf = Tempfile.new('unittest')

data/spec/tools/cmd_tlm_server/interface_thread_spec.rb

@@ -64,7 +64,7 @@ module Cosmos
           sleep 0.2
           Thread.list.length.should eql(1)
 
-          stdout.string.should match "Connection Failed: RuntimeError:ConnectError"
+          stdout.string.should match "Connection Failed: RuntimeError : ConnectError"
         end
       end
 

data/spec/tools/launcher/launcher_config_spec.rb

@@ -274,7 +274,11 @@ module Cosmos
           if Kernel.is_mac? and File.exist?(File.join(USERPATH, 'tools', 'mac'))
             expect(lc.items[0][2]).to eq 'open tools/mac/CmdTlmServer.app --args --system system.txt -x 0 -y 0'
           else
-            expect(lc.items[0][2]).to eq 'RUBYW tools/CmdTlmServer --system system.txt -x 0 -y 0'
+            if Kernel.is_windows?
+              expect(lc.items[0][2]).to eq 'rubyw tools/CmdTlmServer --system system.txt -x 0 -y 0'
+            else
+              expect(lc.items[0][2]).to eq 'ruby tools/CmdTlmServer --system system.txt -x 0 -y 0'
+            end
           end
           expect(lc.items[0][3]).to be true
           expect(lc.items[0][4]).to be_nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -616,6 +616,7 @@ files:
 - data/COSMOS_64x64.bmp
 - data/COSMOS_64x64.ico
 - data/COSMOS_64x64.png
+- data/COSMOS_Architecture.png
 - data/CheckBoxCheck.gif
 - data/CheckBoxEmpty.gif
 - data/Earthmap1024x512.gif