zeus 0.10.0 → 0.10.2

data/examples/zeus.json

@@ -1,5 +1,5 @@
 {
-  "command": "ruby -rzeus/rails -eZeus.go",
+  "command": "ruby -rubygems -rzeus/rails -eZeus.go",
 
   "plan": {
     "boot": {

data/lib/zeus.rb

@@ -5,63 +5,27 @@ require 'zeus/load_tracking'
 
 module Zeus
   class Plan
+    def after_fork ; end
   end
 
   class << self
-
-    def add_extra_feature(path)
-      $untracked_features ||= []
-      $untracked_features << path
-    end
-
     attr_accessor :plan
 
-    def report_error_to_master(local, error)
-      str = "R:"
-      str << "#{error.backtrace[0]}: #{error.message} (#{error.class})\n"
-      error.backtrace[1..-1].each do |line|
-        str << "\tfrom #{line}\n"
-      end
-      str << "\0"
-      local.write str
-    end
-
-    def run_action(socket, identifier)
-      plan.send(identifier)
-      socket.write "R:OK\0"
-    rescue Exception => e
-      report_error_to_master(socket, e)
-    end
-
-    def notify_features(sock, features)
-      features.each do |t|
-        begin
-          sock.write "F:#{t}\0"
-        rescue Errno::ENOBUFS
-          sleep 0.2
-          retry
-        end
-      end
-    end
-
     def go(identifier=:boot)
-      identifier = identifier.to_sym
       $0 = "zeus slave: #{identifier}"
       # okay, so I ahve this FD that I can use to send data to the master.
       fd = ENV['ZEUS_MASTER_FD'].to_i
       master = UNIXSocket.for_fd(fd)
 
       # I need to give the master a way to talk to me exclusively
-      local, remote = UNIXSocket.pair(:STREAM)
-
+      local, remote = UNIXSocket.pair(Socket::SOCK_STREAM)
       master.send_io(remote)
 
       # Now I need to tell the master about my PID and ID
-      File.open("a.log","a") { |f| f.puts identifier}
       local.write "P:#{Process.pid}:#{identifier}\0"
 
       # Now we run the action and report its success/fail status to the master.
-      features = features_loaded_by {
+      features = Zeus::LoadTracking.features_loaded_by {
         run_action(local, identifier)
       }
 
@@ -72,26 +36,18 @@ module Zeus
       loop do
         messages = local.recv(1024)
         messages.split("\0").each do |new_identifier|
-          if new_identifier =~ /^S:/
-            fork { plan.after_fork ; go(new_identifier.sub(/^S:/,'')) }
+          new_identifier =~ /^(.):(.*)/
+          code, ident = $1, $2
+          if code == "S"
+            fork { plan.after_fork ; go(ident.to_sym) }
           else
-            fork { plan.after_fork ; command(new_identifier.sub(/^C:/,''), local) }
+            fork { plan.after_fork ; command(ident.to_sym, local) }
           end
         end
       end
     end
 
-    def all_features
-      untracked = defined?($untracked_features) ? $untracked_features : []
-      $LOADED_FEATURES + untracked
-    end
-
-    def features_loaded_by(&block)
-      old_features = all_features()
-      yield
-      new_features = all_features() - old_features
-      return new_features
-    end
+    private
 
     def command(identifier, sock)
       $0 = "zeus runner: #{identifier}"
@@ -126,5 +82,33 @@ module Zeus
       local.close
     end
 
+    def notify_features(sock, features)
+      features.each do |t|
+        begin
+          sock.write "F:#{t}\0"
+        rescue Errno::ENOBUFS
+          sleep 0.2
+          retry
+        end
+      end
+    end
+
+    def report_error_to_master(local, error)
+      str = "R:"
+      str << "#{error.backtrace[0]}: #{error.message} (#{error.class})\n"
+      error.backtrace[1..-1].each do |line|
+        str << "\tfrom #{line}\n"
+      end
+      str << "\0"
+      local.write str
+    end
+
+    def run_action(socket, identifier)
+      plan.send(identifier)
+      socket.write "R:OK\0"
+    rescue Exception => e
+      report_error_to_master(socket, e)
+    end
+
   end
 end

data/lib/zeus/load_tracking.rb

@@ -1,22 +1,37 @@
 module Zeus
-  class Server
-    class LoadTracking
-      class << self
-
-        def add_feature(file)
-          path = if File.exist?(File.expand_path(file))
-            File.expand_path(file)
-          else
-            find_in_load_path(file)
-          end
-          Zeus.add_extra_feature(path) if path
-        end
+  class LoadTracking
+    class << self
 
-        private
+      def features_loaded_by(&block)
+        old_features = all_features()
+        yield
+        new_features = all_features() - old_features
+        return new_features
+      end
 
-        def find_in_load_path(file)
-          $LOAD_PATH.map { |path| "#{path}/#{file}" }.detect{ |file| File.exist? file }
+      def add_feature(file)
+        path = if File.exist?(File.expand_path(file))
+          File.expand_path(file)
+        else
+          find_in_load_path(file)
         end
+        add_extra_feature(path) if path
+      end
+
+      private
+
+      def all_features
+        untracked = defined?($untracked_features) ? $untracked_features : []
+        $LOADED_FEATURES + untracked
+      end
+
+      def add_extra_feature(path)
+        $untracked_features ||= []
+        $untracked_features << path
+      end
+
+      def find_in_load_path(file)
+        $LOAD_PATH.map { |path| "#{path}/#{file}" }.detect{ |file| File.exist? file }
       end
     end
   end
@@ -31,7 +46,7 @@ module Kernel
   class << self
     alias_method :__load_without_zeus, :load
     def load(file, *a)
-      Zeus::Server::LoadTracking.add_feature(file)
+      Zeus::LoadTracking.add_feature(file)
       __load_without_zeus(file, *a)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-07 00:00:00.000000000 Z
+date: 2012-09-13 00:00:00.000000000 Z
 dependencies: []
 description: Boot any rails app in under a second
 email: