cosmos 3.5.3 → 3.6.0

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

@@ -198,7 +198,7 @@ module Cosmos
       else
         Logger.error "#{@interface.name} Connection Failed: #{connect_error.formatted(false, false)}"
         case connect_error
-        when Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENOTSOCK, Errno::EHOSTUNREACH
+        when Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::ENOTSOCK, Errno::EHOSTUNREACH, IOError
           # 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/)
@@ -222,7 +222,7 @@ module Cosmos
         if err
           Logger.info "Connection Lost for #{@interface.name}: #{err.formatted(false, false)}"
           case err
-          when Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EBADF
+          when Errno::ECONNABORTED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EBADF, IOError
             # Do not write an exception file for these extremely common cases
           else
             Logger.error err.formatted

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

@@ -1485,46 +1485,50 @@ module Cosmos
 
     # Right click context_menu for the script
     def context_menu(point)
-      if @tab_book_shown
-        current_script = @tab_book.tab(@tab_book.currentIndex)
-      else
-        current_script = @script
-      end
-      menu = current_script.context_menu(point)
-      menu.addSeparator()
-      if not self.class.running?
-        exec_selected_action = Qt::Action.new(tr("Execute Selected Lines"), self)
-        exec_selected_action.statusTip = tr("Execute the selected lines as a standalone script")
-        exec_selected_action.connect(SIGNAL('triggered()')) { run_selection() }
-        menu.addAction(exec_selected_action)
-
-        exec_cursor_action = Qt::Action.new(tr("Execute From Cursor"), self)
-        exec_cursor_action.statusTip = tr("Execute the script starting at the line containing the cursor")
-        exec_cursor_action.connect(SIGNAL('triggered()')) { run_from_cursor() }
-        menu.addAction(exec_cursor_action)
-
-        menu.addSeparator()
-
-        if RUBY_VERSION.split('.')[0].to_i > 1
-          syntax_action = Qt::Action.new(tr("Ruby Syntax Check Selected Lines"), self)
-          syntax_action.statusTip = tr("Check the selected lines for valid Ruby syntax")
-          syntax_action.connect(SIGNAL('triggered()')) { ruby_syntax_check_selection() }
-          menu.addAction(syntax_action)
+      # Only show context menu if not running or paused.  Otherwise will segfault if current tab goes away while menu
+      # is shown
+      if not self.class.running? or (running?() and @realtime_button_bar.state != 'Running')
+        if @tab_book_shown
+          current_script = @tab_book.tab(@tab_book.currentIndex)
+        else
+          current_script = @script
         end
+        menu = current_script.context_menu(point)
+        menu.addSeparator()
+        if not self.class.running?
+          exec_selected_action = Qt::Action.new(tr("Execute Selected Lines"), self)
+          exec_selected_action.statusTip = tr("Execute the selected lines as a standalone script")
+          exec_selected_action.connect(SIGNAL('triggered()')) { run_selection() }
+          menu.addAction(exec_selected_action)
+
+          exec_cursor_action = Qt::Action.new(tr("Execute From Cursor"), self)
+          exec_cursor_action.statusTip = tr("Execute the script starting at the line containing the cursor")
+          exec_cursor_action.connect(SIGNAL('triggered()')) { run_from_cursor() }
+          menu.addAction(exec_cursor_action)
+
+          menu.addSeparator()
+
+          if RUBY_VERSION.split('.')[0].to_i > 1
+            syntax_action = Qt::Action.new(tr("Ruby Syntax Check Selected Lines"), self)
+            syntax_action.statusTip = tr("Check the selected lines for valid Ruby syntax")
+            syntax_action.connect(SIGNAL('triggered()')) { ruby_syntax_check_selection() }
+            menu.addAction(syntax_action)
+          end
 
