cosmos 3.8.0 → 3.8.1

data/lib/cosmos/tools/test_runner/test_runner.rb

@@ -103,7 +103,11 @@ module Cosmos
       @select_keyseq = Qt::KeySequence.new(tr('Ctrl+S'))
       @select.shortcut = @select_keyseq
       @select.statusTip = tr('Select Test Suites/Groups/Cases')
-      @select.connect(SIGNAL('triggered()')) { show_select}
+      @select.connect(SIGNAL('triggered()')) { show_select }
+
+      @file_options = Qt::Action.new(tr('O&ptions'), self)
+      @file_options.statusTip = tr('Application Options')
+      @file_options.connect(SIGNAL('triggered()')) { file_options() }
 
       # Script Actions
       @test_results_log_message = Qt::Action.new(tr('Log Message to Test Results'), self)
@@ -141,21 +145,23 @@ module Cosmos
 
     def initialize_menus
       # File Menu
-      @file_menu = menuBar.addMenu(tr('&File'))
-      @file_menu.addAction(@show_last)
-      @file_menu.addAction(@select)
-      @file_menu.addSeparator()
-      @file_menu.addAction(@exit_action)
+      file_menu = menuBar.addMenu(tr('&File'))
+      file_menu.addAction(@show_last)
+      file_menu.addAction(@select)
+      file_menu.addSeparator()
+      file_menu.addAction(@file_options)
+      file_menu.addSeparator()
+      file_menu.addAction(@exit_action)
 
       # Script Menu
-      @script_menu = menuBar.addMenu(tr('&Script'))
-      @script_menu.addAction(@test_results_log_message)
-      @script_menu.addAction(@script_log_message)
-      @script_menu.addAction(@show_call_stack)
-      @script_menu.addAction(@toggle_debug)
-      @script_menu.addAction(@script_disconnect)
-      @script_menu.addSeparator()
-      @script_menu.addAction(@script_audit)
+      script_menu = menuBar.addMenu(tr('&Script'))
+      script_menu.addAction(@test_results_log_message)
+      script_menu.addAction(@script_log_message)
+      script_menu.addAction(@show_call_stack)
+      script_menu.addAction(@toggle_debug)
+      script_menu.addAction(@script_disconnect)
+      script_menu.addSeparator()
+      script_menu.addAction(@script_audit)
 
       # Help Menu
       @about_string  = "Test Runner provides a framework for developing high " \
@@ -816,6 +822,7 @@ module Cosmos
                                              Qt::DialogButtonBox::Cancel)
         connect(button_box, SIGNAL('rejected()'), box, SLOT('reject()'))
         connect(button_box, SIGNAL('accepted()')) do
+          ScriptRunnerFrame.instance = @script_runner_frame
           Cosmos.module_eval("class CustomTestSuite < TestSuite; end")
           tree.topLevelItems do |suite_node|
             next if suite_node.checkState == Qt::Unchecked
@@ -880,6 +887,7 @@ module Cosmos
             @test_runner_chooser.test_suites = @@suites
             @test_runner_chooser.select_suite("CustomTestSuite")
           end
+          ScriptRunnerFrame.instance = nil
           box.accept
         end
         dialog_layout.addWidget(button_box)
@@ -890,6 +898,60 @@ module Cosmos
       dialog.dispose
     end
 
+    def file_options
+      dialog = Qt::Dialog.new(self)
+      dialog.setWindowTitle('Test Runner Options')
+      layout = Qt::VBoxLayout.new
+
+      form = Qt::FormLayout.new
+      box = Qt::DoubleSpinBox.new
+      box.setRange(0, 60)
+      box.setValue(ScriptRunnerFrame.line_delay)
+      form.addRow(tr("&Delay between each script line:"), box)
+      monitor = Qt::CheckBox.new
+      form.addRow(tr("&Monitor limits:"), monitor)
+      pause_on_red = Qt::CheckBox.new
+      form.addRow(tr("Pause on &red limit:"), pause_on_red)
+      if ScriptRunnerFrame.monitor_limits
+        monitor.setCheckState(Qt::Checked)
+        pause_on_red.setCheckState(Qt::Checked) if ScriptRunnerFrame.pause_on_red
+      else
+        pause_on_red.setEnabled(false)
+      end
+      monitor.connect(SIGNAL('stateChanged(int)')) do
+        if monitor.isChecked()
+          pause_on_red.setEnabled(true)
+        else
+          pause_on_red.setCheckState(Qt::Unchecked)
+          pause_on_red.setEnabled(false)
+        end
+      end
+      layout.addLayout(form)
+
+      divider = Qt::Frame.new
+      divider.setFrameStyle(Qt::Frame::HLine | Qt::Frame::Raised)
+      divider.setLineWidth(1)
+      layout.addWidget(divider)
+
+      ok = Qt::PushButton.new('Ok')
+      ok.setDefault(true)
+      ok.connect(SIGNAL('clicked(bool)')) do
+        ScriptRunnerFrame.line_delay = box.value
+        ScriptRunnerFrame.monitor_limits = (monitor.checkState == Qt::Checked)
+        ScriptRunnerFrame.pause_on_red = (pause_on_red.checkState == Qt::Checked)
+        dialog.accept
+      end
+      cancel = Qt::PushButton.new('Cancel')
+      cancel.connect(SIGNAL('clicked(bool)')) { dialog.reject }
+      button_layout = Qt::HBoxLayout.new
+      button_layout.addWidget(ok)
+      button_layout.addWidget(cancel)
+      layout.addLayout(button_layout)
+      dialog.setLayout(layout)
+      dialog.exec
+      dialog.dispose
+    end
+
     def process_config(filename)
       ScriptRunnerFrame.instance = @script_runner_frame
 

data/lib/cosmos/tools/tlm_viewer/widgets/linegraph_widget.rb

@@ -33,10 +33,19 @@ module Cosmos
     end
 
     def value=(data)
-      @data << data.to_f
+      if data.is_a?(Array)
+        data2 = data.map(&:to_f)
+        data2.reject!{|val| val.nan? or val.infinite?}
+        @data.push(data2).flatten!
+      else
+        data2 = data.to_f
+        if !data2.infinite? and !data2.nan?
+          @data << data2
+        end
+      end
 
       if @data.length > @num_samples
-        @data = @data[1..-1]
+        @data = @data.last(@num_samples)
       end
       if not @data.empty?
         self.clear_lines

data/lib/cosmos/tools/tlm_viewer/widgets/timegraph_widget.rb

@@ -66,21 +66,24 @@ module Cosmos
       # Don't regraph old data
       return if @time[-1] == t_sec
 
-      # create time array
-      @time << t_sec
+      data2 = data.to_f
+      if data2.infinite? or data2.nan?
+        # create time array
+        @time << t_sec
 
-      # create data array and graph
-      @data << data.to_f
+        # create data array and graph
+        @data << data2
 
-      # truncate data if necessary
-      if @data.length > @num_samples
-        @data = @data[1..-1]
-        @time = @time[1..-1]
-      end
+        # truncate data if necessary
+        if @data.length > @num_samples
+          @data = @data[1..-1]
+          @time = @time[1..-1]
+        end
 
-      self.clear_lines
-      self.add_line('line', @data, @time)
-      self.graph
+        self.clear_lines
+        self.add_line('line', @data, @time)
+        self.graph
+      end
     end
 
   end

data/lib/cosmos/top_level.rb

@@ -162,11 +162,12 @@ module Cosmos
       # No Gemfile - so no gem based extensions
     end
 
+    # Check CORE
     filename = File.join(::Cosmos::PATH, 'data', name)
     return filename if File.exist? filename
 
-    # Check CORE
-    filename = Cosmos.path('data', name)
+    # Check relative to executing file
+    filename = Cosmos.path($0, 'config/data/' + name)
     return filename if File.exist? filename
 
     nil
@@ -304,7 +305,7 @@ module Cosmos
           if real_lines > 0
             Logger.error output
             self.write_unexpected_file(output)
-            if defined? ::Qt and ::Qt::Application.instance
+            if defined? ::Qt and $qApp
               Qt.execute_in_main_thread(false) do
                 dialog = Qt::Dialog.new do |box|
                   box.setWindowTitle('Unexpected text output')
