Changed how the initializers are defined by default, including hooks,…

… requires, and routes. Updated the generated apps as well, in addition to the spec app.

lib/halcyon/application.rb

@@ -28,7 +28,7 @@ class Application
     def initialize
       self.logger.info "Starting up..."
 
-      self.hooks[:startup].call(Halcyon.config) if self.hooks[:startup]
+      self.hooks[:startup].call(Halcyon.config, Halcyon.logger) if self.hooks[:startup]
 
       # clean after ourselves and get prepared to start serving things
       self.logger.debug "Starting GC."
@@ -38,7 +38,7 @@ def initialize
 
       at_exit do
         self.logger.info "Shutting down #{$$}."
-        self.hooks[:shutdown].call(Halcyon.config) if self.hooks[:shutdown]
+        self.hooks[:shutdown].call(Halcyon.config, Halcyon.logger) if self.hooks[:shutdown]
         self.logger.info "Done."
       end
     end

spec/spec_helper.rb

@@ -40,7 +40,7 @@ class Halcyon::Application
     # r.default_routes
     {:action => 'missing'}
   end
-  startup do |config|
+  startup do |config, logger|
     $started = true
   end
 end

support/generators/halcyon/templates/config/initialize/hooks.rb

@@ -0,0 +1,8 @@
+# = Hooks
+Halcyon::Application.startup do |config, logger|
+  logger.info 'Define startup tasks in config/initialize/hooks.rb'
+end
+
+Halcyon::Application.shutdown do |config, logger|
+  logger.info 'Define shutdown tasks in config/initialize/hooks.rb'
+end

support/generators/halcyon/templates/config/initialize/requires.rb

@@ -0,0 +1,2 @@
+# = Required Libraries
+%w().each {|dep|require dep}

support/generators/halcyon/templates/config/initialize/routes.rb

@@ -0,0 +1,9 @@
+# = Routes
+Halcyon::Application.route do |r|
+  r.match('/time').to(:controller => 'application', :action => 'time')
+
+  r.match('/').to(:controller => 'application', :action => 'index')
+
+  # failover
+  {:action => 'not_found'}
+end

support/generators/halcyon_flat/templates/app.rb

@@ -4,6 +4,7 @@
 %w().each {|dep|require dep}
 
 # = Configuration
+# Halcyon::Runner.load_config Halcyon.root/'config'/'config.yml'
 Halcyon.config = {
   :allow_from => 'all',
   :logging => {
@@ -13,20 +14,19 @@
   }
 }.to_mash
 
-# = Initialization
-class Halcyon::Application
-  startup do |config|
-    self.logger.info 'Initialize application resources and define routes in config/initialize.rb'
-  end
-  # = Routes
-  route do |r|
-    r.match('/time').to(:controller => 'application', :action => 'time')
-
-    r.match('/').to(:controller => 'application', :action => 'index')
-
-    # failover
-    {:action => 'not_found'}
-  end
+# = Routes
+Halcyon::Application.route do |r|
+  r.match('/time').to(:controller => 'application', :action => 'time')
+
+  r.match('/').to(:controller => 'application', :action => 'index')
+
+  # failover
+  {:action => 'not_found'}
+end
+
+# = Hooks
+Halcyon::Application.startup do |config, logger|
+  logger.info 'Define startup tasks in config/initialize/hooks.rb'
 end
 
 # = Application