zeus 0.2.0.beta1 → 0.2.0.beta2

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in zeus.gemspec
 gemspec
+
+gem 'pry'

data/README.md

@@ -17,7 +17,6 @@ Soon? You can use Zeus now, but don't expect it to be perfect. I'm working hard
 ## Ugly bits
 
 * Not battle-tested yet
-* Creates a bunch of sockets
 * Uses an obscene number of file descriptors
 
 ## Installation
@@ -26,7 +25,17 @@ Install the gem.
 
     gem install zeus
 
-Copy `examples/rails.rb` to `{your app}/.zeus.rb`
+Run the project initializer.
+
+    zeus init
+
+## Upgrading from initial release
+
+Since zeus is super-brand-new, the config file format changed already.
+
+    gem install zeus
+    rm .zeus.rb
+    zeus init
 
 ## Usage
 
@@ -45,23 +54,25 @@ Run some commands:
 
 ## TODO (roughly prioritized)
 
-* Fix all the bugs I added when I switched to singlesocket...
-* Make the code less terrible
-* Figure out how to run full test suites without multiple env loads
-* Support other frameworks?
-* Use fsevent instead of kqueue to reduce the obscene number of file descriptors.
-* Support inotify on linux
+* Make sure client connection requests are handled immediately
+* Acceptors booting should not be dependent on passing all loaded features to the file monitor
+* Route all logging output through Zeus.ui
 * Handle connections for not-yet-started sockets
+* Refactor, refactor, refactor...
+* Support other frameworks?
+* Periodically re-attempt to add lost files to KQueue
+* Figure out how to run full test suites without multiple env loads
 * Don't replace a socket with changed deps until the new one is ready
+
+## Ideas (not quite TODOs)
+
 * (maybe) Start the preloader as a daemon transparently when any command is run, then wait for it to finish
+* Use fsevent instead of kqueue to reduce the obscene number of file descriptors.
+* Support inotify on linux
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+Fork, Branch, Pull Request.
 
 ## Thanks...
 

data/bin/zeus

@@ -1,43 +1,4 @@
 #!/usr/bin/env ruby
 
 require 'zeus'
-  require 'zeus/cli'
-  Zeus::CLI.start
-
-begin
-rescue Zeus::ZeusError => e
-  Zeus.ui.error e.message
-  Zeus.ui.debug e.backtrace.join("\n")
-  exit e.status_code
-rescue Interrupt => e
-  Zeus.ui.error e.message
-  Zeus.ui.debug e.backtrace.join("\n")
-  exit 1
-rescue SystemExit => e
-  exit e.status
-rescue Exception => e
-  Zeus.ui.error("A fatal error has occurred. Please see the github issues at:\n" \
-    "http://github.com/burke/zeus/issues")
-end
-exit 0
-
-
-case ARGV[0]
-when "start"
-  require 'zeus/server'
-  begin
-    require './.zeus.rb'
-  rescue LoadError
-    puts "\x1b[31mYour project is missing a config file (.zeus.rb), or you are not in the project root."
-    puts "You can run `zeus init` to generate a config file.\x1b[0m"
-    exit 1
-  end
-  Zeus::Server.run
-when "init"
-  require 'zeus/init'
-  ARGV.shift # get "init" off the list
-  Zeus::Init.run(ARGV)
-else
-  require 'zeus/client'
-  Zeus::Client.run
-end
+Zeus::CLI.start

data/ext/fsevents-wrapper/main.m

@@ -0,0 +1,133 @@
+//
+//  main.m
+//  fsevents-wrapper
+//
+//  Created by Burke Libbey on 2012-07-30.
+//  Copyright (c) 2012 Burke Libbey. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#include <CoreServices/CoreServices.h>
+#include <sys/stat.h>
+
+
+static CFMutableArrayRef _watchedFiles;
+static FSEventStreamRef  _activeStream;
+static NSMutableDictionary *_fileIsWatched;
+
+static int flagsWorthReloadingFor = \
+kFSEventStreamEventFlagItemRemoved | \
+kFSEventStreamEventFlagItemRenamed | \
+kFSEventStreamEventFlagItemModified;
+
+void myCallbackFunction(
+                        ConstFSEventStreamRef streamRef,
+                        void *clientCallBackInfo,
+                        size_t numEvents,
+                        void *eventPaths,
+                        const FSEventStreamEventFlags eventFlags[],
+                        const FSEventStreamEventId eventIds[])
+{
+    int i, flags;
+    char **paths = eventPaths;
+    
+    for (i = 0; i < numEvents; i++) {
+        flags = eventFlags[i];
+        
+        if (flags & (kFSEventStreamEventFlagItemIsFile | flagsWorthReloadingFor)) {
+            printf("%s\n", paths[i]);
+            fflush(stdout);
+        }
+    }
+}
+
+void configureStream()
+{
+    if (CFArrayGetCount(_watchedFiles) == 0) return;
+    
+    if (_activeStream) {
+        FSEventStreamStop(_activeStream);
+        FSEventStreamUnscheduleFromRunLoop(_activeStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+        //CFRelease(_activeStream);
+    }
+    
+    _activeStream = FSEventStreamCreate(NULL,
+                                        &myCallbackFunction,
+                                        NULL,
+                                        _watchedFiles,
+                                        kFSEventStreamEventIdSinceNow,
+                                        1.0, // latency
+                                        kFSEventStreamCreateFlagFileEvents);
+    
+    FSEventStreamScheduleWithRunLoop(_activeStream, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);
+    
+    FSEventStreamStart(_activeStream);
+    
+}
+
+int maybeAddFileToWatchList(char *line)
+{
+    CFStringRef file = CFStringCreateWithCString(NULL, line, kCFStringEncodingASCII);
+    struct stat buf;
+    
+    if ([_fileIsWatched valueForKey:(__bridge NSString *)file]) {
+        return 0;
+    } else if (stat(line, &buf) == 0) {
+        [_fileIsWatched setValue:@"yes" forKey:(__bridge NSString *)file];
+        CFArrayAppendValue(_watchedFiles, file);
+        return 1;
+    } else {
+        return 0;
+    }
+}
+
+void handleInputFiles()
+{
+    int anyChanges = 0;
+    
+    char line[2048];
+    
+    fd_set fdset;
+    
+    FD_ZERO(&fdset);
+    FD_SET(STDIN_FILENO, &fdset);
+    struct timeval timeout;
+    timeout.tv_sec = 0;
+    timeout.tv_usec = 0;
+    
+    select(STDIN_FILENO+1, &fdset, NULL, NULL, &timeout);
+    while (FD_ISSET(STDIN_FILENO, &fdset) && fgets(line, 2048, stdin) != NULL) {
+        line[strlen(line)-1] = 0;
+        anyChanges |= maybeAddFileToWatchList(line);
+        select(STDIN_FILENO+1, &fdset, NULL, NULL, &timeout);
+    }
+        
+    if (anyChanges) {
+        configureStream();
+    }
+}
+
+void configureTimerAndRun()
+{
+    CFRunLoopTimerRef timer = CFRunLoopTimerCreate(NULL,
+                                                   0,
+                                                   0.5,
+                                                   0,
+                                                   0,
+                                                   &handleInputFiles,
+                                                   NULL);
+    
+    CFRunLoopAddTimer(CFRunLoopGetCurrent(), timer, kCFRunLoopDefaultMode);
+    CFRunLoopRun();
+}
+
+int main(int argc, const char * argv[])
+{
+    @autoreleasepool {
+        _watchedFiles = CFArrayCreateMutable(NULL, 0, NULL);
+        _fileIsWatched = [[NSMutableDictionary alloc] initWithCapacity:500];
+        
+        configureTimerAndRun();
+    }
+    return 0;
+}

data/lib/{tiny_thor.rb → thrud.rb}

@@ -1,4 +1,4 @@
-class TinyThor
+class Thrud
 
   class Task < Struct.new(:method_name, :desc, :long_desc, :method_options)
     def arity(obj)
@@ -78,7 +78,7 @@ BANNER
     taskname = ARGV.shift
     arguments = ARGV
 
-    taskname == "" and taskname = "help"
+    taskname ||= "help"
 
     unless task = @tasks[taskname.to_s]
       Zeus.ui.error "Could not find task \"#{taskname}\""

data/lib/zeus.rb

@@ -1,8 +1,13 @@
-require "zeus/version"
-require 'zeus/server'
-require "zeus/ui"
-
 module Zeus
+  SOCKET_NAME = '.zeus.sock'
+
+  autoload :UI,      'zeus/ui'
+  autoload :CLI,     'zeus/cli'
+  autoload :DSL,     'zeus/dsl'
+  autoload :Server,  'zeus/server'
+  autoload :Client,  'zeus/client'
+  autoload :Version, 'zeus/version'
+
   class ZeusError < StandardError
     def self.status_code(code)
       define_method(:status_code) { code }

data/lib/zeus/cli.rb

@@ -1,8 +1,7 @@
-require 'zeus'
-require 'tiny_thor'
+require 'thrud'
 
 module Zeus
-  class CLI < TinyThor
+  class CLI < Thrud
 
     def initialize(*)
       super
@@ -34,7 +33,6 @@ module Zeus
       use the zeus runner commands (see `zeus help` for a list of available commands).
     D
     def start
-      require 'zeus/server'
       begin
         require './.zeus.rb'
       rescue LoadError
@@ -60,7 +58,6 @@ module Zeus
       Zeus::Server.acceptors.each do |acc|
         desc acc.name, (acc.description || "#{acc.name} task defined in .zeus.rb")
         define_method(acc.name) { |*args|
-          require 'zeus/client'
           Zeus::Client.run(acc.name, args)
         }
         map acc.aliases => acc.name

data/lib/zeus/client.rb

@@ -6,61 +6,90 @@ require "socket"
 module Zeus
   class Client
 
+    attr_accessor :pid
+
     SIGNALS = {
       "\x03" => "TERM",
       "\x1C" => "QUIT"
     }
     SIGNAL_REGEX = Regexp.union(SIGNALS.keys)
 
-    def self.maybe_raw(&b)
-      if $stdout.tty?
-        $stdout.raw(&b)
-      else
-        b.call
-      end
+    def self.run(command, args)
+      new.run(command, args)
     end
 
-    def self.run(command, args)
+    def run(command, args)
       maybe_raw do
         PTY.open do |master, slave|
-          $stdout.tty? and master.winsize = $stdout.winsize
-          winch, winch_ = IO.pipe
-          trap("WINCH") { winch_ << "\0" }
+          @master = master
+          set_winsize
 
-          socket = UNIXSocket.new(".zeus.sock")
-          socket << {command: command, arguments: args}.to_json << "\n"
-          socket.send_io(slave)
-          slave.close
-
-          pid = socket.readline.chomp.to_i
+          @winch = make_winch_channel
+          pid = connect_to_server(command, args, slave)
 
+          buffer = ""
           begin
-            buffer = ""
-
-            while ready = select([winch, master, $stdin])[0]
-              if ready.include?(winch)
-                winch.read(1)
-                $stdout.tty? and master.winsize = $stdout.winsize
-                Process.kill("WINCH", pid)
-              end
-
-              if ready.include?($stdin)
-                input = $stdin.readpartial(4096, buffer)
-                input.scan(SIGNAL_REGEX).each { |signal|
-                  Process.kill(SIGNALS[signal], pid)
-                }
-                master << input
-              end
-
-              if ready.include?(master)
-                $stdout << master.readpartial(4096, buffer)
-              end
+            while ready = select([@winch, @master, $stdin])[0]
+              handle_winch          if ready.include?(@winch)
+              handle_stdin(buffer)  if ready.include?($stdin)
+              handle_master(buffer) if ready.include?(@master)
             end
           rescue EOFError
           end
         end
       end
     end
+
+    private
+
+    def connect_to_server(command, arguments, slave, socket_path = Zeus::SOCKET_NAME)
+      socket = UNIXSocket.new(socket_path)
+      socket << {command: command, arguments: arguments}.to_json << "\n"
+      socket.send_io(slave)
+      slave.close
+
+      pid = socket.readline.chomp.to_i
+    rescue Errno::ENOENT, Errno::ECONNREFUSED, Errno::ECONNRESET
+      Zeus.ui.error "Zeus doesn't seem to be running, try 'zeus start`"
+      abort
+    end
+
+    def make_winch_channel
+      winch, winch_ = IO.pipe
+      trap("WINCH") { winch_ << "\0" }
+      winch
+    end
+
+    def handle_winch
+      @winch.read(1)
+      set_winsize
+      Process.kill("WINCH", pid) if pid
+    end
+
+    def handle_stdin(buffer)
+      input = $stdin.readpartial(4096, buffer)
+      input.scan(SIGNAL_REGEX).each { |signal|
+        Process.kill(SIGNALS[signal], pid)
+      }
+      @master << input
+    end
+
+    def handle_master(buffer)
+      $stdout << @master.readpartial(4096, buffer)
+    end
+
+    def set_winsize
+      $stdout.tty? and @master.winsize = $stdout.winsize
+    end
+
+    def maybe_raw(&b)
+      if $stdout.tty?
+        $stdout.raw(&b)
+      else
+        b.call
+      end
+    end
+
   end
 end
 

data/lib/zeus/dsl.rb

@@ -1,6 +1,3 @@
-require 'zeus/server/stage'
-require 'zeus/server/acceptor'
-
 module Zeus
   module DSL
 

data/lib/zeus/server.rb

@@ -2,18 +2,18 @@ require 'json'
 require 'socket'
 
 require 'rb-kqueue'
-
 require 'zeus/process'
-require 'zeus/dsl'
-require 'zeus/server/file_monitor'
-require 'zeus/server/client_handler'
-require 'zeus/server/process_tree_monitor'
-require 'zeus/server/acceptor_registration_monitor'
-require 'zeus/server/acceptor'
 
 module Zeus
   class Server
 
+    autoload :Stage,                       'zeus/server/stage'
+    autoload :Acceptor,                    'zeus/server/acceptor'
+    autoload :FileMonitor,                 'zeus/server/file_monitor'
+    autoload :ClientHandler,               'zeus/server/client_handler'
+    autoload :ProcessTreeMonitor,          'zeus/server/process_tree_monitor'
+    autoload :AcceptorRegistrationMonitor, 'zeus/server/acceptor_registration_monitor'
+
     def self.define!(&b)
       @@definition = Zeus::DSL::Evaluator.new.instance_eval(&b)
     end
@@ -24,7 +24,7 @@ module Zeus
 
     attr_reader :client_handler, :acceptor_registration_monitor
     def initialize
-      @file_monitor                  = FileMonitor.new(&method(:dependency_did_change))
+      @file_monitor                  = FileMonitor::FSEvent.new(&method(:dependency_did_change))
       @acceptor_registration_monitor = AcceptorRegistrationMonitor.new
       @process_tree_monitor          = ProcessTreeMonitor.new
       @client_handler                = ClientHandler.new(acceptor_registration_monitor)
@@ -39,22 +39,18 @@ module Zeus
 
     PID_TYPE = "P"
     def w_pid line
-      begin
-        @w_msg.send(PID_TYPE + line, 0)
-      rescue Errno::ENOBUFS
-        sleep 0.2
-        retry
-      end
+      @w_msg.send(PID_TYPE + line, 0)
+    rescue Errno::ENOBUFS
+      sleep 0.2
+      retry
     end
 
     FEATURE_TYPE = "F"
     def w_feature line
-      begin
-        @w_msg.send(FEATURE_TYPE + line, 0)
-      rescue Errno::ENOBUFS
-        sleep 0.2
-        retry
-      end
+      @w_msg.send(FEATURE_TYPE + line, 0)
+    rescue Errno::ENOBUFS
+      sleep 0.2
+      retry
     end
 
     def run
@@ -69,48 +65,38 @@ module Zeus
       @w_msg.close
 
       loop do
-        @file_monitor.process_events
-
-        datasources = [@r_msg,
-          @acceptor_registration_monitor.datasource, @client_handler.datasource]
-
-        # TODO: It would be really nice if we could put the queue poller in the select somehow.
-        #   --investigate kqueue. Is this possible?
-        begin
-          rs, _, _ = IO.select(datasources, [], [], 1)
-        rescue Errno::EBADF
-          puts "EBADF" unless defined?($asdf)
-          sleep 1
-          $asdf = true
+        monitors = [@file_monitor, @acceptor_registration_monitor, @client_handler]
+        # TODO: Make @r_msg a Monitor instead. All that logic should be its own thing.
+        datasources = [@r_msg, *monitors.map(&:datasource)]
+
+        ready, _, _ = IO.select(datasources, [], [], 1)
+        next unless ready
+        monitors.each do |m|
+          m.on_datasource_event if ready.include?(m.datasource)
         end
-        rs.each do |r|
-          case r
-          when @acceptor_registration_monitor.datasource
-            @acceptor_registration_monitor.on_datasource_event
-          when @r_msg ; handle_messages
-          when @client_handler.datasource
-            @client_handler.on_datasource_event
-          end
-        end if rs
+        handle_messages if ready.include?(@r_msg)
       end
 
+    ensure
+      File.unlink(Zeus::SOCKET_NAME)
     end
 
     def handle_messages
       loop do
-        begin
-          data = @r_msg.recv_nonblock(1024)
-          case data[0]
-          when FEATURE_TYPE
-            handle_feature_message(data[1..-1])
-          when PID_TYPE
-            handle_pid_message(data[1..-1])
-          else
-            raise "Unrecognized message"
-          end
-        rescue Errno::EAGAIN
-          break
-        end
+        handle_message
+      end
+    rescue Errno::EAGAIN
+    end
+
+    def handle_message
+      data = @r_msg.recv_nonblock(1024)
+      case data[0]
+      when FEATURE_TYPE
+        handle_feature_message(data[1..-1])
+      when PID_TYPE
+        handle_pid_message(data[1..-1])
+      else
+        raise "Unrecognized message"
       end
     end
 

data/lib/zeus/server/acceptor.rb

@@ -36,9 +36,9 @@ module Zeus
 
           @server.w_pid "#{pid}:#{Process.ppid}"
 
-          puts "\x1b[35m[zeus] starting acceptor `#{@name}`\x1b[0m"
+          Zeus.ui.as_zeus "starting acceptor `#{@name}`"
           trap("INT") {
-            puts "\x1b[35m[zeus] killing acceptor `#{@name}`\x1b[0m"
+            Zeus.ui.as_zeus "killing acceptor `#{@name}`"
             exit 0
           }
 

data/lib/zeus/server/client_handler.rb

@@ -1,8 +1,6 @@
 require 'socket'
 require 'json'
 
-require 'zeus/server/acceptor'
-
 module Zeus
   class Server
     # The model here is kind of convoluted, so here's an explanation of what's
@@ -26,23 +24,16 @@ module Zeus
     #   4. ClientHandler forwards the pid to the client over S_CLI.
     #
     class ClientHandler
-      SERVER_SOCK = ".zeus.sock"
-
       def datasource ; @server ; end
       def on_datasource_event ; handle_server_connection ; end
 
       def initialize(registration_monitor)
         @reg_monitor = registration_monitor
-        begin
-          @server = UNIXServer.new(SERVER_SOCK)
-          @server.listen(10)
-        rescue Errno::EADDRINUSE
-          Zeus.ui.error "Zeus appears to be already running in this project. If not, remove .zeus.sock and try again."
-          exit 1
-        # ensure
-        #   @server.close rescue nil
-        #   File.unlink(SERVER_SOCK)
-        end
+        @server = UNIXServer.new(Zeus::SOCKET_NAME)
+        @server.listen(10)
+      rescue Errno::EADDRINUSE
+        Zeus.ui.error "Zeus appears to be already running in this project. If not, remove .zeus.sock and try again."
+        exit 1
       end
 
       def handle_server_connection
@@ -71,7 +62,7 @@ module Zeus
         # TODO handle nothing found
         usock.send_io(client_terminal)
 
-        puts "accepting connection for #{command}"
+        Zeus.ui.info "accepting connection for #{command}"
 
         # 4
         acceptor.socket.puts arguments.to_json

data/lib/zeus/server/file_monitor.rb

@@ -2,56 +2,8 @@ require 'rb-kqueue'
 
 module Zeus
   class Server
-    class FileMonitor
-
-      TARGET_FD_LIMIT = 8192
-
-      def initialize(&change_callback)
-        configure_file_descriptor_resource_limit
-        @queue = KQueue::Queue.new
-        @watched_files = {}
-        @deleted_files = []
-        @change_callback = change_callback
-      end
-
-      def process_events
-        @queue.poll
-      end
-
-      def watch(file)
-        return if @watched_files[file]
-        @watched_files[file] = true
-        @queue.watch_file(file, :write, :extend, :rename, :delete, &method(:file_did_change))
-      rescue Errno::ENOENT
-        Zeus.ui.debug("No file found at #{file}")
-      end
-
-      private
-
-      def file_did_change(event)
-        Zeus.ui.info("Dependency change at #{event.watcher.path}")
-        resubscribe_deleted_file(event) if event.flags.include?(:delete)
-        @change_callback.call(event.watcher.path)
-      end
-
-      def configure_file_descriptor_resource_limit
-        limit = Process.getrlimit(Process::RLIMIT_NOFILE)
-        if limit[0] < TARGET_FD_LIMIT && limit[1] >= TARGET_FD_LIMIT
-          Process.setrlimit(Process::RLIMIT_NOFILE, TARGET_FD_LIMIT)
-        else
-          puts "\x1b[33m[zeus] Warning: increase the max number of file descriptors. If you have a large project, this max cause a crash in about 10 seconds.\x1b[0m"
-        end
-      end
-
-      def resubscribe_deleted_file(event)
-        event.watcher.disable!
-        begin
-          @queue.watch_file(event.watcher.path, :write, :extend, :rename, :delete, &method(:file_did_change))
-        rescue Errno::ENOENT
-          @deleted_files << event.watcher.path
-        end
-      end
-
+    module FileMonitor
+      autoload :FSEvent, 'zeus/server/file_monitor/fsevent'
     end
   end
 end

data/lib/zeus/server/file_monitor/fsevent.rb

@@ -0,0 +1,63 @@
+require 'open3'
+
+module Zeus
+  class Server
+    module FileMonitor
+      class FSEvent
+        WRAPPER_PATH = File.expand_path("../../../../../ext/fsevents-wrapper/fsevents-wrapper", __FILE__)
+
+        def datasource ; @io_out ; end
+        def on_datasource_event ; handle_changed_files ; end
+
+        def initialize(&change_callback)
+          @change_callback = change_callback
+          @io_in, @io_out, _ = Open3.popen2e(WRAPPER_PATH)
+          @watched_files = {}
+          @buffer = ""
+        end
+
+        def handle_changed_files
+          loop do
+            begin
+              read_and_notify_files
+            rescue Errno::EAGAIN
+              break
+            end
+          end
+        end
+
+        def read_and_notify_files
+          lines = @io_out.read_nonblock(30000)
+          files = lines.split("\n")
+          files[0] = "#{@buffer}#{files[0]}" unless @buffer == ""
+          unless lines[-1] == "\n"
+            @buffer = files.pop
+          end
+
+          files.each do |file|
+            file_did_change(file)
+          end
+        end
+
+        def watch(file)
+          return false if @watched_files[file]
+          @watched_files[file] = true
+          File.open('a.log', 'a') { |f| f.puts file }
+          @io_in.puts file
+          true
+        end
+
+        private
+
+        def file_did_change(file)
+          Zeus.ui.info("Dependency change at #{file}")
+          @change_callback.call(file)
+        end
+
+      end
+    end
+  end
+end
+
+
+

data/lib/zeus/server/process_tree_monitor.rb

@@ -76,7 +76,7 @@ module Zeus
         def kill_nodes_with_feature(file, base = @root)
           if base.has_feature?(file)
             if base == @root.children[0] || base == @root
-              puts "\x1b[31mOne of zeus's dependencies changed. Not killing zeus. You may have to restart the server.\x1b[0m"
+              Zeus.ui.error "One of zeus's dependencies changed. Not killing zeus. You may have to restart the server."
               return false
             end
             kill_node(base)

data/lib/zeus/server/stage.rb

@@ -1,6 +1,7 @@
 module Zeus
   class Server
     class Stage
+      HasNoChildren = Class.new(Exception)
 
       attr_accessor :name, :stages, :actions
       attr_reader :pid
@@ -17,9 +18,10 @@ module Zeus
           $0 = "zeus spawner: #{@name}"
           pid = Process.pid
           @server.w_pid "#{pid}:#{Process.ppid}"
-          puts "\x1b[35m[zeus] starting spawner `#{@name}`\x1b[0m"
+
+          Zeus.ui.as_zeus("starting spawner `#{@name}`")
           trap("INT") {
-            puts "\x1b[35m[zeus] killing spawner `#{@name}`\x1b[0m"
+            Zeus.ui.as_zeus("killing spawner `#{@name}`")
             exit 0
           }
 
@@ -38,7 +40,7 @@ module Zeus
             begin
               pid = Process.wait
             rescue Errno::ECHILD
-              raise "Stage `#{@name}` has no children. All terminal nodes must be acceptors"
+              raise HasNoChildren.new("Stage `#{@name}` - All terminal nodes must be acceptors")
             end
             if (status = $?.exitstatus) > 0
               exit status

data/lib/zeus/templates/rails.rb

@@ -19,7 +19,7 @@ Zeus::Server.define! do
       stage :dev do
         action do
           Bundler.require(:development)
-          ENV['RAILS_ENV'] = "development"
+          Rails.env = ENV['RAILS_ENV'] = "development"
           require APP_PATH
           Rails.application.require_environment!
         end
@@ -57,22 +57,23 @@ Zeus::Server.define! do
         end
       end
 
-      stage :test do
-        action do
-          ENV['RAILS_ENV'] = "test"
-          Bundler.require(:test)
-          require APP_PATH
-          Rails.application.require_environment!
-        end
+      # stage :test do
+      #   action do
+      #     Rails.env = ENV['RAILS_ENV'] = "test"
+      #     Bundler.require(:test)
+      #     require APP_PATH
+      #     Rails.application.require_environment!
+      #   end
 
-        command :testrb do
-          (r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-            abort r.options.banner + " tests..."
-          exit r.run
-        end
+      #   command :testrb do
+      #     (r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
+      #       abort r.options.banner + " tests..."
+      #     exit r.run
+      #   end
 
-      end
+      # end
 
     end
   end
 end
+

data/lib/zeus/ui.rb

@@ -6,6 +6,10 @@ module Zeus
       @debug = ENV['DEBUG']
     end
 
+    def as_zeus(msg)
+      tell_me("[zeus] #{msg}",:purple)
+    end
+
     def info(msg)
       tell_me(msg, nil) if !@quiet
     end
@@ -45,6 +49,7 @@ module Zeus
             when :red    ; "\x1b[31m#{msg}\x1b[0m"
             when :green  ; "\x1b[32m#{msg}\x1b[0m"
             when :yellow ; "\x1b[33m#{msg}\x1b[0m"
+            when :purple ; "\x1b[35m#{msg}\x1b[0m"
             else         ; msg
             end
       puts msg

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.2.0.beta1"
+  VERSION = "0.2.0.beta2"
 end

data/zeus.gemspec

@@ -8,12 +8,10 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Zeus is an alpha-quality application preloader with terrible documentation.}
   gem.homepage      = "http://github.com/burke/zeus"
 
-  gem.files         = `git ls-files`.split($\)
+  gem.files         = `git ls-files`.split("\n").reject{ |f| f =~ /xcodeproj/ }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "zeus"
   gem.require_paths = ["lib"]
   gem.version       = Zeus::VERSION
-
-  gem.add_dependency "rb-kqueue-burke", "~> 0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta1
+  version: 0.2.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,19 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rb-kqueue-burke
-  requirement: &70116037263980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *70116037263980
+date: 2012-07-31 00:00:00.000000000 Z
+dependencies: []
 description: Zeus preloads pretty much everything you'll ever want to use in development.
 email:
 - burke@libbey.me
@@ -36,18 +25,21 @@ files:
 - README.md
 - Rakefile
 - bin/zeus
-- lib/tiny_thor.rb
+- ext/.DS_Store
+- ext/fsevents-wrapper/fsevents-wrapper
+- ext/fsevents-wrapper/main.m
+- lib/thrud.rb
 - lib/zeus.rb
 - lib/zeus/cli.rb
 - lib/zeus/client.rb
 - lib/zeus/dsl.rb
-- lib/zeus/init.rb
 - lib/zeus/process.rb
 - lib/zeus/server.rb
 - lib/zeus/server/acceptor.rb
 - lib/zeus/server/acceptor_registration_monitor.rb
 - lib/zeus/server/client_handler.rb
 - lib/zeus/server/file_monitor.rb
+- lib/zeus/server/file_monitor/fsevent.rb
 - lib/zeus/server/process_tree_monitor.rb
 - lib/zeus/server/stage.rb
 - lib/zeus/templates/rails.rb

data/lib/zeus/init.rb

@@ -1,17 +0,0 @@
-module Zeus
-  module Init
-
-    def self.run
-      if looks_like_rails?
-        copy_rails_template!
-      else
-        puts 
-      end
-    end
-
-    def self.looks_like_rails?
-      File.exist?('Gemfile') && File.read('Gemfile').include?('rails')
-    end
-
-  end
-end