cosmos 4.0.3-java → 4.1.0-java

data/spec/tools/launcher/launcher_config_spec.rb

@@ -19,7 +19,7 @@ module Cosmos
   describe LauncherConfig do
     describe "initialize" do
       it "checks for a given filename" do
-        expect { LauncherConfig.new('blah_file.txt') }.to raise_error(/file does not exist/)
+        expect { LauncherConfig.new('blah_file.txt') }.to raise_error("Configuration file blah_file.txt does not exist.")
       end
 
       it "raises on unknown parameters" do

data/spec/tools/table_manager/table_item_spec.rb

@@ -35,7 +35,7 @@ module Cosmos
     describe "clone" do
       it "duplicates the entire TableItem" do
         pi2 = @ti.clone
-        expect(@ti == pi2).to be true
+        expect(@ti < pi2).to be true
       end
     end
 

data/spec/tools/table_manager/tablemanager_core_spec.rb

@@ -19,7 +19,7 @@ module Cosmos
 
     describe "process_definition" do
       it "complains if the definition filename does not exist" do
-        expect { core.process_definition('path') }.to raise_error(/No such file/)
+        expect { core.process_definition('path') }.to raise_error("Configuration file path does not exist.")
       end
 
       it "processes the table definition" do
@@ -47,7 +47,7 @@ module Cosmos
 
     describe "file_new" do
       it "complains if the definition filename does not exist" do
-        expect { core.file_new('path', Dir.pwd) }.to raise_error(/No such file/)
+        expect { core.file_new('path', Dir.pwd) }.to raise_error(/Configuration file path does not exist./)
       end
 
       it "creates a new file in the given output dir" do
@@ -74,7 +74,7 @@ module Cosmos
         FileUtils.rm def_filename if File.exist? def_filename
         bin_filename = File.join(Dir.pwd, 'dat.bin')
         File.open(bin_filename,'w') {|file| file.puts "\x00\x01" }
-        expect { core.file_open(bin_filename, def_filename) }.to raise_error(/No such file/)
+        expect { core.file_open(bin_filename, def_filename) }.to raise_error(/does not exist/)
         FileUtils.rm bin_filename
       end
 
@@ -83,7 +83,7 @@ module Cosmos
         FileUtils.rm bin_filename if File.exist? bin_filename
         def_filename = File.join(Dir.pwd, 'def.txt')
         File.open(def_filename,'w') {|file| file.puts "TABLE table1 BIG_ENDIAN ONE_DIMENSIONAL" }
-        expect { core.file_open(bin_filename, def_filename) }.to raise_error(/No such file/)
+        expect { core.file_open(bin_filename, def_filename) }.to raise_error(/Unable to open and load/)
         FileUtils.rm def_filename
       end
 

data/spec/top_level/top_level_spec.rb

@@ -100,6 +100,44 @@ module Cosmos
     end
   end
 
+  describe "data_path" do
+    it "looks first in USERPATH/config/data" do
+      filename = Cosmos.data_path('data.txt')
+      expect(filename).to eql File.join(Cosmos::USERPATH,'config','data','data.txt')
+    end
+
+    it "looks in core/data" do
+      filename = Cosmos.data_path('about.txt')
+      expect(filename).to eql File.join(Cosmos::PATH,'data','about.txt')
+    end
+
+    it "complains if the file is not found" do
+      expect { Cosmos.data_path('nope.txt') }.to raise_error(/Could not find path/)
+    end
+  end
+
+  describe "path" do
+    it "looks first in the USERPATH" do
+      filename = Cosmos.path(__FILE__, ['config','system','system.txt'])
+      expect(filename).to eql File.join(Cosmos::USERPATH,'config','system','system.txt')
+    end
+
+    it "looks relative to the absolute path calling_file" do
+      spec = File.expand_path(File.join(File.dirname(Cosmos::USERPATH),'spec_helper.rb'))
+      filename = Cosmos.path(spec, ['top_level', 'top_level_spec.rb'])
+      expect(filename).to eql __FILE__
+    end
+
+    it "looks relative to the relative path calling_file" do
+      filename = Cosmos.path('spec/spec_helper.rb', ['top_level', 'top_level_spec.rb'])
+      expect(filename).to eql __FILE__
+    end
+
+    it "complains if the path is not found" do
+      expect { Cosmos.path(__FILE__, ['nope', 'nowhere.rb']) }.to raise_error(/Could not find path/)
+    end
+  end
+
   describe "self.marshal_dump, self.marshal_load" do
     after(:each) do
       Cosmos.disable_warnings do
@@ -197,10 +235,29 @@ module Cosmos
   end
 
   describe "create_log_file" do
+    it "creates a log file in System LOGS" do
+      filename1 = Cosmos.create_log_file('test')
+      expect(File.exist?(filename1)).to be true
+      if File.dirname(filename1)[-1] == '/' and System.paths['LOGS'][-1] != '/'
+        expect(File.dirname(filename1)).to eq (System.paths['LOGS'] + '/')
+      elsif File.dirname(filename1)[-1] != '/' and System.paths['LOGS'][-1] == '/'
+        expect(File.dirname(filename1) + '/').to eq System.paths['LOGS']
+      else
+        expect(File.dirname(filename1)).to eq System.paths['LOGS']
+      end
+      File.delete(filename1)
+    end
+
     it "creates a log file even if System LOGS doesn't exist" do
-      filename = Cosmos.create_log_file('test', 'X:/directory/which/does/not/exit')
-      expect(File.exist?(filename)).to be true
-      File.delete(filename)
+      filename1 = Cosmos.create_log_file('test', 'X:/directory/which/does/not/exit')
+      expect(File.exist?(filename1)).to be true
+      # Immediately create another log file to ensure we get unique names
+      filename2 = Cosmos.create_log_file('test', 'X:/directory/which/does/not/exit')
+      expect(File.exist?(filename2)).to be true
+      # Ensure the file names are unique
+      expect(filename1).to_not eql filename2
+      File.delete(filename1)
+      File.delete(filename2)
 
       Cosmos.set_working_dir do
         # Move the defaults output dir out of the way for this test
@@ -318,6 +375,24 @@ module Cosmos
       expect(klass).to eq MyTestClass
       File.delete(filename)
     end
+
+    it "requires the class represented by the classname" do
+      filename = File.join(Cosmos::USERPATH,"lib","my_other_test_class.rb")
+      File.delete(filename) if File.exist? filename
+
+      # Explicitly load cosmos.rb to ensure the Cosmos::USERPATH/lib
+      # directory is in the path
+      load 'cosmos.rb'
+      File.open(filename,'w') do |file|
+        file.puts "class MyOtherTestClass"
+        file.puts "end"
+      end
+
+      klass = Cosmos.require_class("MyOtherTestClass")
+      expect(klass).to be_a(Class)
+      expect(klass).to eq MyOtherTestClass
+      File.delete(filename)
+    end
   end
 
   describe "require_file" do
@@ -346,6 +421,79 @@ module Cosmos
     end
   end
 
+  describe "kill_thread" do
+    before(:each) do
+      @log_info = ''
+      @log_warn = ''
+      @log_error = ''
+      allow(Logger).to receive(:info) {|str| @log_info << str}
+      allow(Logger).to receive(:warn) {|str| @log_warn << str}
+      allow(Logger).to receive(:error) {|str| @log_error << str}
+    end
+
+    it "calls thread.kill if the thread is alive" do
+      thread = Thread.new { loop { sleep 1 } }
+      Cosmos.kill_thread(nil, thread) # No thread owner
+      expect(@log_info).to match("")
+      expect(@log_warn).to match("Failed to gracefully kill thread")
+      expect(@log_error).to eql("")
+      expect(thread.alive?).to be false
+    end
+
+    it "warns if the thread owner doesn't support graceful_kill" do
+      thread = Thread.new { loop { sleep 1 } }
+      Cosmos.kill_thread(thread, thread)
+      expect(@log_info).to match("Thread owner Thread does not support graceful_kill")
+      expect(@log_warn).to match("Failed to gracefully kill thread")
+      expect(@log_error).to eql("")
+      expect(thread.alive?).to be false
+    end
+
+    it "warns if the thread owner is the current thread" do
+      class MyThread < Thread
+        def graceful_kill; end
+      end
+      thread = MyThread.new do
+        Cosmos.kill_thread(thread, thread)
+      end
+      sleep 0.1 while thread.alive?
+      expect(@log_info).to match("")
+      expect(@log_warn).to match("Threads cannot graceful_kill themselves")
+      expect(@log_error).to eql("")
+      expect(thread.alive?).to be false
+    end
+
+    it "calls graceful_kill on the owner" do
+      class ThreadOwner
+        attr_accessor :thread
+        def initialize
+          @thread = Thread.new { loop { sleep 1 } }
+        end
+        def graceful_kill
+          @thread.kill
+        end
+      end
+      owner = ThreadOwner.new
+      Cosmos.kill_thread(owner, owner.thread)
+      expect(@log_info).to match("")
+      expect(@log_warn).to match("")
+      expect(@log_error).to match("")
+      expect(owner.thread.alive?).to be false
+    end
+
+    it "logs an error if the thread doesn't die" do
+      class MyAliveThread
+        def alive?; true; end
+        def kill; end
+        def backtrace; []; end
+      end
+      Cosmos.kill_thread(nil, MyAliveThread.new)
+      expect(@log_info).to match("")
+      expect(@log_warn).to match("Failed to gracefully kill thread")
+      expect(@log_error).to match("Failed to kill thread")
+    end
+  end
+
   describe "open_file_browser" do
     it "opens a file browser" do
       unless ENV['TRAVIS']

data/spec/utilities/csv_spec.rb

@@ -21,7 +21,8 @@ module Cosmos
       @lines << "bool1,true,false\n"
       @lines << "bool2,false,true\n"
       @lines << "int,10,11\n"
-      @lines << "float,1.1,2.2\n"
+      @lines << "float,1.1,2.2,3.3\n"
+      @lines << "string,test,text with space\n"
 
       @test_file = File.open('cosmos_csv_spec.csv','w')
       @test_file.write(@lines.join(''))
@@ -68,7 +69,7 @@ module Cosmos
       end
 
       it "returns all keys" do
-        expect(@csv.keys).to eq(%w(test bool1 bool2 int float))
+        expect(@csv.keys).to eq(%w(test bool1 bool2 int float string))
       end
 
       it "returns boolean values" do
@@ -77,19 +78,37 @@ module Cosmos
 
         expect(@csv.boolean("bool1", 1)).to be false
         expect(@csv.bool("bool2", 1)).to be true
+
+        expect(@csv.bool("bool1", (0..-1))).to eql([true, false])
+        expect(@csv.bool("bool2", (0..-1))).to eql([false, true])
       end
 
       it "returns integer values" do
         expect(@csv.integer("int")).to be(10)
-        expect(@csv.int("int")).to be(10)
-
-        expect(@csv.integer("int", 1)).to be(11)
         expect(@csv.int("int", 1)).to be(11)
+        expect(@csv.integer("int", (0..1))).to eql([10, 11])
       end
 
       it "returns float values" do
         expect(@csv.float("float")).to eq(1.1)
         expect(@csv.float("float", 1)).to eq(2.2)
+        expect(@csv.float("float", 2)).to eq(3.3)
+        expect(@csv.float("float", (0..1))).to eql([1.1, 2.2])
+        expect(@csv.float("float", (1..2))).to eql([2.2, 3.3])
+        expect(@csv.float("float", (0..-1))).to eql([1.1, 2.2, 3.3])
+      end
+
+      it "returns string values" do
+        expect(@csv.string("string")).to eq("test")
+        expect(@csv.str("string", 1)).to eq("text with space")
+        expect(@csv.str("string", (0..-1))).to eq(["test", "text with space"])
+      end
+
+      it "returns symbol values" do
+        expect(@csv.symbol("string")).to eq(:test)
+        # This works but please don't do this! Symbols with spaces is ugly!
+        expect(@csv.sym("string", 1)).to eq(:"text with space")
+        expect(@csv.sym("string", (0..-1))).to eq([:test, :"text with space"])
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 4.0.3
+  version: 4.1.0
 platform: java
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2017-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
   name: rubyzip
   prerelease: false
   type: :runtime
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -201,6 +201,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+  name: puma
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+  name: rack
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  name: httpclient
+  prerelease: false
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -346,15 +388,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-  name: coveralls
+        version: '0.1'
+  name: codecov
   prerelease: false
   type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -399,6 +441,7 @@ files:
 - Manifest.txt
 - README.md
 - Rakefile
+- appveyor.yml
 - autohotkey/config/data/attitude.bin
 - autohotkey/config/data/diamond.STL
 - autohotkey/config/data/groundoff.gif
@@ -760,6 +803,7 @@ files:
 - demo/config/targets/INST/cmd_tlm/inst_cmds.txt
 - demo/config/targets/INST/cmd_tlm/inst_tlm.txt
 - demo/config/targets/INST/cmd_tlm_server.txt
+- demo/config/targets/INST/cmd_tlm_server2.txt
 - demo/config/targets/INST/doc/README.txt
 - demo/config/targets/INST/lib/example_limits_response.rb
 - demo/config/targets/INST/lib/inst_dump_component.rb
@@ -807,6 +851,7 @@ files:
 - demo/config/targets/TEMPLATED/cmd_tlm_server.txt
 - demo/config/targets/TEMPLATED/lib/templated_interface.rb
 - demo/config/targets/TEMPLATED/target.txt
+- demo/config/tools/cmd_sequence/cmd_sequence.txt
 - demo/config/tools/cmd_tlm_server/cmd_tlm_server.txt
 - demo/config/tools/cmd_tlm_server/cmd_tlm_server2.txt
 - demo/config/tools/data_viewer/data_viewer.txt
@@ -849,6 +894,7 @@ files:
 - demo/config/tools/tlm_extractor/tlm_extractor4.txt
 - demo/config/tools/tlm_grapher/README.txt
 - demo/config/tools/tlm_viewer/tlm_viewer.txt
+- demo/lib/cmd_sequence_exporter.rb
 - demo/lib/example_background_task.rb
 - demo/lib/example_target.rb
 - demo/lib/scpi_target.rb
@@ -877,6 +923,7 @@ files:
 - demo/procedures/cosmos_api_test.rb
 - demo/procedures/example_test.rb
 - demo/procedures/plot_test.rb
+- demo/procedures/replay_test.rb
 - demo/procedures/run_example_test.rb
 - demo/procedures/test.rb
 - demo/tools/CmdExtractor
@@ -1344,6 +1391,7 @@ files:
 - lib/cosmos/io/io_multiplexer.rb
 - lib/cosmos/io/json_drb.rb
 - lib/cosmos/io/json_drb_object.rb
+- lib/cosmos/io/json_drb_rack.rb
 - lib/cosmos/io/json_rpc.rb
 - lib/cosmos/io/posix_serial_driver.rb
 - lib/cosmos/io/raw_logger.rb
@@ -1388,6 +1436,7 @@ files:
 - lib/cosmos/script/commands.rb
 - lib/cosmos/script/extract.rb
 - lib/cosmos/script/limits.rb
+- lib/cosmos/script/replay.rb
 - lib/cosmos/script/script.rb
 - lib/cosmos/script/scripting.rb
 - lib/cosmos/script/telemetry.rb
@@ -1417,12 +1466,14 @@ files:
 - lib/cosmos/tools/cmd_tlm_server/gui/interfaces_tab.rb
 - lib/cosmos/tools/cmd_tlm_server/gui/logging_tab.rb
 - lib/cosmos/tools/cmd_tlm_server/gui/packets_tab.rb
+- lib/cosmos/tools/cmd_tlm_server/gui/replay_tab.rb
 - lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb
 - lib/cosmos/tools/cmd_tlm_server/gui/targets_tab.rb
 - lib/cosmos/tools/cmd_tlm_server/interface_thread.rb
 - lib/cosmos/tools/cmd_tlm_server/interfaces.rb
 - lib/cosmos/tools/cmd_tlm_server/limits_groups_background_task.rb
 - lib/cosmos/tools/cmd_tlm_server/packet_logging.rb
+- lib/cosmos/tools/cmd_tlm_server/replay_backend.rb
 - lib/cosmos/tools/cmd_tlm_server/router_thread.rb
 - lib/cosmos/tools/cmd_tlm_server/routers.rb
 - lib/cosmos/tools/config_editor/config_editor.rb
@@ -1441,7 +1492,6 @@ files:
 - lib/cosmos/tools/opengl_builder/scene_config.rb
 - lib/cosmos/tools/packet_viewer/packet_viewer.rb
 - lib/cosmos/tools/replay/replay.rb
-- lib/cosmos/tools/replay/replay_server.rb
 - lib/cosmos/tools/script_runner/script_audit.rb
 - lib/cosmos/tools/script_runner/script_runner.rb
 - lib/cosmos/tools/script_runner/script_runner_config.rb
@@ -1610,6 +1660,8 @@ files:
 - spec/core_ext/time_spec.rb
 - spec/gui/line_graph/line_clip_spec.rb
 - spec/gui/qt_spec.rb
+- spec/gui/utilities/script_module_gui_spec.rb
+- spec/install/config/data/data.txt
 - spec/install/config/system/system.txt
 - spec/install/config/targets/INST/cmd_tlm/inst_cmd_linc.txt
 - spec/install/config/targets/INST/cmd_tlm/inst_cmds.txt
@@ -1949,7 +2001,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="