cosmos 3.2.1 → 3.3.0

data/lib/cosmos/tools/cmd_tlm_server/gui/status_tab.rb

@@ -35,13 +35,11 @@ module Cosmos
     end
 
     # Update the status tab in the GUI
-    #
-    # @param previous_request_count [Integer] The previous number of
-    def update(previous_request_count)
-      update_limits_set
-      update_api_status(previous_request_count)
-      update_system_status
-      update_background_task_status
+    def update
+      update_limits_set()
+      update_api_status()
+      update_system_status()
+      update_background_task_status()
     end
 
     private
@@ -76,6 +74,12 @@ module Cosmos
     end
 
     def populate_api_status(layout)
+      if CmdTlmServer.json_drb
+        @previous_request_count = CmdTlmServer.json_drb.request_count
+      else
+        @previous_request_count = 0
+      end
+
       api = Qt::GroupBox.new(Qt::Object.tr("API Status"))
       api_layout = Qt::VBoxLayout.new(api)
       @api_table = Qt::TableWidget.new()
@@ -88,7 +92,7 @@ module Cosmos
       item0 = Qt::TableWidgetItem.new(Qt::Object.tr(CmdTlmServer.json_drb.num_clients.to_s))
       item0.setTextAlignment(Qt::AlignCenter)
       @api_table.setItem(0, 1, item0)
-      item = Qt::TableWidgetItem.new(Qt::Object.tr(CmdTlmServer.json_drb.request_count.to_s))
+      item = Qt::TableWidgetItem.new(Qt::Object.tr(@previous_request_count.to_s))
       item.setTextAlignment(Qt::AlignCenter)
       @api_table.setItem(0, 2, item)
       item2 = Qt::TableWidgetItem.new("0.0")
@@ -188,14 +192,14 @@ module Cosmos
     end
 
     # Update the API statistics in the GUI
-    def update_api_status(previous_request_count)
+    def update_api_status
       if CmdTlmServer.json_drb
         @api_table.item(0,1).setText(CmdTlmServer.json_drb.num_clients.to_s)
         @api_table.item(0,2).setText(CmdTlmServer.json_drb.request_count.to_s)
         request_count = CmdTlmServer.json_drb.request_count
-        requests_per_second = request_count - previous_request_count
+        requests_per_second = request_count - @previous_request_count
         @api_table.item(0,3).setText(requests_per_second.to_s)
-        previous_request_count = request_count
+        @previous_request_count = request_count
         average_request_time = CmdTlmServer.json_drb.average_request_time
         @api_table.item(0,4).setText(sprintf("%0.6f s", average_request_time))
         estimated_utilization = requests_per_second * average_request_time * 100.0

data/lib/cosmos/tools/data_viewer/data_viewer.rb

@@ -413,7 +413,7 @@ module Cosmos
           @time_start = packet_log_dialog.time_start
           @time_end = packet_log_dialog.time_end
           @log_file_directory = File.dirname(@log_filenames[0])
-          @log_file_directory += '/' unless @log_file_directory[-1..-1] == '\\'
+          @log_file_directory << '/' unless @log_file_directory[-1..-1] == '\\'
 
           # Stop realtime collection
           handle_stop()

data/lib/cosmos/tools/data_viewer/data_viewer_component.rb

@@ -37,7 +37,7 @@ module Cosmos
 
       @text = Qt::PlainTextEdit.new
       @text.setReadOnly(true)
-      @text.setMaximumBlockCount(10000) # 10000 lines of history will be displayed
+      @text.setMaximumBlockCount(100)
       if Kernel.is_windows?
         @text.font = Cosmos.getFont("courier", 9)
       else
@@ -55,7 +55,7 @@ module Cosmos
           filename = Qt::FileDialog::getSaveFileName(self, "Save As...", filename, "Text Files (*.txt);;All Files (*)")
           if not filename.nil? and not filename.empty?
             @log_file_directory = File.dirname(filename)
-            @log_file_directory += '/' unless @log_file_directory[-1..-1] == '\\'
+            @log_file_directory << '/' unless @log_file_directory[-1..-1] == '\\'
 
             File.open(filename, 'w') do |file|
               file.write(@text.toPlainText)

data/lib/cosmos/tools/handbook_creator/handbook_creator.rb

@@ -61,8 +61,8 @@ module Cosmos
           success = @config.create_pdf(progress_dialog)
           if success
             msg = "\n\n"
-            msg += "HTML and " if both
-            msg += "PDF Handbooks created successfully"
+            msg << "HTML and " if both
+            msg << "PDF Handbooks created successfully"
             progress_dialog.append_text(msg)
           else
             progress_dialog.append_text("\nPDF Handbooks could not be created.\n\nIs wkhtmltopdf in your PATH and are all existing pdfs closed?\n\nUsing version 0.11.0_rc1 of wkhtmltox is recommended which can be found at: https://code.google.com/p/wkhtmltopdf/downloads/list?can=1.\n\nVersion 0.12.x has shown issues with Handbook Creator's default templates.")

data/lib/cosmos/tools/handbook_creator/handbook_creator_config.rb

@@ -70,7 +70,6 @@ module Cosmos
           if @type == :TARGETS
             target_names = @target_names
             target_names = System.commands.target_names | System.telemetry.target_names if @target_names.empty?
-            target_names.delete('UNKNOWN')
             target_names.each {|target_name| create_file(target_name.downcase + @filename, [target_name], true, :HTML)}
           else # @type == :NORMAL
             create_file(@filename, @target_names, false, :HTML)
@@ -93,7 +92,6 @@ module Cosmos
             if @type == :TARGETS
               target_names = @target_names
               target_names = System.commands.target_names | System.telemetry.target_names if @target_names.empty?
-              target_names.delete('UNKNOWN')
               target_names.each do |target_name|
                 create_pdf_file(progress_dialog, target_name)
               end

data/lib/cosmos/tools/limits_monitor/limits_monitor.rb

@@ -127,7 +127,7 @@ module Cosmos
 
       @log_output = Qt::PlainTextEdit.new
       @log_output.setReadOnly(true)
-      @log_output.setMaximumBlockCount(10000)
+      @log_output.setMaximumBlockCount(100)
 
       @tabbook.addTab(@widget, "Limits")
       @tabbook.addTab(@log_output, "Log")

data/lib/cosmos/tools/replay/replay.rb

@@ -50,7 +50,7 @@ module Cosmos
       # Initialize variables
       @packet_log_reader  = System.default_packet_log_reader.new
       @log_directory = System.paths['LOGS']
-      @log_directory  += '/' unless @log_directory[-1..-1] == '\\' or @log_directory[-1..-1] == '/'
+      @log_directory << '/' unless @log_directory[-1..-1] == '\\' or @log_directory[-1..-1] == '/'
       @log_filename = nil
       @playing = false
       @playback_thread = nil
@@ -194,7 +194,7 @@ module Cosmos
       # Add the message output
       @output = Qt::PlainTextEdit.new
       @output.setReadOnly(true)
-      @output.setMaximumBlockCount(10000) # 10000 lines of history will be displayed
+      @output.setMaximumBlockCount(100)
 
       @top_layout.addWidget(@output, 500)
 

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

@@ -53,7 +53,7 @@ module Cosmos
             packets.each do |packet_name, packet|
               # Skip hidden and disabled packets
               next if packet.hidden || packet.disabled
-              packet.items.keys.each do |item_name|
+              packet.items.each_key do |item_name|
                 # Skip ignored items
                 next if System.targets[target_name].ignored_items.include? item_name
                 all_telemetry["#{target_name},#{packet_name},#{item_name}"] = 0

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

@@ -793,7 +793,7 @@ module Cosmos
       else
         self.setWindowTitle("Script Runner : #{@tab_book.currentTab.filename}")
       end
-      self.setWindowTitle(self.windowTitle += '*') if @tab_book.currentTab.modified
+      self.setWindowTitle(self.windowTitle << '*') if @tab_book.currentTab.modified
     end
 
     # Returns the script runner frame of the active tab

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

@@ -171,7 +171,7 @@ module Cosmos
       @bottom_layout.addWidget(@bottom_layout_label)
       @output = Qt::PlainTextEdit.new
       @output.setReadOnly(true)
-      @output.setMaximumBlockCount(10000) # 10000 lines of history will be displayed
+      @output.setMaximumBlockCount(100)
       @bottom_layout.addWidget(@output)
       @bottom_frame.setLayout(@bottom_layout)
       @splitter.addWidget(@bottom_frame)
@@ -470,10 +470,6 @@ module Cosmos
 
       ruby_lex_utils = RubyLexUtils.new
       instrumented_text = ''
-      # Add an extra newline because the Ruby 1.9.1 lexer RubyLex has a bug
-      # where it loops unless the file ends in a newline. If there is already
-      # a newline then so what, we add an extra.
-      text += "\n"
 
       Qt.execute_in_main_thread(true) do
         window = Qt::CoreApplication.instance.activeWindow
@@ -1196,7 +1192,7 @@ module Cosmos
               end
             end
             @output.add_formatted_text(line_to_write, color)
-            lines_to_write += line_to_write
+            lines_to_write << line_to_write
 
             line_count += 1
             if line_count > 1000
@@ -1207,7 +1203,7 @@ module Cosmos
                 line_to_write = time_formatted + " (SCRIPTRUNNER): "  + out_line
               end
               @output.addText(line_to_write, Cosmos::RED)
-              lines_to_write += line_to_write
+              lines_to_write << line_to_write
               break
             end
           end # string.each_line

data/lib/cosmos/tools/table_manager/table_config.rb

@@ -373,7 +373,7 @@ module Cosmos
           end
         end
 
-        new_file_data += (line + "\n")
+        new_file_data << (line + "\n")
 
       end # end loop
 

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

@@ -228,7 +228,7 @@ module Cosmos
         end
       end
       run_time = Time.format_seconds(@stop_time - @start_time)
-      run_time += " (#{@stop_time - @start_time} seconds)" if @stop_time-@start_time > 60
+      run_time << " (#{@stop_time - @start_time} seconds)" if @stop_time-@start_time > 60
       @file.puts("Run Time : #{run_time}")
       @file.puts("Total Tests : #{@results.length}")
       @file.puts("Pass : #{pass_count}")

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

@@ -1056,10 +1056,10 @@ module Cosmos
       if @@test_suites.empty? || tests.empty?
         msg = "No TestSuites or no Test classes found"
         if !ignored_test_suite_classes.empty?
-          msg += "\n\nThe following TestSuites were found but ignored:\n#{ignored_test_suite_classes.join(", ")}"
+          msg << "\n\nThe following TestSuites were found but ignored:\n#{ignored_test_suite_classes.join(", ")}"
         end
         if !ignored_test_classes.empty?
-          msg += "\n\nThe following Tests were found but ignored:\n#{ignored_test_classes.join(", ")}"
+          msg << "\n\nThe following Tests were found but ignored:\n#{ignored_test_classes.join(", ")}"
         end
         Qt.execute_in_main_thread(true) do
           Qt::MessageBox.critical(self, 'Error', msg)

data/lib/cosmos/tools/tlm_extractor/tlm_extractor.rb

@@ -48,7 +48,7 @@ module Cosmos
 
       def remove_selected_items
         indexes = selected_items()
-        indexes.reverse.each do |index|
+        indexes.reverse_each do |index|
           item = takeItem(index)
           item.dispose if item
         end
@@ -92,6 +92,7 @@ module Cosmos
         @tlm_extractor_config = TlmExtractorConfig.new(options.config_file)
         @tlm_extractor_processor = TlmExtractorProcessor.new
         Qt.execute_in_main_thread(true) do
+          @telemetry_chooser.update
           sync_config_to_gui()
         end
 

data/lib/cosmos/tools/tlm_extractor/tlm_extractor_processor.rb

@@ -28,7 +28,7 @@ module Cosmos
         base = File.basename(config_filename)
         extension = File.extname(base)
         filename_no_extension = base[0..-(extension.length + 1)]
-        configs[-1].output_filename = File.join(output_dir, batch_name.gsub(' ', '_') + '_' + filename_no_extension.gsub(' ', '_') + output_extension)
+        configs[-1].output_filename = File.join(output_dir, batch_name.tr(' ', '_') + '_' + filename_no_extension.tr(' ', '_') + output_extension)
       end
       process(input_filenames, configs, time_start, time_end, &block)
     end # def process_batch

data/lib/cosmos/tools/tlm_grapher/data_object_adders/xy_data_object_adder.rb

@@ -38,6 +38,7 @@ module Cosmos
 
       # Chooser for packet and y item
       @telemetry_chooser = TelemetryChooser.new(self, orientation, true, false, true, true)
+      @telemetry_chooser.update
       @overall_frame.addWidget(@telemetry_chooser)
       @telemetry_chooser.target_changed_callback = method(:packet_changed_callback)
       @telemetry_chooser.packet_changed_callback = method(:packet_changed_callback)

data/lib/cosmos/tools/tlm_grapher/data_object_editors/housekeeping_data_object_editor.rb

@@ -43,6 +43,7 @@ module Cosmos
 
       # Telemetry Chooser for housekeeping item
       @telemetry_chooser = TelemetryChooser.new(self, Qt::Vertical, true, false, true)
+      @telemetry_chooser.update
       @telemetry_chooser.set_item(data_object.target_name, data_object.packet_name, data_object.item_name)
       @telemetry_chooser.target_changed_callback = method(:target_packet_changed_callback)
       @telemetry_chooser.packet_changed_callback = method(:target_packet_changed_callback)

data/lib/cosmos/tools/tlm_grapher/data_object_editors/xy_data_object_editor.rb

@@ -50,6 +50,7 @@ module Cosmos
 
       # Telemetry Chooser for x item
       @telemetry_chooser = TelemetryChooser.new(self, Qt::Vertical, true, false)
+      @telemetry_chooser.update
       @telemetry_chooser.set_item(data_object.target_name, data_object.packet_name, data_object.y_item_name)
       @telemetry_chooser.target_changed_callback = method(:target_packet_changed_callback)
       @telemetry_chooser.packet_changed_callback = method(:target_packet_changed_callback)

data/lib/cosmos/tools/tlm_grapher/tabbed_plots/overview_tabbed_plots.rb

@@ -573,7 +573,7 @@ module Cosmos
                                                     tab_index,
                                                     plot_index,
                                                     data_object_index)
-      data_object_indexes.reverse.each do |data_object_idx|
+      data_object_indexes.reverse_each do |data_object_idx|
         @tabbed_plots_config.remove_data_object(tab_index, plot_index, data_object_idx)
       end
 
@@ -686,7 +686,7 @@ module Cosmos
 
       if plot_index
         data_object_indexes = selected_data_object_indexes()
-        data_object_indexes.reverse.each do |data_object_idx|
+        data_object_indexes.reverse_each do |data_object_idx|
           @tabbed_plots_config.reset_data_objects(tab_index, plot_index, data_object_idx)
         end
         redraw_plots(true, true)
@@ -823,7 +823,7 @@ module Cosmos
     # Create GUI objects
     def create
       # Select first plot on each tab in reverse order
-      @tabbed_plots_config.tabs.reverse.each {|tab| select_plot(tab.plots[0]) if tab.plots[0]}
+      @tabbed_plots_config.tabs.reverse_each {|tab| select_plot(tab.plots[0]) if tab.plots[0]}
 
       # Setup timeout to redraw graphs
       @timeout = Qt::Timer.new(self)

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

@@ -338,7 +338,6 @@ module Cosmos
 
     def file_generate
       target_names = System.telemetry.target_names
-      target_names.delete('UNKNOWN')
       target_names.unshift('ALL')
 
       dialog = SelectDialog.new(self, 'Target Name:', target_names, 'Select Target Name to Generate Screens')
@@ -347,7 +346,6 @@ module Cosmos
         ProgressDialog.execute(self, 'Generating Telemetry Screens', 500, 10, false, false, true, true, false) do |progress_dialog|
           if target_name == 'ALL'
             System.telemetry.target_names.each do |my_target_name|
-              next if my_target_name == 'UNKNOWN'
               progress_dialog.append_text(generate_target(my_target_name))
             end
           else
@@ -520,7 +518,7 @@ module Cosmos
           option_parser.on("-s", "--screen FILE", "Start up the specified screen") { |arg| options.screen = arg }
           option_parser.on("-n", "--nolisten", "Don't listen for requests") do
             options.listen = false
-            options.title += ' : Not Listening'
+            options.title << ' : Not Listening'
           end
           option_parser.parse!(ARGV)
         end

data/lib/cosmos/top_level.rb

@@ -291,12 +291,8 @@ module Cosmos
     digest = Digest::MD5.new
     Cosmos.set_working_dir do
       filenames.each do |filename|
-        # Read the file's data
-        data = ''
-        File.open(filename, 'r') {|file| data = file.read.gsub("\r",'')}
-
-        # Add to the running MD5 sum
-        digest << data
+        # Read the file's data and add to the running MD5 sum
+        digest << File.read(filename).gsub(/\r/,'')
       end
     end
     digest << additional_data if additional_data

data/lib/cosmos/utilities/ruby_lex_utils.rb

@@ -217,7 +217,7 @@ class RubyLexUtils
     end
 
     delete_count = 0
-    delete_ranges.reverse.each do |range|
+    delete_ranges.reverse_each do |range|
       delete_count += 1
       comments_removed[range] = ''
       if progress_dialog and delete_count % 10000 == 0

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '3.2.1'
+COSMOS_VERSION = '3.3.0'
 module Cosmos
   module Version
     MAJOR = '3'
-    MINOR = '2'
-    PATCH = '1'
-    BUILD = '3b192982d9c44a1e0bef7c7a1d8c730d17a5beb3'
+    MINOR = '3'
+    PATCH = '0'
+    BUILD = 'f3db0cfa39b8f3cf8121ab8ead4e5b82964da8d5'
   end
-  VERSION = '3.2.1'
+  VERSION = '3.3.0'
 end

data/lib/cosmos/win32/win32_main.rb

@@ -11,22 +11,26 @@
 module Cosmos
 
   # Win32API is deprecated in 1.9.x so recreate it
-  require 'dl'
+  require 'fiddle'
   class Win32API
     # Cache to hold already opened dll files
     DLL_CACHE = {}
 
-    RETURN_VALUE_TYPEMAP = {"0" => DL::TYPE_VOID, "S" => DL::TYPE_VOIDP, "I" => DL::TYPE_LONG}
+    VALUE_TYPEMAP = {"0" => Fiddle::TYPE_VOID, "S" => Fiddle::TYPE_VOIDP, "I" => Fiddle::TYPE_LONG}
 
     def initialize(dll_name, function_name, import, export = "0")
       # Convert all input parameters into either 0, S, or I
-      @function_prototype = [import].join.tr("VPpNnLlIi", "0SSI")
+      @function_prototype = [import].join.tr("VPpNnLlIiCc", "0SSI")
+      params = []
+      @function_prototype.split('').each do |param|
+        params << VALUE_TYPEMAP[param]
+      end
 
       # Get handle to dll file and add to cache if necessary
-      dll_handle = DLL_CACHE[dll_name] ||= DL.dlopen(dll_name)
+      dll_handle = DLL_CACHE[dll_name] ||= Fiddle.dlopen(dll_name)
 
-      # Create DL::CFunc necessary to call a function with proper return type and name
-      @function = DL::CFunc.new(dll_handle[function_name], RETURN_VALUE_TYPEMAP[export.tr("VPpNnLlIi", "0SSI")], function_name)
+      # Create Fiddle::Function necessary to call a function with proper return type and name
+      @function = Fiddle::Function.new(dll_handle[function_name], params, VALUE_TYPEMAP[export.tr("VPpNnLlIi", "0SSI")])
     end
 
     def call(*args)
@@ -48,7 +52,7 @@ module Cosmos
       end
 
       # Call the function and return its return value
-      return_value = @function.call(args)
+      return_value = @function.call(*args)
       return_value ||= 0
       return_value
     end

data/spec/ccsds/ccsds_packet_spec.rb

@@ -16,50 +16,50 @@ module Cosmos
   describe CcsdsPacket do
 
     describe "constants" do
-      it "should define COMMAND and TELEMETRY" do
-        CcsdsPacket::TELEMETRY.should eql 0
-        CcsdsPacket::COMMAND.should eql 1
+      it "defines COMMAND and TELEMETRY" do
+        expect(CcsdsPacket::TELEMETRY).to eql 0
+        expect(CcsdsPacket::COMMAND).to eql 1
       end
 
-      it "should define sequence flags" do
-        CcsdsPacket::CONTINUATION.should eql 0
-        CcsdsPacket::FIRST.should eql 1
-        CcsdsPacket::LAST.should eql 2
-        CcsdsPacket::STANDALONE.should eql 3
+      it "defines sequence flags" do
+        expect(CcsdsPacket::CONTINUATION).to eql 0
+        expect(CcsdsPacket::FIRST).to eql 1
+        expect(CcsdsPacket::LAST).to eql 2
+        expect(CcsdsPacket::STANDALONE).to eql 3
       end
     end
 
     describe "initialize" do
-      it "should set the target_name and packet_name" do
+      it "sets the target_name and packet_name" do
         p = CcsdsPacket.new("tgt", "pkt")
-        p.target_name.should eql "TGT"
-        p.packet_name.should eql "PKT"
+        expect(p.target_name).to eql "TGT"
+        expect(p.packet_name).to eql "PKT"
 
         version = p.get_item("CCSDSVERSION")
-        version.bit_offset.should eql 0
-        version.bit_size.should eql 3
+        expect(version.bit_offset).to eql 0
+        expect(version.bit_size).to eql 3
         type = p.get_item("CCSDSTYPE")
-        type.bit_offset.should eql 3
-        type.bit_size.should eql 1
+        expect(type.bit_offset).to eql 3
+        expect(type.bit_size).to eql 1
         type = p.get_item("CCSDSSHF")
-        type.bit_offset.should eql 4
-        type.bit_size.should eql 1
+        expect(type.bit_offset).to eql 4
+        expect(type.bit_size).to eql 1
         type = p.get_item("CCSDSAPID")
-        type.bit_offset.should eql 5
-        type.bit_size.should eql 11
+        expect(type.bit_offset).to eql 5
+        expect(type.bit_size).to eql 11
         type = p.get_item("CCSDSSEQFLAGS")
-        type.bit_offset.should eql 16
-        type.bit_size.should eql 2
+        expect(type.bit_offset).to eql 16
+        expect(type.bit_size).to eql 2
         type = p.get_item("CCSDSSEQCNT")
-        type.bit_offset.should eql 18
-        type.bit_size.should eql 14
-        type.overflow.should eql :TRUNCATE
+        expect(type.bit_offset).to eql 18
+        expect(type.bit_size).to eql 14
+        expect(type.overflow).to eql :TRUNCATE
         type = p.get_item("CCSDSLENGTH")
-        type.bit_offset.should eql 32
-        type.bit_size.should eql 16
+        expect(type.bit_offset).to eql 32
+        expect(type.bit_size).to eql 16
         type = p.get_item("CCSDSDATA")
-        type.bit_offset.should eql 48
-        type.bit_size.should eql 0 # fill the packet
+        expect(type.bit_offset).to eql 48
+        expect(type.bit_size).to eql 0 # fill the packet
       end
     end
   end