zeus 0.4.0 → 0.4.1

data/lib/zeus/client.rb

@@ -50,8 +50,10 @@ module Zeus
 
       pid = socket.readline.chomp.to_i
     rescue Errno::ENOENT, Errno::ECONNREFUSED, Errno::ECONNRESET
-      Zeus.ui.error "Zeus doesn't seem to be running, try 'zeus start`"
-      abort
+      # we need a \r at the end because the terminal is in raw mode.
+      # we need to reset the cursor to position 0
+      Zeus.ui.error "Zeus doesn't seem to be running, try 'zeus start`\r"
+      exit 1
     end
 
     def make_winch_channel

data/lib/zeus/server.rb

@@ -58,15 +58,13 @@ module Zeus
       File.unlink(Zeus::SOCKET_NAME)
     end
 
-    # this is used in conjunction with Zeus::LoadTracking to track files loaded
-    # using `load` rather than `require`.
     def add_extra_feature(full_expanded_path)
-      @extra_loaded_features ||= []
-      @extra_loaded_features << full_expanded_path
+      $extra_loaded_features ||= []
+      $extra_loaded_features << full_expanded_path
     end
 
     def extra_features
-      @extra_loaded_features || []
+      $extra_loaded_features || []
     end
 
     # Child process API

data/lib/zeus/server/forked_process.rb

@@ -47,11 +47,6 @@ module Zeus
 
         defined?(ActiveRecord::Base) and ActiveRecord::Base.clear_all_connections!
 
-        new_features = newly_loaded_features()
-        $previously_loaded_features = new_features
-        Thread.new {
-          new_features.each { |f| notify_feature(f) }
-        }
       end
 
       def newly_loaded_features
@@ -74,6 +69,19 @@ module Zeus
       def after_setup
       end
 
+      def notify_new_features
+        new_features = newly_loaded_features()
+        $previously_loaded_features ||= []
+        $previously_loaded_features |= new_features
+        Thread.new {
+          new_features.each { |f| notify_feature(f) }
+        }
+      end
+
+      def after_notify
+      end
+
+      # TODO: This just got really ugly and needs a refactor more than ever.
       def run(close_parent_sockets = false)
         @pid = fork {
           before_setup
@@ -82,6 +90,9 @@ module Zeus
           Zeus.run_after_fork!
 
           after_setup
+          notify_new_features
+
+          after_notify
           runloop!
         }
         kill_pid_on_exit(@pid)

data/lib/zeus/server/load_tracking.rb

@@ -3,18 +3,13 @@ module Zeus
     class LoadTracking
 
       def self.inject!(server)
-        mod = module_for_server(server)
-        Object.class_eval { include mod }
-      end
-
-      def self.module_for_server(server)
-        Module.new.tap do |load_tracking|
-          load_tracking.send(:define_method, :load) { |file, *a|
-            if ret = super(file, *a)
-              LoadTracking.add_feature(server, file)
-            end
-            ret
-          }
+        $server = server
+        class << Kernel
+          alias_method :__original_load, :load
+          def load(file, *a)
+            LoadTracking.add_feature($server, file)
+            __original_load(file, *a)
+          end
         end
       end
 

data/lib/zeus/server/stage.rb

@@ -16,7 +16,9 @@ module Zeus
         rescue => e
           handle_load_error(e)
         end
+      end
 
+      def after_notify
         @pids = {}
         @stages.each do |stage|
           @pids[stage.run] = stage

data/lib/zeus/version.rb

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

data/zeus.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["burke@libbey.me"]
   gem.description   = %q{Boot any rails app in under a second}
   gem.summary       = %q{Zeus is an intelligent preloader for ruby applications. It allows normal development tasks to be run in a fraction of a second.}
-  gem.homepage      = "http://github.com/burke/zeus"
+  gem.homepage      = "https://github.com/burke/zeus"
 
   gem.files         = `git ls-files`.split("\n").reject{ |f| f =~ /xcodeproj/ }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -14,4 +14,5 @@ Gem::Specification.new do |gem|
   gem.name          = "zeus"
   gem.require_paths = ["lib"]
   gem.version       = Zeus::VERSION
+  gem.license       = "MIT"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zeus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-10 00:00:00.000000000 Z
 dependencies: []
 description: Boot any rails app in under a second
 email:
@@ -23,7 +23,7 @@ files:
 - .travis.yml
 - .zeus.rb
 - Gemfile
-- LICENSE
+- MIT-LICENSE
 - README.md
 - Rakefile
 - bin/zeus
@@ -52,8 +52,9 @@ files:
 - spec/server/process_tree_monitor_spec.rb
 - spec/ui_spec.rb
 - zeus.gemspec
-homepage: http://github.com/burke/zeus
-licenses: []
+homepage: https://github.com/burke/zeus
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: