simultaneous 0.3.3 → 0.4.0

data/Gemfile

@@ -2,5 +2,4 @@ source :rubygems
 
 gemspec
 
-gem 'rack-async', :git => "git://github.com/matsadler/rack-async.git"
-# gem 'thin'
+#gem 'rack-async', :git => "git://github.com/matsadler/rack-async.git"

data/lib/simultaneous.rb

@@ -4,7 +4,7 @@ require 'socket'
 require 'eventmachine'
 
 module Simultaneous
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 
   DEFAULT_CONNECTION = "/tmp/simultaneous-server.sock"
   DEFAULT_PORT = 9999
@@ -77,10 +77,10 @@ module Simultaneous
       @client ||= \
         begin
           client = \
-            if ::EM.reactor_running?
-              Client.new(domain, connection)
+            if client_mode == :async and ::EM.reactor_running?
+              AsyncClient.new(domain, connection)
             else
-              TaskClient.new(domain, connection)
+              SyncClient.new(domain, connection)
             end
           # make sure that new client is hooked into all listeners
           event_listeners.each do |event, blocks|
@@ -139,6 +139,10 @@ module Simultaneous
       @domain = domain
     end
 
+    def client_mode=(mode)
+      @client_mode = mode
+    end
+
     def connection
       @connection ||= (ENV[Simultaneous::ENV_CONNECTION] || Simultaneous::DEFAULT_CONNECTION)
     end
@@ -147,6 +151,11 @@ module Simultaneous
       @domain ||= (ENV[Simultaneous::ENV_DOMAIN] || "domain#{$$}")
     end
 
+    def client_mode
+      reset_client!
+      @client_mode ||= :async
+    end
+
     # Used by the {Simultaneous::Daemon} module to set the correct PID for a given task
     def map_pid(task_name, pid)
       command = Command::SetPid.new(task_name, pid)
@@ -255,8 +264,8 @@ module Simultaneous
 
   autoload :Connection,       "simultaneous/connection"
   autoload :Server,           "simultaneous/server"
-  autoload :Client,           "simultaneous/client"
-  autoload :TaskClient,       "simultaneous/task_client"
+  autoload :AsyncClient,      "simultaneous/async_client"
+  autoload :SyncClient,       "simultaneous/sync_client"
   autoload :Task,             "simultaneous/task"
   autoload :TaskDescription,  "simultaneous/task_description"
   autoload :BroadcastMessage, "simultaneous/broadcast_message"

data/lib/simultaneous/{client.rb → async_client.rb}

@@ -3,7 +3,7 @@
 require 'eventmachine'
 
 module Simultaneous
-  class Client
+  class AsyncClient
 
 
     attr_reader :domain
@@ -32,7 +32,7 @@ module Simultaneous
         end
 
         # def unbind
-        #   $stdout.puts "Client Connection closed\\n"
+        #   $stdout.puts "Client Connection closed\\\\\\\\n"
         #   client.reconnect!
         # end
       end

data/lib/simultaneous/command/fire.rb

@@ -63,6 +63,7 @@ module Simultaneous
             Process::GID.change_privilege(task_gid) unless Process.egid == task_gid
             Process::UID.change_privilege(task_uid) unless Process.euid == task_uid
             File.umask(0022)
+            redirect_io(@task.logfile)
             Dir.chdir(@task.pwd)
             exec(cmd)
           end
@@ -110,8 +111,6 @@ module Simultaneous
           end
         end
 
-        redirect_io(logfile_name)
-
         return sess_id
       end
 

data/lib/simultaneous/connection.rb

@@ -73,7 +73,7 @@ module Simultaneous
 
     def set_socket_permissions(socket)
       if File.exist?(socket)
-        File.chmod(0777, socket)
+        File.chmod(00777, socket)
         File.chown(nil, options[:gid], socket) if options[:gid]
       end
     end

data/lib/simultaneous/rack.rb

@@ -58,7 +58,9 @@ module Simultaneous
 
         @lock.synchronize { @clients << stream }
 
-        [200, {"Content-type" => "text/event-stream"}, stream]
+        # Nginx specific header to disable buffering
+        # see: http://wiki.nginx.org/X-accel#X-Accel-Buffering
+        [200, {"Content-type" => "text/event-stream", "X-Accel-Buffering" => "no"}, stream]
       end
 
       def deliver_event(event)

data/lib/simultaneous/{task_client.rb → sync_client.rb}

@@ -3,7 +3,7 @@
 require 'socket'
 
 module Simultaneous
-  class TaskClient
+  class SyncClient
     attr_reader :domain
 
     def initialize(domain = Simultaneous.domain, connection_string=Simultaneous.connection)

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.3.3'
-  s.date              = '2012-02-21'
+  s.version           = '0.4.0'
+  s.date              = '2012-02-23'
   s.rubyforge_project = 'simultaneous'
 
   ## Make sure your summary is short. The description may be as long
@@ -63,8 +63,8 @@ Gem::Specification.new do |s|
     bin/simultaneous-console
     bin/simultaneous-server
     lib/simultaneous.rb
+    lib/simultaneous/async_client.rb
     lib/simultaneous/broadcast_message.rb
-    lib/simultaneous/client.rb
     lib/simultaneous/command.rb
     lib/simultaneous/command/client_event.rb
     lib/simultaneous/command/fire.rb
@@ -74,8 +74,8 @@ Gem::Specification.new do |s|
     lib/simultaneous/connection.rb
     lib/simultaneous/rack.rb
     lib/simultaneous/server.rb
+    lib/simultaneous/sync_client.rb
     lib/simultaneous/task.rb
-    lib/simultaneous/task_client.rb
     lib/simultaneous/task_description.rb
     simultaneous.gemspec
     test/helper.rb

data/test/helper.rb

@@ -1,8 +1,11 @@
+path = File.expand_path('../../lib', __FILE__)
+$:.unshift(path) if File.directory?(path) && !$:.include?(path)
+
 require 'minitest/spec'
 require 'minitest/autorun'
 require 'rr'
-require 'simultaneous'
 require 'fileutils'
+require File.expand_path('../../lib/simultaneous', __FILE__)
 
 
 $debug = false

data/test/test_client.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../helper', __FILE__)
 
-describe Simultaneous::Client do
+describe Simultaneous::AsyncClient do
   it "should send right command to server" do
     EM.run {
       task = Simultaneous.add_task(:publish, "/publish", {:param1 => "value1", :param2 => "value2"}, 12)

data/test/test_connection.rb

@@ -79,7 +79,7 @@ describe Simultaneous::Connection do
     socket = "/tmp/socket.sock"
     gid = "789"
     FileUtils.rm(socket) if File.exist?(socket)
-    mock(File).chmod(0777, socket)
+    mock(File).chmod(00777, socket)
     mock(File).chown(nil, gid, socket)
     handler = Module.new
     mock(EventMachine).start_server(socket, handler) { FileUtils.touch(socket) }

data/test/test_server.rb

@@ -18,9 +18,9 @@ describe Simultaneous::Server do
       EM.run {
         Simultaneous::Server.start(SOCKET)
 
-        client1 = Simultaneous::Client.new("domain1", SOCKET)
-        client2 = Simultaneous::Client.new("domain1", SOCKET)
-        client3 = Simultaneous::Client.new("domain2", SOCKET)
+        client1 = Simultaneous::AsyncClient.new("domain1", SOCKET)
+        client2 = Simultaneous::AsyncClient.new("domain1", SOCKET)
+        client3 = Simultaneous::AsyncClient.new("domain2", SOCKET)
 
         command = Simultaneous::Command::ClientEvent.new("domain1", "a", "data")
 
@@ -161,11 +161,11 @@ describe Simultaneous::Server do
         ENV[Simultaneous::ENV_TASK_NAME] = "publish"
         ENV[Simultaneous::ENV_CONNECTION] = SOCKET
 
-        c = Simultaneous::TaskClient.new("example2.com", SOCKET)
-        mock(Simultaneous::TaskClient).new { c }
+        c = Simultaneous::SyncClient.new("example2.com", SOCKET)
+        mock(Simultaneous::SyncClient).new { c }
         mock(c).run(is_a(Simultaneous::Command::SetPid))
         proxy(c).run(is_a(Simultaneous::Command::ClientEvent))
-        client = Simultaneous::Client.new("example2.com", SOCKET)
+        client = Simultaneous::AsyncClient.new("example2.com", SOCKET)
 
         client.on_event("publish_status") { |event|
           event.data.must_equal "completed"
@@ -199,8 +199,8 @@ describe Simultaneous::Server do
         ENV[Simultaneous::ENV_TASK_NAME] = "publish"
         ENV[Simultaneous::ENV_CONNECTION] = SOCKET
 
-        c = Simultaneous::TaskClient.new("example3.com", SOCKET)
-        mock(Simultaneous::TaskClient).new { c }
+        c = Simultaneous::SyncClient.new("example3.com", SOCKET)
+        mock(Simultaneous::SyncClient).new { c }
         mock(c).run(is_a(Simultaneous::Command::SetPid))
         proxy(c).run(is_a(Simultaneous::Command::Kill))
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simultaneous
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-21 00:00:00.000000000Z
+date: 2012-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70282715898340 !ruby/object:Gem::Requirement
+  requirement: &70178587096280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282715898340
+  version_requirements: *70178587096280
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70282715897160 !ruby/object:Gem::Requirement
+  requirement: &70178587092600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282715897160
+  version_requirements: *70178587092600
 - !ruby/object:Gem::Dependency
   name: rack-async
-  requirement: &70282715896280 !ruby/object:Gem::Requirement
+  requirement: &70178587106180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -52,10 +52,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70282715896280
+  version_requirements: *70178587106180
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70282715895540 !ruby/object:Gem::Requirement
+  requirement: &70178587104560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -63,7 +63,7 @@ dependencies:
         version: 1.0.4
   type: :development
   prerelease: false
-  version_requirements: *70282715895540
+  version_requirements: *70178587104560
 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
@@ -86,8 +86,8 @@ files:
 - bin/simultaneous-console
 - bin/simultaneous-server
 - lib/simultaneous.rb
+- lib/simultaneous/async_client.rb
 - lib/simultaneous/broadcast_message.rb
-- lib/simultaneous/client.rb
 - lib/simultaneous/command.rb
 - lib/simultaneous/command/client_event.rb
 - lib/simultaneous/command/fire.rb
@@ -97,8 +97,8 @@ files:
 - lib/simultaneous/connection.rb
 - lib/simultaneous/rack.rb
 - lib/simultaneous/server.rb
+- lib/simultaneous/sync_client.rb
 - lib/simultaneous/task.rb
-- lib/simultaneous/task_client.rb
 - lib/simultaneous/task_description.rb
 - simultaneous.gemspec
 - test/helper.rb
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: simultaneous
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 2
 summary: Simultaneous is the background task launcher used by Spontaneous CMS