zeus 0.2.0.beta2 → 0.2.0

data/README.md

@@ -14,10 +14,15 @@ Because waiting 25 seconds sucks, but waiting 0.4 seconds doesn't.
 
 Soon? You can use Zeus now, but don't expect it to be perfect. I'm working hard on it.
 
-## Ugly bits
+## Requirements
 
-* Not battle-tested yet
-* Uses an obscene number of file descriptors
+Pretty specific:
+
+* OS X 10.7+
+* Ruby 1.9+
+* Backported GC from Ruby 2.0.
+
+You can install the GC-patched ruby from [this gist](https://gist.github.com/1688857) or from RVM.
 
 ## Installation
 
@@ -52,22 +57,22 @@ Run some commands:
     zeus rake -T
     zeus runner omg.rb
 
+
 ## TODO (roughly prioritized)
 
-* 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
+* Make sure that when a command process's connection is dropped, it is killed
+* less leaky handling of at_exit pid killing
+* Instead of exiting when requesting an as-yet-unbooted acceptor, wait until it's available then run.
 * Refactor, refactor, refactor...
+* Make sure client connection requests are handled immediately (Chunk the select loop)
+* Don't fork to handshake client to acceptor
+* Eliminate the client-side exit lag for zeus commands.
 * 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

data/lib/zeus/client.rb

@@ -25,7 +25,7 @@ module Zeus
           set_winsize
 
           @winch = make_winch_channel
-          pid = connect_to_server(command, args, slave)
+          @pid = connect_to_server(command, args, slave)
 
           buffer = ""
           begin

data/lib/zeus/dsl.rb

@@ -21,6 +21,10 @@ module Zeus
       # ^ configuration
       # V later use
 
+      def commands
+        [name, *aliases].map(&:to_s)
+      end
+
       def acceptors
         self
       end

data/lib/zeus/process.rb

@@ -9,11 +9,17 @@ module Process
     end
   end
 
+  def self.pids_to_ppids
+    Hash[*`ps -eo pid,ppid`.scan(/\d+/).map(&:to_i)]
+  end
+
   def self.descendants(base=Process.pid)
     descendants = Hash.new{|ht,k| ht[k]=[k]}
-    Hash[*`ps -eo pid,ppid`.scan(/\d+/).map{|x|x.to_i}].each{|pid,ppid|
+
+    pids_to_ppids.each do |pid,ppid|
       descendants[ppid] << descendants[pid]
-    }
+    end
+
     descendants[base].flatten - [base]
   end
 end

data/lib/zeus/server.rb

@@ -1,7 +1,6 @@
 require 'json'
 require 'socket'
 
-require 'rb-kqueue'
 require 'zeus/process'
 
 module Zeus
@@ -27,7 +26,8 @@ module Zeus
       @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)
+      acceptor_commands = self.class.acceptors.map(&:commands).flatten
+      @client_handler                = ClientHandler.new(acceptor_commands, acceptor_registration_monitor)
 
       # TODO: deprecate Zeus::Server.define! maybe. We can do that better...
       @plan = @@definition.to_domain_object(self)
@@ -56,7 +56,6 @@ module Zeus
     def run
       $0 = "zeus master"
       trap("INT") { exit 0 }
-      at_exit { Process.killall_descendants(9) }
 
       @r_msg, @w_msg = Socket.pair(:UNIX, :DGRAM)
 

data/lib/zeus/server/acceptor.rb

@@ -14,9 +14,7 @@ module Zeus
       end
 
       def register_with_client_handler(pid)
-        @a, @b = Socket.pair(:UNIX, :STREAM)
-        @s_client_handler = UNIXSocket.for_fd(@a.fileno)
-        @s_acceptor       = UNIXSocket.for_fd(@b.fileno)
+        @s_client_handler, @s_acceptor = UNIXSocket.pair
 
         @s_acceptor.puts registration_data(pid)
 
@@ -27,8 +25,34 @@ module Zeus
         {pid: pid, commands: [name, *aliases], description: description}.to_json
       end
 
+      def descendent_acceptors
+        self
+      end
+
+      def print_error(io, error)
+        io.puts "#{error.backtrace[0]}: #{error.message} (#{error.class})"
+        error.backtrace[1..-1].each do |line|
+          io.puts "\tfrom #{line}"
+        end
+      end
+
+      def run_as_error(e)
+        register_with_client_handler(Process.pid)
+        Zeus.ui.as_zeus "starting error-state acceptor `#{@name}`"
+
+        Thread.new do
+          loop do
+            terminal = @s_acceptor.recv_io
+            _ = @s_acceptor.readline
+            @s_acceptor << 0 << "\n"
+            print_error(terminal, e)
+            terminal.close
+          end
+        end
+      end
+
       def run
-        fork {
+        pid = fork {
           $0 = "zeus acceptor: #{@name}"
           pid = Process.pid
 
@@ -51,6 +75,7 @@ module Zeus
             terminal = @s_acceptor.recv_io
             arguments = JSON.parse(@s_acceptor.readline.chomp)
             child = fork do
+              $0 = "zeus runner: #{@name}"
               postfork_action!
               @s_acceptor << $$ << "\n"
               $stdin.reopen(terminal)
@@ -64,6 +89,9 @@ module Zeus
             terminal.close
           end
         }
+        currpid = Process.pid
+        at_exit { Process.kill(9, pid) if Process.pid == currpid rescue nil }
+        pid
       end
 
       def prefork_action! # TODO : refactor

data/lib/zeus/server/acceptor_registration_monitor.rb

@@ -6,11 +6,7 @@ module Zeus
       def on_datasource_event ; handle_registration ; end
 
       def initialize
-        # note: if these aren't ivars, they go out of scope, get GC'd,
-        # and cause the UNIXSockets to quit working... often in perplexing ways.
-        @s, @r = Socket.pair(:UNIX, :DGRAM)
-        @reg_monitor  = UNIXSocket.for_fd(@s.fileno)
-        @reg_acceptor = UNIXSocket.for_fd(@r.fileno)
+        @reg_monitor, @reg_acceptor = UNIXSocket.pair
         @acceptors = []
       end
 

data/lib/zeus/server/client_handler.rb

@@ -27,8 +27,9 @@ module Zeus
       def datasource ; @server ; end
       def on_datasource_event ; handle_server_connection ; end
 
-      def initialize(registration_monitor)
+      def initialize(acceptor_commands, registration_monitor)
         @reg_monitor = registration_monitor
+        @acceptor_commands = acceptor_commands
         @server = UNIXServer.new(Zeus::SOCKET_NAME)
         @server.listen(10)
       rescue Errno::EADDRINUSE
@@ -38,7 +39,18 @@ module Zeus
 
       def handle_server_connection
         s_client = @server.accept
-        fork { handshake_client_to_acceptor(s_client) }
+        fork { handshake_client_to_acceptor(s_client) ; exit }
+      end
+
+      NoSuchCommand = Class.new(Exception)
+      AcceptorNotBooted = Class.new(Exception)
+      ApplicationLoadFailed = Class.new(Exception)
+
+      def exit_with_message(s_client, client_terminal, msg)
+        s_client << "0\n"
+        client_terminal << "[zeus] #{msg}\n"
+        client_terminal.close
+        s_client.close
       end
 
       #  client clienthandler acceptor
@@ -57,9 +69,23 @@ module Zeus
         client_terminal = s_client.recv_io
 
         # 3
+        unless @acceptor_commands.include?(command.to_s)
+          return exit_with_message(
+            s_client, client_terminal,
+            "no such command `#{command}`.")
+        end
         acceptor = @reg_monitor.find_acceptor_for_command(command)
+        unless acceptor
+          return exit_with_message(
+            s_client, client_terminal,
+            "not yet ready to process `#{command}`. Try again right away.")
+        end
         usock = UNIXSocket.for_fd(acceptor.socket.fileno)
-        # TODO handle nothing found
+        if usock.closed?
+          return exit_with_message(
+            s_client, client_terminal,
+            "`#{command}` handler is reloading a dependency. Try again right away.")
+        end
         usock.send_io(client_terminal)
 
         Zeus.ui.info "accepting connection for #{command}"

data/lib/zeus/server/file_monitor.rb

@@ -1,5 +1,3 @@
-require 'rb-kqueue'
-
 module Zeus
   class Server
     module FileMonitor

data/lib/zeus/server/stage.rb

@@ -9,10 +9,40 @@ module Zeus
         @server = server
       end
 
-      # There are a few things we want to accomplish:
-      # 1. Running all the actions (each time this stage is killed and restarted)
-      # 2. Starting all the substages (and restarting them when necessary)
-      # 3. Starting all the acceptors (and restarting them when necessary)
+      def notify_feature(feature)
+        @server.w_feature "#{Process.pid}:#{feature}"
+      end
+
+      def descendent_acceptors
+        @stages.map(&:descendent_acceptors).flatten
+      end
+
+      def register_acceptors_as_errors(e)
+        descendent_acceptors.each do |acc|
+          acc.run_as_error(e)
+        end
+      end
+
+
+      def handle_load_error(e)
+        errored_file = e.backtrace[0].scan(/(.+?):\d+:in/)[0][0]
+
+        # handle relative paths
+        unless errored_file =~ /^\//
+          errored_file = File.expand_path(errored_file, Dir.pwd)
+        end
+
+        register_acceptors_as_errors(e)
+        # register all the decendent acceptors as stubs with errors
+
+        notify_feature(errored_file)
+        $LOADED_FEATURES.each { |f| notify_feature(f) }
+
+        # we do not need to do anything. We wait, until a dependency changes.
+        # At that point, we get killed and restarted.
+        sleep
+      end
+
       def run
         @pid = fork {
           $0 = "zeus spawner: #{@name}"
@@ -25,16 +55,18 @@ module Zeus
             exit 0
           }
 
-          @actions.each(&:call)
+          begin
+            @actions.each(&:call)
+          rescue => e
+            handle_load_error(e)
+          end
 
           pids = {}
           @stages.each do |stage|
             pids[stage.run] = stage
           end
 
-          $LOADED_FEATURES.each do |f|
-            @server.w_feature "#{pid}:#{f}"
-          end
+          $LOADED_FEATURES.each { |f| notify_feature(f) }
 
           loop do
             begin
@@ -42,15 +74,13 @@ module Zeus
             rescue Errno::ECHILD
               raise HasNoChildren.new("Stage `#{@name}` - All terminal nodes must be acceptors")
             end
-            if (status = $?.exitstatus) > 0
-              exit status
-            else # restart the stage that died.
-              stage = pids[pid]
-              pids[stage.run] = stage
-            end
+            stage = pids[pid]
+            pids[stage.run] = stage
           end
-
         }
+        currpid = Process.pid
+        at_exit { Process.kill(9, @pid) if Process.pid == currpid rescue nil }
+        @pid
       end
 
     end

data/lib/zeus/ui.rb

@@ -52,7 +52,11 @@ module Zeus
             when :purple ; "\x1b[35m#{msg}\x1b[0m"
             else         ; msg
             end
-      puts msg
+      if msg[-1] == "\n"
+        puts msg
+      else
+        puts "#{msg}\n"
+      end
     end
 
 

data/lib/zeus/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta2
-  prerelease: 6
+  version: 0.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Burke Libbey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-02 00:00:00.000000000 Z
 dependencies: []
 description: Zeus preloads pretty much everything you'll ever want to use in development.
 email:
@@ -25,7 +25,6 @@ files:
 - README.md
 - Rakefile
 - bin/zeus
-- ext/.DS_Store
 - ext/fsevents-wrapper/fsevents-wrapper
 - ext/fsevents-wrapper/main.m
 - lib/thrud.rb
@@ -61,9 +60,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11