zeus 0.4.4 → 0.4.5

data/README.md

@@ -45,11 +45,16 @@ Run some commands:
     zeus rake -T
     zeus runner omg.rb
 
+## What's coming?
+
+[See the roadmap](https://github.com/burke/zeus/wiki/Roadmap)
 
 ## Contributing
 
 Fork, Branch, Pull Request.
 
+Check [Rails tests](https://github.com/burke/zeus-extended-testcases) if you change something rails related.
+
 ## Thanks...
 
 * To [Stefan Penner](http://github.com/stefanpenner) for discussion and various contributions.
@@ -64,3 +69,4 @@ Try these libraries instead:
 * [spin](https://github.com/jstorimer/spin)
 * [spork](https://github.com/sporkrb/spork)
 * [guard](https://github.com/guard/guard)
+

data/lib/zeus/client.rb

@@ -1,4 +1,12 @@
-require "io/console"
+# encoding: utf-8
+begin
+  require "io/console"
+rescue LoadError
+  Zeus.ui.error "io/console not found. Please `gem install io-console` or, preferably, " +
+    "install ruby 1.9.3 by following the instructions at: " +
+    "https://gist.github.com/1688857"
+  exit 1
+end
 require "json"
 require "pty"
 require "socket"

data/lib/zeus/dsl.rb

@@ -44,8 +44,6 @@ module Zeus
         end
       end
 
-      private
-
       # We send STOP before actually killing the processes here.
       # This is to prevent parents from respawning before all the children
       # are killed. This prevents a race condition.
@@ -56,7 +54,9 @@ module Zeus
         old_pid  = pid
         self.pid = nil
         Process.kill("KILL", old_pid) if old_pid
-      end ; protected :kill!
+      end
+
+      private
 
       def node_for_name(name)
         @nodes_by_name ||= __nodes_by_name

data/lib/zeus/server.rb

@@ -12,6 +12,7 @@ module Zeus
     autoload :LoadTracking,                'zeus/server/load_tracking'
     autoload :ForkedProcess,               'zeus/server/forked_process'
     autoload :ClientHandler,               'zeus/server/client_handler'
+    autoload :CommandRunner,               'zeus/server/command_runner'
     autoload :ProcessTreeMonitor,          'zeus/server/process_tree_monitor'
     autoload :AcceptorRegistrationMonitor, 'zeus/server/acceptor_registration_monitor'
 
@@ -48,9 +49,11 @@ module Zeus
         exit 0
       }
 
-      LoadTracking.inject!(self)
+      LoadTracking.server = self
 
       @plan.run(true) # boot the actual app
+      master = Process.pid
+      at_exit { @process_tree_monitor.kill_all_nodes if Process.pid == master }
       monitors.each(&:close_child_socket)
 
       runloop!

data/lib/zeus/server/acceptor.rb

@@ -4,53 +4,29 @@ require 'socket'
 # See Zeus::Server::ClientHandler for relevant documentation
 module Zeus
   class Server
-    class Acceptor < ForkedProcess
-      attr_accessor :aliases, :description, :action
+    class Acceptor
+      attr_accessor :aliases, :description, :action, :name
+      def initialize(server)
+        @server = server
+      end
 
       def descendent_acceptors
         self
       end
 
-      def before_setup
+      def run
         register_with_client_handler(Process.pid)
-      end
-
-      def runloop!
-        loop do
-          prefork_action!
-          terminal, arguments = accept_connection # blocking
-          child = fork { __RUNNER__run(terminal, arguments) }
-          terminal.close
+        Zeus.ui.info("starting #{process_type} `#{@name}`")
 
-          Process.detach(child)
-        end
-      end
-
-      def __RUNNER__run(terminal, arguments)
-        $0 = "zeus runner: #{@name}"
-        Process.setsid
-        postfork_action!
-        @s_acceptor << $$ << "\n"
-        $stdin.reopen(terminal)
-        $stdout.reopen(terminal)
-        $stderr.reopen(terminal)
-        ARGV.replace(arguments)
-
-        @action.call
-      ensure
-        # TODO this is a whole lot of voodoo that I don't really understand.
-        # I need to figure out how best to make the process disconenct cleanly.
-        dnw, dnr = File.open("/dev/null", "w+"), File.open("/dev/null", "r+")
-        $stderr.reopen(dnr)
-        $stdout.reopen(dnr)
-        terminal.close
-        $stdin.reopen(dnw)
-        Process.kill(9, $$)
-        exit 0
+        thread_with_backtrace_on_error { runloop! }
       end
 
       private
 
+      def command_runner
+        CommandRunner.new(name, action, @s_acceptor)
+      end
+
       def register_with_client_handler(pid)
         @s_client_handler, @s_acceptor = UNIXSocket.pair
         @s_acceptor.puts registration_data(pid)
@@ -72,41 +48,45 @@ module Zeus
         "acceptor"
       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
 
-      # these two methods should be part of the configuration DSL.
-      # They're here for now, but I want them out.
-      def prefork_action! # TODO : refactor
-        ActiveRecord::Base.clear_all_connections! rescue nil
+      def thread_with_backtrace_on_error(&b)
+        Thread.new {
+          begin
+            b.call
+          rescue => e
+            print_error($stdout, e)
+          end
+        }
       end
 
-      def postfork_action! # TODO :refactor
-        ActiveRecord::Base.establish_connection   rescue nil
-        # ActiveSupport::DescendantsTracker.clear   rescue nil
-        # ActiveSupport::Dependencies.clear         rescue nil
+      def runloop!
+        loop do
+          terminal, arguments = accept_connection # blocking
+          command_runner.run(terminal, arguments)
+        end
       end
 
       module ErrorState
+        NOT_A_PID = 0
         attr_accessor :error
 
-        def print_error(io, error = @error)
-          io.puts "#{error.backtrace[0]}: #{error.message} (#{error.class})"
-          error.backtrace[1..-1].each do |line|
-            io.puts "\tfrom #{line}"
-          end
+        def process_type
+          "error-state acceptor"
         end
 
-        def run
-          register_with_client_handler(Process.pid)
-          Zeus.ui.info "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)
-              terminal.close
-            end
+        def runloop!
+          loop do
+            terminal = @s_acceptor.recv_io
+            _ = @s_acceptor.readline
+            @s_acceptor << NOT_A_PID << "\n"
+            print_error(terminal, @error)
+            terminal.close
           end
         end
 

data/lib/zeus/server/command_runner.rb

@@ -0,0 +1,50 @@
+module Zeus
+  class Server
+    class CommandRunner
+
+      def initialize(name, action, s_acceptor)
+        @name = name
+        @action = action
+        @s_acceptor = s_acceptor
+      end
+
+      def run(terminal, arguments)
+        child = fork { _run(terminal, arguments) }
+        terminal.close
+        Process.detach(child)
+        child
+      end
+
+      private
+
+      def _run(terminal, arguments)
+        $0 = "zeus runner: #{@name}"
+        Process.setsid
+        reconnect_activerecord!
+        @s_acceptor << $$ << "\n"
+        $stdin.reopen(terminal)
+        $stdout.reopen(terminal)
+        $stderr.reopen(terminal)
+        ARGV.replace(arguments)
+
+        @action.call
+      ensure
+        # TODO this is a whole lot of voodoo that I don't really understand.
+        # I need to figure out how best to make the process disconenct cleanly.
+        dnw, dnr = File.open("/dev/null", "w+"), File.open("/dev/null", "r+")
+        $stderr.reopen(dnr)
+        $stdout.reopen(dnr)
+        terminal.close
+        $stdin.reopen(dnw)
+        Process.kill(9, $$)
+        exit 0
+      end
+
+      def reconnect_activerecord!
+        ActiveRecord::Base.clear_all_connections! rescue nil
+        ActiveRecord::Base.establish_connection   rescue nil
+      end
+
+    end
+  end
+end

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

@@ -66,7 +66,6 @@ module Zeus
             Zeus.ui.error("fsevents-wrapper crashed.")
             Process.kill("INT", 0)
           end
-          File.open("fse-out.log", "a") { |f|f.write lines }
           files = lines.split("\n")
           files[0] = "#{@buffer}#{files[0]}" unless @buffer == ""
           unless lines[-1] == "\n"

data/lib/zeus/server/forked_process.rb

@@ -2,7 +2,6 @@ module Zeus
   class Server
     # base class for Stage and Acceptor
     class ForkedProcess
-      HasNoChildren = Class.new(Exception)
 
       attr_accessor :name
       attr_reader :pid
@@ -41,7 +40,7 @@ module Zeus
 
         trap("INT") { exit }
         trap("TERM") {
-          notify_terminating
+          notify_terminated
           exit
         }
 
@@ -54,11 +53,6 @@ module Zeus
         ($LOADED_FEATURES + @server.extra_features) - old_features
       end
 
-      def kill_pid_on_exit(pid)
-        currpid = Process.pid
-        at_exit { Process.kill(9, pid) if Process.pid == currpid rescue nil }
-      end
-
       def runloop!
         raise NotImplementedError
       end
@@ -95,8 +89,6 @@ module Zeus
           after_notify
           runloop!
         }
-        kill_pid_on_exit(@pid)
-        @pid
       end
 
     end

data/lib/zeus/server/load_tracking.rb

@@ -1,31 +1,25 @@
 module Zeus
   class Server
     class LoadTracking
-
-      def self.inject!(server)
-        $zeus_file_monitor_server = server
-      end
-
-      def self.add_feature(server, file)
-        if absolute_path?(file)
-          server.add_extra_feature(file)
-        elsif File.exist?("./#{file}")
-          server.add_extra_feature(File.expand_path("./#{file}"))
-        else
-          path = find_in_load_path(file)
-          server.add_extra_feature(path) if path
+      class << self
+        attr_accessor :server
+
+        def add_feature(file)
+          return unless server
+          path = if File.exist?(File.expand_path(file))
+            File.expand_path(file)
+          else
+            find_in_load_path(file)
+          end
+          server.add_extra_feature path if path
         end
-      end
 
-      def self.find_in_load_path(file)
-        path = $LOAD_PATH.detect { |path| File.exist?("#{path}/#{file}") }
-        "#{path}/#{file}" if path
-      end
+        private
 
-      def self.absolute_path?(file)
-        file =~ /^\// && File.exist?(file)
+        def find_in_load_path(file)
+          $LOAD_PATH.map { |path| "#{path}/#{file}" }.detect{ |file| File.exist? file }
+        end
       end
-
     end
   end
 end
@@ -37,15 +31,10 @@ module Kernel
   end
 
   class << self
-    alias_method :__original_load, :load
+    alias_method :__load_without_zeus, :load
     def load(file, *a)
-      if defined?($zeus_file_monitor_server)
-        Zeus::Server::LoadTracking.add_feature($zeus_file_monitor_server, file)
-      end
-      __original_load(file, *a)
+      Zeus::Server::LoadTracking.add_feature(file)
+      __load_without_zeus(file, *a)
     end
   end
-
 end
-
-

data/lib/zeus/server/process_tree_monitor.rb

@@ -20,6 +20,10 @@ module Zeus
         @root.kill_nodes_with_feature(file)
       end
 
+      def kill_all_nodes
+        @root.kill!
+      end
+
       module ChildProcessApi
         def __CHILD__stage_starting_with_pid(name, pid)
           buffer_send("#{STARTING_MARKER}#{name}:#{pid}")

data/lib/zeus/server/stage.rb

@@ -30,14 +30,13 @@ module Zeus
           begin
             pid = Process.wait
           rescue Errno::ECHILD
-            raise HasNoChildren.new("Stage `#{@name}` - All terminal nodes must be acceptors")
+            sleep # if this is a terminal node, just let acceptors run...
           end
           stage = @pids[pid]
           @pids[stage.run] = stage
         end
       end
 
-
       private
 
       def register_acceptors_as_errors(e)

data/lib/zeus/templates/rails.rb

@@ -1,4 +1,8 @@
 require 'socket'
+begin
+  require 'testrbl' # before bundler is setup so it does not need to be in the Gemfile
+rescue LoadError
+end
 
 ROOT_PATH = File.expand_path(Dir.pwd)
 
@@ -92,9 +96,21 @@ Zeus::Server.define! do
             action { require 'test_helper' }
 
             command :testrb do
-              (r = Test::Unit::AutoRunner.new(true)).process_args(ARGV) or
-                abort r.options.banner + " tests..."
-              exit r.run
+              argv = ARGV
+
+              # try to find patter by line using testrbl
+              if defined?(Testrbl) && argv.size == 1 and argv.first =~ /^\S+:\d+$/
+                file, line = argv.first.split(':')
+                argv = [file, '-n', "/#{Testrbl.send(:pattern_from_file, File.readlines(file), line)}/"]
+                puts "using -n '#{argv[2]}'" # let users copy/paste or adjust the pattern
+              end
+
+              runner = Test::Unit::AutoRunner.new(true)
+              if runner.process_args(argv)
+                exit runner.run
+              else
+                abort runner.options.banner + " tests..."
+              end
             end
           end
         end

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
 end

data/spec/integration_spec.rb

@@ -5,21 +5,40 @@ describe "Integration" do
     kill_all_children
   end
 
-  it "starts the zeus server in a non-rails project with a config and responds to commands" do
-    write ".zeus.rb", <<-RUBY
-      Zeus::Server.define! do
-        stage :foo do
-          command :bar do
-            puts "YES"
+  context "in a non-rails project with a .zeus.rb" do
+    it "starts the zeus server and responds to commands" do
+      write ".zeus.rb", <<-RUBY
+        Zeus::Server.define! do
+          stage :foo do
+            command :bar do
+              puts "YES"
+            end
           end
         end
-      end
-    RUBY
+      RUBY
 
-    start, run = start_and_run("bar")
-    start.should include "spawner `foo`"
-    start.should include "acceptor `bar`"
-    run.should == ["YES\r\n"]
+      start, run = start_and_run("bar")
+      start.should include "spawner `foo`"
+      start.should include "acceptor `bar`"
+      run.should == ["YES\r\n"]
+    end
+
+    it "can run via command alias" do
+      write ".zeus.rb", <<-RUBY
+        Zeus::Server.define! do
+          stage :foo do
+            command :bar, :b do
+              puts "YES"
+            end
+          end
+        end
+      RUBY
+
+      start, run = start_and_run("b")
+      start.should include "spawner `foo`"
+      start.should include "acceptor `bar`"
+      run.should == ["YES\r\n"]
+    end
   end
 
   private

data/spec/server/load_tracking_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Zeus::Server::LoadTracking do
+  class Recorder
+    def recorded
+      @recorded ||= []
+    end
+
+    def add_extra_feature(*args)
+      recorded << [:add_extra_feature, *args]
+    end
+  end
+
+  let(:recorder){ Recorder.new }
+
+  around do |example|
+    $foo = nil
+    Zeus::Server::LoadTracking.server = recorder
+    example.call
+    Zeus::Server::LoadTracking.server = nil
+  end
+
+  let(:tmp_path) { File.expand_path(Dir.pwd) }
+
+  it "tracks loading of absolute paths" do
+    write "foo.rb", "$foo = 1"
+    load "#{Dir.pwd}/foo.rb"
+    $foo.should == 1
+    recorder.recorded.should == [[:add_extra_feature, tmp_path + "/foo.rb"]]
+  end
+
+  it "tracks loading of relative paths" do
+    write "foo.rb", "$foo = 1"
+    load "./foo.rb"
+    $foo.should == 1
+    recorder.recorded.should == [[:add_extra_feature, tmp_path + "/foo.rb"]]
+  end
+
+  it "tracks loading from library paths" do
+    write "lib/foo.rb", "$foo = 1"
+    restoring $LOAD_PATH do
+      $LOAD_PATH << File.expand_path("lib")
+      load "foo.rb"
+    end
+    $foo.should == 1
+    recorder.recorded.should == [[:add_extra_feature, tmp_path + "/lib/foo.rb"]]
+  end
+
+  it "does not add unfound files" do
+    write "lib/foo.rb", "$foo = 1"
+    begin
+      load "foo.rb"
+    rescue LoadError
+    end
+    $foo.should == nil
+    recorder.recorded.should == []
+  end
+
+  private
+
+  def restoring(thingy)
+    old = thingy.dup
+    yield
+  ensure
+    thingy.replace(old)
+  end
+end

data/spec/server/process_tree_monitor_spec.rb

@@ -1,4 +1,4 @@
-require 'zeus'
+require 'spec_helper'
 
 class Zeus::Server
   describe ProcessTreeMonitor do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-11 00:00:00.000000000 Z
+date: 2012-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Boot any rails app in under a second
 email:
@@ -38,6 +38,7 @@ files:
 - lib/zeus/server/acceptor.rb
 - lib/zeus/server/acceptor_registration_monitor.rb
 - lib/zeus/server/client_handler.rb
+- lib/zeus/server/command_runner.rb
 - lib/zeus/server/file_monitor.rb
 - lib/zeus/server/file_monitor/fsevent.rb
 - lib/zeus/server/forked_process.rb
@@ -50,6 +51,7 @@ files:
 - spec/cli_spec.rb
 - spec/integration_spec.rb
 - spec/server/file_monitor/fsevent_spec.rb
+- spec/server/load_tracking_spec.rb
 - spec/server/process_tree_monitor_spec.rb
 - spec/spec_helper.rb
 - spec/ui_spec.rb
@@ -75,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Zeus is an intelligent preloader for ruby applications. It allows normal
@@ -84,7 +86,7 @@ test_files:
 - spec/cli_spec.rb
 - spec/integration_spec.rb
 - spec/server/file_monitor/fsevent_spec.rb
+- spec/server/load_tracking_spec.rb
 - spec/server/process_tree_monitor_spec.rb
 - spec/spec_helper.rb
 - spec/ui_spec.rb
-has_rdoc: