@@ -2,5 +2,4 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..') require 'rubygems' require File.dirname(__FILE__) + "/../lib/aerial/installer" - Aerial::Installer.start bin/aerial @@ -1,6 +1,7 @@ libdir = File.dirname(__FILE__) $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir) AERIAL_ROOT = File.join(File.dirname(__FILE__), '..') unless defined? AERIAL_ROOT +CONFIG = YAML.load_file( File.join(AERIAL_ROOT, 'config', 'config.yml') ) unless defined?(CONFIG) # System requirements require 'rubygems' @@ -11,16 +12,40 @@ require 'haml' require 'sass' require 'rdiscount' require 'aerial/base' -require "aerial/app" +require 'aerial/content' +require 'aerial/article' +require 'aerial/comment' +require 'aerial/vendor/cache' +require 'aerial/vendor/akismetor' +require 'aerial/config' +require 'aerial/app' module Aerial - def self.new(config=nil) + # Make sure git is added to the env path + ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin" + VERSION = '0.1.0' + + class << self + attr_accessor :debug, :logger, :repo, :config + end + + def self.new(root, config_name = nil) + @root ||= root + @logger ||= ::Logger.new(STDOUT) + @debug ||= false + @repo ||= Grit::Repo.new(@root) + config = File.join(root, config_name) + if config.is_a?(String) && File.file?(config) - self.config = YAML.load_file(config) + @config = Aerial::Config.new(YAML.load_file(config)) elsif config.is_a?(Hash) - self.config = config + @config = Aerial::Config.new(config) end end + def self.log(str) + logger.debug { str } if debug + end + end lib/aerial.rb @@ -1,36 +1,10 @@ -CONFIG = YAML.load_file( File.join(AERIAL_ROOT, 'config', 'config.yml') ) unless defined?(CONFIG) - -require 'aerial/content' -require 'aerial/article' -require 'aerial/comment' -require 'aerial/vendor/cache' -require 'aerial/vendor/akismetor' -require 'aerial/config' - module Aerial - VERSION = '0.1.0' - - class << self - attr_accessor :debug, :logger, :repo, :config - - def log(str) - logger.debug { str } if debug - end - end - - # Make sure git is added to the env path - ENV['PATH'] = "#{ENV['PATH']}:/usr/local/bin" - @logger ||= ::Logger.new(STDOUT) - @config ||= Aerial::Config.new(CONFIG) - @repo ||= Grit::Repo.new(File.join(AERIAL_ROOT, '.')) - @debug ||= false - module Helper # Returns the current url def url() request.url end - + # Returns the request host # TODO: just use request.host (http://rack.lighthouseapp.com/projects/22435/tickets/77-requesthost-should-answer-the-forwarded-host) def host lib/aerial/base.rb 8c88bbefd39e6b342c5721511829ea03eb76e9e5 Matt Sears matt@mattsears.com http://github.com/mattsears/aerial/commit/59ecc502cda36102cc4d64be7c96ef3e50204a8b 59ecc502cda36102cc4d64be7c96ef3e50204a8b 2009-10-18T19:57:39-07:00 2009-10-18T19:57:39-07:00 A little house cleaning and removed unnecessary variables 12e430b1bedd9a11c21a109b6a334b2a8748a2fd Matt Sears matt@mattsears.com