cosmos 4.0.3 → 4.1.0

data/lib/cosmos/tools/script_runner/script_audit.rb

@@ -131,6 +131,7 @@ module Cosmos
                 file.puts "#{tlm},#{total}"
               end
             end
+            File.chmod(0444, output_filename)
           end
         rescue => error
           progress.append_text("Error processing:\n#{error.formatted}\n")

data/lib/cosmos/tools/script_runner/script_runner.rb

@@ -49,10 +49,10 @@ module Cosmos
       @running_icon = Cosmos.get_icon('running.png')
       @no_icon = Qt::Icon.new
 
-      if File.exist?(options.config_file)
+      begin
         ScriptRunnerConfig.new(options.config_file)
-      else
-        raise "Could not find config file #{options.config_file}"
+      rescue => error
+        ExceptionDialog.new(self, error, "Error parsing #{options.config_file}")
       end
 
       @procedure_dir = System.paths['PROCEDURES'][0]
@@ -955,7 +955,6 @@ module Cosmos
           options.height = 600
           options.title = "Script Runner : Untitled"
           options.auto_size = false
-          options.config_file = "script_runner.txt"
           options.server_config_file = CmdTlmServer::DEFAULT_CONFIG_FILE
           options.run_procedure = nil
 

data/lib/cosmos/tools/script_runner/script_runner_config.rb

@@ -11,11 +11,11 @@
 require 'cosmos'
 
 module Cosmos
-
   # This class reads the Script Runner configuration file
   class ScriptRunnerConfig
     # Processes the config file
     def initialize(filename)
+      return unless filename
       parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#script-runner-configuration")
       parser.parse_file(filename) do |keyword, params|
         case keyword
@@ -35,6 +35,5 @@ module Cosmos
         end
       end
     end
-  end # class ScriptRunnerConfig
-
-end # module Cosmos
+  end
+end

data/lib/cosmos/tools/script_runner/script_runner_frame.rb

@@ -140,6 +140,7 @@ module Cosmos
       # Add Realtime Button Bar
       @realtime_button_bar = RealtimeButtonBar.new(self)
       @realtime_button_bar.state = 'Stopped'
+      @realtime_button_bar.step_callback = method(:handle_step_button)
       @realtime_button_bar.start_callback = method(:handle_start_go_button)
       @realtime_button_bar.pause_callback = method(:handle_pause_retry_button)
       @realtime_button_bar.stop_callback  = method(:handle_stop_button)
@@ -549,13 +550,20 @@ module Cosmos
         return nil if @cancel_instrumentation
         instrumented_line = ''
         if instrumentable
+          # Skip the segment if it's empty. Note that the segment could have
+          # originally had comments but they were stripped in
+          # ruby_lex_utils.remove_comments
+          next if segment.strip.empty?
           # If not inside a begin block then create one to catch exceptions
           unless inside_begin
             instrumented_line << 'begin; '
           end
 
           # Add preline instrumentation
-          instrumented_line << "ScriptRunnerFrame.instance.script_binding = binding(); if ScriptRunnerFrame.instance.inline_return then ScriptRunnerFrame.instance.inline_return = nil; return ScriptRunnerFrame.instance.inline_return_params; end; ScriptRunnerFrame.instance.pre_line_instrumentation('#{filename}', #{line_no}); "
+          instrumented_line << "ScriptRunnerFrame.instance.script_binding = binding(); "\
+            "if ScriptRunnerFrame.instance.inline_return then ScriptRunnerFrame.instance.inline_return = nil; "\
+            "return ScriptRunnerFrame.instance.inline_return_params; end; "\
+            "ScriptRunnerFrame.instance.pre_line_instrumentation('#{filename}', #{line_no}); "
 
           # Add the actual line
           instrumented_line << segment
@@ -566,7 +574,8 @@ module Cosmos
 
           # Complete begin block to catch exceptions
           unless inside_begin
-            instrumented_line << "; rescue Exception => eval_error; retry if ScriptRunnerFrame.instance.exception_instrumentation(eval_error, '#{filename}', #{line_no}); end"
+            instrumented_line << "; rescue Exception => eval_error; "\
+            "retry if ScriptRunnerFrame.instance.exception_instrumentation(eval_error, '#{filename}', #{line_no}); end"
           end
 
           instrumented_line << "\n"
@@ -682,7 +691,16 @@ module Cosmos
     # Implement the breakpoint callbacks from the RubyEditor
     ######################################
     def breakpoint_set(line)