-        mnemonic_action = Qt::Action.new(tr("Mnemonic Check Selected Lines"), self)
-        mnemonic_action.statusTip = tr("Check the selected lines for valid targets, packets, mnemonics and parameters")
-        mnemonic_action.connect(SIGNAL('triggered()')) { mnemonic_check_selection() }
-        menu.addAction(mnemonic_action)
+          mnemonic_action = Qt::Action.new(tr("Mnemonic Check Selected Lines"), self)
+          mnemonic_action.statusTip = tr("Check the selected lines for valid targets, packets, mnemonics and parameters")
+          mnemonic_action.connect(SIGNAL('triggered()')) { mnemonic_check_selection() }
+          menu.addAction(mnemonic_action)
 
-      elsif running?() and @realtime_button_bar.state != 'Running'
-        exec_selected_action = Qt::Action.new(tr("Execute Selected Lines While Paused"), self)
-        exec_selected_action.statusTip = tr("Execute the selected lines as a standalone script")
-        exec_selected_action.connect(SIGNAL('triggered()')) { run_selection_while_paused() }
-        menu.addAction(exec_selected_action)
+        elsif running?() and @realtime_button_bar.state != 'Running'
+          exec_selected_action = Qt::Action.new(tr("Execute Selected Lines While Paused"), self)
+          exec_selected_action.statusTip = tr("Execute the selected lines as a standalone script")
+          exec_selected_action.connect(SIGNAL('triggered()')) { run_selection_while_paused() }
+          menu.addAction(exec_selected_action)
+        end
+        menu.exec(current_script.mapToGlobal(point))
+        menu.dispose
       end
-      menu.exec(current_script.mapToGlobal(point))
-      menu.dispose
     end
 
     def load_file_into_script(filename)

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.5.3'
+COSMOS_VERSION = '3.6.0'
 module Cosmos
   module Version
     MAJOR = '3'
-    MINOR = '5'
-    PATCH = '3'
-    BUILD = '351455c115f9d09210eb410fa47da30f60787489'
+    MINOR = '6'
+    PATCH = '0'
+    BUILD = 'c536539999e6ee8e176d875a88e4ae639bb1e196'
   end
-  VERSION = '3.5.3'
+  VERSION = '3.6.0'
 end

data/spec/config/config_parser_spec.rb

@@ -128,7 +128,7 @@ module Cosmos
         tf.close
 
         msg_callback = double(:call => true)
-        expect(msg_callback).to receive(:call).once.with(/Parsing .* bytes of #{tf.path}/)
+        expect(msg_callback).to receive(:call).once.with(/Parsing .* bytes of .*#{File.basename(tf.path)}/)
 
         ConfigParser.message_callback = msg_callback
         @cp.parse_file(tf.path) do |keyword, params|

data/spec/io/json_drb_spec.rb

@@ -17,6 +17,7 @@ module Cosmos
   describe JsonDRb do
     before(:each) do
       @json = JsonDRb.new
+      @pipe_reader, @pipe_writer = IO.pipe
     end
 
     describe "initialize" do
@@ -122,21 +123,6 @@ module Cosmos
     end
 
     describe "receive_message" do
-      it "returns nil if 4 bytes of data aren't available" do
-        @json.start_service('127.0.0.1', 7777, self)
-        socket = TCPSocket.open('127.0.0.1',7777)
-        # Stub recv_nonblock so it returns nothing
-        allow(socket).to receive(:recv_nonblock) { "" }
-        sleep 0.1
-        JsonDRb.send_data(socket, "\x00")
-        response_data = JsonDRb.receive_message(socket, '')
-        expect(response_data).to be_nil
-        socket.close
-        sleep 0.1
-        @json.stop_service
-        sleep(0.1)
-      end
-
       it "processes success requests" do
         class MyServer1
           def my_method(param)
@@ -148,7 +134,7 @@ module Cosmos
         sleep 0.1
         request = JsonRpcRequest.new('my_method', 'param', 1).to_json
         JsonDRb.send_data(socket, request)
-        response_data = JsonDRb.receive_message(socket, '')
+        response_data = JsonDRb.receive_message(socket, '', @pipe_reader)
         response = JsonRpcResponse.from_json(response_data)
         expect(response).to be_a(JsonRpcSuccessResponse)
         socket.close
@@ -166,7 +152,7 @@ module Cosmos
         sleep 0.1
         request = JsonRpcRequest.new('my_method', 'param', 1).to_json
         JsonDRb.send_data(socket, request)
-        response_data = JsonDRb.receive_message(socket, '')
+        response_data = JsonDRb.receive_message(socket, '', @pipe_reader)
         response = JsonRpcResponse.from_json(response_data)
         expect(response).to be_a(JsonRpcErrorResponse)
         expect(response.error.code).to eql -32601
@@ -188,7 +174,7 @@ module Cosmos
         sleep 0.1
         request = JsonRpcRequest.new('my_method', 'param1', 1).to_json
         JsonDRb.send_data(socket, request)
-        response_data = JsonDRb.receive_message(socket, '')
+        response_data = JsonDRb.receive_message(socket, '', @pipe_reader)
         response = JsonRpcResponse.from_json(response_data)
         expect(response).to be_a(JsonRpcErrorResponse)
         expect(response.error.code).to eql -32602
@@ -211,7 +197,7 @@ module Cosmos
         sleep 0.1
         request = JsonRpcRequest.new('my_method', 'param', 1).to_json
         JsonDRb.send_data(socket, request)
-        response_data = JsonDRb.receive_message(socket, '')
+        response_data = JsonDRb.receive_message(socket, '', @pipe_reader)
         response = JsonRpcResponse.from_json(response_data)
         expect(response).to be_a(JsonRpcErrorResponse)
         expect(response.error.code).to eql -1
@@ -228,7 +214,7 @@ module Cosmos
         sleep 0.1
         request = JsonRpcRequest.new('send', 'param', 1).to_json
         JsonDRb.send_data(socket, request)
-        response_data = JsonDRb.receive_message(socket, '')
+        response_data = JsonDRb.receive_message(socket, '', @pipe_reader)
         response = JsonRpcResponse.from_json(response_data)
         expect(response).to be_a(JsonRpcErrorResponse)
         expect(response.error.code).to eql -1
@@ -247,7 +233,7 @@ module Cosmos
         request.gsub!("jsonrpc","version")
         request.gsub!("2.0","1.1")
         JsonDRb.send_data(socket, request)
-        response_data = JsonDRb.receive_message(socket, '')
+        response_data = JsonDRb.receive_message(socket, '', @pipe_reader)
         response = JsonRpcResponse.from_json(response_data)
         expect(response).to be_a(JsonRpcErrorResponse)
         expect(response.error.code).to eql -32600

data/spec/packets/packet_config_spec.rb

@@ -26,7 +26,7 @@ module Cosmos
         tf = Tempfile.new('unittest')
         tf.puts("BLAH")
         tf.close
-        expect { @pc.process_file(tf.path, 'SYSTEM') }.to raise_error(ConfigParser::Error, "Unknown keyword 'BLAH'")
+        expect { @pc.process_file(tf.path, 'SYSTEM') }.to raise_error(ConfigParser::Error, /Unknown keyword 'BLAH'/)
         tf.unlink
       end
 
@@ -46,7 +46,7 @@ module Cosmos
             tf = Tempfile.new('unittest')
             tf.puts(keyword)
             tf.close
-            expect { @pc.process_file(tf.path, "SYSTEM") }.to raise_error(ConfigParser::Error, "No current packet for #{keyword}")
+            expect { @pc.process_file(tf.path, "SYSTEM") }.to raise_error(ConfigParser::Error, /No current packet for #{keyword}/)
             tf.unlink
           end # end for each tlm_keywords
         end
@@ -59,7 +59,7 @@ module Cosmos
             tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
             tf.puts keyword
             tf.close
-            expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "No current item for #{keyword}")
+            expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /No current item for #{keyword}/)
             tf.unlink
           end
         end
@@ -241,7 +241,7 @@ module Cosmos
           tf.puts 'SELECT_TELEMETRY TGT PKT'
           tf.puts '  SELECT_PARAMETER ITEM'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, "SELECT_PARAMETER only applies to command packets")
+          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, /SELECT_PARAMETER only applies to command packets/)
         end
 
         it "complains if the parameter is not found" do
@@ -259,7 +259,7 @@ module Cosmos
           tf.puts '  SELECT_PARAMETER PARAMX'
           tf.puts '    DESCRIPTION "New description"'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, "PARAMX not found in command packet TGT PKT")
+          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, /PARAMX not found in command packet TGT PKT/)
         end
       end
 
@@ -271,7 +271,7 @@ module Cosmos
           tf.puts 'SELECT_COMMAND TGT PKT'
           tf.puts '  SELECT_ITEM PARAM'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, "SELECT_ITEM only applies to telemetry packets")
+          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, /SELECT_ITEM only applies to telemetry packets/)
         end
 
         it "complains if the item is not found" do
@@ -289,7 +289,7 @@ module Cosmos
           tf.puts '  SELECT_ITEM ITEMX'
           tf.puts '    DESCRIPTION "New description"'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, "ITEMX not found in telemetry packet TGT PKT")
+          expect { @pc.process_file(tf.path, "TGT") }.to raise_error(ConfigParser::Error, /ITEMX not found in telemetry packet TGT PKT/)
         end
       end
 
@@ -716,14 +716,14 @@ module Cosmos
           tf.puts '  ITEM item1 0 8 UINT'
           tf.puts '    REQUIRED'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "REQUIRED only applies to command parameters")
+          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /REQUIRED only applies to command parameters/)
           tf.unlink
 
           tf = Tempfile.new('unittest')
           tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Packet"'
           tf.puts '  REQUIRED'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "No current item for REQUIRED")
+          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /No current item for REQUIRED/)
           tf.unlink
         end
 
@@ -748,7 +748,7 @@ module Cosmos
           tf.puts '  APPEND_ITEM item1 16 UINT'
           tf.puts '    MINIMUM_VALUE 1'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "MINIMUM_VALUE only applies to command parameters")
+          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /MINIMUM_VALUE only applies to command parameters/)
           tf.unlink
 
           tf = Tempfile.new('unittest')
@@ -756,7 +756,7 @@ module Cosmos
           tf.puts '  APPEND_ITEM item1 16 UINT'
           tf.puts '    MAXIMUM_VALUE 3'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "MAXIMUM_VALUE only applies to command parameters")
+          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /MAXIMUM_VALUE only applies to command parameters/)
           tf.unlink
 
           tf = Tempfile.new('unittest')
@@ -764,7 +764,7 @@ module Cosmos
           tf.puts '  APPEND_ITEM item1 16 UINT'
           tf.puts '    DEFAULT_VALUE 2'
           tf.close
-          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "DEFAULT_VALUE only applies to command parameters")
+          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /DEFAULT_VALUE only applies to command parameters/)
           tf.unlink
         end
 

data/spec/packets/parsers/format_string_parser_spec.rb

@@ -29,7 +29,7 @@ module Cosmos
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  FORMAT_STRING'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "No current item for FORMAT_STRING")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /No current item for FORMAT_STRING/)
         tf.unlink
       end
 
@@ -59,7 +59,7 @@ module Cosmos
         tf.puts '  ITEM item1 0 8 INT'
         tf.puts '    FORMAT_STRING "%*s"'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid FORMAT_STRING specified for type INT: %*s")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid FORMAT_STRING specified for type INT: \%\*s/)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -67,7 +67,7 @@ module Cosmos
         tf.puts '  ITEM item1 0 8 STRING'
         tf.puts '    FORMAT_STRING "%d"'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid FORMAT_STRING specified for type STRING: %d")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid FORMAT_STRING specified for type STRING: \%d/)
         tf.unlink
       end
 

data/spec/packets/parsers/limits_parser_spec.rb

@@ -28,7 +28,7 @@ module Cosmos
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  LIMITS mylimits 1 ENABLED 0 10 20 30 12 18'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "No current item for LIMITS")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /No current item for LIMITS/)
         tf.unlink
       end
 
@@ -157,7 +157,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 2 1 3 4'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure yellow limits are within red limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure yellow limits are within red limits./)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -165,7 +165,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 5 3 7'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure yellow limits are within red limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure yellow limits are within red limits./)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -173,7 +173,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 2 5 4'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure yellow limits are within red limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure yellow limits are within red limits./)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -181,7 +181,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 2 3 0'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure yellow limits are within red limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure yellow limits are within red limits./)
         tf.unlink
       end
 
@@ -191,7 +191,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 2 6 7 0 5'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure green limits are within yellow limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure green limits are within yellow limits./)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -199,7 +199,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 3 6 7 2 5'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure green limits are within yellow limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure green limits are within yellow limits./)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -207,7 +207,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 2 6 8 3 7'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure green limits are within yellow limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure green limits are within yellow limits./)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -215,7 +215,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 2 6 8 3 9'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure green limits are within yellow limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure green limits are within yellow limits./)
         tf.unlink
 
         tf = Tempfile.new('unittest')
@@ -223,7 +223,7 @@ module Cosmos
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
         tf.puts '    LIMITS DEFAULT 3 ENABLED 1 2 6 8 4 3'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "Invalid limits specified. Ensure green limits are within yellow limits.")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Invalid limits specified. Ensure green limits are within yellow limits./)
         tf.unlink
       end
 

data/spec/packets/parsers/limits_response_parser_spec.rb

@@ -28,7 +28,7 @@ module Cosmos
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  LIMITS_RESPONSE'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "No current item for LIMITS_RESPONSE")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /No current item for LIMITS_RESPONSE/)
         tf.unlink
       end
 
@@ -48,7 +48,7 @@ module Cosmos
         tf.puts '  APPEND_PARAMETER item1 16 UINT 0 0 0 "Item"'
         tf.puts '    LIMITS_RESPONSE test.rb'
         tf.close
-        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, "LIMITS_RESPONSE only applies to telemetry items")
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /LIMITS_RESPONSE only applies to telemetry items/)
         tf.unlink
       end
 

data/spec/packets/parsers/macro_parser_spec.rb

@@ -27,7 +27,7 @@ module Cosmos
         tf = Tempfile.new('unittest')
         tf.puts '  MACRO_APPEND_START'
         tf.close
-        expect { @pc.process_file(tf.path, "SYSTEM") }.to raise_error(ConfigParser::Error, "No current packet for MACRO_APPEND_START")
+        expect { @pc.process_file(tf.path, "SYSTEM") }.to raise_error(ConfigParser::Error, /No current packet for MACRO_APPEND_START/)
       end
 
       it "complains if there are not enough parameters" do
@@ -58,7 +58,7 @@ module Cosmos
         expect { @pc.process_file(tf.path, "SYSTEM") }.to raise_error(ConfigParser::Error, /First close the previous/)
       end
 
-      it "swaps reverse ranges to be in order" do
+      it "supports descending order" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
         tf.puts 'MACRO_APPEND_START 4 1' # <-- Note the reverse order
@@ -71,10 +71,10 @@ module Cosmos
         pkt = @pc.telemetry["TGT1"]["PKT1"]
         expect(pkt.items.length).to eql 7 # 4 plus the RECEIVED_XXX items
         expect(pkt.items.keys).to include('BIT1','BIT2','BIT3','BIT4')
-        expect(pkt.sorted_items[3].name).to eql 'BIT1'
-        expect(pkt.sorted_items[4].name).to eql 'BIT2'
-        expect(pkt.sorted_items[5].name).to eql 'BIT3'
-        expect(pkt.sorted_items[6].name).to eql 'BIT4'
+        expect(pkt.sorted_items[3].name).to eql 'BIT4'
+        expect(pkt.sorted_items[4].name).to eql 'BIT3'
+        expect(pkt.sorted_items[5].name).to eql 'BIT2'
+        expect(pkt.sorted_items[6].name).to eql 'BIT1'
         limits_items = []
         pkt.items.each do |name, item|
           limits_items << item if name.include?('BIT')