cosmos 3.0.0 → 3.0.1

data/spec/tools/cmd_tlm_server/router_thread_spec.rb

@@ -23,7 +23,7 @@ module Cosmos
 
       @interface = Interface.new
       $connected_count = 0
-      allow(@interface).to receive(:connected?) do
+      def @interface.connected?
         if $connected_count == 0
           $connected_count += 1
           false
@@ -43,17 +43,16 @@ module Cosmos
     describe "start" do
       it "should log the connection" do
         commanding = double("commanding")
-        expect(commanding).to receive(:send_command_to_interface)
+        expect(commanding).to receive(:send_command_to_interface).at_least(1).times
         allow(CmdTlmServer).to receive(:commanding).and_return(commanding)
         @interface.interfaces = [@interface]
         thread = RouterThread.new(@interface)
-        threads = Thread.list.length
         thread.start
-        sleep 0.1
-        Thread.list.length.should eql threads + 1
+        sleep 0.5
+        Thread.list.length.should eql(2)
         thread.stop
         sleep 0.5
-        Thread.list.length.should eql threads
+        Thread.list.length.should eql(1)
       end
 
     end
@@ -66,14 +65,13 @@ module Cosmos
         @interface.interfaces = [@interface]
         thread = RouterThread.new(@interface)
         sleep(1)
-        threads = Thread.list.length
         capture_io do |stdout|
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
           sleep 0.5
-          Thread.list.length.should eql threads
+          Thread.list.length.should eql(1)
           stdout.string.should match "Error routing command"
         end
       end
@@ -87,14 +85,13 @@ module Cosmos
         @packet.packet_name = 'SMITH'
         thread = RouterThread.new(@interface)
         sleep(1)
-        threads = Thread.list.length
         capture_io do |stdout|
           thread.start
           sleep 0.1
-          Thread.list.length.should eql threads + 1
+          Thread.list.length.should eql(2)
           thread.stop
           sleep 0.5
-          Thread.list.length.should eql threads
+          Thread.list.length.should eql(1)
           stdout.string.should match "Received unknown identified command: BOB SMITH"
         end
       end

data/spec/tools/cmd_tlm_server/routers_spec.rb

@@ -41,6 +41,7 @@ module Cosmos
           routers.stop
         end
         tf.unlink
+        sleep(0.2)
       end
     end
 
@@ -69,6 +70,7 @@ module Cosmos
           stdout.string.should match "Disconnected from router MY_ROUTER"
         end
         tf.unlink
+        sleep(0.2)
       end
     end
 
@@ -124,10 +126,12 @@ module Cosmos
         tf.puts 'ROUTE DEST2'
         tf.close
         capture_io do |stdout|
-          server = TCPServer.new('127.0.0.1', 9797)
-          Thread.new do
-            client = server.accept
-            client.close
+          server = TCPServer.new('127.0.0.1', 8888)
+          clients = []
+          server_thread = Thread.new do
+            loop do
+              clients << server.accept
+            end
           end
 
           config = CmdTlmServerConfig.new(tf.path)
@@ -140,7 +144,7 @@ module Cosmos
           sleep 0.1
           stdout.string.should match "Connecting to MY_ROUTER"
           routers.disconnect("MY_ROUTER")
-          routers.connect("MY_ROUTER",'localhost',9888,9888,6,6,'length')
+          routers.connect("MY_ROUTER",'localhost',8888,8888,6,6,'length')
           sleep 0.1
           stdout.string.should match "Disconnected from router MY_ROUTER"
           stdout.string.should match "Connecting to MY_ROUTER"
@@ -149,8 +153,16 @@ module Cosmos
           config.interfaces['DEST1'].routers[0].name.should eql "MY_ROUTER"
           config.interfaces['DEST2'].routers[0].name.should eql "MY_ROUTER"
           routers.disconnect("MY_ROUTER")
+          routers.stop
+
+          server_thread.kill
+          server.close
+          clients.each do |c|
+            c.close
+          end
         end
         tf.unlink
+        sleep(0.2)
       end
     end
 

data/spec/top_level/top_level_spec.rb

@@ -274,12 +274,13 @@ module Cosmos
   describe "safe_thread" do
     it "should handle exceptions" do
       capture_io do |stdout|
-        Cosmos.safe_thread("Test", 1) do
+        thread = Cosmos.safe_thread("Test", 1) do
           raise "TestError"
         end
-        sleep 0.5
-
+        sleep 1
         stdout.string.should match "Test thread unexpectedly died."
+        thread.kill
+        sleep(0.2)
       end
       Cosmos.cleanup_exceptions()
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cosmos
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Ryan Melton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -317,28 +317,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.4'
-- !ruby/object:Gem::Dependency
-  name: wdm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -422,10 +408,12 @@ extensions:
 - ext/cosmos/ext/string/extconf.rb
 - ext/cosmos/ext/tabbed_plots_config/extconf.rb
 - ext/cosmos/ext/telemetry/extconf.rb
+- ext/mkrf_conf.rb
 extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CONTRIBUTING.txt
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -941,6 +929,7 @@ files:
 - ext/cosmos/ext/tabbed_plots_config/tabbed_plots_config.c
 - ext/cosmos/ext/telemetry/extconf.rb
 - ext/cosmos/ext/telemetry/telemetry.c
+- ext/mkrf_conf.rb
 - install/Gemfile
 - install/Launcher
 - install/Launcher.bat