cosmos 4.0.1-universal-java-1.8 → 4.0.2-universal-java-1.8

data/spec/interfaces/udp_interface_spec.rb

@@ -17,7 +17,14 @@ module Cosmos
   describe UdpInterface do
     describe "initialize" do
       it "initializes the instance variables" do
-        i = UdpInterface.new('localhost','8888','8889','8890','127.0.0.1','64','5','5','127.0.0.1')
+        i = UdpInterface.new('localhost','8888','8889','8890','localhost','64','5','5','localhost')
+        expect(i.instance_variable_get("@hostname")).to eql '127.0.0.1'
+        expect(i.instance_variable_get("@interface_address")).to eql '127.0.0.1'
+        expect(i.instance_variable_get("@bind_address")).to eql '127.0.0.1'
+        i = UdpInterface.new('10.10.10.1','8888','8889','8890','10.10.10.2','64','5','5','10.10.10.3')
+        expect(i.instance_variable_get("@hostname")).to eql '10.10.10.1'
+        expect(i.instance_variable_get("@interface_address")).to eql '10.10.10.2'
+        expect(i.instance_variable_get("@bind_address")).to eql '10.10.10.3'
       end
 
       it "is not writeable if no write port given" do
@@ -237,4 +244,3 @@ module Cosmos
     end
   end
 end
-

data/spec/packets/packet_config_spec.rb

@@ -814,6 +814,17 @@ module Cosmos
           expect(@pc.telemetry["TGT1"]["PKT1"].read("ITEM1",:WITH_UNITS)).to eql "0 V"
           tf.unlink
         end
+
+        it "complains if STATE defined" do
+          tf = Tempfile.new('unittest')
+          tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
+          tf.puts '  ITEM item1 0 8 UINT'
+          tf.puts '    STATE ONE 1'
+          tf.puts '    UNITS Volts V'
+          tf.close
+          expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Items with STATE can't define UNITS/)
+          tf.unlink
+        end
       end
 
       context "with META" do

data/spec/packets/parsers/format_string_parser_spec.rb

@@ -53,6 +53,17 @@ module Cosmos
         tf.unlink
       end
 
+      it "complains if STATE is defined" do
+        tf = Tempfile.new('unittest')
+        tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
+        tf.puts 'ITEM myitem 0 8 UINT "Test Item"'
+        tf.puts 'STATE ONE 1'
+        tf.puts "FORMAT_STRING '0x%x'"
+        tf.close
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Items with STATE can't define FORMAT_STRING/)
+        tf.unlink
+      end
+
       it "complains about invalid format strings" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'

data/spec/packets/parsers/limits_parser_spec.rb

@@ -23,7 +23,7 @@ module Cosmos
         @pc = PacketConfig.new
       end
 
-      it "raises if a current item is not defined" do
+      it "complains if a current item is not defined" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  LIMITS mylimits 1 ENABLED 0 10 20 30 12 18'
@@ -32,7 +32,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if there are not enough parameters" do
+      it "complains if there are not enough parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  ITEM myitem 0 8 UINT "Test Item"'
@@ -50,7 +50,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if there are too many parameters" do
+      it "complains if there are too many parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  ITEM myitem 0 8 UINT "Test Item"'
@@ -60,7 +60,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if applied to a command PARAMETER" do
+      it "complains if applied to a command PARAMETER" do
         tf = Tempfile.new('unittest')
         tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_PARAMETER item1 16 UINT 0 0 0 "Item"'
@@ -70,7 +70,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if a DEFAULT limits set isn't defined" do
+      it "complains if a DEFAULT limits set isn't defined" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
@@ -80,6 +80,17 @@ module Cosmos
         tf.unlink
       end
 
+      it "complains if STATES are defined" do
+        tf = Tempfile.new('unittest')
+        tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
+        tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
+        tf.puts '    STATE ONE 1'
+        tf.puts '    LIMITS TVAC 3 ENABLED 1 2 6 7 3 5'
+        tf.close
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Items with STATE can't define LIMITS/)
+        tf.unlink
+      end
+
       it "sets a warning if a new limits set persistence isn't consistent with DEFAULT" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
@@ -116,7 +127,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if the second parameter isn't a number" do
+      it "complains if the second parameter isn't a number" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
@@ -126,7 +137,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if the third parameter isn't ENABLED or DISABLED" do
+      it "complains if the third parameter isn't ENABLED or DISABLED" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
@@ -136,7 +147,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if the fourth through ninth parameter aren't numbers'" do
+      it "complains if the fourth through ninth parameter aren't numbers'" do
         msgs = ['','','','','red low','yellow low','yellow high','red high','green low','green high']
         (4..9).each do |index|
           tf = Tempfile.new('unittest')
@@ -151,7 +162,7 @@ module Cosmos
         end
       end
 
-      it "raises if the 4 limits are out of order" do
+      it "complains if the 4 limits are out of order" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'
@@ -185,7 +196,7 @@ module Cosmos
         tf.unlink
       end
 
-      it "raises if the 6 limits are out of order" do
+      it "complains if the 6 limits are out of order" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
         tf.puts '  APPEND_ITEM item1 16 UINT "Item"'

data/spec/packets/parsers/packet_item_parser_spec.rb

@@ -33,7 +33,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "raises if given an incomplete definition" do
+        it "complains if given an incomplete definition" do
           tf = Tempfile.new('unittest')
           tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  ITEM ITEM1 8 0'
@@ -63,7 +63,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "raises if given a bad bit offset" do
+        it "complains if given a bad bit offset" do
           tf = Tempfile.new('unittest')
           tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  ITEM ITEM1 EIGHT 0 DERIVED'
@@ -72,7 +72,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "raises if given a bad bit size" do
+        it "complains if given a bad bit size" do
           tf = Tempfile.new('unittest')
           tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  ITEM ITEM1 8 ZERO DERIVED'
@@ -81,7 +81,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "raises if given a bad array size" do
+        it "complains if given a bad array size" do
           tf = Tempfile.new('unittest')
           tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  ARRAY_ITEM ITEM3 0 32 FLOAT EIGHT'
@@ -178,7 +178,7 @@ module Cosmos
           tf.unlink
         end
 
-        it "raises if given an incomplete definition" do
+        it "complains if given an incomplete definition" do
           tf = Tempfile.new('unittest')
           tf.puts 'COMMAND tgt1 pkt1 LITTLE_ENDIAN "Description"'
           tf.puts '  PARAMETER ITEM1 8 0'

data/spec/packets/parsers/state_parser_spec.rb

@@ -43,6 +43,39 @@ module Cosmos
         tf.unlink
       end
 
+      it "complains if LIMITS defined" do
+        tf = Tempfile.new('unittest')
+        tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
+        tf.puts '  ITEM myitem 0 8 UINT "Test Item"'
+        tf.puts '    LIMITS DEFAULT 3 ENABLED 1 2 6 7 3 5'
+        tf.puts '    STATE ONE 1'
+        tf.close
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Items with LIMITS can't define STATE/)
+        tf.unlink
+      end
+
+      it "complains if FORMAT_STRING defined" do
+        tf = Tempfile.new('unittest')
+        tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
+        tf.puts '  ITEM myitem 0 8 UINT "Test Item"'
+        tf.puts '    FORMAT_STRING "0x%x"'
+        tf.puts '    STATE ONE 1'
+        tf.close
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Items with FORMAT_STRING can't define STATE/)
+        tf.unlink
+      end
+
+      it "complains if UNITS defined" do
+        tf = Tempfile.new('unittest')
+        tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'
+        tf.puts '  ITEM myitem 0 8 UINT "Test Item"'
+        tf.puts '    UNITS Kelvin K'
+        tf.puts '    STATE ONE 1'
+        tf.close
+        expect { @pc.process_file(tf.path, "TGT1") }.to raise_error(ConfigParser::Error, /Items with UNITS can't define STATE/)
+        tf.unlink
+      end
+
       it "complains if there are too many parameters" do
         tf = Tempfile.new('unittest')
         tf.puts 'TELEMETRY tgt1 pkt1 LITTLE_ENDIAN "Packet"'

data/spec/tools/cmd_tlm_server/limits_groups_background_task_spec.rb

@@ -62,11 +62,11 @@ module Cosmos
         Cosmos.kill_thread(self, thread)
       end
 
-      it "processes the check methods at 1Hz" do
+      it "processes the check methods at a configurable rate" do
         class MyLimitsGroups3 < LimitsGroupsBackgroundTask
           attr_accessor :first_count, :second_count, :on_logic, :off_logic
-          def initialize
-            super()
+          def initialize(connect_delay, task_delay)
+            super(connect_delay, task_delay)
             @first_count = 0
             @second_count = 0
             @on_logic = false
@@ -85,7 +85,7 @@ module Cosmos
             process_group { false } # Never enable
           end
         end
-        my = MyLimitsGroups3.new
+        my = MyLimitsGroups3.new(0, 1) # Run at 1Hz
         thread = Thread.new do
           my.call
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.0.2
 platform: universal-java-1.8
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement