ahn in adhearsion-0.7.4 vs ahn in adhearsion-0.7.5

- old
+ new

@@ -36,12 +36,10 @@ $: << File.join(File.dirname(__FILE__), 'lib') ADHEARSION_VERSION = File.read(File.join(File.dirname(__FILE__), '.version')).strip ARGV.unshift 'start' if ARGV.empty? # Set the default operation require 'yaml' -adhearsion_config = File.join('config', 'adhearsion.yml') -CONFIG = File.readable?(adhearsion_config) ? YAML.load_file(adhearsion_config) : {} $HUTDOWN = [] class << $HUTDOWN def hook(&block) self << block end def now! @@ -52,13 +50,10 @@ end ['INT','TERM'].each do |sig| trap sig do $HUTDOWN.now! end end -require 'logging' -register_logger StandardLogger.new(STDOUT) - case ARGV.shift when 'help', '-h', '--h', '-help', '--help' then puts usage when 'version' then puts "Adhearsion v#{ADHEARSION_VERSION}" when /^create(:[\w_.]+)?$/ require 'fileutils' @@ -67,18 +62,19 @@ dest_dir_relative = ARGV.shift || Dir.pwd dest_dir = File.expand_path dest_dir_relative base_dir = File.expand_path File.dirname(__FILE__) App = $&.index(':') ? $&.split(':')[1..-1] * ':' : "default" - abort %'No app "#{App}" found!' unless File.directory? "#{base_dir}/apps/#{App}" + abort %'No app "#{App}" found!' unless File.exists? "#{base_dir}/apps/#{App}" from, to = [], [] (Dir["{#{base_dir}/apps/#{App},docs}/**/*"] + ["#{base_dir}/LICENSE"]).each do |key| value = key[base_dir.length..-1] value.sub! "apps/#{App}/", '' if value.index "apps/#{App}/" to << dest_dir + value + from << key end #from.each_index { |i| debug "#{from[i]} => #{to[i]}" } @@ -141,10 +137,16 @@ end target = File.expand_path(arg || target) Dir.chdir target + adhearsion_config = File.join('config', 'adhearsion.yml') + CONFIG = File.readable?(adhearsion_config) ? YAML.load_file(adhearsion_config) : {} + + require 'logging' + register_logger StandardLogger.new(STDOUT) + register_logger StandardLogger.new('logs/adhearsion.log') puts %{\nStarting Adhearsion v#{ADHEARSION_VERSION} Written by Jay Phillips of Codemecca LLC, et al. http://adhearsion.com\n\n} @@ -154,9 +156,10 @@ $: << 'config' require 'adhearsion' require 'database' if CONFIG['enable_database'] require 'servlet_container' + require "constants" # Load appropriate helpers $HELPERS = {} Contexts::Container.new.run_inside do # Start with compiled helpers