-      ScriptRunnerFrame.set_breakpoint(current_tab_filename(), line)
+      # Check for blank and comment lines which can't have a breakpoint.
+      # There are other un-instrumentable lines which don't support breakpoints
+      # but this is the most common and is an easy check.
+      # Note: line is 1 based but @script.get_line is zero based so subtract 1
+      text = @script.get_line(line - 1)
+      if text.strip.empty? || text.strip[0] == '#'
+        @script.clear_breakpoint(line) # Immediately clear it
+      else
+        ScriptRunnerFrame.set_breakpoint(current_tab_filename(), line)
+      end
     end
 
     def breakpoint_cleared(line)
@@ -874,6 +892,7 @@ module Cosmos
 
     def show_debug
       unless @debug_frame
+        @realtime_button_bar.step_button.setHidden(false)
         @script.enable_breakpoints = true
         if @tab_book_shown
           if @tab_book.count > 0
@@ -946,20 +965,6 @@ module Cosmos
 
         @debug_frame.addWidget(@debug_text)
 
-        @toggle_button = Qt::PushButton.new('Toggle Run/Step')
-        @debug_frame.addWidget(@toggle_button)
-        @toggle_button.connect(SIGNAL('clicked(bool)')) do
-          if @@step_mode
-            scriptrunner_puts "Debug: run_mode"
-            handle_output_io()
-            self.class.step_mode = false
-          else
-            scriptrunner_puts "Debug: step_mode"
-            handle_output_io()
-            self.class.step_mode = true
-          end
-        end
-
         @return_button = Qt::PushButton.new('Insert Return')
         @debug_frame.addWidget(@return_button)
         @return_button.connect(SIGNAL('clicked(bool)')) do
@@ -985,11 +990,19 @@ module Cosmos
           end
         end
       end
+      @realtime_button_bar.step_button.setHidden(true)
       # Remove the debug frame
       @bottom_frame.layout.takeAt(@bottom_frame.layout.count - 1) if @debug_frame
       @debug_frame.removeAll
       @debug_frame.dispose
       @debug_frame = nil
+
+      # If step mode was previously active then pause the script so it doesn't
+      # just take off when we end the debugging session
+      if @@step_mode
+        pause()
+        @@step_mode = false
+      end
     end
 
     def self.set_breakpoint(filename, line_number)
@@ -1442,8 +1455,18 @@ module Cosmos
       true
     end
 
-    def handle_start_go_button
-      scriptrunner_puts "User pressed #{@realtime_button_bar.start_button.text.strip}"
+    def handle_step_button
+      scriptrunner_puts "User pressed #{@realtime_button_bar.step_button.text.strip}"
+      pause()
+      @@step_mode = true
+      handle_start_go_button(step = true)
+    end
+
+    def handle_start_go_button(step = false)
+      unless step
+        scriptrunner_puts "User pressed #{@realtime_button_bar.start_button.text.strip}"
+        @@step_mode = false
+      end
       handle_output_io()
       @realtime_button_bar.start_button.clear_focus()
 
@@ -1832,7 +1855,5 @@ module Cosmos
         # Oh Well
       end
     end
-
-  end # class ScriptRunnerFrame
-
-end # module Cosmos
+  end
+end

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

@@ -116,6 +116,9 @@ module Cosmos
       footer()
     ensure
       @file.close if @file and not @file.closed?
+      Cosmos.set_working_dir do
+        File.chmod(0444, @filename)
+      end
     end
 
     def header
@@ -166,6 +169,7 @@ module Cosmos
                 end
               end
             end
+            File.chmod(0444, @data_package_filename)
           end
           progress_dialog.close_done if progress_dialog
         rescue => error

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

@@ -971,12 +971,9 @@ module Cosmos
 
     def process_config(filename)
       ScriptRunnerFrame.instance = @script_runner_frame
-
       # Remember all the requires that fail and warn the user
       require_errors = []
 
-      # Ensure the file exists
-      raise "Configuration File: #{filename} does not exist" unless test(?f, filename)
       parser = ConfigParser.new("http://cosmosrb.com/docs/tools/#test-runner-configuration")
       parser.parse_file(filename) do |keyword, params|
         case keyword

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_realtime_thread.rb

@@ -18,8 +18,12 @@ module Cosmos
   class TabbedPlotsRealtimeThread < InterfaceThread
 
     # Create a new TabbedPlotsRealtimeThread
-    def initialize(tabbed_plots_config, connection_success_callback = nil, connection_failed_callback = nil, connection_lost_callback = nil, fatal_exception_callback = nil)
-      interface = TcpipClientInterface.new(System.connect_hosts['CTS_PREIDENTIFIED'], nil, System.ports['CTS_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
+    def initialize(tabbed_plots_config, connection_success_callback = nil, connection_failed_callback = nil, connection_lost_callback = nil, fatal_exception_callback = nil, replay_mode = false)
+      if replay_mode
+        interface = TcpipClientInterface.new(System.connect_hosts['REPLAY_PREIDENTIFIED'], nil, System.ports['REPLAY_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
+      else
+        interface = TcpipClientInterface.new(System.connect_hosts['CTS_PREIDENTIFIED'], nil, System.ports['CTS_PREIDENTIFIED'], nil, tabbed_plots_config.cts_timeout, 'PREIDENTIFIED')
+      end
       super(interface)
 
       @queue = Queue.new

data/lib/cosmos/tools/tlm_grapher/tabbed_plots_tool/tabbed_plots_tool.rb

@@ -63,6 +63,7 @@ module Cosmos
       @tabbed_plots = nil
       @realtime_thread = nil
       @config_modified = false
+      @replay_mode = false
 
       # Bring up slash screen for long duration tasks after creation
       Splash.execute(self) do |splash|
@@ -107,6 +108,10 @@ module Cosmos
       @file_screenshot.statusTip = tr('Screenshot of Application')
       @file_screenshot.connect(SIGNAL('triggered()')) { on_file_screenshot() }
 
+      @replay_action = Qt::Action.new(tr('Toggle Replay Mode'), self)
+      @replay_action.statusTip = tr('Toggle Replay Mode')
+      @replay_action.connect(SIGNAL('triggered()')) { toggle_replay_mode() }
+
       # Tab Menu Actions
       @tab_add = Qt::Action.new(Cosmos.get_icon('add_tab.png'), tr('&Add Tab'), self)
       @tab_add.statusTip = tr('Add New Tab')
@@ -209,6 +214,8 @@ module Cosmos
       @file_menu.addSeparator()
       @file_menu.addAction(@file_screenshot)
       @file_menu.addSeparator()
+      @file_menu.addAction(@replay_action)
+      @file_menu.addSeparator()
       @file_menu.addAction(@exit_action)
 
       @tab_menu = menuBar.addMenu(tr('&Tab'))
@@ -265,6 +272,10 @@ module Cosmos
       # Create a Vertical Frame for the right contents
       @right_widget = Qt::Widget.new(self)
       @right_frame = Qt::VBoxLayout.new
+      @replay_flag = Qt::Label.new("Replay Mode")
+      @replay_flag.setStyleSheet("background:green;color:white;padding:5px;font-weight:bold;height:30px;")
+      @right_frame.addWidget(@replay_flag)
+      @replay_flag.hide      
       @right_widget.setLayout(@right_frame)
       @splitter.addWidget(@right_widget)
       @splitter.setStretchFactor(0,0) # Set the left side stretch factor to 0
@@ -581,6 +592,20 @@ module Cosmos
       @tabbed_plots.resume unless paused
     end # def on_file_screenshot
 
+    def toggle_replay_mode
+      running = @realtime_thread ? true : false
+      handle_stop()
+      System.telemetry.reset
+      @tabbed_plots.reset_all_data_objects      
+      @replay_mode = !@replay_mode
+      if @replay_mode
+        @replay_flag.show
+      else
+        @replay_flag.hide
+      end
+      handle_start() if running
+    end
+
     ###############################################################################
     # Tab Menu Handlers
     ###############################################################################
@@ -921,7 +946,7 @@ module Cosmos
         # Startup realtime thread
         @realtime_button_bar.state = 'Connecting'
         statusBar.showMessage(tr("Connecting to COSMOS Server"))
-        @realtime_thread = TabbedPlotsRealtimeThread.new(@tabbed_plots_config, method(:realtime_thread_connection_success_callback), method(:realtime_thread_connection_failed_callback), method(:realtime_thread_connection_lost_callback), method(:realtime_thread_fatal_exception_callback))
+        @realtime_thread = TabbedPlotsRealtimeThread.new(@tabbed_plots_config, method(:realtime_thread_connection_success_callback), method(:realtime_thread_connection_failed_callback), method(:realtime_thread_connection_lost_callback), method(:realtime_thread_fatal_exception_callback), @replay_mode)
       end
     end # def handle_start
 

data/lib/cosmos/tools/tlm_viewer/screen.rb

@@ -21,7 +21,7 @@ module Cosmos
     # close_all_screens is called
     @@open_screens = []
 
-    attr_accessor :full_name, :width, :height, :window
+    attr_accessor :full_name, :width, :height, :window, :replay_flag
 
     class Widgets
       # Flag to indicate all screens should close
@@ -229,6 +229,7 @@ module Cosmos
       app_style = File.join(Cosmos::USERPATH, 'config', 'tools', 'application.css')
       setStyleSheet(File.read(app_style)) if File.exist? app_style
 
+      @replay_flag = nil
       @widgets = Widgets.new(self, mode)
       @window = process(filename)
       @@open_screens << self if @window
@@ -277,6 +278,12 @@ module Cosmos
               setCentralWidget(top_widget)
               frame = Qt::VBoxLayout.new()
               top_widget.setLayout(frame)
+
+              @replay_flag = Qt::Label.new("Replay Mode")
+              @replay_flag.setStyleSheet("background:green;color:white;padding:5px;font-weight:bold;")
+              frame.addWidget(@replay_flag)
+              @replay_flag.hide unless get_replay_mode()
+
               layout_stack[0] = frame
               Cosmos.load_cosmos_icon if @single_screen
             when 'END'
@@ -498,5 +505,21 @@ module Cosmos
       Widgets.closing_all = false
     end
 
+    def self.update_replay_mode
+      screens = @@open_screens.clone
+      replay_mode = get_replay_mode()
+      screens.each do |screen|
+        begin
+          if replay_mode
+            screen.replay_flag.show if screen.replay_flag
+          else
+            screen.replay_flag.hide if screen.replay_flag
+          end
+        rescue
+          # Oh well
+        end
+      end
+    end
+
   end
 end

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

@@ -57,6 +57,8 @@ module Cosmos
     end
 
     def self.load_config(filename)
+      raise "Configuration file #{filename} does not exist." unless filename && File.exist?(filename)
+
       # Find all screen files so we can calculate MD5
       tlmviewer_files = [filename, System.initial_filename]
       additional_data = ''
@@ -179,6 +181,10 @@ module Cosmos
       @file_audit.shortcut = @file_audit_keyseq
       @file_audit.statusTip = tr('Create a report listing which telemetry points are not on screens')
       @file_audit.connect(SIGNAL('triggered()')) { file_audit() }
+
+      @replay_action = Qt::Action.new(tr('Toggle Replay Mode'), self)
+      @replay_action.statusTip = tr('Toggle Replay Mode')
+      @replay_action.connect(SIGNAL('triggered()')) { toggle_replay_mode() }      
     end
 
     def initialize_menus(options)
@@ -187,6 +193,7 @@ module Cosmos
       @file_menu.addAction(@file_save)
       @file_menu.addAction(@file_generate)
       @file_menu.addAction(@file_audit)
+      @file_menu.addAction(@replay_action)      
       @file_menu.addSeparator()
       @file_menu.addAction(@exit_action)
 
@@ -202,6 +209,11 @@ module Cosmos
       setCentralWidget(central_widget)
       top_layout = Qt::VBoxLayout.new
 
+      @replay_flag = Qt::Label.new("Replay Mode")
+      @replay_flag.setStyleSheet("background:green;color:white;padding:5px;font-weight:bold;")
+      top_layout.addWidget(@replay_flag)
+      @replay_flag.hide
+
       @search_box = FullTextSearchLineEdit.new(self)
       top_layout.addWidget(@search_box)
 
@@ -406,6 +418,16 @@ module Cosmos
       Cosmos.open_in_text_editor(output_filename) if output_filename
     end
 
+    def toggle_replay_mode
+      set_replay_mode(!get_replay_mode())
+      if get_replay_mode()
+        @replay_flag.show
+      else
+        @replay_flag.hide
+      end
+      Screen.update_replay_mode
+    end
+
     # Method called by screens to notify that they have been closed
     def notify(closed_screen)
       screen_full_name = closed_screen.full_name
@@ -447,6 +469,9 @@ module Cosmos
 
     def display(screen_full_name, x_pos = nil, y_pos = nil)
       return unless screen_full_name
+      x_pos = x_pos.to_i if x_pos
+      y_pos = y_pos.to_i if y_pos
+
       # Find the specified screen
       screen_info = find_screen_info(screen_full_name)
 

data/lib/cosmos/tools/tlm_viewer/tlm_viewer_config.rb

@@ -46,6 +46,21 @@ module Cosmos
         @invalid_items = []
       end
 
+      def as_json(options = nil) #:nodoc:
+        {group: @group, 
+         target_name: @target_name, 
+         original_target_name: 
+         @original_target_name, 
+         name: @name, 
+         filename: @filename, 
+         x_pos: @x_pos,
+         y_pos: @y_pos,
+         substitute: @substitute,
+         force_substitute: @force_substitute,
+         show_on_startup: @show_on_startup
+        }
+      end
+
       def full_name
         @group ? @name : "#{@target_name} #{@name}"
       end
@@ -96,15 +111,10 @@ module Cosmos
     attr_accessor :completion_list
     attr_accessor :tlm_to_screen_mapping
 
-    def initialize(filename = nil)
+    def initialize(filename = nil, skip_read_items = false)
       # Handle nil filename
       filename = File.join(Cosmos::USERPATH, 'config', 'tools', 'tlm_viewer', 'tlm_viewer.txt') unless filename
       @filename = filename
-
-      # Ensure the file exists
-      raise "Telemetry Viewer configuration file #{filename} does not exist" unless test ?f, filename
-
-      # Initialize instance variables
       @columns = []
       @columns << {}
       @screen_infos = {}
@@ -129,7 +139,7 @@ module Cosmos
             screen_dir = File.join(target.dir, 'screens')
             if File.exist?(screen_dir) and num_screens(screen_dir) > 0
               start_target(target.name, parser)
-              auto_screens()
+              auto_screens(skip_read_items)
             end
           end
 
@@ -141,7 +151,7 @@ module Cosmos
           screen_dir = File.join(target.dir, 'screens')
           if File.exist?(screen_dir) and num_screens(screen_dir) > 0
             start_target(target.name, parser)
-            auto_screens()
+            auto_screens(skip_read_items)
           end
 
         when 'TARGET'
@@ -153,7 +163,7 @@ module Cosmos
           raise parser.error("No target defined. SCREEN must follow TARGET.") unless @current_target
           parser.verify_num_parameters(1, 3, 'SCREEN <Filename> <X Position (optional)> <Y Position (optional)>')
           screen_filename = File.join(@current_target.dir, 'screens', parameters[0])
-          start_screen(screen_filename, parameters[1], parameters[2])
+          start_screen(screen_filename, parameters[1], parameters[2], skip_read_items)
 
         when 'SHOW_ON_STARTUP'
           raise parser.error("No screen defined. SHOW_ON_STARTUP must follow SCREEN or GROUP_SCREEN.") unless @current_screen_info
@@ -179,7 +189,7 @@ module Cosmos
           parser.verify_num_parameters(2, 4, 'GROUP_SCREEN <Target Name> <Screen Filename> <X Position (optional)> <Y Position (Optional)>')
           start_target(parameters[0].upcase, parser, @current_group)
           screen_filename = File.join(@current_target.dir, 'screens', parameters[1])
-          start_screen(screen_filename, parameters[2], parameters[3])
+          start_screen(screen_filename, parameters[2], parameters[3], skip_read_items)
 
         else
           # blank config.lines will have a nil keyword and should not raise an exception
@@ -233,7 +243,7 @@ module Cosmos
       end
     end
 
-    def start_screen(screen_filename, x_pos = nil, y_pos = nil)
+    def start_screen(screen_filename, x_pos = nil, y_pos = nil, skip_read_items = false)
       screen_name = File.basename(screen_filename, '.txt').upcase
       x_pos = x_pos.to_i if x_pos
       y_pos = y_pos.to_i if y_pos
@@ -244,15 +254,15 @@ module Cosmos
       @current_screen_info.force_substitute = true if @current_target.auto_screen_substitute
       @current_screen_info.original_target_name = @current_target.original_name
       @current_screen_info.substitute = @current_target.name if @current_target.substitute or @current_target.auto_screen_substitute
-      @current_screen_info.read_items
+      @current_screen_info.read_items unless skip_read_items
     end
 
-    def auto_screens
+    def auto_screens(skip_read_items = false)
       @current_group = nil
       screen_dir = File.join(@current_target.dir, 'screens')
       if File.exist?(screen_dir)
         Dir.new(screen_dir).each do |filename|
-          start_screen(File.join(screen_dir, filename)) if valid_screen_name(filename)
+          start_screen(File.join(screen_dir, filename), nil, nil, skip_read_items) if valid_screen_name(filename)
         end
       end
     end