cosmos 3.4.2 → 3.5.0

data/demo/config/data/crc.txt

@@ -19,7 +19,7 @@
 "config/data/position.bin" 0x6EB90F11
 "config/data/hselecton.gif" 0xA824E4FC
 "config/system/system2.txt" 0xC75EBA65
-"config/system/system.txt" 0x1BAF7FCC
+"config/system/system.txt" 0xFA24EDAA
 "config/targets/SYSTEM/cmd_tlm/override.txt" 0x8FE016FF
 "config/targets/SYSTEM/cmd_tlm/limits_groups.txt" 0x16AF4BA3
 "config/targets/SYSTEM/screens/status.txt" 0x89B616E5
@@ -43,7 +43,7 @@
 "config/targets/META/cmd_tlm/meta_cmd.txt" 0x674D6D66
 "config/targets/META/cmd_tlm/meta_tlm.txt" 0x5FC12229
 "config/targets/EXAMPLE/cmd_tlm/example_cmds.txt" 0xB1A6D401
-"config/targets/EXAMPLE/cmd_tlm/example_tlm.txt" 0x52A3D7FF
+"config/targets/EXAMPLE/cmd_tlm/example_tlm.txt" 0x65BF425A
 "config/targets/EXAMPLE/cmd_tlm_server.txt" 0x6139204A
 "config/targets/EXAMPLE/target.txt" 0x4ED5B5BC
 "config/targets/EXAMPLE/lib/example_interface.rb" 0x126C4586
@@ -94,112 +94,130 @@
 "config/tools/handbook_creator/templates/pdf_footer.html.erb" 0xF0D3EB77
 "config/tools/handbook_creator/templates/overview.html.erb" 0xDC4DD2B8
 "config/tools/tlm_viewer/tlm_viewer.txt" 0x825AF31C
-"tools/TlmGrapher" 0x4ECDFE31
-"tools/TestRunner.bat" 0xF1C468BA
-"tools/ExampleTarget.bat" 0xF7D93DD0
-"tools/PacketViewer.bat" 0xF1C468BA
-"tools/TlmViewer.bat" 0xF1C468BA
-"tools/TlmExtractor" 0x2EF21468
-"tools/CmdTlmServer.bat" 0xF1C468BA
-"tools/OpenGLBuilder" 0x96F7D2C2
-"tools/Replay" 0xA2C90DA4
-"tools/CmdSender" 0x8F2A9EC6
-"tools/PacketViewer" 0x019FC483
-"tools/TableManager.bat" 0xF1C468BA
-"tools/TlmExtractor.bat" 0xF1C468BA
-"tools/HandbookCreator.bat" 0x4D5B6471
-"tools/Launcher.bat" 0xF1C468BA
-"tools/TestRunner" 0xDE0A3BD7
-"tools/CmdSender.bat" 0xF1C468BA
-"tools/LimitsMonitor.bat" 0xF1C468BA
+"tools/TlmGrapher" 0x9464F502
+"tools/TestRunner.bat" 0x09A34857
+"tools/ExampleTarget.bat" 0x251F2D88
+"tools/PacketViewer.bat" 0x09A34857
+"tools/TlmViewer.bat" 0x09A34857
+"tools/TlmExtractor" 0x1EC4639A
+"tools/ToolLaunch.bat" 0x1A936987
+"tools/CmdTlmServer.bat" 0x09A34857
+"tools/OpenGLBuilder" 0x585EA691
+"tools/Replay" 0xAC00D2AD
+"tools/CmdSender" 0x10346CF4
+"tools/PacketViewer" 0xF23A40BB
+"tools/TableManager.bat" 0x09A34857
+"tools/TlmExtractor.bat" 0x09A34857
+"tools/HandbookCreator.bat" 0x09A34857
+"tools/Launcher.bat" 0x09A34857
+"tools/TestRunner" 0x0B0E0B8B
+"tools/CmdSender.bat" 0x09A34857
+"tools/LimitsMonitor.bat" 0x09A34857
 "tools/mac/CmdExtractor.app/Contents/Resources/appIcon.icns" 0x39862FA7
-"tools/mac/CmdExtractor.app/Contents/MacOS/CmdExtractor.rb" 0x9AD128F4
+"tools/mac/CmdExtractor.app/Contents/MacOS/CmdExtractor.rb" 0x96E82AC3
 "tools/mac/CmdExtractor.app/Contents/MacOS/main.sh" 0x52DD5B34
