em-simple_telnet 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf16b8d0ef409b504417bc283ebe89d5854657f1
-  data.tar.gz: 512db553a0cf00813a2c74b0261dfa9e7bdf96ea
+  metadata.gz: 594676275954e10f5f5e5e2f9aea15372a127067
+  data.tar.gz: 49adcad4478b2f6c1f558e8db0ff6df4c47f1ccf
 SHA512:
-  metadata.gz: d40a5473dc45009bcc06fad1776bcbc49b4ac41a20285c8a3b9ba0e27ff87caa07167566fe255d9a6ac83259b07ea971a2d483fff7968d2f85a67771f188a69d
-  data.tar.gz: 0692dbe8c46fe79f08931f332670477dc341d8a61f1aab93ecc3d5d3ab12eba90b3bbf246995f1d07dfa6473fdcf799ad301d2dffd97a3822436347955646d46
+  metadata.gz: 5a59880c63f66990b965f7db01ec1a6b74863c86fa426452a4274263bd44714ea0570fe94113744f21610ac47ce506c8a443677a631d7e415d29044b8b8bc304
+  data.tar.gz: f63524ea45c482481d3222682f079608dab940b612a23533f58cd2a1e5483d36032b4164f15a2dbf14b5c4c835c5f9c0743a580241f39fa988933a63e81a189e

data/lib/em-simple_telnet.rb

@@ -158,6 +158,9 @@ class EventMachine::Protocols::SimpleTelnet < EventMachine::Connection
   # number of active connections
   @@_telnet_connection_count = 0
 
+  # the root fiber
+  RootFiber = Fiber.current
+
   class << self
 
     ##
@@ -189,7 +192,16 @@ class EventMachine::Protocols::SimpleTelnet < EventMachine::Connection
         callback.call if callback
       end
 
-      if EventMachine.reactor_running?
+      if EventMachine.reactor_running? and Fiber.current == RootFiber
+        warn "SimpleTelnet: EventMachine reactor had been started " +
+          "independently. Won't stop it automatically."
+        fiber.resume
+
+      elsif EventMachine.reactor_running?
+        # NOTE: Seems like the EventMachine reactor is already running, but we're
+        # not in the root Fiber. That means we're probably in the process of
+        # establishing a nested connection (from inside a Fiber created by SimpleTelnet).
+
         # Transfer control to the "inner" Fiber and stop the current one.
         # The block will be called after connect() returned to transfer control
         # back to the "outer" Fiber.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: em-simple_telnet
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Patrik Wenger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-31 00:00:00.000000000 Z
+date: 2013-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -55,8 +55,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple telnet client on EventMachine
 test_files: []
+has_rdoc: true