0
@@ -1,9 +1,50 @@
0
 require 'rubygems'
0
 require 'set'
0
 require 'fileutils'
0
-require 'merb/gem_ext/erubis'
0
-require 'merb/logger'
0
-require 'merb/version'
0
+require 'merb_core/gem_ext/erubis'
0
+require 'merb_core/logger'
0
+require 'merb_core/version'
0
 
0
 gem "assistance"
0
-require "assistance"
0
\ No newline at end of file
0
+require "assistance"
0
+
0
+module Merb
0
+  class << self
0
+    
0
+    attr_accessor :environment, :load_paths
0
+    self.load_paths = Mash.new
0
+		
0
+		# This is the core mechanism for setting up your application layout
0
+		# merb-core won't set a default application layout, but merb-more will
0
+		# use the app/:type layout that is in use in Merb 0.5
0
+		def push_path(type, path, file_glob = "**/*.rb")
0
+		  load_paths[type] = [path, file_glob]
0
+		end
0
+		
0
+		# Application paths
0
+		def root()          @root || Merb::Config[:merb_root] || Dir.pwd  end
0
+		def root=(value)    @root ||= value                               end
0
+		def root_path(path) File.join(root, path)                         end
0
+    
0
+		# Logger settings
0
+		attr_accessor :logger
0
+		
0
+		def log_path
0
+		  if $TESTING
0
+        "#{Merb.root}/log/merb_test.log"
0
+      elsif !(Merb::Config[:daemonize] || Merb::Config[:cluster] )
0
+        STDOUT
0
+      else
0
+        "#{Merb.root}/log/merb.#{Merb::Config[:port]}.log"
0
+		  end
0
+		end
0
+		
0
+		# Framework paths
0
+		def framework_root()  @framework_root ||= File.dirname(__FILE__)          end
0
+		  
0
+    # Set up default generator scope
0
+    attr_accessor :generator_scope
0
+    self.generator_scope = [:merb_default, :merb, :rspec]
0
+  end
0
+
0
+end