em-simple_telnet 0.0.13 → 0.0.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/em-simple_telnet.rb +13 -1
  3. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: bf16b8d0ef409b504417bc283ebe89d5854657f1
4
- data.tar.gz: 512db553a0cf00813a2c74b0261dfa9e7bdf96ea
3
+ metadata.gz: 594676275954e10f5f5e5e2f9aea15372a127067
4
+ data.tar.gz: 49adcad4478b2f6c1f558e8db0ff6df4c47f1ccf
5
5
  SHA512:
6
- metadata.gz: d40a5473dc45009bcc06fad1776bcbc49b4ac41a20285c8a3b9ba0e27ff87caa07167566fe255d9a6ac83259b07ea971a2d483fff7968d2f85a67771f188a69d
7
- data.tar.gz: 0692dbe8c46fe79f08931f332670477dc341d8a61f1aab93ecc3d5d3ab12eba90b3bbf246995f1d07dfa6473fdcf799ad301d2dffd97a3822436347955646d46
6
+ metadata.gz: 5a59880c63f66990b965f7db01ec1a6b74863c86fa426452a4274263bd44714ea0570fe94113744f21610ac47ce506c8a443677a631d7e415d29044b8b8bc304
7
+ data.tar.gz: f63524ea45c482481d3222682f079608dab940b612a23533f58cd2a1e5483d36032b4164f15a2dbf14b5c4c835c5f9c0743a580241f39fa988933a63e81a189e
@@ -158,6 +158,9 @@ class EventMachine::Protocols::SimpleTelnet < EventMachine::Connection
158
158
  # number of active connections
159
159
  @@_telnet_connection_count = 0
160
160
 
161
+ # the root fiber
162
+ RootFiber = Fiber.current
163
+
161
164
  class << self
162
165
 
163
166
  ##
@@ -189,7 +192,16 @@ class EventMachine::Protocols::SimpleTelnet < EventMachine::Connection
189
192
  callback.call if callback
190
193
  end
191
194
 
192
- if EventMachine.reactor_running?
195
+ if EventMachine.reactor_running? and Fiber.current == RootFiber
196
+ warn "SimpleTelnet: EventMachine reactor had been started " +
197
+ "independently. Won't stop it automatically."
198
+ fiber.resume
199
+
200
+ elsif EventMachine.reactor_running?
201
+ # NOTE: Seems like the EventMachine reactor is already running, but we're
202
+ # not in the root Fiber. That means we're probably in the process of
203
+ # establishing a nested connection (from inside a Fiber created by SimpleTelnet).
204
+
193
205
  # Transfer control to the "inner" Fiber and stop the current one.
194
206
  # The block will be called after connect() returned to transfer control
195
207
  # back to the "outer" Fiber.
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: em-simple_telnet
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.13
4
+ version: 0.0.14
5
5
  platform: ruby
6
6
  authors:
7
7
  - Patrik Wenger
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-07-31 00:00:00.000000000 Z
11
+ date: 2013-08-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: eventmachine
@@ -55,8 +55,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
55
55
  version: '0'
56
56
  requirements: []
57
57
  rubyforge_project:
58
- rubygems_version: 2.0.2
58
+ rubygems_version: 2.0.3
59
59
  signing_key:
60
60
  specification_version: 4
61
61
  summary: Simple telnet client on EventMachine
62
62
  test_files: []
63
+ has_rdoc: true