cosmos 3.3.3 → 3.4.0

data/spec/tools/cmd_tlm_server/cmd_tlm_server_config_spec.rb

@@ -106,8 +106,8 @@ module Cosmos
           tf.close
           config = CmdTlmServerConfig.new(tf.path)
           expect(config.packet_log_writer_pairs.keys).to eql ["DEFAULT","MY_WRITER"]
-          expect(config.packet_log_writer_pairs["DEFAULT"].cmd_log_writer.logging_enabled).to be_truthy
-          expect(config.packet_log_writer_pairs["MY_WRITER"].cmd_log_writer.logging_enabled).to be_falsey
+          expect(config.packet_log_writer_pairs["DEFAULT"].cmd_log_writer.logging_enabled).to be true
+          expect(config.packet_log_writer_pairs["MY_WRITER"].cmd_log_writer.logging_enabled).to be false
           tf.unlink
           config.packet_log_writer_pairs.each do |name, plwp|
             plwp.cmd_log_writer.shutdown
@@ -191,7 +191,7 @@ module Cosmos
           tf.puts 'DONT_CONNECT'
           tf.close
           config = CmdTlmServerConfig.new(tf.path)
-          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].connect_on_startup).to be_falsey
+          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].connect_on_startup).to be false
           tf.unlink
         end
       end
@@ -212,7 +212,7 @@ module Cosmos
           tf.puts 'DONT_RECONNECT'
           tf.close
           config = CmdTlmServerConfig.new(tf.path)
-          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].auto_reconnect).to be_falsey
+          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].auto_reconnect).to be false
           tf.unlink
         end
       end
@@ -254,7 +254,7 @@ module Cosmos
           tf.puts 'DISABLE_DISCONNECT'
           tf.close
           config = CmdTlmServerConfig.new(tf.path)
-          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].disable_disconnect).to be_truthy
+          expect(config.interfaces['CTSCONFIGTESTINTERFACE'].disable_disconnect).to be true
           tf.unlink
         end
       end

data/spec/tools/cmd_tlm_server/interface_thread_spec.rb

@@ -121,7 +121,7 @@ module Cosmos
           thread.stop
           sleep 0.2
           expect(Thread.list.length).to eql(1)
-          expect(callback_called).to be_truthy
+          expect(callback_called).to be true
 
           expect(stdout.string).not_to match "Connection Success"
         end
@@ -163,7 +163,7 @@ module Cosmos
           thread.stop
           sleep 0.2
           expect(Thread.list.length).to eql(1)
-          expect(callback_called).to be_truthy
+          expect(callback_called).to be true
 
           expect(stdout.string).not_to match "Connection Lost"
         end
@@ -229,7 +229,7 @@ module Cosmos
           sleep 0.1
           thread.stop
           sleep 0.2
-          expect(callback_called).to be_truthy
+          expect(callback_called).to be true
 
           expect(stdout.string).not_to match "Packet reading thread unexpectedly died"
         end

data/spec/top_level/top_level_spec.rb

@@ -116,7 +116,7 @@ module Cosmos
         array = [1,2,3,4]
         Cosmos.marshal_dump('marshal_test', array)
         array_load = Cosmos.marshal_load('marshal_test')
-        expect(File.exist?(File.join(Cosmos::USERPATH,'marshal_test'))).to be_truthy
+        expect(File.exist?(File.join(Cosmos::USERPATH,'marshal_test'))).to be true
         expect(array).to eql array_load
         File.delete(File.join(Cosmos::USERPATH,'marshal_test'))
       end
@@ -161,9 +161,9 @@ module Cosmos
           thread = Cosmos.run_process("ping 192.0.0.234 -n 1 -w 1000 > nul")
           sleep 0.1
           expect(thread).to be_a Thread
-          expect(thread.alive?).to be_truthy
+          expect(thread.alive?).to be true
           sleep 2
-          expect(thread.alive?).to be_falsey
+          expect(thread.alive?).to be false
         end
       end
     end
@@ -198,7 +198,7 @@ module Cosmos
   describe "create_log_file" do
     it "creates a log file even if System LOGS doesn't exist" do
       filename = Cosmos.create_log_file('test', 'X:/directory/which/does/not/exit')
-      expect(File.exist?(filename)).to be_truthy
+      expect(File.exist?(filename)).to be true
       File.delete(filename)
 
       Cosmos.set_working_dir do
@@ -220,13 +220,13 @@ module Cosmos
         # Create a logs directory as the first order backup
         FileUtils.mkdir('logs')
         filename = Cosmos.create_log_file('test', 'X:/directory/which/does/not/exit')
-        expect(File.exist?(filename)).to be_truthy
+        expect(File.exist?(filename)).to be true
         File.delete(filename)
 
         # Delete logs and see if we still get a log file
         FileUtils.rm_rf('logs')
         filename = Cosmos.create_log_file('test', 'X:/directory/which/does/not/exit')
-        expect(File.exist?(filename)).to be_truthy
+        expect(File.exist?(filename)).to be true
         File.delete(filename)
 
         # Restore outputs
@@ -238,9 +238,9 @@ module Cosmos
   describe "write_exception_file" do
     it "writes an exception file" do
       file = Cosmos.write_exception_file(nil, 'test1_exception', File.dirname(__FILE__))
-      expect(File.exist?(file)).to be_truthy
+      expect(File.exist?(file)).to be true
       file = Cosmos.write_exception_file(RuntimeError.new, 'test2_exception', File.dirname(__FILE__))
-      expect(File.exist?(file)).to be_truthy
+      expect(File.exist?(file)).to be true
       Cosmos.cleanup_exceptions()
     end
   end

data/spec/utilities/csv_spec.rb

@@ -54,7 +54,7 @@ module Cosmos
     describe "create_archive" do
       it "creates a default archive file" do
         @csv.create_archive
-        expect(File.exist?(@csv.archive_file)).to be_truthy
+        expect(File.exist?(@csv.archive_file)).to be true
         @csv.close_archive
       end
 
@@ -62,7 +62,7 @@ module Cosmos
         if Kernel.is_windows?
           Dir.mkdir("C:/temp") unless File.directory?("C:/temp")
           @csv.create_archive("C:/temp")
-          expect(File.exist?(@csv.archive_file)).to be_truthy
+          expect(File.exist?(@csv.archive_file)).to be true
           @csv.close_archive
         end
       end
@@ -74,7 +74,7 @@ module Cosmos
         @csv.write_archive(%w(HI a b c))
         @csv.close_archive
         data = File.read @csv.archive_file
-        expect(data.include?("HI,a,b,c")).to be_truthy
+        expect(data.include?("HI,a,b,c")).to be true
       end
 
       it "raises an exception if writing to an unopened archive" do

data/spec/utilities/message_log_spec.rb

@@ -27,7 +27,7 @@ module Cosmos
         log.start
         log.stop
         Cosmos.set_working_dir do
-          expect(File.exist?(log.filename)).to be_truthy
+          expect(File.exist?(log.filename)).to be true
           expect(log.filename).to match 'TEST'
           expect(log.filename).to match 'logs'
           File.delete log.filename
@@ -38,7 +38,7 @@ module Cosmos
         log = MessageLog.new('TEST', File.expand_path(File.dirname(__FILE__)))
         log.start
         log.stop
-        expect(File.exist?(log.filename)).to be_truthy
+        expect(File.exist?(log.filename)).to be true
         expect(log.filename).to match File.expand_path(File.dirname(__FILE__))
         File.delete log.filename
       end
@@ -79,7 +79,7 @@ module Cosmos
         log.start
         log.stop
         Cosmos.set_working_dir do
-          expect(File.stat(log.filename).writable?).to be_falsey
+          expect(File.stat(log.filename).writable?).to be false
           File.delete log.filename
         end
       end

data/spec/utilities/ruby_lex_utils_spec.rb

@@ -19,23 +19,23 @@ module Cosmos
 
     describe "contains_begin?" do
       it "detects the begin keyword" do
-        expect(@lex.contains_begin?("  begin  ")).to be_truthy
-        expect(@lex.contains_begin?("  begin # asdf  ")).to be_truthy
+        expect(@lex.contains_begin?("  begin  ")).to be true
+        expect(@lex.contains_begin?("  begin # asdf  ")).to be true
       end
     end
 
     describe "contains_keyword?" do
       it "detects the ruby keywords" do
-        expect(@lex.contains_keyword?("if something")).to be_truthy
-        expect(@lex.contains_keyword?("obj.method = something")).to be_falsey
+        expect(@lex.contains_keyword?("if something")).to be true
+        expect(@lex.contains_keyword?("obj.method = something")).to be false
       end
     end
 
     describe "contains_block_beginning?" do
       it "detects block beginning keywords" do
-        expect(@lex.contains_block_beginning?("do")).to be_truthy
-        expect(@lex.contains_block_beginning?("[].each {")).to be_truthy
-        expect(@lex.contains_block_beginning?("begin")).to be_truthy
+        expect(@lex.contains_block_beginning?("do")).to be true
+        expect(@lex.contains_block_beginning?("[].each {")).to be true
+        expect(@lex.contains_block_beginning?("begin")).to be true
       end
     end
 

data/test/performance/config/tools/launcher/launcher_threads.txt

@@ -1,9 +1,11 @@
 TITLE "Threads"
 TOOL_FONT tahoma 12
 LABEL_FONT tahoma 16
+NUM_COLUMNS 5 # This is the default
 
-TOOL "CTS - Profiled" "ruby-prof -p call_tree -m 1 -f callgrind.profile tools\CmdTlmServerMemProf -- --config cmd_tlm_server_threads.txt --system system_threads.txt" "cts.png"
 TOOL "CTS" "LAUNCH CmdTlmServer --config cmd_tlm_server_threads.txt --system system_threads.txt" "cts.png"
+TOOL "CTS - CodeProf" "ruby-prof -p call_tree -m 1 -f callgrind.cts tools\CmdTlmServer -- --config cmd_tlm_server_threads.txt --system system_threads.txt" "cts.png"
+TOOL "CTS - MemProf" "LAUNCH CmdTlmServerMemProf --config cmd_tlm_server_threads.txt --system system_threads.txt" "cts.png"
 TOOL "Script Runner" "LAUNCH ScriptRunner --system system_threads.txt" "script_runner.png"
 MULTITOOL_START "Simulated Targets" NULL
   TOOL "LAUNCH_TERMINAL ExampleTarget 9999 STATUS 10 --system system_threads.txt"
@@ -68,3 +70,8 @@ MULTITOOL_START "Simulated Targets" NULL
     DONT_CAPTURE_IO # Without this you get an "Unexpected Output" dialog
 MULTITOOL_END
 
+DIVIDER
+TOOL "Telemetry Grapher" "LAUNCH TlmGrapher --system system_threads.txt" "tlm_grapher.png"
+TOOL "Grapher - CodeProf" "ruby-prof -p call_tree -m 1 -f callgrind.grapher tools\TlmGrapher -- --system system_threads.txt" "tlm_grapher.png"
+TOOL "Grapher - MemProf" "LAUNCH TlmGrapherMemProf --system system_threads.txt" "tlm_grapher.png"
+

data/test/performance/tools/CmdTlmServerMemProf

@@ -16,5 +16,5 @@ require 'memory_profiler'
 report = MemoryProfiler.report do
   Cosmos::CmdTlmServerGui.run
 end
-File.open(File.build_timestamped_filename(%w(memory profile)),'w') {|file| report.pretty_print(file) }
+File.open(File.build_timestamped_filename(%w(cts memory profile)),'w') {|file| report.pretty_print(file) }
 

data/test/performance/tools/TlmGrapherMemProf

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# encoding: ascii-8bit
+
+# Copyright 2014 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 'cosmos'
+require 'cosmos/tools/tlm_grapher/tlm_grapher'
+
+require 'memory_profiler'
+report = MemoryProfiler.report do
+  Cosmos::TlmGrapher.run
+end
+File.open(File.build_timestamped_filename(%w(grapher memory profile)),'w') {|file| report.pretty_print(file) }

data/test/performance/tools/TlmGrapherMemProf.bat

@@ -0,0 +1,59 @@
+@ECHO OFF
+
+SET RUBYEXE=rubyw.exe
+
+SET "DESTINATION_DIR=%~dp0..\..\"
+IF EXIST "%DESTINATION_DIR%Vendor\Ruby" GOTO DIREND
+IF "%COSMOS_DIR%" == "" GOTO DIREND
+SET "DESTINATION_DIR=%COSMOS_DIR%\"
+:DIREND
+
+IF NOT EXIST "%DESTINATION_DIR%Vendor\Ruby" GOTO SYSTEMRUBY
+
+REM Save some variables we're going to change so we can restore them later
+SET "COSMOS_GEM_HOME_SAVED=%GEM_HOME%"
+SET "COSMOS_GEM_PATH_SAVED=%GEM_PATH%"
+SET "COSMOS_GEMRC_SAVED=%GEMRC%"
+SET "COSMOS_PATH_SAVED=%PATH%"
+SET "COSMOS_RUBYOPT_SAVED=%RUBYOPT%"
+SET "COSMOS_RUBYLIB_SAVED=%RUBYLIB%"
+SET "COSMOS_RI_DEVKIT_SAVED=%RI_DEVKIT%"
+
+REM Set environmental variables
+
+IF EXIST "%DESTINATION_DIR%Vendor\Ruby\lib\ruby\gems\1.8" SET "GEM_HOME=%DESTINATION_DIR%Vendor\Ruby\lib\ruby\gems\1.8"
+IF EXIST "%DESTINATION_DIR%Vendor\Ruby\lib\ruby\gems\1.9.1" SET "GEM_HOME=%DESTINATION_DIR%Vendor\Ruby\lib\ruby\gems\1.9.1"
+IF EXIST "%DESTINATION_DIR%Vendor\Ruby\lib\ruby\gems\2.0.0" SET "GEM_HOME=%DESTINATION_DIR%Vendor\Ruby\lib\ruby\gems\2.0.0"
+SET "GEM_PATH=%GEM_HOME%"
+SET "GEMRC=%DESTINATION_DIR%Vendor\Ruby\lib\ruby\gems\etc\gemrc"
+
+REM Prepend embedded bin to PATH so we prefer those binaries
+SET "RI_DEVKIT=%DESTINATION_DIR%Vendor\Devkit\"
+SET "PATH=%DESTINATION_DIR%Vendor\Ruby\bin;%RI_DEVKIT%bin;%RI_DEVKIT%mingw\bin;%DESTINATION_DIR%Vendor\wkhtmltopdf;%PATH%"
+
+REM Remove RUBYOPT and RUBYLIB, which can cause serious problems.
+SET RUBYOPT=
+SET RUBYLIB=
+
+REM Run tool using Installer Ruby
+ECHO Starting tool using installer ruby in %DESTINATION_DIR%
+START "COSMOS" "%DESTINATION_DIR%Vendor\Ruby\bin\%RUBYEXE%" "%~dp0%~n0" %*
+
+REM Restore some environmental variables we changed
+SET "GEM_HOME=%COSMOS_GEM_HOME_SAVED%"
+SET "GEM_PATH=%COSMOS_GEM_PATH_SAVED%"
+SET "GEMRC=%COSMOS_GEMRC_SAVED%"
+SET "PATH=%COSMOS_PATH_SAVED%"
+SET "RUBYOPT=%COSMOS_RUBYOPT_SAVED%"
+SET "RUBYLIB=%COSMOS_RUBYLIB_SAVED%"
+SET "RI_DEVKIT=%COSMOS_RI_DEVKIT_SAVED%"
+
+GOTO END
+:SYSTEMRUBY
+
+REM Use System Ruby and Environment
+ECHO Starting tool using system ruby and environment
+START "COSMOS" "%RUBYEXE%" "%~dp0%~n0" %*
+
+GOTO END
+:END

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -395,6 +395,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
 description: |2
       Ball Aerospace COSMOS provides all the functionality needed to send
       commands to and receive data from one or more embedded systems
@@ -426,6 +440,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".gitattributes"
 - ".gitignore"
 - ".travis.yml"
 - CONTRIBUTING.txt
@@ -608,8 +623,13 @@ files:
 - autohotkey/userpath.txt
 - bin/cosmos
 - bin/cstol_converter
+- bin/exchndl20-x64.dll
 - bin/exchndl20.dll
+- bin/exchndl21-x64.dll
 - bin/exchndl21.dll
+- bin/exchndl22-x64.dll
+- bin/exchndl22.dll
+- bin/mgwhelp-x64.dll
 - bin/mgwhelp.dll
 - bin/rubysloc
 - cosmos.gemspec
@@ -1252,8 +1272,14 @@ files:
 - lib/cosmos/processors/statistics_processor.rb
 - lib/cosmos/processors/watermark_processor.rb
 - lib/cosmos/script.rb
+- lib/cosmos/script/cmd_tlm_server.rb
+- lib/cosmos/script/commands.rb
 - lib/cosmos/script/extract.rb
+- lib/cosmos/script/limits.rb
 - lib/cosmos/script/script.rb
+- lib/cosmos/script/scripting.rb
+- lib/cosmos/script/telemetry.rb
+- lib/cosmos/script/tools.rb
 - lib/cosmos/streams/burst_stream_protocol.rb
 - lib/cosmos/streams/fixed_stream_protocol.rb
 - lib/cosmos/streams/length_stream_protocol.rb
@@ -1459,6 +1485,7 @@ files:
 - spec/core_ext/stringio_spec.rb
 - spec/core_ext/time_spec.rb
 - spec/gui/line_graph/line_clip_spec.rb
+- spec/gui/qt_spec.rb
 - spec/install/config/system/system.txt
 - spec/install/config/targets/COSMOS/cmd_tlm/cosmos_server_cmds.txt
 - spec/install/config/targets/COSMOS/cmd_tlm/cosmos_server_tlm.txt
@@ -1527,7 +1554,14 @@ files:
 - spec/processors/processor_spec.rb
 - spec/processors/statistics_processor_spec.rb
 - spec/processors/watermark_processor_spec.rb
+- spec/script/cmd_tlm_server_spec.rb
+- spec/script/commands_disconnect_spec.rb
+- spec/script/commands_spec.rb
+- spec/script/limits_spec.rb
 - spec/script/script_spec.rb
+- spec/script/scripting_spec.rb
+- spec/script/telemetry_spec.rb
+- spec/script/tools_spec.rb
 - spec/spec_helper.rb
 - spec/streams/burst_stream_protocol_spec.rb
 - spec/streams/fixed_stream_protocol_spec.rb
@@ -1692,6 +1726,8 @@ files:
 - test/performance/tools/TlmExtractor.bat
 - test/performance/tools/TlmGrapher
 - test/performance/tools/TlmGrapher.bat
+- test/performance/tools/TlmGrapherMemProf
+- test/performance/tools/TlmGrapherMemProf.bat
 - test/performance/tools/TlmViewer
 - test/performance/tools/TlmViewer.bat
 - test/performance/tools/mac/CmdExtractor.app/Contents/Info.plist