cosmos 4.1.0 → 4.1.1

data/lib/cosmos/tools/config_editor/config_editor.rb

@@ -17,10 +17,18 @@ Cosmos.catch_fatal_exception do
 end
 
 module Cosmos
-
   class ConfigEditor < QtTool
+    # Class to intercept keyPressEvents
+    class MyTreeView < Qt::TreeView
+      attr_accessor :keyPressCallback
+      def keyPressEvent(event)
+        call_super = @keyPressCallback.call(event)
+        super(event) if call_super
+      end
+    end
+
     slots 'handle_tab_change(int)'
-    slots 'context_menu(const QPoint&)'
+    slots 'tab_context_menu(const QPoint&)'
     slots 'undo_available(bool)'
 
     UNTITLED = 'Untitled'
@@ -211,6 +219,10 @@ module Cosmos
         active_config_editor_frame.set_file_type(action.text)
         update_cursor()
       end
+
+      @create_target = Qt::Action.new(tr('&Create Target'), self)
+      @create_target.statusTip = tr('Create a new COSMOS target')
+      @create_target.connect(SIGNAL('triggered()')) { create_target() }
     end
 
     def initialize_menus
@@ -259,6 +271,10 @@ module Cosmos
       type_menu = menuBar.addMenu(tr('File &Type'))
       type_menu.addActions(@type_group.actions)
 
+      # Actions Menu
+      actions_menu = menuBar.addMenu(tr('&Actions'))
+      actions_menu.addAction(@create_target)
+
       # Help Menu
       @about_string = "Config Editor allows the user to edit COSMOS configuration "\
         "files with contextual help. "\
@@ -272,7 +288,7 @@ module Cosmos
 
       @fs_model = Qt::FileSystemModel.new
       @fs_model.setRootPath(Cosmos::USERPATH)
-      @tree_view = Qt::TreeView.new(@splitter)
+      @tree_view = MyTreeView.new(@splitter)
       @tree_view.setModel(@fs_model)
       @tree_view.setRootIndex(@fs_model.index(Cosmos::USERPATH))
       @tree_view.setColumnHidden(1, true) # Size
@@ -284,6 +300,17 @@ module Cosmos
       @tree_view.connect(SIGNAL('clicked(const QModelIndex&)')) do |index|
         select_or_load_file(@fs_model.filePath(index))
       end
+      @tree_view.setContextMenuPolicy(Qt::CustomContextMenu)
+      @tree_view.connect(SIGNAL('customContextMenuRequested(const QPoint&)')) do |point|
+        tree_context_menu(point)
+      end
+      @tree_view.keyPressCallback = lambda do |event|
+        case event.key
+        when Qt::Key_Delete
+          delete_path(@fs_model.filePath(@tree_view.currentIndex()))
+        end
+        true # call super
+      end
 
       @tab_book = Qt::TabWidget.new(@splitter)
       @tab_book.setMovable(true)
@@ -291,7 +318,7 @@ module Cosmos
       connect(@tab_book,
               SIGNAL('customContextMenuRequested(const QPoint&)'),
               self,
-              SLOT('context_menu(const QPoint&)'))
+              SLOT('tab_context_menu(const QPoint&)'))
       connect(@tab_book,
               SIGNAL('currentChanged(int)'),
               self,
@@ -340,6 +367,29 @@ module Cosmos
       end
     end
 
+    def tree_context_menu(point)
+      menu = Qt::Menu.new()
+
+      delete_action = Qt::Action.new(tr("Delete"), self)
+      delete_action.statusTip = tr("Delete file")
+      delete_action.connect(SIGNAL('triggered()')) do
+        delete_path(@fs_model.filePath(@tree_view.indexAt(point)))
+      end
+      menu.addAction(delete_action)
+
+      menu.exec(@tree_view.mapToGlobal(point))
+      menu.dispose
+    end
+
+    def delete_path(path)
+      case Qt::MessageBox.warning(self, "Delete!", "Are you sure you want to delete #{path}?",
+      Qt::MessageBox::Yes | Qt::MessageBox::No, # buttons
+      Qt::MessageBox::Yes) # default button
+      when Qt::MessageBox::Yes
+        FileUtils.rm_rf path
+      end
+    end
+
     ###########################################
     # File Menu Options
     ###########################################
@@ -381,6 +431,7 @@ module Cosmos
         @procedure_dir = File.dirname(filename)
         @procedure_dir << '/' if @procedure_dir[-1..-1] != '/' and @procedure_dir[-1..-1] != '\\'
       end
+      update_tree()
     end
 
     # File->Reload
@@ -432,6 +483,7 @@ module Cosmos
           File.open(filename, "w") {|file| file.write(active_config_editor_frame().text)}
           saved = true
           update_title()
+          update_tree()
           statusBar.showMessage(tr("#{filename} saved"))
           @procedure_dir = File.dirname(filename)
           @procedure_dir << '/' if @procedure_dir[-1..-1] != '/' and @procedure_dir[-1..-1] != '\\'
@@ -456,6 +508,92 @@ module Cosmos
       end
     end
 
+    ###########################################
+    # Actions
+    ###########################################
+
+    def create_target()
+      qt_boolean = Qt::Boolean.new
+      target = Qt::InputDialog::getText(self, "Target Name",
+        "Enter the name of the target.\nUse underscores to separate words.\n"\
+        "Try to keep target names relatively short.\n\nFor example: PWR_SUPPLY\n",
+        Qt::LineEdit::Normal, '', qt_boolean)
+      return if qt_boolean.nil? # Cancelled
+      target.upcase!
+      target_folder = File.join(Cosmos::USERPATH, 'config', 'targets', target)
+      if File.exist?(target_folder)
+        Qt::MessageBox.warning(self, "Existing Target", "The specified target already exists!")
+        return
+      end
+      Dir.mkdir(target_folder)
+      %w(cmd_tlm lib procedures screens sequences tables tools).each do |folder|
+        Dir.mkdir File.join(target_folder, folder)
+      end
+      File.open(File.join(target_folder, 'cmd_tlm', 'cmd.txt'), 'w') do |file|
+        file.puts "COMMAND #{target} NOOP BIG_ENDIAN \"No operation\""
+        file.puts "  APPEND_ID_PARAMETER OPCODE 16 UINT 0x0 0xFFFF 0x1 \"Noop opcode\""
+      end
+      File.open(File.join(target_folder, 'cmd_tlm', 'tlm.txt'), 'w') do |file|
+        file.puts "TELEMETRY #{target} STATUS BIG_ENDIAN \"Status telemetry\""
+        file.puts "  APPEND_ID_ITEM OPCODE 16 UINT 0x1 \"Opcode which identifies this packet\""
+        file.puts "  APPEND_ITEM COUNT 16 UINT \"Packet counter\""
+        file.puts "  APPEND_ITEM VALUE 0 STRING \"String which consumes the rest of the packet\""
+      end
+      lib_filename = File.join(target_folder, 'lib', "#{target.downcase}.rb")
+      File.open(lib_filename, 'w') do |file|
+        file.puts "require 'cosmos'"
+        file.puts "\n"
+        file.puts "class #{lib_filename.filename_to_class_name}"
+        file.puts "  attr_reader :tgt_name"
+        file.puts "\n"
+        file.puts "  # It is good practice to pass in the name of the target when instantiating"
+        file.puts "  # the library. This way if the target name changes by COSMOS target name"
+        file.puts "  # substitution or by simply renaming in the filesystem, the library continues"
+        file.puts "  # to work simply by passing in the new name."
+        file.puts "  def initialize(tgt_name = '#{target}')"
+        file.puts "    @tgt_name = tgt_name"
+        file.puts "  end"
+        file.puts "\n"
+        file.puts "  def noop"
+        file.puts "    count = tlm(\"\#{@tgt_name} STATUS COUNT\")"
+        file.puts "    cmd(\"\#{@tgt_name} NOOP\")"
+        file.puts "    # Wait 5s for the counter to increment. Note the double equals!"
+        file.puts "    wait_check(\"\#{@tgt_name} STATUS COUNT == \#{count + 1}\", 5)"
+        file.puts "  end"
+        file.puts "end"
+      end
+      File.open(File.join(target_folder, 'procedures', "#{target.downcase}_noop.rb"), 'w') do |file|
+        file.puts "require 'cosmos'"
+        file.puts "require '#{File.basename(lib_filename)}'"
+        file.puts "\n"
+        file.puts "#{target.downcase} = #{lib_filename.filename_to_class_name}.new"
+        file.puts "#{target.downcase}.noop"
+      end
+      File.open(File.join(target_folder, 'target.txt'), 'w') do |file|
+        file.puts "# Ignored Parameters"
+        file.puts "IGNORE_PARAMETER OPCODE"
+        file.puts "\n"
+        file.puts "# Ignored Items"
+        file.puts "IGNORE_ITEM OPCODE"
+        file.puts "\n"
+        file.puts "# Automatically substitute the target name in screen definitions"
+        file.puts "AUTO_SCREEN_SUBSTITUTE"
+      end
+      cmd_tlm = File.join(target_folder, 'cmd_tlm_server.txt')
+      File.open(cmd_tlm, 'w') do |file|
+        file.puts "# This is a segment of the main cmd_tlm_server.txt that will be used with"
+        file.puts "# AUTO_INTERFACE_TARGETS or INTERFACE_TARGET"
+        file.puts "\n"
+        file.puts "# NOTE: This line must be modified to match how your actual target connects."
+        file.puts "# See http://cosmosrb.com/docs/interfaces/ for more information."
+        file.puts "INTERFACE #{target}_INT tcpip_client_interface.rb localhost 8080 8080 10.0 nil BURST 4 0xDEADBEEF"
+        file.puts "  TARGET #{target}"
+        file.puts "  # Add in the OverrideProtocol to allow override_tlm(\"#{target} STATUS STRING = 'HI'\")"
+        file.puts "  PROTOCOL READ_WRITE OverrideProtocol"
+      end
+      file_open(cmd_tlm)
+    end
+
     ###########################################
     # Callbacks
     ###########################################
@@ -537,7 +675,7 @@ module Cosmos
       end
     end
 
-    def context_menu(point)
+    def tab_context_menu(point)
       index = 0
       @tab_book.tabBar.count.times do
         break if @tab_book.tabBar.tabRect(index).contains(point)

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

@@ -328,7 +328,7 @@ module Cosmos
       rescue Exception => err
         begin
           raise $!, "In file #{filename} at line #{parser.line_number}:\n\n#{$!}", $!.backtrace
-        rescue => err
+        rescue Exception => err
           ExceptionDialog.new(self, err, "Screen #{File.basename(filename)}", false)
         end
         shutdown()

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

@@ -184,7 +184,7 @@ module Cosmos
 
       @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() }      
+      @replay_action.connect(SIGNAL('triggered()')) { toggle_replay_mode() }
     end
 
     def initialize_menus(options)
@@ -193,7 +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.addAction(@replay_action)
       @file_menu.addSeparator()
       @file_menu.addAction(@exit_action)
 
@@ -382,7 +382,9 @@ module Cosmos
             found = []
             all_telemetry.each do |tlm|
               break if @cancel_audit
-              found << tlm if screen_text.include? tlm
+              if screen_text.include?(tlm) || Packet::RESERVED_ITEM_NAMES.include?(tlm.split[-1].strip)
+                found << tlm
+              end
             end
             all_telemetry -= found
 

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

@@ -11,9 +11,11 @@
 require 'cosmos'
 
 module Cosmos
-
+  # Parses the Telemetry Viewer configuration file and builds up the list
+  # of available screens to display.
   class TlmViewerConfig
-
+    # Aggregates information about a single Telemetry Viewer screen. It loads
+    # the widgets called out by the screen and manages NAMED_WIDGETs.
     class ScreenInfo
       attr_accessor :group
       attr_accessor :target_name
@@ -47,12 +49,12 @@ module Cosmos
       end
 
       def as_json(options = nil) #:nodoc:
-        {group: @group, 
-         target_name: @target_name, 
-         original_target_name: 
-         @original_target_name, 
-         name: @name, 
-         filename: @filename, 
+        {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,
@@ -105,10 +107,15 @@ module Cosmos
       end
     end
 
+    # @return [Array<Hash]>] Columns of screen names
     attr_accessor :columns
+    # @return [Hash] ScreenInfo instances indexed by screen name
     attr_accessor :screen_infos
+    # @return [String] Name of the telemetry viewer configuration file
     attr_accessor :filename
+    # @return [Array] List of all the items on all the defined telemety screens
     attr_accessor :completion_list
+    # @return [Hash] Telemetry item to screen name lookup
     attr_accessor :tlm_to_screen_mapping
 
     def initialize(filename = nil, skip_read_items = false)
@@ -130,6 +137,7 @@ module Cosmos
         case keyword
 
         when 'NEW_COLUMN'
+          parser.verify_num_parameters(0, 0, 'NEW_COLUMN')
           @columns << {}
           @current_column = @columns[-1]
 
@@ -205,24 +213,31 @@ module Cosmos
 
       File.open(filename, 'w') do |file|
         @columns.each_with_index do |target_screen_infos, column_index|
-          if column_index != 0
-            file.puts ''
-            file.puts "NEW_COLUMN"
-            file.puts ''
-          end
+          file.puts "NEW_COLUMN\n\n" if column_index != 0
           target_screen_infos.each do |target_name, screen_infos|
-            file.puts "TARGET \"#{target_name}\""
+            if screen_infos.values[0].group
+              file.puts "GROUP \"#{target_name}\""
+            else
+              file.puts "TARGET \"#{target_name}\""
+            end
             screen_infos.each do |screen_name, screen_info|
-              # Grab the filename by indexing the full path for 'screens' and going past
-              # to capture the filename such as 'status.txt' below
-              #   C:/COSMOS/config/targets/TGT/screens/status.txt
-              screen_filename = screen_info.filename[(screen_info.filename.index("screens").to_i + 8)..-1]
-              string = "  SCREEN"
-              string << " \"#{screen_filename}\""
-              string << " #{screen_info.x_pos}" if screen_info.x_pos
-              string << " #{screen_info.y_pos}" if screen_info.y_pos
-              file.puts string
-              if screen_info.screen
+              if screen_info.group
+                string = "  GROUP_SCREEN #{screen_info.name}"
+                string << " #{screen_info.x_pos}" if screen_info.x_pos
+                string << " #{screen_info.y_pos}" if screen_info.y_pos
+                file.puts string
+              else
+                # Grab the filename by indexing the full path for 'screens' and going past
+                # to capture the filename such as 'status.txt' below
+                #   C:/COSMOS/config/targets/TGT/screens/status.txt
+                screen_filename = screen_info.filename[(screen_info.filename.index("screens").to_i + 8)..-1]
+                string = "  SCREEN"
+                string << " \"#{screen_filename}\""
+                string << " #{screen_info.x_pos}" if screen_info.x_pos
+                string << " #{screen_info.y_pos}" if screen_info.y_pos
+                file.puts string
+              end
+              if screen_info.show_on_startup
                 file.puts "    SHOW_ON_STARTUP"
               end
             end
@@ -297,7 +312,5 @@ module Cosmos
       end
       @completion_list.uniq!
     end
-
   end
-
-end # module Cosmos
+end

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.1.0'
+COSMOS_VERSION = '4.1.1'
 module Cosmos
   module Version
     MAJOR = '4'
     MINOR = '1'
-    PATCH = '0'
-    BUILD = '9731591f6e6dd90749a966e06a95d923b7f112ae'
+    PATCH = '1'
+    BUILD = '4d061cac0c17e02bfbb77c8506ee17354ef8b8f1'
   end
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/spec/config/config_parser_spec.rb

@@ -12,6 +12,7 @@ require 'spec_helper'
 require 'cosmos'
 require 'cosmos/config/config_parser'
 require 'tempfile'
+require 'tmpdir'
 
 module Cosmos
 
@@ -76,10 +77,46 @@ module Cosmos
         tf.unlink
       end
 
+      it "allows ERB partials in subdirectories" do
+        Dir.mktmpdir("partial_dir") do |dir|
+          tf2 = Tempfile.new('_partial.txt', dir)
+          tf2.puts "SUBDIR"
+          tf2.close
+          tf = Tempfile.new('unittest')
+          # Grab the sub directory name plus filename
+          subdir_path = tf2.path().split('/')[-2..-1].join('/')
+          tf.puts "<%= render '#{subdir_path}' %>"
+          tf.close
+
+          @cp.parse_file(tf.path) do |keyword, params|
+            expect(keyword).to eql "SUBDIR"
+          end
+          tf.unlink
+          tf2.unlink
+        end
+      end
+
+      it "allows absolute paths to ERB partials" do
+        Dir.mktmpdir("partial_dir") do |dir|
+          tf2 = Tempfile.new('_partial.txt', dir)
+          tf2.puts "ABSOLUTE"
+          tf2.close
+          tf = Tempfile.new('unittest')
+          tf.puts "<%= render '#{tf2.path}' %>"
+          tf.close
+
+          @cp.parse_file(tf.path) do |keyword, params|
+            expect(keyword).to eql "ABSOLUTE"
+          end
+          tf.unlink
+          tf2.unlink
+        end
+      end
+
       it "supports ERB partials via render" do
         tf2 = Tempfile.new('_partial.txt')
         tf2.puts '<% if output %>'
-        tf2.puts 'KEYWORD <%= id %> <%= desc %>'
+        tf2.puts 'RENDER <%= id %> <%= desc %>'
         tf2.puts '<% end %>'
         tf2.close
 
@@ -92,7 +129,7 @@ module Cosmos
           yielded = false
           @cp.parse_file(tf.path) do |keyword, params|
             yielded = true
-            expect(keyword).to eql "KEYWORD"
+            expect(keyword).to eql "RENDER"
             expect(params[0]).to eql "1"
             expect(params[1]).to eql "Description"
           end