mutle-rackdapter 0.0.1 → 0.0.2

data/Manifest

@@ -8,7 +8,6 @@ lib/rackdapter/spawner.rb
 lib/rackdapter.rb
 Manifest
 MIT-LICENSE
-rackdapter.gemspec
 Rakefile
 README.rdoc
 test/rackdapter.yml

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('rackdapter', '0.0.1') do |p|
+Echoe.new('rackdapter', '0.0.2') do |p|
   p.description    = "rackdapter"
   p.gemspec_name   = "rackdapter.gemspec"
   p.url            = "http://github.com/mutle/rackdapter"

data/lib/rackdapter/master.rb

@@ -25,11 +25,11 @@ module Rackdapter
     end
     
     def run      
-      Signal.trap("INT") { all_apps(:stop); exit(0) }
-      Signal.trap("TERM") { all_apps(:stop); exit(0) }
+      Signal.trap("INT") { all_apps(:stop); EventMachine::stop_event_loop }
+      Signal.trap("TERM") { all_apps(:stop); EventMachine::stop_event_loop }
       Signal.trap("HUP") { all_apps(:restart) }
       EventMachine::run {
-        EventMachine::add_timer(5) { all_apps(:ensure_running) }
+        EventMachine::add_periodic_timer(5) { all_apps(:ensure_running) }
       }
     end
   end

data/lib/rackdapter/spawner.rb

@@ -1,7 +1,7 @@
 module Rackdapter
   
   class Application
-    attr_accessor :name, :path, :environment, :backend, :port, :balancer, :base_port, :instances, :type, :log
+    attr_accessor :name, :path, :environment, :backend, :port, :balancer, :base_port, :instances, :type, :log, :ruby
     
     def initialize(options={})
       options.each do |k,v|
@@ -31,6 +31,10 @@ module Rackdapter
       @ports
     end
     
+    def ruby
+      @ruby || "/usr/bin/ruby"
+    end
+    
     def all_instances(&block)
       @app_instances.each do |port,instance|
         instance.send(:instance_eval, &block)
@@ -61,34 +65,36 @@ module Rackdapter
   end
   
   def self.app_options(app, port, options)
-    out = ''
     log = app.log.gsub(/<port>/, port.to_s).gsub(/<environment>/, app.environment)
+    opts = []
     options.each do |k,v|
-      out << " -#{k.to_s} #{v}" unless v.blank?
+      unless v.blank?
+        opts << "-#{k.to_s}"
+        opts << v.to_s
+      end
     end
-    out << " >> #{log} 2>&1"
-    out
+    opts
   end
   
   module RailsBackend
     def self.spawn(app, port)
       Dir.chdir(app.path)
-      options = Rackdapter.app_options(app, port, "e" => app.environment, "p" => port)
-      exec "mongrel_rails start #{options}"
+      options = Rackdapter.app_options(app, port, "e" => app.environment, "p" => port, "c" => File.expand_path(app.path))
+      exec app.ruby, "/usr/bin/mongrel_rails", "start", *options
     end
   end
   
   module MerbBackend
     def self.spawn(app, port)
       Dir.chdir(app.path)
-      options = Rackdapter.app_options(app, port, "e" => app.environment, "p" => port, "n" => app.name)
-      exec "merb #{options}"
+      options = Rackdapter.app_options(app, port, "e" => app.environment, "p" => port, "n" => app.name, "m" => File.expand_path(app.path))
+      exec app.ruby, "/usr/bin/merb", *options
     end
   end
   
   module ProxyBackend
     def self.spawn(application, port=nil)
-      exec "rackdapter_proxy #{Rackdapter.config_path}"
+      exec app.ruby, File.join(File.dirname(__FILE__), '../../bin/rackdapter_proxy'), Rackdapter.config_path
     end
   end
   
@@ -142,7 +148,7 @@ module Rackdapter
       return false unless @pid
       found = false
       `ps`.each_line do |line|
-        if line =~ /(^| )(#{@pid}) /
+        if line =~ /^ *(#{@pid}) /
           found = true
           break
         end

data/rackdapter.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rackdapter}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mutwin Kraus"]
-  s.date = %q{2008-12-05}
+  s.date = %q{2008-12-12}
   s.description = %q{rackdapter}
   s.email = %q{mutwin.kraus@gmail.com}
   s.executables = ["rackdapter", "rackdapter_proxy"]
   s.extra_rdoc_files = ["bin/rackdapter", "bin/rackdapter_proxy", "lib/rackdapter/config.rb", "lib/rackdapter/master.rb", "lib/rackdapter/proxy.rb", "lib/rackdapter/rackdapter.rb", "lib/rackdapter/spawner.rb", "lib/rackdapter.rb", "README.rdoc"]
-  s.files = ["bin/rackdapter", "bin/rackdapter_proxy", "lib/rackdapter/config.rb", "lib/rackdapter/master.rb", "lib/rackdapter/proxy.rb", "lib/rackdapter/rackdapter.rb", "lib/rackdapter/spawner.rb", "lib/rackdapter.rb", "Manifest", "MIT-LICENSE", "rackdapter.gemspec", "Rakefile", "README.rdoc", "test/rackdapter.yml", "test/test_helper.rb", "test/unit/test_config.rb"]
+  s.files = ["bin/rackdapter", "bin/rackdapter_proxy", "lib/rackdapter/config.rb", "lib/rackdapter/master.rb", "lib/rackdapter/proxy.rb", "lib/rackdapter/rackdapter.rb", "lib/rackdapter/spawner.rb", "lib/rackdapter.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "test/rackdapter.yml", "test/test_helper.rb", "test/unit/test_config.rb", "rackdapter.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/mutle/rackdapter}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Rackdapter", "--main", "README.rdoc"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mutle-rackdapter
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Mutwin Kraus
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -08:00
+date: 2008-12-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,12 +49,12 @@ files:
 - lib/rackdapter.rb
 - Manifest
 - MIT-LICENSE
-- rackdapter.gemspec
 - Rakefile
 - README.rdoc
 - test/rackdapter.yml
 - test/test_helper.rb
 - test/unit/test_config.rb
+- rackdapter.gemspec
 has_rdoc: true
 homepage: http://github.com/mutle/rackdapter
 post_install_message: