mpex 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2454a26f57e35fe68ee81fa629266788b3eb9059
-  data.tar.gz: 665b68f17bb164db43c929ac19f521e625e1fdd0
+  metadata.gz: d2e9cf3a474bbeed9681a7ce0907ff7e05b27c28
+  data.tar.gz: 437eee712d95706cc8b6c033ca71f447120f1f16
 SHA512:
-  metadata.gz: 2f91599220b2d73afc0e3e17fdc3a3282cf5b752de040ffb72a1dbbc23bc507cf4e7084d6d9416471a99c5633f839d05a9d5cc338645b371945f3372edea2370
-  data.tar.gz: 7ad5a9da36bd1995f0b3be3aac944e9f9d0fe1bb706b0e2be4540ff4870ab89c3aecf4a4f719fd3d4c23307e782b72ef6c77dc66ead45706717661ca1df3c3b5
+  metadata.gz: aa574c8245e15b4458b15c07c6296bf29559a42ef803f9a16f8d087585ca03bcbc2c96c45a0f1872cf1baddbdc4b3dcb4fc9a128a15d42402b6d8668b9495d7f
+  data.tar.gz: 44eb7fc2214ed39de00e59f5864d9f800c568f2183b96ac76328af486f62967baba049327f3846aeac8d8d7e08d2307ce24d33def160e320083579c806aca6fb

data/lib/mpex/irc.rb

@@ -1,5 +1,6 @@
 require 'net/yail'
 require 'net/http'
+require 'timeout'
 
 module Mpex
   # TODO to be improved and to be made configurable!
@@ -7,6 +8,7 @@ module Mpex
 
     ASSBOT = "assbot"
     MPEXBOT = "mpexbot"
+    TIMEOUT = 30 # seconds
 
     def initialize
       @irc = Net::YAIL.new(
@@ -26,6 +28,10 @@ module Mpex
         @connected = true
       end
 
+      @irc.hearing_msg do |event|
+        @last_message = {:nick => event.nick, :message => event.message}
+      end
+
       puts "Connecting. Please wait."
 
       @irc.start_listening
@@ -44,39 +50,63 @@ module Mpex
       dpaste_url = res['Location']
       @irc.msg(ASSBOT, "!mp " + dpaste_url)
 
-      @irc.hearing_msg do |event|
-        resp_url = parse_message(event.message)
-        mpex_res = Net::HTTP.get(URI.parse(resp_url)) if resp_url
-        yield mpex_res
+      status = Timeout::timeout(TIMEOUT) {
+        yield wait_for_assbot_message
+      }
+    end
+
+    def wait_for_assbot_message
+      while true
+        if @last_message
+          answer = handle_assbot_incoming(@last_message[:message])
+          if answer
+            @last_message = nil
+            return answer
+          end
+        end
       end
     end
 
-    def parse_message(msg)
+    def handle_assbot_incoming(msg)
       if msg.start_with? "Response: http:"
-        return msg.split[1]
+        resp_url = msg.split[1]
+        return Net::HTTP.get(URI.parse(resp_url))
       end
     end
 
     def vwap(&block)
       @irc.msg MPEXBOT, '$vwap'
-      
-      @irc.hearing_msg do |event|
-        mpexbot_res = Net::HTTP.get(URI.parse(event.message)) if event.message.start_with?("http:")
-        yield mpexbot_res.to_s if mpexbot_res
-      end
+
+      status = Timeout::timeout(TIMEOUT) {
+        yield wait_for_mpexbot_message
+      }
     end
 
     def depth(&block)
       @irc.msg MPEXBOT, '$depth'
-      
-      @irc.hearing_msg do |event|
-        if event.message.start_with?("http:")
-          uri = URI.parse(event.message);
-          id = uri.path[1..-1]
-          uri = URI.parse("http://pastebin.com/raw.php?i=" + id)
-          mpexbot_res = Net::HTTP.get(uri)
+
+      status = Timeout::timeout(TIMEOUT) {
+        yield wait_for_mpexbot_message
+      }
+    end
+
+    def wait_for_mpexbot_message
+      while true
+        if @last_message
+          answer = handle_mpexbot_incoming(@last_message[:message])
+          if answer
+            @last_message = nil
+            return answer
+          end
         end
-        yield mpexbot_res.to_s if mpexbot_res
+      end
+    end
+
+    def handle_mpexbot_incoming(msg)
+      if msg.start_with?("http://pastebin.com")
+        id = URI.parse(msg).path[1..-1]
+        uri = URI.parse("http://pastebin.com/raw.php?i=" + id)
+        return Net::HTTP.get(uri)
       end
     end
 

data/lib/mpex/version.rb

@@ -1,3 +1,3 @@
 module Mpex
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpex
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Fa Wuxi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri