cosmos 3.6.2 → 3.6.3

data/spec/script/scripting_spec.rb

@@ -419,7 +419,7 @@ module Cosmos
 
       it "raises an error if the script can't be found" do
         class ScriptRunnerFrame; def self.instance; false; end; end
-        expect { start("unknown_script.rb") }.to raise_error(RuntimeError)
+        expect { start("unknown_script.rb") }.to raise_error(LoadError)
       end
 
       it "starts a script within ScriptRunnerFrame" do
@@ -439,7 +439,7 @@ module Cosmos
     describe "load_utility" do
       it "requires a script" do
         class ScriptRunnerFrame; def self.instance; false; end; end;
-        expect { load_utility("example.rb") }.to raise_error(RuntimeError, /Procedure not found/)
+        expect { load_utility("example.rb") }.to raise_error(LoadError, /Procedure not found/)
       end
 
       it "requires a script within ScriptRunnerFrame" do

data/spec/script/tools_spec.rb

@@ -61,6 +61,7 @@ module Cosmos
       it "complains if unable to start telemetry viewer" do
         # Avoid the needless delay by stubbing sleep
         allow_any_instance_of(Object).to receive(:sleep)
+        allow_any_instance_of(Object).to receive(:cosmos_script_sleep).and_return(true)
         allow(Cosmos).to receive(:run_process)
         expect { display("HI") }.to raise_error(RuntimeError, /HI could not be displayed/)
       end
@@ -80,6 +81,7 @@ module Cosmos
       it "complains if unable to start telemetry viewer" do
         # Avoid the needless delay by stubbing sleep
         allow_any_instance_of(Object).to receive(:sleep)
+        allow_any_instance_of(Object).to receive(:cosmos_script_sleep).and_return(true)
         allow(Cosmos).to receive(:run_process)
         expect { clear("HI") }.to raise_error(RuntimeError, /HI could not be cleared/)
       end

data/spec/spec_helper.rb

@@ -8,6 +8,15 @@
 # as published by the Free Software Foundation; version 3 with
 # attribution addendums as found in the LICENSE.txt
 
+# Redefine Object.load so simplecov doesn't overwrite the results after
+# re-loading a file during test.
+def load(file, wrap = false)
+  SimpleCov.start do
+    command_name "#{command_name}1"
+  end
+  Kernel.load(file, wrap)
+end
+
 # NOTE: You MUST require simplecov before anything else!
 unless ENV['COSMOS_NO_SIMPLECOV']
   require 'simplecov'
@@ -18,7 +27,7 @@ unless ENV['COSMOS_NO_SIMPLECOV']
     Coveralls::SimpleCov::Formatter
   ]
   SimpleCov.start do
-    merge_timeout 7200 # merge the last two hours of results
+    merge_timeout 12 * 60 * 60 # merge the last 12 hours of results
     add_filter '/spec/'
     add_filter '/autohotkey/'
 

data/spec/tools/launcher/launcher_config_spec.rb

@@ -12,6 +12,7 @@ require 'spec_helper'
 require 'cosmos'
 require 'cosmos/tools/launcher/launcher_config'
 require 'tempfile'
+require 'ostruct'
 
 module Cosmos
 
@@ -446,19 +447,28 @@ module Cosmos
           tf.unlink
         end
       end
-    end
 
-#  DONT_CAPTURE_IO
-#MULTITOOL_START "COSMOS"
-#  TOOL "LAUNCH CmdTlmServer -x 827 -y 2 -w 756 -t 475 -c cmd_tlm_server.txt"
-#  DELAY 5
-#  TOOL "LAUNCH TlmViewer -x 827 -y 517 -w 424 -t 111"
-#    DONT_CAPTURE_IO
-#MULTITOOL_END
-#DIVIDER
-#LABEL "This is a test"
-#DOC
+      describe "AUTO_GEM_TOOLS" do
+        it "loads a tool from a gem" do
+          spec1 = OpenStruct.new
+          spec1.name = "cosmos-test"
+          spec1.gem_dir = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
+          allow(Bundler).to receive_message_chain(:load, :specs).and_return([spec1])
+
+          tf = Tempfile.new('mylauncher.txt')
+          tf.puts 'AUTO_GEM_TOOLS'
+          tf.close
 
+          lc = LauncherConfig.new(tf.path)
+          expect(lc.items[0][0]).to eq :TOOL
+          expect(lc.items[0][1]).to eq 'cmd_tlm_server'
+          expect(lc.items[0][2]).to match('cmd_tlm_server')
+          expect(lc.items[0][3]).to be true
+          expect(lc.items[0][5]).to be_nil
+          tf.unlink
+        end
+      end
+    end
   end
 end
 

data/spec/top_level/top_level_spec.rb

@@ -158,7 +158,7 @@ module Cosmos
     it "returns a Thread" do
       if Kernel.is_windows?
         capture_io do |stdout|
-          thread = Cosmos.run_process("ping 192.0.0.234 -n 1 -w 1000 > nul")
+          thread = Cosmos.run_process("ping google.com -n 2 -w 1000 > nul")
           sleep 0.1
           expect(thread).to be_a Thread
           expect(thread.alive?).to be true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.6.3
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler