simultaneous 0.4.0 → 0.4.1

data/lib/simultaneous.rb

@@ -4,7 +4,7 @@ require 'socket'
 require 'eventmachine'
 
 module Simultaneous
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 
   DEFAULT_CONNECTION = "/tmp/simultaneous-server.sock"
   DEFAULT_PORT = 9999

data/lib/simultaneous/async_client.rb

@@ -23,25 +23,37 @@ module Simultaneous
         def client=(client); @client = client end
         def client; @client end
 
-        def connection_completed
-          # $stdout.puts "Client connection completed\\n"
-        end
+        def connection_completed; end
 
         def receive_line(line)
           client.receive(line)
         end
 
-        # def unbind
-        #   $stdout.puts "Client Connection closed\\\\\\\\n"
-        #   client.reconnect!
-        # end
+        def unbind
+          $stderr.puts "#{Time.now} Client Connection closed\n"
+          client.reconnect!
+        end
       end
       handler
     end
 
     def reconnect!
+      attempt_reconnect
+    end
+
+    def attempt_reconnect
       @socket = nil
-      connect
+      @reconnect_timer = EM::PeriodicTimer.new(1) do
+        $stderr.puts "#{Time.now} Attempting reconnect"
+        begin
+          connect
+          EM.cancel_timer(@reconnect_timer)
+          @reconnect_timer = nil
+          $stderr.puts "#{Time.now} Re-connection successful"
+        rescue => e
+          $stderr.puts "#{Time.now} Reconnection failed `#{e}`"
+        end
+      end
     end
 
     def close

data/lib/simultaneous/rack.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'rack/async'
+#require 'rack/async'
 
 module Simultaneous
   module Rack
@@ -49,7 +49,7 @@ module Simultaneous
       end
 
       def app
-        ::Rack::Async.new(self)
+        #::Rack::Async.new(self)
       end
 
       def call(env)

data/lib/simultaneous/task.rb

@@ -10,7 +10,7 @@ module Simultaneous
     end
 
     def self.included(klass)
-      Simultaneous.client = Simultaneous::TaskClient.new
+      Simultaneous.client = Simultaneous::SyncClient.new
       Simultaneous.set_pid(self.task_name, pid) if task_name
       at_exit {
         begin

data/simultaneous.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'simultaneous'
-  s.version           = '0.4.0'
-  s.date              = '2012-02-23'
+  s.version           = '0.4.1'
+  s.date              = '2012-06-21'
   s.rubyforge_project = 'simultaneous'
 
   ## Make sure your summary is short. The description may be as long
@@ -43,9 +43,9 @@ Gem::Specification.new do |s|
 
   ## List your runtime dependencies here. Runtime dependencies are those
   ## that are needed for an end user to actually USE your code.
-  s.add_dependency('eventmachine', [">= 1.0.0.beta.4", "< 2.0"])
+  s.add_dependency('eventmachine', [">= 1.0.0.rc.1", "< 2.0"])
   s.add_dependency('rack', [">= 1.0", "< 2.0"])
-  s.add_dependency('rack-async', [">= 0.0.1", "< 2.0"])
+  s.add_dependency('async-rack', ["~> 0.5.0"])
 
   ## List your development dependencies here. Development dependencies are
   ## those that are only needed during development

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simultaneous
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,25 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70178587096280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta.4
+        version: 1.0.0.rc.1
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178587096280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70178587092600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,24 +46,34 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70178587092600
-- !ruby/object:Gem::Dependency
-  name: rack-async
-  requirement: &70178587106180 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '1.0'
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: async-rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70178587106180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70178587104560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -63,7 +81,12 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70178587104560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.4
 description: Simultaneous is designed for the very specific use case of a small set
   of users collaborating on editing a single website. Because of that it is optimised
   for infrequent invocation of very long running publishing tasks and provides an
@@ -131,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simultaneous
-rubygems_version: 1.8.16
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 2
 summary: Simultaneous is the background task launcher used by Spontaneous CMS