pancake 0.1.18 → 0.1.19

data/lib/pancake/stack/bootloader.rb

@@ -24,17 +24,7 @@ Pancake::Stack::BootLoader.add(:load_mounted_inits, :level => :init) do
   end
 end
 
-Pancake::Stack::BootLoader.add(:set_as_master) do
-  def run!
-    return unless config[:master]
-    roots = stack_class.roots.dup
-    roots.each do |root|
-      stack_class.roots << File.join(root, "master")
-    end
-  end
-end
-
-Pancake::Stack::BootLoader.add(:load_configuration) do
+Pancake::Stack::BootLoader.add(:load_configuration, :level => :init) do
   def run!
     stack_class.roots.each do |root|
       stack_class.paths_for(:config).each{|f| require f.join}
@@ -42,7 +32,7 @@ Pancake::Stack::BootLoader.add(:load_configuration) do
   end
 end
 
-Pancake::Stack::BootLoader.add(:load_application) do
+Pancake::Stack::BootLoader.add(:load_application, :level => :init) do
   def run!
     stack_class.roots.each do |root|
       [:models, :controllers].each do |type|
@@ -63,7 +53,7 @@ end
 #
 
 
-Pancake::Stack::BootLoader.add(:load_routes) do
+Pancake::Stack::BootLoader.add(:load_routes, :level => :init) do
   def run!
     stack_class.roots.each do |root|
       stack_class.paths_for(:router).each{|f| require f.join}

data/lib/pancake/stack/stack.rb

@@ -18,11 +18,14 @@ module Pancake
 
 
     #Iterates the list of roots in the stack, and initializes the app found their
-    def self.initialize_stack
+    def self.initialize_stack(opts = {})
       raise "Stack root not set" if roots.empty?
-
+      master = opts.delete(:master)
+      set_as_master! if master
       # Run any :init level bootloaders for this stack
       self::BootLoader.run!(:stack_class => self, :only => {:level => :init})
+      # Pick up any new stacks added during the boot process.
+      set_as_master! if master
 
       @initialized = true
     end # initiailze stack
@@ -44,7 +47,10 @@ module Pancake
 
     def initialize(app = nil, opts = {})
       @app_name = opts.delete(:app_name) || self.class
-      self.class.initialize_stack unless self.class.initialized?
+
+      master = opts.delete(:master)
+      self.class.initialize_stack(:master => master) unless self.class.initialized?
+      self.class.set_as_master! if master
       Pancake.configuration.stacks[@app_name] = self
 
       # setup the configuration for this stack
@@ -128,6 +134,16 @@ module Pancake
       end
     end
 
+    # Sets this as a master stack.  This means that the "master" directory will be added to all existing stack roots
+    def self.set_as_master!
+      # Want to add master to the roots for this stack only
+      roots.dup.each do |root|
+        unless root =~ /master\/?$/
+          roots << File.join(root, 'master')
+        end
+      end
+    end
+
     # Creates a bootloader hook(s) of the given name. That are inheritable
     # This will create hooks for use in a bootloader (but will not create the bootloader itself!)
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pancake
 version: !ruby/object:Gem::Version 
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: pancake
 bindir: bin
 cert_chain: []
 
-date: 2009-11-14 00:00:00 +11:00
+date: 2009-11-15 00:00:00 +11:00
 default_executable: pancake-gen
 dependencies: 
 - !ruby/object:Gem::Dependency