cosmos 3.9.2 → 4.0.0

data/spec/system/target_spec.rb

@@ -113,13 +113,13 @@ module Cosmos
           tf = Tempfile.new('unittest')
           tf.puts("REQUIRE")
           tf.close
-          expect { Target.new("TGT").process_file(tf.path) }.to raise_error(ConfigParser::Error, /Not enough parameters for REQUIRE./)
+          expect { Target.new("INST").process_file(tf.path) }.to raise_error(ConfigParser::Error, /Not enough parameters for REQUIRE./)
           tf.unlink
 
           tf = Tempfile.new('unittest')
           tf.puts("REQUIRE my_file.rb TRUE")
           tf.close
-          expect { Target.new("TGT").process_file(tf.path) }.to raise_error(ConfigParser::Error, /Too many parameters for REQUIRE./)
+          expect { Target.new("INST").process_file(tf.path) }.to raise_error(ConfigParser::Error, /Too many parameters for REQUIRE./)
           tf.unlink
         end
 
@@ -127,21 +127,44 @@ module Cosmos
           tf = Tempfile.new('unittest')
           tf.puts("REQUIRE my_file.rb")
           tf.close
-          expect { Target.new("TGT").process_file(tf.path) }.to raise_error(ConfigParser::Error, /Unable to require my_file.rb/)
+          expect { Target.new("INST").process_file(tf.path) }.to raise_error(ConfigParser::Error, /Unable to require my_file.rb/)
           tf.unlink
         end
 
-        it "requires the file" do
-          filename = File.join(File.dirname(__FILE__),'..','..','lib','my_file.rb')
+        it "requires the file in the target lib directory over system lib" do
+          filename = File.join(Cosmos::USERPATH, 'config', 'targets', 'INST', 'lib', 'tgt_file.rb')
           File.open(filename, 'w') do |file|
-            file.puts "class MyFile"
+            file.puts "class TgtLibFile"
             file.puts "end"
           end
+          filename = File.join(Cosmos::USERPATH, 'lib', 'tgt_file.rb')
+          File.open(filename, 'w') do |file|
+            file.puts "class SystemLibFile"
+            file.puts "end"
+          end
+
           tf = Tempfile.new('unittest')
-          tf.puts("REQUIRE my_file.rb")
+          tf.puts("REQUIRE tgt_file.rb")
+          tf.close
+          Target.new("INST").process_file(tf.path)
+          expect { TgtLibFile.new }.to_not raise_error
+          expect(Object.const_defined?('TgtLibFile')).to be true
+          expect(Object.const_defined?('SystemLibFile')).to be false
+          File.delete filename
+          tf.unlink
+        end
+
+        it "requires the file in the system lib directory" do
+          filename = File.join(Cosmos::USERPATH, 'lib', 'system_file.rb')
+          File.open(filename, 'w') do |file|
+            file.puts "class SystemFile"
+            file.puts "end"
+          end
+          tf = Tempfile.new('unittest')
+          tf.puts("REQUIRE system_file.rb")
           tf.close
-          Target.new("TGT").process_file(tf.path)
-          expect { MyFile.new }.to_not raise_error
+          Target.new("INST").process_file(tf.path)
+          expect { SystemFile.new }.to_not raise_error
           File.delete filename
           tf.unlink
         end
@@ -271,11 +294,10 @@ module Cosmos
           expect(tgt.cmd_tlm_files.length).to eql 4
           expect(tgt.cmd_tlm_files).to eql [tgt_dir + '/cmd_tlm/tgt_cmds3.txt', tgt_dir + '/cmd_tlm/tgt_cmds2.txt', tgt_dir + '/cmd_tlm/tgt_tlm3.txt', tgt_dir + '/cmd_tlm/tgt_tlm.txt']
 
-          FileUtils.rm_r(tgt_dir)
+          FileUtils.rm_rf(tgt_dir)
         end
       end
     end
 
   end
 end
-

data/spec/tools/cmd_tlm_server/api_spec.rb

@@ -474,13 +474,13 @@ module Cosmos
         time2 = Time.now + 2
         packet = System.commands.packet("INST", "COLLECT")
         packet.received_time = time
-        packet2 = System.commands.packet("COSMOS", "STARTLOGGING")
+        packet2 = System.commands.packet("SYSTEM", "STARTLOGGING")
         packet2.received_time = time2
-        expect(@api.get_cmd_time()).to eql ['COSMOS', 'STARTLOGGING', time2.tv_sec, time2.tv_usec]
+        expect(@api.get_cmd_time()).to eql ['SYSTEM', 'STARTLOGGING', time2.tv_sec, time2.tv_usec]
         expect(@api.get_cmd_time('INST')).to eql ['INST', 'COLLECT', time.tv_sec, time.tv_usec]
-        expect(@api.get_cmd_time('COSMOS')).to eql ['COSMOS', 'STARTLOGGING', time2.tv_sec, time2.tv_usec]
+        expect(@api.get_cmd_time('SYSTEM')).to eql ['SYSTEM', 'STARTLOGGING', time2.tv_sec, time2.tv_usec]
         expect(@api.get_cmd_time('INST', 'COLLECT')).to eql ['INST', 'COLLECT', time.tv_sec, time.tv_usec]
-        expect(@api.get_cmd_time('COSMOS', 'STARTLOGGING')).to eql ['COSMOS', 'STARTLOGGING', time2.tv_sec, time2.tv_usec]
+        expect(@api.get_cmd_time('SYSTEM', 'STARTLOGGING')).to eql ['SYSTEM', 'STARTLOGGING', time2.tv_sec, time2.tv_usec]
       end
     end
 
@@ -1036,7 +1036,7 @@ module Cosmos
 
     describe "get_target_list" do
       it "returns all target names" do
-        expect(@api.get_target_list).to eql %w(COSMOS INST META SYSTEM)
+        expect(@api.get_target_list).to eql %w(INST SYSTEM)
       end
     end
 

data/spec/tools/cmd_tlm_server/background_tasks_spec.rb

@@ -48,26 +48,42 @@ module Cosmos
         tf.close
         config = CmdTlmServerConfig.new(tf.path)
         bt = BackgroundTasks.new(config)
-        expect(Thread.list.length).to eql(1) # RSpec main thread
+        if RUBY_ENGINE == 'ruby'
+          expect(Thread.list.length).to eql(1) # RSpec main thread
+        else
+          expect(Thread.list.length).to eql(2) # RSpec main thread
+        end
         expect(bt.instance_variable_get("@threads").length).to eq 0
 
         capture_io do |stdout|
           bt.start_all
           sleep 0.2
-          expect(Thread.list.length).to eql(3)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(3)
+          else
+            expect(Thread.list.length).to eql(4)
+          end
           expect(bt.instance_variable_get("@threads").compact.length).to eq 2
           expect(stdout.string).to match "BG0 START"
           expect(stdout.string).to match "BG2 START"
 
           bt.start(1)
           sleep 0.1
-          expect(Thread.list.length).to eql(4)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(4)
+          else
+            expect(Thread.list.length).to eql(5)
+          end
           expect(bt.instance_variable_get("@threads").compact.length).to eq 3
           expect(stdout.string).to match "BG1 START"
 
           bt.stop_all
           sleep 0.2
-          expect(Thread.list.length).to eql(1)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(1)
+          else
+            expect(Thread.list.length).to eql(2)
+          end
           expect(bt.instance_variable_get("@threads").compact.length).to eq 0
           expect(stdout.string).to match "BG0 STOP"
           expect(stdout.string).to match "BG1 STOP"
@@ -86,48 +102,76 @@ module Cosmos
         tf.close
         config = CmdTlmServerConfig.new(tf.path)
         bt = BackgroundTasks.new(config)
-        expect(Thread.list.length).to eql(1) # RSpec main thread
+        if RUBY_ENGINE == 'ruby'
+          expect(Thread.list.length).to eql(1) # RSpec main thread
+        else
+          expect(Thread.list.length).to eql(2) # RSpec main thread
+        end
         expect(bt.instance_variable_get("@threads").length).to eq 0
 
         capture_io do |stdout|
           bt.start(2)
           sleep 0.1
-          expect(Thread.list.length).to eql(2)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(2)
+          else
+            expect(Thread.list.length).to eql(3)
+          end
           expect(bt.instance_variable_get("@threads")[2].alive?).to eq true
           expect(bt.instance_variable_get("@threads").compact.length).to eq 1
           expect(stdout.string).to match "BG2 START"
 
           bt.start(1)
           sleep 0.1
-          expect(Thread.list.length).to eql(3)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(3)
+          else
+            expect(Thread.list.length).to eql(4)
+          end
           expect(bt.instance_variable_get("@threads")[1].alive?).to eq true
           expect(bt.instance_variable_get("@threads").compact.length).to eq 2
           expect(stdout.string).to match "BG1 START"
 
           bt.start(0)
           sleep 0.1
-          expect(Thread.list.length).to eql(4)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(4)
+          else
+            expect(Thread.list.length).to eql(5)
+          end
           expect(bt.instance_variable_get("@threads")[0].alive?).to eq true
           expect(bt.instance_variable_get("@threads").compact.length).to eq 3
           expect(stdout.string).to match "BG0 START"
 
           bt.stop(1)
           sleep 0.2
-          expect(Thread.list.length).to eql(3)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(3)
+          else
+            expect(Thread.list.length).to eql(4)
+          end
           expect(bt.instance_variable_get("@threads")[1]).to be_nil
           expect(bt.instance_variable_get("@threads").compact.length).to eq 2
           expect(stdout.string).to match "BG1 STOP"
 
           bt.stop(0)
           sleep 0.2
-          expect(Thread.list.length).to eql(2)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(2)
+          else
+            expect(Thread.list.length).to eql(3)
+          end
           expect(bt.instance_variable_get("@threads")[0]).to be_nil
           expect(bt.instance_variable_get("@threads").compact.length).to eq 1
           expect(stdout.string).to match "BG0 STOP"
 
           bt.stop(2)
           sleep 0.2
-          expect(Thread.list.length).to eql(1)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(1)
+          else
+            expect(Thread.list.length).to eql(2)
+          end
           expect(bt.instance_variable_get("@threads")[2]).to be_nil
           expect(bt.instance_variable_get("@threads").compact.length).to eq 0
           expect(stdout.string).to match "BG2 STOP"
@@ -141,21 +185,37 @@ module Cosmos
         tf.close
         config = CmdTlmServerConfig.new(tf.path)
         bt = BackgroundTasks.new(config)
-        expect(Thread.list.length).to eql(1) # RSpec main thread
+        if RUBY_ENGINE == 'ruby'
+          expect(Thread.list.length).to eql(1) # RSpec main thread
+        else
+          expect(Thread.list.length).to eql(2) # RSpec main thread
+        end
         expect(bt.instance_variable_get("@threads").length).to eq 0
 
         capture_io do |stdout|
           bt.start_all
           # 2 because the RSpec main thread plus the background task
-          expect(Thread.list.length).to eql(2)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(2)
+          else
+            expect(Thread.list.length).to eql(3)
+          end
           sleep 1.1 # Allow the thread to crash
-          expect(Thread.list.length).to eql(1)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(1)
+          else
+            expect(Thread.list.length).to eql(2)
+          end
           expect(bt.instance_variable_get("@threads").length).to eq 1
           expect(bt.instance_variable_get("@threads")[0].alive?).to eq false
 
           bt.stop_all
           sleep 0.2
-          expect(Thread.list.length).to eql(1)
+          if RUBY_ENGINE == 'ruby'
+            expect(Thread.list.length).to eql(1)
+          else
+            expect(Thread.list.length).to eql(2)
+          end
           expect(bt.instance_variable_get("@threads").length).to eq 0
 
           expect(stdout.string).to match "unexpectedly died"

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -32,13 +32,27 @@ module Cosmos
         file.puts "end"
       end
 
+      @protocol_filename = File.join(Cosmos::USERPATH,'lib','cts_config_test_protocol.rb')
+      File.open(@protocol_filename,'w') do |file|
+        file.puts "require 'cosmos'"
+        file.puts "require 'cosmos/interfaces/protocols/protocol'"
+        file.puts "module Cosmos"
+        file.puts "  class CtsConfigTestProtocol < Protocol"
+        file.puts "    def initialize(*args)" # Allow any args
+        file.puts "      super()"
+        file.puts "    end"
+        file.puts "  end"
+        file.puts "end"
+      end
+
       @keywords = %w(TITLE PACKET_LOG_WRITER AUTO_INTERFACE_TARGETS INTERFACE_TARGET INTERFACE ROUTER)
-      @interface_keywords = %w(DONT_CONNECT DONT_RECONNECT RECONNECT_DELAY DISABLE_DISCONNECT LOG DONT_LOG TARGET)
+      @interface_keywords = %w(DONT_CONNECT DONT_RECONNECT RECONNECT_DELAY DISABLE_DISCONNECT LOG DONT_LOG TARGET PROTOCOL)
     end
 
     after(:all) do
       clean_config()
       File.delete @interface_filename
+      File.delete @protocol_filename
     end
 
     describe "process_file" do
@@ -142,7 +156,7 @@ module Cosmos
           tf.puts 'AUTO_INTERFACE_TARGETS'
           tf.close
           config = CmdTlmServerConfig.new(tf.path)
-          expect(config.interfaces.keys).to eql %w(INST_INT COSMOSINT)
+          expect(config.interfaces.keys).to eql %w(INST_INT SYSTEM_INT)
           tf.unlink
         end
       end
@@ -369,6 +383,112 @@ module Cosmos
         end
       end
 
+      context "with PROTOCOL" do
+        it "requires two parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL'
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, /Not enough parameters for PROTOCOL/)
+          tf.unlink
+        end
+
+        it "requires a READ, WRITE, or READ_WRITE descriptor" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL BLAH cts_config_test_protocol.rb'
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, /Invalid protocol type: BLAH/)
+          tf.unlink
+        end
+
+        it "requires a protocol filename or class" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL READ'
+          tf.close
+          expect { CmdTlmServerConfig.new(tf.path) }.to raise_error(ConfigParser::Error, /Not enough parameters for PROTOCOL/)
+          tf.unlink
+        end
+
+        it "instantiates via the file name" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL READ cts_config_test_protocol.rb'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].read_protocols[0].class).to be CtsConfigTestProtocol
+          tf.unlink
+        end
+
+        it "instantiates via the class name" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL READ CtsConfigTestProtocol'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].read_protocols[0].class).to be CtsConfigTestProtocol
+          tf.unlink
+        end
+
+        it "appends to the list of READ protocols" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL READ OverrideProtocol'
+          tf.puts 'PROTOCOL READ CtsConfigTestProtocol'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          read_protocols = config.interfaces['CTSCONFIGTESTINTERFACE'].read_protocols
+          expect(read_protocols[0].class).to be OverrideProtocol
+          expect(read_protocols[1].class).to be CtsConfigTestProtocol
+          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].write_protocols).to be_empty
+          tf.unlink
+        end
+
+        it "prepends to the list of WRITE protocols" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL WRITE OverrideProtocol'
+          tf.puts 'PROTOCOL WRITE CtsConfigTestProtocol'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          write_protocols = config.interfaces['CTSCONFIGTESTINTERFACE'].write_protocols
+          expect(write_protocols[0].class).to be CtsConfigTestProtocol
+          expect(write_protocols[1].class).to be OverrideProtocol
+          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].read_protocols).to be_empty
+          tf.unlink
+        end
+
+        it "adds to both with READ_WRITE" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL READ_WRITE OverrideProtocol'
+          tf.puts 'PROTOCOL READ_WRITE CtsConfigTestProtocol'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          read_protocols = config.interfaces['CTSCONFIGTESTINTERFACE'].read_protocols
+          write_protocols = config.interfaces['CTSCONFIGTESTINTERFACE'].write_protocols
+          expect(read_protocols[0].class).to be OverrideProtocol
+          expect(read_protocols[1].class).to be CtsConfigTestProtocol
+          expect(write_protocols[0].class).to be CtsConfigTestProtocol
+          expect(write_protocols[1].class).to be OverrideProtocol
+          tf.unlink
+        end
+
+        it "stores initialization parameters" do
+          tf = Tempfile.new('unittest')
+          tf.puts "INTERFACE CtsConfigTestInterface cts_config_test_interface.rb"
+          tf.puts 'PROTOCOL READ cts_config_test_protocol.rb PARAM1 20'
+          tf.close
+          config = CmdTlmServerConfig.new(tf.path)
+          pinfo = config.interfaces['CTSCONFIGTESTINTERFACE'].protocol_info[0]
+          expect(pinfo[0]).to be CtsConfigTestProtocol
+          expect(pinfo[1]).to eq ['PARAM1', '20']
+          expect(pinfo[2]).to eq :READ
+          tf.unlink
+        end
+      end
+
       context "with two interfaces with the same name" do
         it "complains about duplicate interface names" do
           tf = Tempfile.new('unittest')
@@ -456,7 +576,7 @@ module Cosmos
             file.puts "  end"
             file.puts "end"
           end
-          
+
           background_task_args_file = File.join(Cosmos::USERPATH,'lib','cts_config_test_background_task_args.rb')
           File.open(background_task_args_file,'w') do |file|
             file.puts "require 'cosmos'"
@@ -469,7 +589,7 @@ module Cosmos
             file.puts "  end"
             file.puts "end"
           end
-          
+
           tf = Tempfile.new('unittest')
           tf.puts 'BACKGROUND_TASK cts_config_test_background_task_no_args.rb'
           tf.puts 'BACKGROUND_TASK cts_config_test_background_task_args.rb 1 2 3'
@@ -479,7 +599,7 @@ module Cosmos
           expect(config.background_tasks[0]).to be_a CtsConfigTestBackgroundTaskNoArgs
           expect(config.background_tasks[1]).to be_a CtsConfigTestBackgroundTaskArgs
           tf.unlink
-          
+
           File.delete background_task_no_args_file
           File.delete background_task_args_file
         end