@@ -528,7 +529,7 @@ module Cosmos
     Logger.level = Logger::FATAL unless try_gui
     Logger.fatal "Fatal Exception! Exiting..."
     Logger.fatal error.formatted
-    if defined? ExceptionDialog and try_gui and Qt::Application.instance
+    if defined? ExceptionDialog and try_gui and $qApp
       Qt.execute_in_main_thread(true) {||ExceptionDialog.new(nil, error, '', true, false, log_file)}
     else
       if $stdout != STDOUT
@@ -618,39 +619,35 @@ module Cosmos
   # @param filename [String] Name of the file to open in the editor
   def self.open_in_text_editor(filename)
     if filename
-      if Kernel.is_windows?
-        if File.extname(filename).to_s.downcase == '.csv'
-          self.run_process("cmd /c \"start wordpad \"#{filename.gsub('/','\\')}\"\"")
-        else
-          self.run_process("cmd /c \"start \"\" \"#{filename.gsub('/','\\')}\"\"")
-        end
-      elsif Kernel.is_mac?
-        self.run_process("open -a TextEdit \"#{filename}\"")
+      if ENV['COSMOS_TEXT']
+        self.run_process("#{ENV['COSMOS_TEXT']} \"#{filename}\"")
       else
-        which_gedit = `which gedit 2>&1`.chomp
-        if which_gedit =~ /Command not found/i or which_gedit =~ /no .* in/i
-          # No gedit
-          editor = ENV['EDITOR']
-          editor = 'vi' unless editor
-          which_xterm = `which xterm 2>&1`.chomp
-          if which_xterm =~ /Command not found/i or which_xterm =~ /no .* in/i
-            # No xterm
-            which_gnome_terminal = `which gnome-terminal 2>&1`.chomp
-            if which_gnome_terminal =~ /Command not found/i or which_gnome_terminal =~ /no .* in/i
-              # No gnome-terminal - Do nothing
-            else
-              # Have gnome-terminal
-              system_call = "gnome-terminal -e #{editor} \"#{filename}\""
-            end
+        if Kernel.is_windows?
+          if File.extname(filename).to_s.downcase == '.csv'
+            self.run_process("cmd /c \"start wordpad \"#{filename.gsub('/','\\')}\"\"")
           else
-            # Have xterm
-            system_call = "xterm -e #{editor} \"#{filename}\""
+            self.run_process("cmd /c \"start \"\" \"#{filename.gsub('/','\\')}\"\"")
           end
+        elsif Kernel.is_mac?
+          self.run_process("open -a TextEdit \"#{filename}\"")
         else
-          # Have gedit
-          system_call = "gedit \"#{filename}\""
+          which_gedit = `which gedit 2>&1`.chomp
+          if which_gedit.to_s.strip == "" or which_gedit =~ /Command not found/i or which_gedit =~ /no .* in/i
+            # No gedit
+            ['xterm', 'gnome-terminal', 'urxvt', 'rxvt'].each do |terminal|
+              which_terminal = `which #{terminal} 2>&1`.chomp
+              next if which_terminal.to_s.strip == "" or which_terminal =~ /Command not found/i or which_terminal =~ /no .* in/i
+              editor = ENV['VISUAL']
+              editor = ENV['EDITOR'] unless editor
+              editor = 'vi' unless editor
+              self.run_process("#{terminal} -e \"#{editor} '#{filename}'\"")
+              break
+            end
+          else
+            # Have gedit
+            self.run_process("gedit \"#{filename}\"")
+          end
         end
-        self.run_process(system_call)
       end
     end
   end

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.8.0'
+COSMOS_VERSION = '3.8.1'
 module Cosmos
   module Version
     MAJOR = '3'
     MINOR = '8'
-    PATCH = '0'
-    BUILD = '2bed164a724153c0accb6392928da087b2120ade'
+    PATCH = '1'
+    BUILD = 'fa125f2a38e0aa28f6d3000a80ea5167115172d7'
   end
-  VERSION = '3.8.0'
+  VERSION = '3.8.1'
 end

data/spec/config/config_parser_spec.rb

@@ -221,11 +221,6 @@ module Cosmos
         expect(ConfigParser.handle_nil("HI")).to eql "HI"
         expect(ConfigParser.handle_nil(5.0)).to eql 5.0
       end
-
-      #it "should complain if it can't convert" do
-      #  expect { ConfigParser.handle_nil(0) }.to raise_error(ArgumentError, "Value is not nil: 0")
-      #  expect { ConfigParser.handle_nil(false) }.to raise_error(ArgumentError, "Value is not nil: false")
-      #end
     end
 
     describe "self.handle_true_false" do
@@ -245,11 +240,6 @@ module Cosmos
         expect(ConfigParser.handle_true_false("HI")).to eql "HI"
         expect(ConfigParser.handle_true_false(5.0)).to eql 5.0
       end
-
-      #it "should complain if it can't convert" do
-      #  expect { ConfigParser.handle_true_false(0) }.to raise_error(ArgumentError, "Value neither true or false: 0")
-      #  expect { ConfigParser.handle_true_false(nil) }.to raise_error(ArgumentError, "Value neither true or false: ")
-      #end
     end
 
     describe "self.handle_true_false_nil" do
@@ -281,15 +271,18 @@ module Cosmos
         expect(ConfigParser.handle_true_false("HI")).to eql "HI"
         expect(ConfigParser.handle_true_false(5.0)).to eql 5.0
       end
-
-      #it "should complain if it can't convert" do
-      #  expect { ConfigParser.handle_true_false_nil(0) }.to raise_error(ArgumentError, "Value neither true, false, or nil: 0")
-      #  expect { ConfigParser.handle_true_false_nil(1) }.to raise_error(ArgumentError, "Value neither true, false, or nil: 1")
-      #end
     end
 
     describe "self.handle_defined_constants" do
       it "converts string constants to numbers" do
+        (1..64).each do |val|
+          # Unsigned
+          expect(ConfigParser.handle_defined_constants("MIN", :UINT, val)).to eql 0
+          expect(ConfigParser.handle_defined_constants("MAX", :UINT, val)).to eql (2**val - 1)
+          # Signed
+          expect(ConfigParser.handle_defined_constants("MIN", :INT, val)).to eql -((2**val) / 2)
+          expect(ConfigParser.handle_defined_constants("MAX", :INT, val)).to eql ((2**val) / 2 - 1)
+        end
         [8,16,32,64].each do |val|
           # Unsigned
           expect(ConfigParser.handle_defined_constants("MIN_UINT#{val}")).to eql 0

data/spec/core_ext/socket_spec.rb

@@ -25,8 +25,8 @@ describe Socket do
 
   describe "lookup_hostname_from_ip" do
     it "returns the hostname for the ip address" do
-      ipaddr = Resolv.getaddress "www.ball.com"
-      expect(Socket.lookup_hostname_from_ip(ipaddr)).to match "ball.com"
+      ipaddr = Resolv.getaddress "localhost"
+      expect(Socket.lookup_hostname_from_ip(ipaddr)).to match "localhost"
     end
   end
 end

data/spec/core_ext/string_spec.rb

@@ -194,6 +194,16 @@ describe String do
     it "converts an array" do
       expect("[0,1,2,3]".convert_to_value).to eql [0,1,2,3]
     end
+
+    it "just returns the string if something goes wrong" do
+      expect("[.a,2,3]".convert_to_value).to eql "[.a,2,3]"
+    end
+
+    it "doesn't match multiline strings" do
+      expect("12345\n12345".convert_to_value).to eql "12345\n12345"
+      expect("5.123\n5.123".convert_to_value).to eql "5.123\n5.123"
+      expect("[0,1,2,3]\n[0,1,2,3]".convert_to_value).to eql "[0,1,2,3]\n[0,1,2,3]"
+    end
   end
 
   describe "hex_to_byte_string" do

data/spec/core_ext/time_spec.rb

@@ -113,12 +113,20 @@ describe Time do
   end
 
   describe "formatted" do
-    it "formats the Time" do
-      expect(Time.new(2020,1,2,3,4,5.5).formatted).to eql "2020/01/02 03:04:05.500"
+    it "formats the Time with date and fractional seconds" do
+      expect(Time.new(2020,1,2,3,4,5.123456).formatted(true, 6)).to eql "2020/01/02 03:04:05.123456"
     end
 
-    it "formats the Time without the date" do
-      expect(Time.new(2020,1,2,3,4,5.5).formatted(false)).to eql "03:04:05.500"
+    it "formats the Time with date and no fractional seconds" do
+      expect(Time.new(2020,1,2,3,4,5.123456).formatted(true, 0)).to eql "2020/01/02 03:04:05"
+    end
+
+    it "formats the Time without the date and fractional seconds" do
+      expect(Time.new(2020,1,2,3,4,5.123456).formatted(false, 2)).to eql "03:04:05.12"
+    end
+
+    it "formats the Time without the date and no fractional seconds" do
+      expect(Time.new(2020,1,2,3,4,5.123456).formatted(false, 0)).to eql "03:04:05"
     end
   end
 

data/spec/io/io_multiplexer_spec.rb

@@ -18,6 +18,15 @@ module Cosmos
       @io = IoMultiplexer.new
     end
 
+    describe "stream_operator" do
+      it "supports the << operator" do
+        @io.add_stream(STDOUT)
+        expect($stdout).to receive(:<<).with("TEST").and_return($stdout)
+        result = (@io << "TEST")
+        expect(result).to eql(@io)
+      end
+    end
+
     describe "add_stream" do
       it "adds a single stream" do
         @io.add_stream(STDOUT)
@@ -64,10 +73,10 @@ module Cosmos
     describe "write write_nonblock" do
       it "defers to the stream" do
         @io.add_stream(STDOUT)
-        expect($stdout).to receive(:write).with("TEST")
+        expect($stdout).to receive(:write).with("TEST").and_return(4)
         len = @io.write "TEST"
         expect(len).to eql 4
-        expect($stdout).to receive(:write_nonblock).with("TEST")
+        expect($stdout).to receive(:write_nonblock).with("TEST").and_return(4)
         len = @io.write_nonblock "TEST"
         expect(len).to eql 4
       end
@@ -88,7 +97,6 @@ module Cosmos
         File.delete("unittest.txt")
       end
     end
-
   end
 end
 

data/spec/packets/packet_spec.rb

@@ -370,6 +370,36 @@ module Cosmos
         expect(@p.read_item(i, :CONVERTED, "\x02")).to eql 1
       end
 
+      it "prevents the read conversion cache from being corrupted" do
+        @p.append_item("item",8,:UINT)
+        i = @p.get_item("ITEM")
+        i.read_conversion = GenericConversion.new("'A String'")
+        i.units = "with units"
+        value = @p.read_item(i, :CONVERTED)
+        expect(value).to eql 'A String'
+        value << 'That got modified'
+        value = @p.read_item(i, :WITH_UNITS)
+        expect(value).to eql 'A String with units'
+        value << 'That got modified'
+        expect(@p.read_item(i, :WITH_UNITS)).to eql 'A String with units'
+        value = @p.read_item(i, :WITH_UNITS)
+        value << ' more things'
+        expect(@p.read_item(i, :WITH_UNITS)).to eql 'A String with units'
+
+        @p.buffer = "\x00"
+        i.read_conversion = GenericConversion.new("['A', 'B', 'C']")
+        value = @p.read_item(i, :CONVERTED)
+        expect(value).to eql ['A', 'B', 'C']
+        value << 'D'
+        value = @p.read_item(i, :WITH_UNITS)
+        expect(value).to eql ['A with units', 'B with units', 'C with units']
+        value << 'D'
+        expect(@p.read_item(i, :WITH_UNITS)).to eql ['A with units', 'B with units', 'C with units']
+        value = @p.read_item(i, :WITH_UNITS)
+        value << 'D'
+        expect(@p.read_item(i, :WITH_UNITS)).to eql ['A with units', 'B with units', 'C with units']
+      end
+
       it "reads the CONVERTED value with states" do
         @p.append_item("item",8,:UINT)
         i = @p.get_item("ITEM")