zeus 0.4.6 → 0.10.0.pre

data/docs/client_server_handshake.md

@@ -1,25 +0,0 @@
-# Client/Server handshake
-
-This takes place in `lib/zeus/server/client_handler.rb`, `lib/zeus/client.rb`, and `lib/zeus/server/acceptor.rb`.
-
-The model is kind of convoluted, so here's an explanation of what's happening with all these sockets:
-
-## Running a command
-1. ClientHandler has a UNIXServer (`SVR`) listening.
-2. ClientHandler has a socketpair with the acceptor referenced by the command (see `docs/acceptor_registration.md`) (`S_ACC`)
-3. When clienthandler receives a connection (`S_CLI`) on `SVR`:
-  1. ClientHandler sends `S_CLI` over `S_ACC`, so the acceptor can communicate with the server's client.
-  2. ClientHandler sends a JSON-encoded array of `arguments` over `S_ACC`
-  3. Acceptor sends the newly-forked worker PID over `S_ACC` to clienthandler.
-  4. ClientHandler forwards the pid to the client over `S_CLI`.
-
-
-## A sort of network diagram
-     client clienthandler acceptor
-    1  ---------->                | {command: String, arguments: [String]}
-    2  ---------->                | Terminal IO
-    3            ----------->     | Terminal IO
-    4            ----------->     | Arguments (json array)
-    5            <-----------     | pid
-    6  <---------                 | pid
-

data/ext/fsevents-wrapper/main.m

@@ -1,118 +0,0 @@
-#import <Foundation/Foundation.h>
-#include <CoreServices/CoreServices.h>
-#include <sys/stat.h>
-#include <fcntl.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];
-    
-    while (fgets(line, sizeof(line), stdin) != NULL) {
-        line[strlen(line)-1] = 0;
-        anyChanges |= maybeAddFileToWatchList(line);
-    }
-    
-    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[])
-{
-    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];
-        
-    configureTimerAndRun();
-    return 0;
-}

data/lib/thrud.rb

@@ -1,97 +0,0 @@
-class Thrud
-
-  class Task < Struct.new(:method_name, :desc, :long_desc, :method_options)
-    def arity(obj)
-      obj.method(method_name).arity
-    end
-  end
-
-  def self.desc(name, a)
-    @desc = a
-  end
-  def self.long_desc(a)
-    @long_desc = a
-  end
-  def self.method_option(*a)
-    @method_options ||= []
-    @method_options << a
-  end
-
-  def self.method_added(m)
-    desc, long_desc, method_options = @desc, @long_desc, (@method_options||[])
-    @desc, @long_desc, @method_options = nil, nil, nil
-
-    @tasks ||= {}
-    @tasks[m.to_s] = Task.new(m, desc, long_desc, method_options)
-  end
-
-  def self.map(a)
-    a.each do |aliases, target|
-      aliases = [aliases] unless aliases.kind_of?(Array)
-      aliases.each do |name|
-        @tasks[name.to_s] = @tasks[target.to_s]
-      end
-    end
-  end
-
-  def self.task_for_name(name)
-    @tasks[name.to_s]
-  end
-
-  def task_for_name(name)
-    self.class.task_for_name(name)
-  end
-
-  def help(taskname = nil)
-    if taskname && task = task_for_name(taskname)
-      arity = task.arity(self)
-      Zeus.ui.info <<-BANNER
-Usage:
-  zeus #{taskname} #{arity == -1 ? "[ARGS]" : ""}
-
-Description:
-  #{task.long_desc || task.desc}
-BANNER
-    else
-      # this is super non-generic. problem for future-burke.
-      project_tasks = self.class.instance_variable_get("@tasks").
-        reject{|k,v|['definition_file', 'initialize', 'version', 'init', 'start', 'help'].include?(v.method_name.to_s)}.values.uniq
-
-      tasks = project_tasks.map { |task|
-        "  zeus %-14s # %s" % [task.method_name, task.desc]
-      }
-
-      Zeus.ui.info <<-BANNER
-Global Commands:
-  zeus help           # show this help menu
-  zeus help [COMMAND] # show help for a specific command
-  zeus init           # #{task_for_name(:init).desc}
-  zeus start          # #{task_for_name(:start).desc}
-  zeus version        # #{task_for_name(:version).desc}
-
-Project-local Commands:
-#{tasks.join("\n")}
-BANNER
-    end
-  end
-
-  def self.start
-    taskname = ARGV.shift
-    arguments = ARGV
-
-    taskname ||= "help"
-
-    unless task = @tasks[taskname.to_s]
-      Zeus.ui.error "Could not find task \"#{taskname}\""
-      exit 1
-    end
-
-    instance = new
-    if instance.method(task.method_name).arity == 0 && arguments.any?
-      Zeus.ui.error "\"#{task.method_name}\" was called incorrectly. Call as \"zeus #{task.method_name}\"."
-      exit 1
-    end
-    instance.send(task.method_name, *arguments)
-  end
-
-end

data/lib/zeus/cli.rb

@@ -1,80 +0,0 @@
-require 'thrud'
-
-module Zeus
-  class CLI < Thrud
-
-    def initialize(*)
-      super
-      Zeus.ui = Zeus::UI.new
-      Zeus.ui.debug! #if options['verbose']
-    end
-
-    desc "init", "Generates a zeus config file in the current working directory"
-    long_desc <<-D
-      Init tries to determine what kind of project is in the current working directory,
-      and generates a relevant config file. Currently the only supported template is
-      rails.
-    D
-    # method_option "rails", type: :string, banner: "Use the rails template instead of auto-detecting based on project contents"
-    def init
-      require 'fileutils'
-
-      if File.exist?(".zeus.rb")
-        Zeus.ui.error ".zeus.rb already exists at #{Dir.pwd}/.zeus.rb"
-        exit 1
-      end
-
-      Zeus.ui.info "Writing new .zeus.rb to #{Dir.pwd}/.zeus.rb"
-      FileUtils.cp(File.expand_path("../templates/rails.rb", __FILE__), '.zeus.rb')
-    end
-
-    desc "start", "Start a zeus server for the project in the current working directory"
-    long_desc <<-D
-      starts a server that boots your application using the config file in
-      .zeus.rb. The server will take several seconds to start, after which you may
-      use the zeus runner commands (see `zeus help` for a list of available commands).
-    D
-    def start
-      begin
-        require self.class.definition_file
-      rescue LoadError
-        Zeus.ui.error("Your project is missing a config file (.zeus.rb), and it doesn't appear\n"\
-          "to be a rails project. You can run `zeus init` to generate a config file.")
-        exit 1
-      end
-      Zeus::Server.new.run
-    end
-
-    def help(*)
-      super
-    end
-
-    desc "version", "Print zeus's version information and exit"
-    def version
-      Zeus.ui.info "Zeus version #{Zeus::VERSION}"
-    end
-    map %w(-v --version) => :version
-
-    def self.definition_file
-      if !File.exists?('.zeus.rb') && File.exists?('script/rails')
-        File.expand_path("../templates/rails.rb", __FILE__)
-      else
-        './.zeus.rb'
-      end
-    end
-
-    begin
-      require definition_file
-    rescue LoadError
-    end
-
-    Zeus::Server.acceptors.each do |acc|
-      desc acc.name, (acc.description || "#{acc.name} task defined in zeus definition file")
-      define_method(acc.name) { |*args|
-        Zeus::Client.run(acc.name, args)
-      }
-      map acc.aliases => acc.name
-    end
-
-  end
-end

data/lib/zeus/client.rb

@@ -1,114 +0,0 @@
-# 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"
-
-require 'zeus/client/winsize'
-
-module Zeus
-  class Client
-    include Winsize
-
-    attr_accessor :pid
-
-    SIGNALS = {
-      "\x03" => "INT",
-      "\x1C" => "QUIT",
-      "\x1A" => "TSTP",
-    }
-    SIGNAL_REGEX = Regexp.union(SIGNALS.keys)
-
-    def self.run(command, args)
-      new.run(command, args)
-    end
-
-    def run(command, args)
-      maybe_raw do
-        PTY.open do |master, slave|
-          @exit_status, @es2 = IO.pipe
-          @master = master
-          set_winsize
-          make_winch_channel
-          @pid = connect_to_server(command, args, slave)
-
-          select_loop!
-        end
-      end
-    end
-
-    private
-
-    def select_loop!
-      buffer = ""
-      while ready = select([winch, @master, $stdin, @exit_status])[0]
-        handle_winch          if ready.include?(winch)
-        handle_stdin(buffer)  if ready.include?($stdin)
-        handle_master(buffer) if ready.include?(@master)
-        handle_exit           if ready.include?(@exit_status)
-      end
-    rescue EOFError
-    end
-
-    def handle_exit
-      exit @exit_status.readline.chomp.to_i
-    end
-
-    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)
-      socket.send_io(@es2)
-      slave.close
-
-      pid = socket.readline.chomp.to_i
-      trap("CONT") { Process.kill("CONT", @pid) }
-      pid
-    rescue Errno::ENOENT, Errno::ECONNREFUSED, Errno::ECONNRESET
-      # we need a \r at the end because the terminal is in raw mode.
-      Zeus.ui.error "Zeus doesn't seem to be running, try 'zeus start`\r"
-      exit 1
-    end
-
-    def handle_stdin(buffer)
-      input = $stdin.readpartial(4096, buffer)
-      input.scan(SIGNAL_REGEX).each { |signal|
-        begin
-          send_signal(signal, pid)
-        rescue Errno::ESRCH
-          exit # the remote process died. Just quit.
-        end
-      }
-      @master << input
-    end
-
-    def send_signal(signal, pid)
-      if SIGNALS[signal] == "TSTP"
-        Process.kill("STOP", pid)
-        Process.kill("TSTP", Process.pid)
-      else
-        Process.kill(SIGNALS[signal], pid)
-      end
-    end
-
-    def handle_master(buffer)
-      $stdout << @master.readpartial(4096, buffer)
-    end
-
-    def maybe_raw(&b)
-      if $stdout.tty?
-        $stdout.raw(&b)
-      else
-        b.call
-      end
-    end
-
-  end
-end

data/lib/zeus/client/winsize.rb

@@ -1,28 +0,0 @@
-module Zeus
-  class Client
-    module Winsize
-
-      attr_reader :winch
-
-      def set_winsize
-        $stdout.tty? and @master.winsize = $stdout.winsize
-      end
-
-      def make_winch_channel
-        @winch, winch_ = IO.pipe
-        trap("WINCH") { winch_ << "\0" }
-      end
-
-      def handle_winch
-        @winch.read(1)
-        set_winsize
-        begin
-          Process.kill("WINCH", pid) if pid
-        rescue Errno::ESRCH
-          exit # the remote process died. Just quit.
-        end
-      end
-
-    end
-  end
-end