Merge pull request #797 from BallAerospace/spaces_in_check_extract

closes #790. Support spaces in telemetry check

lib/cosmos/script/extract.rb

@@ -45,7 +45,7 @@ def extract_fields_from_cmd_text(text)
       target_name = first_half[0]
       cmd_name = first_half[1]
       cmd_params = {}
-    
+
       begin
         packet = System.commands.packet(target_name, cmd_name).clone
       rescue
@@ -129,7 +129,9 @@ def extract_fields_from_check_text(text)
       comparison_to_eval = nil
       return [target_name, packet_name, item_name, comparison_to_eval] if split_string.length == 3
       raise "ERROR: Check improperly specified: #{text}" if split_string.length < 4
-      comparison_to_eval = split_string[3..(split_string.length - 1)].join(" ")
+      split_string = text.split(/ /) # Split on regex spaces to preserve spaces in comparison
+      index = split_string.index(item_name)
+      comparison_to_eval = split_string[(index + 1)..(split_string.length - 1)].join(" ")
       raise "ERROR: Use '==' instead of '=': #{text}" if split_string[3] == '='
       return [target_name, packet_name, item_name, comparison_to_eval]
     end

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