zeus 0.2.1 → 0.2.2

data/README.md

@@ -1,14 +1,10 @@
 # Zeus
 
-## What?
+## What is Zeus?
 
-Zeus preloads your app so that your normal development tasks such as `console`, `server`, `generate`, and tests are faster.
+Zeus preloads your app so that your normal development tasks such as `console`, `server`, `generate`, and tests take **ONE second**.
 
-[Mediocre screencast](http://burke.libbey.me/zeus.mov). Better one coming soon.
-
-## Why?
-
-Because waiting 25 seconds sucks, but waiting 0.4 seconds doesn't.
+### [Watch the screencast!](http://vimeo.com/burkelibbey/zeus)
 
 ## Requirements
 
@@ -26,10 +22,6 @@ Install the gem.
 
     gem install zeus
 
-Run the project initializer.
-
-    zeus init
-
 ## Usage
 
 Start the server:
@@ -46,31 +38,15 @@ Run some commands:
     zeus runner omg.rb
 
 
-## TODO (roughly prioritized)
-
-* 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?
-* Figure out how to run full test suites without multiple env loads
-
-## Ideas (not quite TODOs)
-
-* (maybe) Start the preloader as a daemon transparently when any command is run, then wait for it to finish
-* Support inotify on linux
-
 ## Contributing
 
 Fork, Branch, Pull Request.
 
 ## Thanks...
 
-* To [Jesse Storimer](http://github.com/jstorimer) for spin, part of the inspiration for this project
+* To [Stefan Penner](http://github.com/stefanpenner) for discussion and various contributions.
 * To [Samuel Kadolph](http://github.com/samuelkadolph) for doing most of the cross-process pseudoterminal legwork.
+* To [Jesse Storimer](http://github.com/jstorimer) for spin, part of the inspiration for this project
 * To [Shopify](http://github.com/Shopify) for letting me spend (some of) my days working on this.
 
 ## Doesn't work for you?

data/TODO.md

@@ -0,0 +1,18 @@
+## TODO (roughly prioritized)
+
+* 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?
+* Figure out how to run full test suites without multiple env loads
+
+## Ideas (not quite TODOs)
+
+* (maybe) Start the preloader as a daemon transparently when any command is run, then wait for it to finish
+* Support inotify on linux
+
+

data/lib/thrud.rb

@@ -55,7 +55,7 @@ BANNER
     else
       # this is super non-generic. problem for future-burke.
       project_tasks = self.class.instance_variable_get("@tasks").
-        reject{|k,_|['initialize', 'version', 'init', 'start', 'help'].include?(k)}.values.uniq
+        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]
@@ -67,6 +67,7 @@ Global Commands:
   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")}

data/lib/zeus/cli.rb

@@ -34,10 +34,10 @@ module Zeus
     D
     def start
       begin
-        require './.zeus.rb'
+        require self.class.definition_file
       rescue LoadError
-        Zeus.ui.error("Your project is missing a config file (.zeus.rb), or you are not\n"\
-          "in the project root. You can run `zeus init` to generate a config file.")
+        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
@@ -53,8 +53,16 @@ module Zeus
     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 './.zeus.rb'
+      require definition_file
       Zeus::Server.acceptors.each do |acc|
         desc acc.name, (acc.description || "#{acc.name} task defined in .zeus.rb")
         define_method(acc.name) { |*args|
@@ -65,5 +73,6 @@ module Zeus
     rescue LoadError
     end
 
+
   end
 end

data/lib/zeus/templates/rails.rb

@@ -4,10 +4,10 @@ Zeus::Server.define! do
   stage :boot do
 
     action do
-      ENV_PATH  = File.expand_path('../config/environment',  __FILE__)
-      BOOT_PATH = File.expand_path('../config/boot',  __FILE__)
-      APP_PATH  = File.expand_path('../config/application',  __FILE__)
-      ROOT_PATH = File.expand_path('..',  __FILE__)
+      ROOT_PATH = File.expand_path(Dir.pwd)
+      ENV_PATH  = File.expand_path('config/environment',  ROOT_PATH)
+      BOOT_PATH = File.expand_path('config/boot',  ROOT_PATH)
+      APP_PATH  = File.expand_path('config/application',  ROOT_PATH)
 
       require BOOT_PATH
       require 'rails/all'
@@ -57,21 +57,21 @@ Zeus::Server.define! do
         end
       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
-
-      # 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
+
+      end
 
     end
   end

data/lib/zeus/version.rb

@@ -1,3 +1,3 @@
 module Zeus
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -24,6 +24,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- TODO.md
 - bin/zeus
 - ext/fsevents-wrapper/fsevents-wrapper
 - ext/fsevents-wrapper/main.m