zeus 0.4.1 → 0.4.4

data/ext/fsevents-wrapper/main.m

@@ -1,14 +1,7 @@
-//
-//  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>
+#include <fcntl.h>
 
 
 static CFMutableArrayRef _watchedFiles;
@@ -87,21 +80,11 @@ void handleInputFiles()
     
     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) {
+    while (fgets(line, sizeof(line), stdin) != NULL) {
         line[strlen(line)-1] = 0;
         anyChanges |= maybeAddFileToWatchList(line);
-        select(STDIN_FILENO+1, &fdset, NULL, NULL, &timeout);
     }
-        
+    
     if (anyChanges) {
         configureStream();
     }
@@ -123,6 +106,10 @@ void configureTimerAndRun()
 
 int main(int argc, const char * argv[])
 {
+    int flags = fcntl(0, F_GETFL);
+    flags |= O_NONBLOCK;
+    fcntl(STDIN_FILENO, F_SETFL, flags);
+
     _watchedFiles = CFArrayCreateMutable(NULL, 0, NULL);
     _fileIsWatched = [[NSMutableDictionary alloc] initWithCapacity:500];
         

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

@@ -34,7 +34,7 @@ module Zeus
           @realpath_to_givenpath[real] ||= []
           @realpath_to_givenpath[real] << given
 
-          @io_in.puts real
+          @io_in.write("#{real}\n")
           true
         end
 
@@ -52,11 +52,21 @@ module Zeus
 
         def handle_changed_files
           50.times { read_and_notify_files }
-        rescue Errno::EAGAIN
+        rescue Stop
         end
 
+        Stop = Class.new(Exception)
+
         def read_and_notify_files
-          lines = @io_out.read_nonblock(1000)
+          begin
+            lines = @io_out.read_nonblock(1000)
+          rescue Errno::EAGAIN
+            raise Stop
+          rescue EOFError
+            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/load_tracking.rb

@@ -3,14 +3,7 @@ module Zeus
     class LoadTracking
 
       def self.inject!(server)
-        $server = server
-        class << Kernel
-          alias_method :__original_load, :load
-          def load(file, *a)
-            LoadTracking.add_feature($server, file)
-            __original_load(file, *a)
-          end
-        end
+        $zeus_file_monitor_server = server
       end
 
       def self.add_feature(server, file)
@@ -36,3 +29,23 @@ module Zeus
     end
   end
 end
+
+module Kernel
+
+  def load(file, *a)
+    Kernel.load(file, *a)
+  end
+
+  class << self
+    alias_method :__original_load, :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)
+    end
+  end
+
+end
+
+

data/lib/zeus/server/process_tree_monitor.rb

@@ -44,11 +44,17 @@ module Zeus
 
       def handle_messages
         50.times { handle_message }
-      rescue Errno::EAGAIN
+      rescue Stop
       end
 
+      Stop = Class.new(Exception)
+
       def handle_message
-        data = @sock.recv_nonblock(4096)
+        begin
+          data = @sock.recv_nonblock(4096)
+        rescue Errno::EAGAIN
+          raise Stop
+        end
         case data[0]
         when STARTING_MARKER
           handle_starting_message(data[1..-1])

data/lib/zeus/version.rb

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

data/spec/cli_spec.rb

@@ -1,14 +1,22 @@
-require 'zeus'
+require 'spec_helper'
 
 module Zeus
   describe CLI do
-
     let(:ui) { stub(debug!: nil) }
 
     before do
       Zeus::UI.stub(new: ui)
     end
 
+    it "fails with unknown command" do
+      ui.should_receive(:error).with(/Could not find task/m)
+      Thrud.should_receive(:exit).with(1).and_raise(SystemExit)
+      begin
+        run_with_args("foo")
+      rescue SystemExit
+      end
+    end
+
     describe "#help" do
       it "prints a generic help menu" do
         ui.should_receive(:info).with(/Global Commands.*zeus help.*show this help menu/m)
@@ -17,12 +25,16 @@ module Zeus
 
       it "prints a usage menu per command" do
         ui.should_receive(:info).with(/Usage:.*zeus version.*version information/m)
-        run_with_args("help", "version")
+        run_with_args(["help", "version"])
       end
     end
 
     describe "#start" do
-      it "starts the zeus server"
+      it "fails to start the zeus server in a non-rails project without a config" do
+        ui.should_receive(:error).with(/is missing a config file.*rails project.*zeus init/m)
+        run_with_args("start", :exit => 1)
+      end
+
       it "uses the rails template file if the project is missing a config file but looks like rails"
       it "prints an error and exits if there is no config file and the project doesn't look like rails"
     end
@@ -40,12 +52,21 @@ module Zeus
         run_with_args("--version")
         run_with_args("-v")
       end
-
     end
 
     describe "#init" do
-      it "currently only generates a rails file, even if the project doesn't look like rails"
-      it "prints an error and exits if the project already has a zeus config"
+      it "currently only generates a rails file, even if the project doesn't look like rails" do
+        ui.should_receive(:info).with(/Writing new .zeus.rb/m)
+        run_with_args("init")
+        read(".zeus.rb").should include("config/application")
+      end
+
+      it "prints an error and exits if the project already has a zeus config" do
+        write(".zeus.rb", "FOO")
+        ui.should_receive(:error).with(/.zeus.rb already exists /m)
+        run_with_args("init", :exit => 1)
+        read(".zeus.rb").should == "FOO"
+      end
     end
 
     describe "generated tasks" do
@@ -57,11 +78,18 @@ module Zeus
 
     private
 
-    def run_with_args(*args)
-      ARGV.replace(args)
-      Zeus::CLI.start
+    def run_with_args(args, options={})
+      ARGV.replace([*args])
+      if options[:exit]
+        Zeus::CLI.any_instance.should_receive(:exit).with(options[:exit]).and_raise(SystemExit)
+        begin
+          Zeus::CLI.start
+        rescue SystemExit
+        end
+      else
+        Zeus::CLI.start
+      end
     end
-
   end
 end
 

data/spec/integration_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe "Integration" do
+  after 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"
+          end
+        end
+      end
+    RUBY
+
+    start, run = start_and_run("bar")
+    start.should include "spawner `foo`"
+    start.should include "acceptor `bar`"
+    run.should == ["YES\r\n"]
+  end
+
+  private
+
+  def zeus(command, options={})
+    command = zeus_command(command)
+    result = `#{command}`
+    raise "FAILED #{command}\n#{result}" if $?.success? == !!options[:fail]
+    result
+  end
+
+  def zeus_command(command)
+    "ruby -I #{root}/lib #{root}/bin/zeus #{command} 2>&1"
+  end
+
+  def record_start(output)
+    IO.popen(zeus_command("start")) do |pipe|
+      while str = pipe.readpartial(100)
+        output << str
+      end rescue EOFError
+    end
+  end
+
+  def start_and_run(commands)
+    start_output = ""
+    t1 = Thread.new { record_start(start_output) }
+    sleep 0.1
+    run_output = [*commands].map{ |cmd| zeus(cmd) }
+    sleep 0.2
+    t1.kill
+    [start_output, run_output]
+  end
+
+  def kill_all_children
+    `kill -9 #{child_pids.join(" ")}`
+  end
+
+  def child_pids
+    pid = Process.pid
+    pipe = IO.popen("ps -ef | grep #{pid}")
+    pipe.readlines.map do |line|
+      parts = line.split(/\s+/)
+      parts[2] if parts[3] == pid.to_s and parts[2] != pipe.pid.to_s
+    end.compact
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,38 @@
+require 'zeus'
+
+module FolderHelpers
+  def write(file, content)
+    ensure_folder File.dirname(file)
+    File.open(file, 'w'){|f| f.write content }
+  end
+
+  def read(file)
+    File.read file
+  end
+
+  def delete(file)
+    `rm #{file}`
+  end
+
+  def ensure_folder(folder)
+    `mkdir -p #{folder}` unless File.exist?(folder)
+  end
+
+  def root
+    File.expand_path '../..', __FILE__
+  end
+end
+
+RSpec.configure do |config|
+  config.include FolderHelpers
+
+  config.around do |example|
+    folder = File.expand_path("../tmp", __FILE__)
+    `rm -rf #{folder}`
+    ensure_folder folder
+    Dir.chdir folder do
+      example.call
+    end
+    `rm -rf #{folder}`
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies: []
 description: Boot any rails app in under a second
 email:
@@ -48,8 +48,10 @@ files:
 - lib/zeus/ui.rb
 - lib/zeus/version.rb
 - spec/cli_spec.rb
+- spec/integration_spec.rb
 - spec/server/file_monitor/fsevent_spec.rb
 - spec/server/process_tree_monitor_spec.rb
+- spec/spec_helper.rb
 - spec/ui_spec.rb
 - zeus.gemspec
 homepage: https://github.com/burke/zeus
@@ -80,7 +82,9 @@ summary: Zeus is an intelligent preloader for ruby applications. It allows norma
   development tasks to be run in a fraction of a second.
 test_files:
 - spec/cli_spec.rb
+- spec/integration_spec.rb
 - spec/server/file_monitor/fsevent_spec.rb
 - spec/server/process_tree_monitor_spec.rb
+- spec/spec_helper.rb
 - spec/ui_spec.rb
 has_rdoc: