pry-em 0.2.0 → 0.2.1

data/lib/pry-em.rb

@@ -2,7 +2,7 @@ EmCommands = Pry::CommandSet.new do
 
   create_command /\s*em\s*([0-9\.]*)\s*:(.*)/ do
 
-    description "Wait for a deferrable for a length of time (default 3 seconds). `em 3: EM::HttpRequest.new(url).get`"
+    description "Run code in eventmachine and wait for any Deferrable results."
     options(
       :keep_retval  => true,
       :interpolate  => false,
@@ -10,6 +10,22 @@ EmCommands = Pry::CommandSet.new do
       :requires_gem => 'eventmachine'
     )
 
+    banner <<-BANNER
+      The em: command runs your code in an event machine context.
+
+      If your code returns a deferrable, it wil wait for that deferrable to succeed
+      or fail before returning you to Pry.
+
+      By default the em: command will wait forever for your deferrable to return
+      a result, if you'd like to wait for a shorter length of time, you can add
+      a timeout (in seconds) before the colon in em:.
+
+      e.g.
+        pry(main)> em 3: EM::HttpRequest.new("http://www.google.com").get
+        RuntimeError: Timeout after 3.0 seconds
+
+    BANNER
+
     def process(timeout, source)
       # We store the retval and the em-state in globals so that we can catch exceptions
       # raised in the event loop and pass them back pretending to the user that the
@@ -34,7 +50,7 @@ EmCommands = Pry::CommandSet.new do
       deferrable = target.eval(source)
 
       # TODO: Allow the user to configure the default timeout
-      timeout = timeout == "" ? 3 : Float(timeout)
+      timeout = timeout == "" ? nil : Float(timeout)
 
       wait_for_deferrable(deferrable, timeout) unless deferrable.nil?
     end
@@ -89,7 +105,9 @@ EmCommands = Pry::CommandSet.new do
     #
     def wait_for_deferrable(deferrable, timeout)
 
-      EM::Timer.new(timeout) { @@em_state = :timeout if waiting? }
+      if timeout
+        EM::Timer.new(timeout) { @@em_state = :timeout if waiting? }
+      end
 
       [:callback, :errback].each do |method|
         begin
@@ -98,7 +116,8 @@ EmCommands = Pry::CommandSet.new do
             @@retval = result.size > 1 ? result : result.first
           end
         rescue NoMethodError
-          output.puts "WARNING: is not deferrable? #{deferrable}"
+          @@retval = deferrable
+          @@em_state = :callback
           break
         end
       end
@@ -111,7 +130,8 @@ EmCommands = Pry::CommandSet.new do
       raise @@retval if @@em_state != :callback && Exception === @@retval
 
       # TODO: This doesn't interact well with the pager.
-      output.print "#{@@em_state} " #=>
+      output.print "#{@@em_state} " if @@em_state != :callback
+
       @@retval
 
     # If the main thread is interrupted we must ensure that the @@em_state

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pry-em
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Conrad Irwin