kosmonaut 0.2.0 → 0.2.1

data/ChangeLog

@@ -0,0 +1,8 @@
+2012-01-16  Krzysztof Kowalik  <chris@nu7hat.ch>
+
+	* lib/kosmonaut/socket.rb: base for worker and client
+	* lib/kosmonaut/worker.rb: majordomo worker
+	* lib/kosmonaut/client.rb: majordomo client
+	* lib/kosmonaut/errors.rb: possible protocol errors
+	* lib/kosmonaut.rb: base tools
+	* test/: tests for client and worker api

data/NEWS

@@ -0,0 +1,8 @@
+Releases
+========
+
+v0.2.0
+------
+* Pure ruby implementation of the client and worker using
+  majordomo pattern.
+* Tests for the API

data/README

@@ -1,5 +1,5 @@
-Ruby wrapper for Kosmonaut - the WebRocket client
-=================================================
+Kosmonaut - ruby client for the WebRocket
+=========================================
 
 Kosmonaut.rb is a ruby backend client for the WebRocket.
 The idea of the Kosmonaut is to keep it simple, straightforward

data/kosmonaut.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 
 Gem::Specification.new do |s|
   s.name = "kosmonaut"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   s.summary = "Ruby client for the WebRocket backend"
   s.description = "The WebRocket server backend client for ruby programming language"
   s.authors = ["Krzysztof Kowalik", "Cubox"]
@@ -11,9 +11,10 @@ Gem::Specification.new do |s|
   s.homepage = "http://webrocket.io/"
   s.license = "MIT"
 
-  s.files = Dir["{lib/**/*.rb,test/*.rb,Rakefile,README*,COPYING,*.gemspec}"]
+  s.files = Dir["{lib/**/*.rb,test/*.rb,Rakefile,README,COPYING,NEWS,ChangeLog,*.gemspec}"]
   s.test_files = Dir["test/*.rb"]
   s.require_paths = ["lib"]
 
   s.add_dependency "json", "~> 1.0"
+  s.add_development_dependency "minitest", "~> 2.0"
 end

data/lib/kosmonaut/worker.rb

@@ -7,7 +7,6 @@ module Kosmonaut
 
     RECONNECT_DELAY = 1000 # in milliseconds
     HEARTBEAT_INTERVAL = 2000 # in milliseconds
-    LIVENESS = 3
 
     def initialize(url)
       super(url)
@@ -17,26 +16,27 @@ module Kosmonaut
       @reconnect_delay = RECONNECT_DELAY
       @heartbeat_ivl = HEARTBEAT_INTERVAL
       @heartbeat_at = 0
-      @liveness = 0
     end
 
     def listen
-      reconnect
       @alive = true
+      reconnect
       while true
-        if !alive?
-          send(@sock, ["QT"])
-          disconnect
-          break
-        end
         begin
+          if !alive?
+            send(@sock, ["QT"]) if @sock
+            disconnect
+            break
+          end
+          unless @sock
+            raise Errno::ECONNREFUSED
+          end
           Timeout.timeout(((@heartbeat_ivl * 2).to_f / 1000.0).to_i + 1) {
             msg = recv(@sock)
-            @liveness = LIVENESS
+            raise Errno::ECONNRESET if @sock.eof? || msg.empty?
             log("Worker/RECV : #{msg.join("\n").inspect}")
-            next if msg.size < 1
             cmd = msg.shift
-          
+              
             case cmd
             when "HB"
               # nothing to do...
@@ -49,13 +49,12 @@ module Kosmonaut
               error_handler(msg.size < 1 ? 597 : msg[0])
             end
           }
-        rescue Timeout::Error, Errno::ECONNRESET
-          if (@liveness -= 1) == 0
-            sleep(@reconnect_delay.to_f / 1000.0)
-            reconnect
-          end
+        rescue Timeout::Error, Errno::ECONNRESET, Errno::ECONNREFUSED => err
+          log("Worker/RECONNECT: " + err.to_s)
+          sleep(@reconnect_delay.to_f / 1000.0)
+          reconnect
         end
-        if Time.now.to_f > @heartbeat_at
+        if Time.now.to_f > @heartbeat_at && @sock
           send(@sock, ["HB"])
           @heartbeat_at = Time.now.to_f + (@heartbeat_ivl.to_f / 1000.0)
         end
@@ -92,9 +91,9 @@ module Kosmonaut
     def reconnect
       disconnect
       @sock = connect
-      @sock.write(pack(["RD"]))
-      @liveness = LIVENESS
-      @heartbeat_at = Time.now.to_f + (@heartbeat_ivl.to_f / 1000.0)
+      send(@sock, ["RD"])
+      @heartbeat_at = Time.now.to_f + (@heartbeat_ivl.to_f / 1000.0)      
+    rescue Errno::ECONNREFUSED
     end
 
     def message_handler(data)

metadata

@@ -2,7 +2,7 @@
 name: kosmonaut
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Krzysztof Kowalik
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 Z
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -24,6 +24,17 @@ dependencies:
         version: "1.0"
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.0"
+  type: :development
+  version_requirements: *id002
 description: The WebRocket server backend client for ruby programming language
 email: chris@nu7hat.ch
 executables: []
@@ -45,6 +56,8 @@ files:
 - Rakefile
 - README
 - COPYING
+- NEWS
+- ChangeLog
 - kosmonaut.gemspec
 homepage: http://webrocket.io/
 licenses: