@@ -79,7 +79,7 @@ module Autumn def load_configs(stem_config, leaf_config) leaf_config.each do |name, options| - global_config_file = "leaves/#{options['class'].snakecase}/config.yml" + global_config_file = "#{AL_ROOT}/leaves/#{options['class'].snakecase}/config.yml" if File.exist? global_config_file then config.leaf name, YAML.load(File.open(global_config_file)) end @@ -105,11 +105,11 @@ module Autumn end def load_leaf_controller(type) - controller_file = "leaves/#{type.snakecase}/controller.rb" + controller_file = "#{AL_ROOT}/leaves/#{type.snakecase}/controller.rb" raise "controller.rb file for leaf #{type} not found" unless File.exist? controller_file controller_code = nil begin - File.open("leaves/#{type.snakecase}/controller.rb", 'r') { |f| controller_code = f.read } + File.open("#{AL_ROOT}/leaves/#{type.snakecase}/controller.rb", 'r') { |f| controller_code = f.read } rescue Errno::ENOENT raise "controller.rb file for leaf #{type} not found" end @@ -119,7 +119,7 @@ module Autumn def load_leaf_helpers(type) mod = config.leaf(type, :module) helper_code = nil - Dir.glob("leaves/#{type.snakecase}/helpers/*.rb").each do |helper_file| + Dir.glob("#{AL_ROOT}/leaves/#{type.snakecase}/helpers/*.rb").each do |helper_file| File.open(helper_file, 'r') { |f| helper_code = f.read } mod.module_eval helper_code end @@ -140,7 +140,7 @@ module Autumn def load_leaf_views(type) views = Hash.new view_text = nil - Dir.glob("leaves/#{type.snakecase}/views/*.txt.erb").each do |view_file| + Dir.glob("#{AL_ROOT}/leaves/#{type.snakecase}/views/*.txt.erb").each do |view_file| view_name = File.basename(view_file).match(/^(.+)\.txt\.erb$/)[1] File.open(view_file, 'r') { |f| view_text = f.read } views[view_name] = view_text @@ -174,7 +174,7 @@ module Autumn model_code = nil mod = config.leaf(leaf.options[:class], :module) leaf.database do - Dir.glob("leaves/#{leaf.options[:class].snakecase}/models/*.rb").each do |model_file| + Dir.glob("#{AL_ROOT}/leaves/#{leaf.options[:class].snakecase}/models/*.rb").each do |model_file| File.open(model_file, 'r') { |f| model_code = f.read } mod.module_eval model_code end libs/foliater.rb @@ -5,15 +5,8 @@ require 'set' require 'rubygems' require 'yaml' require 'logger' -require 'facets/array' -require 'facets/date' -require 'facets/enumerable' -require 'facets/hash' -require 'facets/kernel' +require 'facets' require 'facets/random' -require 'facets/string' -require 'facets/symbol' -require 'facets/time' require 'anise' require 'libs/misc' require 'libs/speciator' @@ -58,7 +51,7 @@ module Autumn # :nodoc: def load_global_settings begin - config.global YAML.load(File.open('config/global.yml')) + config.global YAML.load(File.open("#{AL_ROOT}/config/global.yml")) rescue SystemCallError raise "Couldn't find your global.yml file." end @@ -71,7 +64,7 @@ module Autumn # :nodoc: # PREREQS: load_global_settings def load_season_settings - @season_dir = "config/seasons/#{config.global :season}" + @season_dir = "#{AL_ROOT}/config/seasons/#{config.global :season}" raise "The current season doesn't have a directory." unless File.directory? @season_dir begin config.season YAML.load(File.open("#{@season_dir}/season.yml")) @@ -118,7 +111,7 @@ module Autumn # :nodoc: # PREREQS: load_libraries def load_daemon_info - Dir.glob('resources/daemons/*.yml').each do |yml_file| + Dir.glob("#{AL_ROOT}/resources/daemons/*.yml").each do |yml_file| yml = YAML.load(File.open(yml_file, 'r')) Daemon.new File.basename(yml_file, '.yml'), yml end @@ -127,7 +120,7 @@ module Autumn # :nodoc: # Loads Ruby code in the shared directory. def load_shared_code - Dir.glob('shared/**/*.rb').each { |lib| load lib } + Dir.glob("#{AL_ROOT}/shared/**/*.rb").each { |lib| load lib } end # Creates connections to databases using the DataMapper gem. @@ -191,7 +184,7 @@ module Autumn # :nodoc: private def log_name - "log/#{config.global(:season)}.log" + "#{AL_ROOT}/log/#{config.global(:season)}.log" end end end libs/genesis.rb @@ -24,4 +24,6 @@ require 'rubygems' require 'daemons' -Daemons.run 'script/server', :app_name => 'autumn', :dir_mode => :script, :dir => '../tmp', :multiple => false, :backtrace => true, :monitor => false, :log_output => true +root = File.expand_path("#{File.dirname(__FILE__)}/..") + +Daemons.run "#{root}/script/server", :app_name => 'autumn', :dir_mode => :normal, :dir => "#{root}/tmp", :multiple => false, :backtrace => true, :monitor => false, :log_output => true script/daemon 70d91164cd29c87249b66ec1bfe64310724043a6 root root@www.timothymorgan.info http://github.com/RISCfuture/autumn/commit/0298fce0f05000e85eb3e1d8336de1a432530f65 0298fce0f05000e85eb3e1d8336de1a432530f65 2009-01-19T21:25:27-08:00 2009-01-19T21:25:27-08:00 All directories referenced from AL_ROOT 4500a8ebb86b1f8bb55ece1d34983fb3b2086f22 root root@www.timothymorgan.info