cosmos 4.2.4-java → 4.5.0-java

data/lib/cosmos/top_level.rb

@@ -11,7 +11,7 @@
 # This file contains top level functions in the Cosmos namespace
 
 require 'thread'
-require 'digest/md5'
+require 'digest'
 require 'open3'
 require 'cosmos/core_ext'
 require 'cosmos/version'
@@ -170,8 +170,12 @@ module Cosmos
     return filename if File.exist? filename
 
     # Check relative to executing file
-    filename = Cosmos.path($0, ['config', 'data', name])
-    return filename if File.exist? filename
+    begin # path raises so begin rescue it
+      filename = Cosmos.path($0, ['config', 'data', name])
+      return filename if File.exist? filename
+    rescue
+      # Couldn't find the file so return nil below
+    end
     nil
   end
 
@@ -186,6 +190,19 @@ module Cosmos
     user_path = File.join(Cosmos::USERPATH, partial_path)
     return user_path if File.exist?(user_path)
 
+    # Check cosmos extensions
+    begin
+      Bundler.load.specs.each do |spec|
+        spec_name_split = spec.name.split('-')
+        if spec_name_split.length > 1 and spec_name_split[0] == 'cosmos'
+          filename = File.join(spec.gem_dir, partial_path)
+          return filename if File.exist? filename
+        end
+      end
+    rescue Bundler::GemfileNotFound
+      # No Gemfile - so no gem based extensions
+    end
+
     # Then look relative to the calling file
     if Pathname.new(calling_file).absolute?
       current_dir = File.dirname(calling_file)
@@ -227,6 +244,11 @@ module Cosmos
       rescue Exception
         # Oh well - we tried
       end
+      if exception.class == TypeError and exception.message =~ /Thread::Mutex/
+        original_backtrace = exception.backtrace
+        exception = exception.exception("Mutex exists in a packet.  Note: Packets must not be read during class initializers for Conversions, Limits Responses, etc.: #{exception}")
+        exception.set_backtrace(original_backtrace)
+      end
       self.handle_fatal_exception(exception)
     end
   end
@@ -360,24 +382,26 @@ module Cosmos
     end
   end
 
-  # Runs an md5 sum over one or more files and returns the Digest::MD5 object.
+  # Runs a hash algorithm over one or more files and returns the Digest object.
   # Handles windows/unix new line differences but changes in whitespace will
-  # change the md5 sum.
+  # change the hash sum.
   #
   # Usage:
-  #   digest = Cosmos.md5_files(files)
+  #   digest = Cosmos.hash_files(files, additional_data, hashing_algorithm)
   #   digest.digest # => the 16 bytes of digest
   #   digest.hexdigest # => the formatted string in hex
   #
-  # @param filenames [Array<String>] List of files to read and calculate a md5
+  # @param filenames [Array<String>] List of files to read and calculate a hashing
   #   sum on
-  # @param additional_data [String] Additional data to add to the md5 sum
-  # @return [Digest::MD5] The md5 sum
-  def self.md5_files(filenames, additional_data = nil)
-    digest = Digest::MD5.new
+  # @param additional_data [String] Additional data to add to the hashing sum
+  # @param hashing_algorithm [String] Hashing algorithm to use
+  # @return [Digest::<algorithm>] The hashing sum object
+  def self.hash_files(filenames, additional_data = nil, hashing_algorithm = 'MD5')
+    digest = Digest.const_get(hashing_algorithm).send('new')
+
     Cosmos.set_working_dir do
       filenames.each do |filename|
-        # Read the file's data and add to the running MD5 sum
+        # Read the file's data and add to the running hashing sum
         digest << File.read(filename).gsub(/\r/,'')
       end
     end
@@ -572,7 +596,7 @@ module Cosmos
   # @param try_gui [Boolean] Whether to try and create a GUI exception popup
   def self.handle_critical_exception(error, try_gui = true)
     Logger.error "Critical Exception! #{error.formatted}"
-    if defined? ExceptionDialog and !ExceptionDialog.dialog_open?
+    if defined? ExceptionDialog and !ExceptionDialog.dialog_open? and $qApp
       log_file = self.write_exception_file(error)
       if try_gui
         Qt.execute_in_main_thread(true) {|| ExceptionDialog.new(nil, error, '', false, false, log_file)}

data/lib/cosmos/utilities/ruby_lex_utils.rb

@@ -45,41 +45,45 @@ class RubyLex
     @exception_on_syntax_error = true
     @prompt                    = nil
   end
+  
+  # Monkey patch to keep this from looping forever if the string never is closed with a right brace
+  def identify_string_dvar
+    begin
+      getc
 
-  # Monkey patch to fix performance issue caused by call to reverse
-  def get_readed
-    if idx = @readed.rindex("\n")
-      @base_char_no = @readed.size - (idx + 1)
-    else
-      @base_char_no += @readed.size
-    end
+      reserve_continue = @continue
+      reserve_ltype = @ltype
+      reserve_indent = @indent
+      reserve_indent_stack = @indent_stack
+      reserve_state = @lex_state
+      reserve_quoted = @quoted
 
-    readed = @readed.join("")
-    @readed = []
-    readed
-  end
+      @ltype = nil
+      @quoted = nil
+      @indent = 0
+      @indent_stack = []
+      @lex_state = EXPR_BEG
 
-  # Monkey patch to fix performance issue caused by call to reverse
-  def ungetc(c = nil)
-    if @here_readed.empty?
-      c2 = @readed.pop
-    else
-      c2 = @here_readed.pop
-    end
-    c = c2 unless c
-    @rests.unshift c #c =
-    @seek -= 1
-    if c == "\n"
-      @line_no -= 1
-      if idx = @readed.rindex("\n")
-        @char_no = idx + 1
-      else
-        @char_no = @base_char_no + @readed.size
+      loop do
+        @continue = false
+        prompt
+        tk = token
+        break if tk.nil? # This is the patch
+        if @ltype or @continue or @indent >= 0
+          next
+        end
+        break if tk.kind_of?(TkRBRACE)
       end
-    else
-      @char_no -= 1
+    ensure
+      @continue = reserve_continue
+      @ltype = reserve_ltype
+      @indent = reserve_indent
+      @indent_stack = reserve_indent_stack
+      @lex_state = reserve_state
+      @quoted = reserve_quoted
     end
-  end
+  end  
+  
 end
 $VERBOSE = old_verbose
 

data/lib/cosmos/version.rb

@@ -1,12 +1,12 @@
 # encoding: ascii-8bit
 
-COSMOS_VERSION = '4.2.4'
+COSMOS_VERSION = '4.5.0'
 module Cosmos
   module Version
     MAJOR = '4'
-    MINOR = '2'
-    PATCH = '4'
-    BUILD = '4c60966285c2f7a5a050bfec88cb081b8662fac9'
+    MINOR = '5'
+    PATCH = '0'
+    BUILD = '627198e20200543f157cc4c2ffde5d7df5180ae2'
   end
-  VERSION = '4.2.4'
+  VERSION = '4.5.0'
 end

data/lib/cosmos/win32/excel.rb

@@ -9,50 +9,108 @@
 # attribution addendums as found in the LICENSE.txt
 
 require 'win32ole'
+require 'fileutils'
 
 module Cosmos
-
-  #
-  # This class will take an Excel spreadsheet and build an easily manipulated spreadsheet in ruby
-  #
+  # Open an Excel spreadsheet and build an easily manipulated spreadsheet in ruby
   class ExcelSpreadsheet
-
     attr_reader :worksheets
 
+    # Class to allow easy manipulation to the data in an Excel worksheet
     class ExcelWorksheet
-
       attr_reader :name, :num_rows, :num_columns, :data
 
-      def initialize (worksheet)
+      # @param worksheet [WIN32OLE] The underlying Excel worksheet object
+      def initialize(worksheet)
         @name = worksheet.name
         @num_rows = worksheet.UsedRange.rows.count
         @num_columns = worksheet.UsedRange.columns.count
 
-        #Get Excel Data from Worksheet
+        # Get Excel Data from Worksheet
         @data = worksheet.UsedRange.value
+
+        # Build a lookup table based on the first column
+        @lkup = {}
+        if @data
+          @data.each do |row|
+            @lkup[row[0]] = row[1..-1]
+          end
+        end
       end
 
-    end
+      def keys
+        @lkup.keys
+      end
 
-    def initialize (filename)
-      excel = WIN32OLE.new('excel.application')
-      excel.visible = false
-      wb = excel.workbooks.open(filename)
+      # Access the lookup values by string or the raw data by index
+      #
+      # @param index [String|Integer] Name of the first column or index
+      # @return [ExcelWorksheet] The data in that row
+      def [](index)
+        if index.is_a? String
+          @lkup[index]
+        else
+          @data[index]
+        end
+      end
+    end
 
-      @worksheets = []
+    # @param filename [String] Name of the Excel file to open
+    # @param archive [true|String] If true, create an archive file in the
+    #   default system LOGS directory. If an absolute path, create the
+    #   archive file in the specified path.
+    def initialize(filename, archive: nil)
+      if archive
+        time = Time.now.sys
+        timestamp = sprintf("%04u_%02u_%02u_%02u_%02u_%02u", time.year, time.month, time.mday, time.hour, time.min, time.sec)
+        # If archive is true we use the system LOGS path
+        if archive == true
+          archive = Cosmos::System.paths['LOGS']
+        end
+        archive = File.join(archive, "#{timestamp}_#{File.basename(filename)}")
+        FileUtils.cp filename, archive
+        File.chmod(0444, archive) # Mark read-only
+      end
 
-      count = wb.worksheets.count
-      count.times do |index|
-        ws = wb.worksheets(index + 1)
-        @worksheets << ExcelWorksheet.new(ws)
+      begin
+        excel = WIN32OLE.new('excel.application')
+        excel.visible = false
+        wb = excel.workbooks.open(filename)
+
+        @worksheets = []
+        @lkup = {}
+        count = wb.worksheets.count
+        count.times do |index|
+          ws = wb.worksheets(index + 1)
+          @worksheets << ExcelWorksheet.new(ws)
+          @lkup[ws.name] = @worksheets[-1]
+        end
+      ensure
+        if excel
+          excel.DisplayAlerts = false
+          excel.quit
+        end
+        excel = nil
+        GC.start
       end
+    end
 
-      excel.DisplayAlerts = false
-      excel.quit
-      excel = nil
-      GC.start
+    # @return [Array<String>] Array of all the worksheet names
+    def keys
+      @lkup.keys
     end
 
+    # Access a worksheet by passing in the name or index
+    #
+    # @param index [String|Integer] Name of the worksheet or index
+    # @return [ExcelWorksheet] The worksheet object
+    def [](index)
+      if index.is_a? String
+        @lkup[index]
+      else
+        @worksheets[index]
+      end
+    end
   end
 
   module ExcelColumnConstants
@@ -62,5 +120,4 @@ module Cosmos
       index += 1
     end
   end
-
-end # module Cosmos
+end

data/make_gems.sh

@@ -0,0 +1,10 @@
+# export VERSION= before running this
+git checkout master
+git pull
+rbenv global 2.4.4
+rake release VERSION=$VERSION
+rake commit_release VERSION=$VERSION
+mv *.gem ~/share/.
+rbenv global jruby-9.1.12.0
+gem build cosmos.gemspec
+mv *.gem ~/share/.

data/run_gui_tests.bat

@@ -1,5 +1,6 @@
 call bundle exec ruby autohotkey\tools\CmdExtractorAHK --defaultsize
 call bundle exec ruby autohotkey\tools\CmdSenderAHK -w 650 -t 650
+call bundle exec ruby autohotkey\tools\CmdSenderAHK2 -w 650 -t 650 -p "INST COLLECT" --production
 call bundle exec ruby autohotkey\tools\CmdSequenceAHK -w 650 -t 650
 call bundle exec ruby autohotkey\tools\CmdSequenceAHK2 -w 650 -t 650 -r run_sequence.txt -o procedures
 call bundle exec ruby autohotkey\tools\CmdTlmServerAHK -x 50 -y 50 -w 900 -t 1000

data/spec/conversions/packet_time_formatted_conversion_spec.rb

@@ -0,0 +1,58 @@
+# encoding: ascii-8bit
+
+# Copyright 2018 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+require 'spec_helper'
+require 'cosmos/conversions/packet_time_formatted_conversion'
+require 'cosmos/packets/packet'
+
+module Cosmos
+
+  describe PacketTimeFormattedConversion do
+
+    describe "initialize" do
+      it "initializes converted_type and converted_bit_size" do
+        gc = PacketTimeFormattedConversion.new()
+        expect(gc.converted_type).to eql :STRING
+        expect(gc.converted_bit_size).to eql 0
+      end
+    end
+
+    describe "call" do
+      it "returns the formatted packet time" do
+        gc = PacketTimeFormattedConversion.new()
+        packet = Packet.new("TGT","PKT")
+        packet.received_time = Time.new(2020,1,31,12,15,30)
+        expect(gc.call(nil,packet,nil)).to eql "2020/01/31 12:15:30.000"
+      end
+
+      it "returns the formatted packet time from a packet item" do
+        gc = PacketTimeFormattedConversion.new()
+        packet = Packet.new("TGT","PKT")
+        item = packet.define_item("PACKET_TIME", 0, 0, :DERIVED)
+        item.read_conversion = GenericConversion.new("Time.new(2020,1,31,12,15,30)")
+        packet.received_time = nil
+        expect(gc.call(nil,packet,nil)).to eql "2020/01/31 12:15:30.000"
+      end
+
+      it "returns a string if packet time isn't set" do
+        gc = PacketTimeFormattedConversion.new()
+        packet = Packet.new("TGT","PKT")
+        expect(gc.call(nil,packet,nil)).to eql "No Packet Time"
+      end
+    end
+
+    describe "to_s" do
+      it "returns the class" do
+        expect(PacketTimeFormattedConversion.new().to_s).to eql "PacketTimeFormattedConversion"
+      end
+    end
+  end
+end
+

data/spec/conversions/packet_time_seconds_conversion_spec.rb

@@ -0,0 +1,60 @@
+# encoding: ascii-8bit
+
+# Copyright 2018 Ball Aerospace & Technologies Corp.
+# All Rights Reserved.
+#
+# This program is free software; you can modify and/or redistribute it
+# under the terms of the GNU General Public License
+# as published by the Free Software Foundation; version 3 with
+# attribution addendums as found in the LICENSE.txt
+
+require 'spec_helper'
+require 'cosmos/conversions/packet_time_seconds_conversion'
+require 'cosmos/packets/packet'
+
+module Cosmos
+
+  describe PacketTimeSecondsConversion do
+
+    describe "initialize" do
+      it "initializes converted_type and converted_bit_size" do
+        gc = PacketTimeSecondsConversion.new()
+        expect(gc.converted_type).to eql :FLOAT
+        expect(gc.converted_bit_size).to eql 64
+      end
+    end
+
+    describe "call" do
+      it "returns the formatted packet time" do
+        gc = PacketTimeSecondsConversion.new()
+        packet = Packet.new("TGT","PKT")
+        time = Time.new(2020,1,31,12,15,30)
+        packet.received_time = time
+        expect(gc.call(nil,packet,nil)).to eql time.to_f
+      end
+
+      it "returns the formatted packet time from a packet item" do
+        gc = PacketTimeSecondsConversion.new()
+        packet = Packet.new("TGT","PKT")
+        item = packet.define_item("PACKET_TIME", 0, 0, :DERIVED)
+        time = Time.new(2020,1,31,12,15,30)
+        item.read_conversion = GenericConversion.new("Time.new(2020,1,31,12,15,30)")
+        packet.received_time = nil
+        expect(gc.call(nil,packet,nil)).to eql time.to_f
+      end
+
+      it "returns 0.0 if packet time isn't set" do
+        gc = PacketTimeSecondsConversion.new()
+        packet = Packet.new("TGT","PKT")
+        expect(gc.call(nil,packet,nil)).to eql 0.0
+      end
+    end
+
+    describe "to_s" do
+      it "returns the class" do
+        expect(PacketTimeSecondsConversion.new().to_s).to eql "PacketTimeSecondsConversion"
+      end
+    end
+  end
+end
+