+"tools/mac/CmdExtractor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/CmdExtractor.app/Contents/Info.plist" 0x0E89084D
 "tools/mac/TestRunner.app/Contents/Resources/appIcon.icns" 0xC8D32D55
-"tools/mac/TestRunner.app/Contents/MacOS/TestRunner.rb" 0xDE0A3BD7
+"tools/mac/TestRunner.app/Contents/MacOS/TestRunner.rb" 0x0B0E0B8B
 "tools/mac/TestRunner.app/Contents/MacOS/main.sh" 0xD486D22B
+"tools/mac/TestRunner.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/TestRunner.app/Contents/Info.plist" 0x482B3BA5
 "tools/mac/TlmGrapher.app/Contents/Resources/appIcon.icns" 0xCA324F50
 "tools/mac/TlmGrapher.app/Contents/MacOS/main.sh" 0x427E2ECF
-"tools/mac/TlmGrapher.app/Contents/MacOS/TlmGrapher.rb" 0x4ECDFE31
+"tools/mac/TlmGrapher.app/Contents/MacOS/TlmGrapher.rb" 0x9464F502
+"tools/mac/TlmGrapher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/TlmGrapher.app/Contents/Info.plist" 0x3623B978
 "tools/mac/Launcher.app/Contents/Resources/appIcon.icns" 0x8857CD2B
-"tools/mac/Launcher.app/Contents/MacOS/Launcher.rb" 0xF992D0E5
+"tools/mac/Launcher.app/Contents/MacOS/Launcher.rb" 0xFD4E356C
 "tools/mac/Launcher.app/Contents/MacOS/main.sh" 0xB47BE66F
+"tools/mac/Launcher.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/Launcher.app/Contents/Info.plist" 0x32A1EF14
 "tools/mac/OpenGLBuilder.app/Contents/Resources/appIcon.icns" 0x8DDBD837
-"tools/mac/OpenGLBuilder.app/Contents/MacOS/OpenGLBuilder.rb" 0x96F7D2C2
+"tools/mac/OpenGLBuilder.app/Contents/MacOS/OpenGLBuilder.rb" 0x585EA691
 "tools/mac/OpenGLBuilder.app/Contents/MacOS/main.sh" 0x5EF4D8E2
+"tools/mac/OpenGLBuilder.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/OpenGLBuilder.app/Contents/Info.plist" 0x3C2E542D
 "tools/mac/HandbookCreator.app/Contents/Resources/appIcon.icns" 0xCEA7C465
 "tools/mac/HandbookCreator.app/Contents/MacOS/main.sh" 0xD6BC144D
-"tools/mac/HandbookCreator.app/Contents/MacOS/HandbookCreator.rb" 0x0D82EDCA
+"tools/mac/HandbookCreator.app/Contents/MacOS/HandbookCreator.rb" 0xD927814C
+"tools/mac/HandbookCreator.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/HandbookCreator.app/Contents/Info.plist" 0x7591A548
 "tools/mac/TableManager.app/Contents/Resources/appIcon.icns" 0xEBF5074E
 "tools/mac/TableManager.app/Contents/MacOS/main.sh" 0x98E69D10
-"tools/mac/TableManager.app/Contents/MacOS/TableManager.rb" 0x2973832A
+"tools/mac/TableManager.app/Contents/MacOS/TableManager.rb" 0x71F21C88
+"tools/mac/TableManager.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/TableManager.app/Contents/Info.plist" 0xF6A5877F
 "tools/mac/TlmViewer.app/Contents/Resources/appIcon.icns" 0x1CBA8EB3
-"tools/mac/TlmViewer.app/Contents/MacOS/TlmViewer.rb" 0x922D7C22
+"tools/mac/TlmViewer.app/Contents/MacOS/TlmViewer.rb" 0xFE723189
 "tools/mac/TlmViewer.app/Contents/MacOS/main.sh" 0x99FD781B
+"tools/mac/TlmViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/TlmViewer.app/Contents/Info.plist" 0x821041E0
 "tools/mac/LimitsMonitor.app/Contents/Resources/appIcon.icns" 0xC98BF799
 "tools/mac/LimitsMonitor.app/Contents/MacOS/main.sh" 0xCC934478
-"tools/mac/LimitsMonitor.app/Contents/MacOS/LimitsMonitor.rb" 0x64186FBA
+"tools/mac/LimitsMonitor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/LimitsMonitor.app/Contents/MacOS/LimitsMonitor.rb" 0x04FD96D8
 "tools/mac/LimitsMonitor.app/Contents/Info.plist" 0xAF650287
 "tools/mac/TlmExtractor.app/Contents/Resources/appIcon.icns" 0x0AC88876
-"tools/mac/TlmExtractor.app/Contents/MacOS/TlmExtractor.rb" 0x2EF21468
+"tools/mac/TlmExtractor.app/Contents/MacOS/TlmExtractor.rb" 0x1EC4639A
 "tools/mac/TlmExtractor.app/Contents/MacOS/main.sh" 0x4210EF0D
+"tools/mac/TlmExtractor.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/TlmExtractor.app/Contents/Info.plist" 0x343784F4
 "tools/mac/DataViewer.app/Contents/Resources/appIcon.icns" 0x3EC9B207
-"tools/mac/DataViewer.app/Contents/MacOS/DataViewer.rb" 0xEC36C843
+"tools/mac/DataViewer.app/Contents/MacOS/DataViewer.rb" 0x9D20734C
 "tools/mac/DataViewer.app/Contents/MacOS/main.sh" 0xC7AC5AC6
+"tools/mac/DataViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/DataViewer.app/Contents/Info.plist" 0xB79CA16B
 "tools/mac/CmdTlmServer.app/Contents/Resources/appIcon.icns" 0x972CDCC6
-"tools/mac/CmdTlmServer.app/Contents/MacOS/CmdTlmServer.rb" 0xEA490D20
+"tools/mac/CmdTlmServer.app/Contents/MacOS/CmdTlmServer.rb" 0x4C7A4FCB
 "tools/mac/CmdTlmServer.app/Contents/MacOS/main.sh" 0xB8D1BE6E
+"tools/mac/CmdTlmServer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/CmdTlmServer.app/Contents/Info.plist" 0x97E53674
 "tools/mac/CmdSender.app/Contents/Resources/appIcon.icns" 0xEC403A52
-"tools/mac/CmdSender.app/Contents/MacOS/CmdSender.rb" 0x8F2A9EC6
+"tools/mac/CmdSender.app/Contents/MacOS/CmdSender.rb" 0x10346CF4
 "tools/mac/CmdSender.app/Contents/MacOS/main.sh" 0x995D6C7D
+"tools/mac/CmdSender.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/CmdSender.app/Contents/Info.plist" 0x87039019
 "tools/mac/ScriptRunner.app/Contents/Resources/appIcon.icns" 0x9246743E
 "tools/mac/ScriptRunner.app/Contents/MacOS/main.sh" 0xE3274772
-"tools/mac/ScriptRunner.app/Contents/MacOS/ScriptRunner.rb" 0x43D56B62
+"tools/mac/ScriptRunner.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/ScriptRunner.app/Contents/MacOS/ScriptRunner.rb" 0x20F38758
 "tools/mac/ScriptRunner.app/Contents/Info.plist" 0x1BC8C5E9
 "tools/mac/Replay.app/Contents/Resources/appIcon.icns" 0x0E6B32E5
-"tools/mac/Replay.app/Contents/MacOS/Replay.rb" 0xA2C90DA4
+"tools/mac/Replay.app/Contents/MacOS/Replay.rb" 0xAC00D2AD
 "tools/mac/Replay.app/Contents/MacOS/main.sh" 0x211D29BB
+"tools/mac/Replay.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
 "tools/mac/Replay.app/Contents/Info.plist" 0x894AC4CF
 "tools/mac/PacketViewer.app/Contents/Resources/appIcon.icns" 0xDF373DAE
 "tools/mac/PacketViewer.app/Contents/MacOS/main.sh" 0x0D28EF08
-"tools/mac/PacketViewer.app/Contents/MacOS/PacketViewer.rb" 0x019FC483
+"tools/mac/PacketViewer.app/Contents/MacOS/tool_launch.rb" 0x0BDB6696
+"tools/mac/PacketViewer.app/Contents/MacOS/PacketViewer.rb" 0xF23A40BB
 "tools/mac/PacketViewer.app/Contents/Info.plist" 0x6934BF89
-"tools/LimitsMonitor" 0x64186FBA
-"tools/HandbookCreator" 0x0D82EDCA
-"tools/Replay.bat" 0xF1C468BA
-"tools/Launcher" 0xF992D0E5
-"tools/CmdExtractor.bat" 0xF1C468BA
-"tools/OpenGLBuilder.bat" 0xF1C468BA
-"tools/ScriptRunner.bat" 0xF1C468BA
-"tools/ScpiTarget" 0xD9EB6791
-"tools/TableManager" 0x2973832A
-"tools/TlmViewer" 0x922D7C22
-"tools/CmdExtractor" 0x9AD128F4
-"tools/DataViewer.bat" 0xF1C468BA
-"tools/ExampleTarget" 0xE03083ED
-"tools/CmdTlmServer" 0xEA490D20
-"tools/ScriptRunner" 0x43D56B62
-"tools/DataViewer" 0xEC36C843
-"tools/TlmGrapher.bat" 0xF1C468BA
-"tools/ScpiTarget.bat" 0xF7D93DD0
+"tools/LimitsMonitor" 0x04FD96D8
+"tools/HandbookCreator" 0xD927814C
+"tools/Replay.bat" 0x09A34857
+"tools/Launcher" 0xFD4E356C
+"tools/CmdExtractor.bat" 0x09A34857
+"tools/OpenGLBuilder.bat" 0x09A34857
+"tools/ScriptRunner.bat" 0x09A34857
+"tools/ScpiTarget" 0x48836AD3
+"tools/tool_launch.rb" 0x0BDB6696
+"tools/TableManager" 0x71F21C88
+"tools/TlmViewer" 0xFE723189
+"tools/CmdExtractor" 0x96E82AC3
+"tools/DataViewer.bat" 0x09A34857
+"tools/ExampleTarget" 0xD04B51CD
+"tools/CmdTlmServer" 0x4C7A4FCB
+"tools/ScriptRunner" 0x20F38758
+"tools/DataViewer" 0x9D20734C
+"tools/TlmGrapher.bat" 0x09A34857
+"tools/ScpiTarget.bat" 0x251F2D88
 "procedures/disconnect.rb" 0x5F3A18E5
 "procedures/plot_test.rb" 0x0C2972E4
 "procedures/collect_util.rb" 0x3952EB08
 "procedures/run_example_test.rb" 0x0F244140
 "procedures/clear_util.rb" 0x5B3C1279
-"procedures/example_test.rb" 0x4FBA73C1
+"procedures/example_test.rb" 0x7E46BD48
 "procedures/cosmos_api_test.rb" 0x54B5DC56
 "procedures/test.rb" 0xCE4DA55A
 "procedures/checks.rb" 0x34EEF3E2

data/demo/config/system/system.txt

@@ -29,6 +29,7 @@ PATH PROCEDURES ./procedures
 
 ALLOW_ACCESS ALL
 
+ENABLE_SOUND
 # DISABLE_DNS
 # STALENESS_SECONDS 30
 # CMD_TLM_VERSION version

data/demo/config/targets/EXAMPLE/cmd_tlm/example_tlm.txt

@@ -1,3 +1,5 @@
 TELEMETRY EXAMPLE STATUS BIG_ENDIAN "Health and status from the instrument"
   APPEND_ID_ITEM PACKET_ID 8 UINT 1 "Packet id"
+  APPEND_ITEM VALUE 32 UINT "Limits value"
+    LIMITS DEFAULT 1 ENABLED 0 1 10 11
   APPEND_ITEM STRING 0 STRING "Time string"

data/demo/procedures/example_test.rb

@@ -7,20 +7,20 @@ load 'cosmos/tools/test_runner/test.rb'
 class ExampleTest < Cosmos::Test
   # Setup the test case by doing stuff
   def setup
-    puts "Running ExampleTest setup"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 
   # test_1 verifies requirement 1
   def test_case_with_long_name_1
-    puts "Running test_1"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     Cosmos::Test.puts "This test verifies requirement 1"
     wait(2)
   end
 
   # test_2 verifies requirement 2
   def test_2
-    puts "Running test_2"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     Cosmos::Test.puts "This test verifies requirement 2"
     if $manual
       answer = ask "Are you sure?"
@@ -31,12 +31,13 @@ class ExampleTest < Cosmos::Test
   end
 
   def test_3xx
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait 1
   end
 
   # Teardown the test case by doing other stuff
   def teardown
-    puts "Running ExampleTest teardown"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 
@@ -56,26 +57,26 @@ end
 # ExampleTest2 runs test_3 and test_4.
 class ExampleTest2 < Cosmos::Test
   def setup
-    puts "Running ExampleTest2 setup"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 
   # ExampleTest2::test_2 is different from ExampleTest::test_2
   def test_2
-    puts "another test_1 "
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     raise "BAD"
     puts "continuing past the exception"
     wait 2
   end
 
   def test_3
-    puts "Running test_3"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     raise SkipTestCase, "test_3 unimplemented"
     wait(2)
   end
 
   def test_4
-    puts "Running test_4"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     if non_existent
       puts "can't get here"
     else
@@ -85,7 +86,7 @@ class ExampleTest2 < Cosmos::Test
   end
 
   def teardown
-    puts "Running ExampleTest2 teardown"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 end
@@ -100,7 +101,7 @@ end
 class ExampleTestSuite3 < Cosmos::TestSuite
   # This setup applies to the entire test suite
   def setup
-    puts "Running ExampleTestSuite3 setup"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 
@@ -118,21 +119,21 @@ class ExampleTestSuite3 < Cosmos::TestSuite
 
   # This teardown applies to the entire test suite
   def teardown
-    puts "Running ExampleTestSuite3 teardown"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 end
 
 class ExampleTest3 < Cosmos::Test
   def test_5
-    puts "Running test_5"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     puts "\000\001\002"
     check_expression("false == true")
     wait(2)
   end
 
   def test_6
-    puts "Running test_6"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 end
@@ -140,7 +141,7 @@ end
 class ExampleTestSuite4 < Cosmos::TestSuite
   # This setup applies to the entire test suite
   def setup
-    puts "Running ExampleTestSuite4 setup"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 
@@ -154,7 +155,7 @@ class ExampleTestSuite4 < Cosmos::TestSuite
 
   # This teardown applies to the entire test suite
   def teardown
-    puts "Running ExampleTestSuite4 teardown"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 end
@@ -167,7 +168,7 @@ class ExampleTestSuite5 < Cosmos::TestSuite
 
   # This teardown applies to the entire test suite
   def teardown
-    puts "Running ExampleTestSuite5 teardown"
+    puts "Running #{Cosmos::Test.current_test_suite}:#{Cosmos::Test.current_test}:#{Cosmos::Test.current_test_case}"
     wait(2)
   end
 end

data/demo/tools/CmdExtractor

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: ascii-8bit
 
-# Copyright 2014 Ball Aerospace & Technologies Corp.
+# Copyright 2015 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -9,7 +9,8 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
-require 'bundler/setup' unless ENV['COSMOS_DEVEL']
-require 'cosmos'
-require 'cosmos/tools/cmd_extractor/cmd_extractor'
-Cosmos::CmdExtractor.run
+require_relative 'tool_launch'
+tool_launch do
+  require 'cosmos/tools/cmd_extractor/cmd_extractor'
+  Cosmos::CmdExtractor.run
+end

data/demo/tools/CmdExtractor.bat

@@ -1,59 +1,9 @@
 @ECHO OFF
 
-SET RUBYEXE=rubyw.exe
+IF NOT EXIST %~dp0ToolLaunch.bat (
+  echo %~dp0ToolLaunch.bat does not exist
+  pause
+  exit /b
+)
 
-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
+call %~dp0ToolLaunch.bat rubyw.exe %~n0 %*

data/demo/tools/CmdSender

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: ascii-8bit
 
-# Copyright 2014 Ball Aerospace & Technologies Corp.
+# Copyright 2015 Ball Aerospace & Technologies Corp.
 # All Rights Reserved.
 #
 # This program is free software; you can modify and/or redistribute it
@@ -9,7 +9,8 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
-require 'bundler/setup' unless ENV['COSMOS_DEVEL']
-require 'cosmos'
-require 'cosmos/tools/cmd_sender/cmd_sender'
-Cosmos::CmdSender.run
+require_relative 'tool_launch'
+tool_launch do
+  require 'cosmos/tools/cmd_sender/cmd_sender'
+  Cosmos::CmdSender.run
+end