awestruct 0.5.7.RC2 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6bd8ffa639608665b03402fe19c453dd79f9fc9
-  data.tar.gz: 9de33bc224111e00dc785563af42799ec25028c2
+  metadata.gz: 24c840fbe2701d3bc0b3d4d123511d086c984959
+  data.tar.gz: ef9ff0655b1c9c8641b59a9b97900de62b40f8c8
 SHA512:
-  metadata.gz: e664a8badfbbb367e90e8681ca57333ba544ffe6d7febccfd75f442687caa870b543be38ce098972b1c781c78df8e9cc56ecf3dbab49d65e5ba92ed4cb527214
-  data.tar.gz: 2d2b7a6c6610f629739fbcffdabb477c8d1eb3879c0522a760612350c6b8f1bc52e1aba1970a38db04b62c55098f42fee092ff987e545a6edf0bca27fbdb9af3
+  metadata.gz: d9bcb190ec4213a565778883fe1bc9ae656439ae27ae096cf6185bd48e5b5f9b6c0e8ece38767d543242c5625e22915cbe3e1a30a7e29dde46312f0fce413859
+  data.tar.gz: 3444c4427e1101927cc7cd7e9bdaf193dac163bf8ed52a7ef264aad4b809d93c07ca9b5ba8e5111374f5d0a34665031627b41ede42a77f4a0eb2e876da0c86f1

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2015-10-19'
+  s.date          = '2016-02-09'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']
@@ -42,8 +42,10 @@ Compass and sass are no longer hard dependencies. You'll need too add them on yo
   s.add_dependency 'listen', '>= 2.7.1', '<= 4.0'
   s.add_dependency 'rack', '~> 1.5', '>= 1.5.2'
   s.add_dependency 'git', '~> 1.2', '>= 1.2.6'
+  s.add_dependency 'guard', '~> 2.13', '>= 2.13.0'
   s.add_dependency 'guard-livereload', '~> 2.1', '>= 2.1.2'
-  s.add_dependency 'colorize', '~> 0.7', '>= 0.7.1'
+  # s.add_dependency 'colorize', '~> 0.7', '>= 0.7.1'
+  s.add_dependency 'logging', '~> 2.0'
   s.add_dependency 'oga', '~> 1.3'
   s.add_dependency 'parallel', '~> 1.1', '> 1.1.1'
 

data/lib/awestruct/cli/auto.rb

@@ -1,6 +1,7 @@
 require 'awestruct/util/exception_helper'
 
 require 'listen'
+require 'guard'
 require 'guard/livereload'
 
 module Awestruct

data/lib/awestruct/cli/generate.rb

@@ -18,7 +18,9 @@ module Awestruct
         begin
           base_url = @base_url || @default_base_url
           $LOG.info "Generating site: #{base_url}" if $LOG.info?
+          start_time = DateTime.now
           @engine.run( @profile, @base_url, @default_base_url, @force, @generate )
+          $LOG.trace "Total time in engine.run #{DateTime.now.to_time - start_time.to_time} seconds"
         rescue =>e
           ExceptionHelper.log_building_error e, ''
           return false

data/lib/awestruct/cli/init.rb

@@ -37,8 +37,13 @@ module Awestruct
           when 'foundation'
             lib = 'zurb-foundation'
         end
-        require lib unless lib.nil?
-        manifest.install_compass(@framework) unless lib.nil?
+        unless lib.nil?
+          require 'sass/callbacks'
+          require 'compass'
+          require 'compass/commands'
+          require lib
+          manifest.install_compass(@framework, lib)
+        end
         if (@scaffold)
           manifest.copy_file('_config/site.yml', framework_path('base_site.yml'), :overwrite => true)
           manifest.copy_file('_layouts/base.html.haml', framework_path('base_layout.html.haml', scaffold_name))

data/lib/awestruct/cli/invoker.rb

@@ -1,6 +1,5 @@
 require 'pathname'
-require 'logger'
-require 'awestruct/logger'
+require 'logging'
 require 'awestruct/cli/options'
 require 'awestruct/util/exception_helper'
 require 'erb'
@@ -17,7 +16,7 @@ module Awestruct
 
       def initialize(*options)
         options = options.flatten
-        if ( ( ! options.empty? ) && ( options.first === Awestruct::CLI::Options ) )
+        if (!options.empty?) && (options.first === Awestruct::CLI::Options)
           @options = options.first
         else
           @options = Awestruct::CLI::Options.parse! options
@@ -25,11 +24,36 @@ module Awestruct
         @threads = []
         @profile = nil
         @success = true
-        logging_path = Pathname.new '.awestruct'
-        logging_path.mkdir unless logging_path.exist?
-        $LOG = Logger.new(Awestruct::AwestructLoggerMultiIO.new(@options.debug, STDOUT, File.open('.awestruct/debug.log', 'w')))
-        $LOG.level = @options.debug ? Logger::DEBUG : Logger::INFO
-        $LOG.formatter = Awestruct::AwestructLogFormatter.new
+        logging_path = Pathname.new File.join(@options.source_dir, '.awestruct')
+        logging_path.mkpath unless logging_path.exist?
+
+        Logging.init :trace, :debug, :verbose, :info, :warn, :error, :fatal
+        $LOG = Logging.logger.new 'awestruct'
+        $LOG.add_appenders(
+                Logging.appenders.stdout({level: (@options.verbose ? :verbose : :info),
+                                          layout: Logging.layouts.pattern(pattern: "%m\n", format_as: :string),
+                                          color_scheme: :default}),
+                Logging.appenders.file('error', {filename: File.join(logging_path, 'error.log'),
+                                                 layout: Logging.layouts.parseable.json(format_as: :string),
+                                                 truncate: true, level: :error})
+        )
+
+        if @options.debug
+          $LOG.add_appenders(
+              Logging.appenders.file('debug', {filename: File.join(logging_path, 'debug.log'),
+                                               layout: Logging.layouts.parseable.json(format_as: :string),
+                                               truncate: true, level: :debug})
+          )
+        end
+
+        if @options.perf_log
+          $LOG.add_appenders(
+              Logging.appenders.file('perf', {filename: File.join(logging_path, 'perf.log'),
+                                              truncate: true, level: :trace,
+                                              layout: Logging.layouts.parseable.json(format_as: :string),
+                                              filters: Logging::Filters::Level.new(:trace)})
+          )
+        end
 
         # these requires are deferred until after $LOG is set
         require 'awestruct/cli/init'

data/lib/awestruct/cli/manifest.rb

@@ -43,8 +43,8 @@ module Awestruct
         steps << AddRequires.new(path, libs)
       end
 
-      def install_compass(framework)
-        steps << InstallCompass.new(framework)
+      def install_compass(framework, lib)
+        steps << InstallCompass.new(framework, lib)
       end
 
       def perform(dir)
@@ -236,7 +236,7 @@ module Awestruct
           rendered = ERB.new(File.read(@input_path), nil, '<>').result(
             OpenStruct.new(@state).instance_eval { binding })
           rescue => e
-            puts "::DEBUG:: #{e.message} state - #{@state}"
+            $LOG.debug "::DEBUG:: #{e.message} state - #{@state}"
           end
 
           p = File.join(dir, @path)
@@ -250,15 +250,12 @@ module Awestruct
       end
 
       class InstallCompass
-        def initialize(framework='compass')
+        def initialize(framework='compass', lib)
           @framework = framework
+          @lib = lib
         end
 
         def perform(dir)
-          require 'sass/callbacks'
-          require 'compass'
-          require 'compass/commands'
-
           ::Compass.configuration.sass_dir = 'stylesheets'
           ::Compass.configuration.css_dir = '_site/stylesheets'
           ::Compass.configuration.images_dir = 'images'

data/lib/awestruct/cli/options.rb

@@ -31,31 +31,39 @@ module Awestruct
       attr_accessor :livereload
       attr_accessor :debug
       attr_accessor :generate_on_access
-
-      def initialize()
-        @generate   = nil
-        @server     = false
-        @port       = DEFAULT_PORT
-        @bind_addr  = DEFAULT_BIND_ADDR
-        @auto       = false
-        @force      = false
-        @init       = false
-        @framework  = 'compass'
-        @scaffold   = true
-        @base_url   = DEFAULT_BASE_URL
-        @profile    = nil
-        @deploy     = false
-        @script     = nil
-        @verbose    = false
-        @quiet      = false
-        @livereload = false
-        @source_dir = Dir.pwd
-        @output_dir = File.expand_path '_site'
-        @generate_on_access = DEFAULT_GENERATE_ON_ACCESS
+      attr_accessor :perf_log
+
+      def initialize(opts = {})
+        default_opts = { server: false, port: DEFAULT_PORT, bind_addr: DEFAULT_BIND_ADDR, auto: false, force: false,
+                         init: false, framework: 'compass', scaffold: true, base_url: DEFAULT_BASE_URL, deploy: false,
+                         verbose: false, quiet: false, livereload: false, source_dir: Dir.pwd,
+                         output_dir: File.expand_path('_site'), generate_on_access: DEFAULT_GENERATE_ON_ACCESS,
+                         perf_log: false
+                       }.merge opts
+        @generate   = default_opts[:generate]
+        @server     = default_opts[:server]
+        @port       = default_opts[:port]
+        @bind_addr  = default_opts[:bind_addr]
+        @auto       = default_opts[:auto]
+        @force      = default_opts[:force]
+        @init       = default_opts[:init]
+        @framework  = default_opts[:framework]
+        @scaffold   = default_opts[:scaffold]
+        @base_url   = default_opts[:base_url]
+        @profile    = default_opts[:profile]
+        @deploy     = default_opts[:deploy]
+        @script     = default_opts[:script]
+        @verbose    = default_opts[:verbose]
+        @quiet      = default_opts[:quiet]
+        @livereload = default_opts[:livereload]
+        @source_dir = default_opts[:source_dir]
+        @output_dir = default_opts[:output_dir]
+        @generate_on_access = default_opts[:generate_on_access]
+        @perf_log = default_opts[:perf_log]
       end
 
       def self.parse!(args)
-        Options.new.parse! args
+        Options.new({output_dir: nil}).parse! args
       end
 
       def parse!(args)
@@ -130,15 +138,18 @@ module Awestruct
           #opts.on( '--run SCRIPT', 'Invoke a script after initialization' ) do |script|
           #  self.script = script
           #end
-          opts.on( '--source-dir DIR', 'Location of sources (default: .' ) do |source_dir|
+          opts.on( '--source-dir DIR', 'Location of sources (default: .)' ) do |source_dir|
             self.source_dir = File.expand_path source_dir
-            self.output_dir = File.expand_path File.join(self.source_dir, '_site')
           end
 
-          opts.on( '--output-dir DIR', 'Location to output generated site (default: _site' ) do |output_dir|
+          opts.on( '--output-dir DIR', 'Location to output generated site (default: _site)' ) do |output_dir|
             self.output_dir = File.expand_path output_dir
           end
 
+          opts.on('--perf', 'Enable performance logging to .awestruct/perf.log') do
+            self.perf_log = true
+          end
+
           opts.separator ''
           opts.separator "Common options:"
 
@@ -157,6 +168,7 @@ module Awestruct
         opts.parse!(args)
         self.port ||= DEFAULT_PORT
         self.base_url = %(http://#{self.bind_addr}:#{self.port}) if self.base_url === DEFAULT_BASE_URL
+        self.output_dir ||= File.expand_path(File.join(self.source_dir, '_site'))
 
         self.generate = true if self.generate.nil?
         self

data/lib/awestruct/cli/server.rb

@@ -20,12 +20,12 @@ module Awestruct
 
       def run
         unless port_open? @bind_addr, @port
-          $LOG.error "#{@bind_addr}:#{@port} not available for server" if $LOG.error?
+          $LOG.error "#{@bind_addr}:#{@port} not available for server"
           abort
         end
         url = %(http://#{@bind_addr}:#{@port})
         msg = %(Starting preview server at #{url} (Press Ctrl-C to shutdown))
-        $LOG.info %(#{'*' * msg.length}\n#{msg}\n#{'*' * msg.length}\n) if $LOG.info?
+        $LOG.info %(#{'*' * msg.length}\n#{msg}\n#{'*' * msg.length}\n)
 
         path = @path
         generate_on_access = @generate_on_access

data/lib/awestruct/config.rb

@@ -23,11 +23,11 @@ module Awestruct
     attr_accessor :options
 
     def initialize(opts = Awestruct::CLI::Options.new)
-      @dir             = Pathname.new( opts.source_dir )
+      @dir             = Pathname.new(File.expand_path(Pathname.new( opts.source_dir )))
       @layouts_dir     = Pathname.new( File.join(@dir, '_layouts') )
       @config_dir      = Pathname.new( File.join(@dir, '_config') )
       @input_dir       = @dir
-      @output_dir      = Pathname.new( opts.output_dir )
+      @output_dir      = Pathname.new(File.expand_path(Pathname.new( opts.output_dir )))
       @extension_dir   = Pathname.new( File.join(@dir, '_ext') )
       @skin_dir        = Pathname.new( File.join(@dir, '_skin') )
       @tmp_dir         = Pathname.new( File.join(@dir, '_tmp') )

data/lib/awestruct/deploy/base_deploy.rb

@@ -46,11 +46,11 @@ module Awestruct
       end
 
       def publish_site
-        $LOG.error( "#{self.class.name}#publish_site not implemented." ) if $LOG.error?
+        $LOG.error( "#{self.class.name}#publish_site not implemented." )
       end
 
       def existing_changes
-        $LOG.error UNCOMMITTED_CHANGES if $LOG.error?
+        $LOG.error UNCOMMITTED_CHANGES
       end
 
       def compress_site

data/lib/awestruct/engine.rb

@@ -53,42 +53,75 @@ module Awestruct
     end
 
     def run(profile, base_url, default_base_url, force=false, generate=true)
-      $LOG.debug 'adjust_load_path' if $LOG.debug?
+      start_time = DateTime.now
+      $LOG.verbose 'adjust_load_path'
       adjust_load_path
-      $LOG.debug 'load_default_site_yaml' if $LOG.debug?
+      $LOG.trace "Total time in adjust_load_path: #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'load_default_site_yaml'
+      start_time = DateTime.now
       load_default_site_yaml( profile )
-      $LOG.debug 'load_user_site_yaml -- profile' if $LOG.debug?
+      $LOG.trace "Total time in load_default_site_yaml #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'load_user_site_yaml -- profile'
+      start_time = DateTime.now
       load_user_site_yaml( profile )
-      $LOG.debug 'set_base_url' if $LOG.debug?
+      $LOG.trace "Total time in load_user_site_yaml #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'set_base_url'
+      start_time = DateTime.now
       set_base_url( base_url, default_base_url )
-      $LOG.debug 'load_yamls' if $LOG.debug?
+      $LOG.trace "Total time in set_base_url #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'load_yamls'
+      start_time = DateTime.now
       load_yamls
-      $LOG.debug 'load_pipeline' if $LOG.debug?
+      $LOG.trace "Total time in load_yamls #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'load_pipeline'
+      start_time = DateTime.now
       load_pipeline
-      $LOG.debug 'load_pages' if $LOG.debug?
+      $LOG.trace "Total time in load_pipeline #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'load_pages'
+      start_time = DateTime.now
       load_pages
-      $LOG.debug 'execute_pipeline' if $LOG.debug?
-      $LOG.info 'Excecuting pipeline...' if $LOG.info?
+      $LOG.trace "Total time in load_pages #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'execute_pipeline'
+      $LOG.info 'Excecuting pipeline...'
+      start_time = DateTime.now
       execute_pipeline(false)
+      $LOG.trace "Total time in execute_pipeline #{DateTime.now.to_time - start_time.to_time} seconds"
+
       begin
         if defined?(::Compass)
-          $LOG.debug 'configure_compass' if $LOG.debug?
+          $LOG.verbose 'configure_compass'
+          start_time = DateTime.now
           configure_compass
+          $LOG.trace "Total time in configure_compass #{DateTime.now.to_time - start_time.to_time} seconds"
         end
       rescue LoadError
         # doesn't matter if we can't load it
       end
-      $LOG.debug 'set_urls' if $LOG.debug?
+      $LOG.verbose 'set_urls'
+      start_time = DateTime.now
       set_urls( site.pages )
-      $LOG.debug 'build_page_index' if $LOG.debug?
+      $LOG.trace "Total time in set_urls #{DateTime.now.to_time - start_time.to_time} seconds"
+
+      $LOG.verbose 'build_page_index'
+      start_time = DateTime.now
       build_page_index
+      $LOG.trace "Total time in build_page_index #{DateTime.now.to_time - start_time.to_time} seconds"
 
-      if ( generate )
-        $LOG.debug 'generate_output' if $LOG.debug?
-        $LOG.info 'Generating pages...' if $LOG.info?
+      if generate
+        $LOG.debug 'generate_output'
+        $LOG.info 'Generating pages...'
+        start_time = DateTime.now
         generate_output
+        $LOG.trace "Total time in generate_output #{DateTime.now.to_time - start_time.to_time} seconds"
       end
-      return Awestruct::ExceptionHelper::EXITCODES[:success]
+      Awestruct::ExceptionHelper::EXITCODES[:success]
     end
 
     def build_page_index
@@ -97,7 +130,7 @@ module Awestruct
       site.pages.each do |p|
         # Add the layout to the set of dependencies
         p.dependencies.add_dependency(site.layouts.find_matching(p.layout, p.output_extension))
-        if ( p.relative_source_path )
+        if p.relative_source_path
           site.pages_by_relative_source_path[ p.relative_source_path ] = p
         end
         site.pages_by_output_path[ p.output_path ] = p
@@ -106,23 +139,23 @@ module Awestruct
         # Add the layout to the set of dependencies
         p.dependencies.add_dependency(site.layouts.find_matching(p.layout, p.output_extension))
 
-        if ( p.relative_source_path )
+        if p.relative_source_path
           site.pages_by_relative_source_path[ p.relative_source_path ] = p
         end
       end
     end
 
     def set_base_url(base_url, default_base_url)
-      if ( base_url )
+      if base_url
         site.base_url = base_url
       end
 
-      if ( site.base_url.nil? )
+      if site.base_url.nil?
         site.base_url = default_base_url
       end
 
-      if ( site.base_url )
-        if ( site.base_url =~ /^(.*)\/$/ )
+      if site.base_url
+        if site.base_url =~ /^(.*)\/$/
           site.base_url = $1
         end
       end
@@ -146,15 +179,15 @@ module Awestruct
     end
 
     def load_site_yaml(yaml_path, profile = nil)
-      if ( File.exist?( yaml_path ) )
+      if File.exist?(yaml_path)
         begin
           data = YAML.load( ERB.new(File.read( yaml_path, :encoding => 'bom|utf-8' )).result )
-          if ( profile )
+          if profile
             # JP: Interpolation now turned off by default, turn it per page if needed
             site.interpolate = false
             profile_data = {}
             data.each do |k,v|
-              if ( ( k == 'profiles' ) && ( ! profile.nil? ) )
+              if (k == 'profiles') && (!profile.nil?)
                 profile_data = ( v[profile] || {} )
               else
                 site.send( "#{k}=", merge_data( site.send( "#{k}" ), v ) )
@@ -227,21 +260,21 @@ module Awestruct
 
     def adjust_load_path
       ext_dir = File.join( site.config.extension_dir )
-      if ( $LOAD_PATH.index( ext_dir ).nil? )
+      if $LOAD_PATH.index(ext_dir).nil?
         $LOAD_PATH << ext_dir
       end
     end
 
     def set_urls(pages)
       pages.each do |page|
-        $LOG.debug "relative_source_path #{page.relative_source_path}" if $LOG.debug?
+        $LOG.debug "relative_source_path #{page.relative_source_path}"
         page_path = page.output_path
-        if ( page_path =~ /^\// )
+        if page_path =~ /^\//
           page.url = page_path
         else
           page.url = "/#{page_path}"
         end
-        if ( page.url =~ /^(.*\/)index.html$/ )
+        if page.url =~ /^(.*\/)index.html$/
           page.url = $1
         end
       end
@@ -250,7 +283,7 @@ module Awestruct
     def load_pipeline
       ext_dir = File.join( site.config.extension_dir )
       pipeline_file = File.join( ext_dir, 'pipeline.rb' )
-      if ( File.exists?( pipeline_file ) )
+      if File.exists?(pipeline_file)
         p = eval(File.read( pipeline_file ), nil, pipeline_file, 1)
         p.before_all_extensions.each do |e|
           pipeline.add_before_extension( e )
@@ -346,7 +379,7 @@ module Awestruct
       end
 
       compass_config_file = File.join(site.config.config_dir, 'compass.rb')
-      if (File.exists? compass_config_file)
+      if File.exists? compass_config_file
         ::Compass.add_configuration ::Compass::Configuration::FileData.new_from_file(compass_config_file) 
       end 
       ::Compass.configuration # return for use elsewhere
@@ -355,9 +388,9 @@ module Awestruct
     end
 
     def load_pages
-      $LOG.debug "layout_page_loader.load_all :post" if $LOG.debug?
+      $LOG.debug "layout_page_loader.load_all :post"
       @layout_page_loader.load_all( :post )
-      $LOG.debug "site_page_loader.load_all :inline" if $LOG.debug?
+      $LOG.debug "site_page_loader.load_all :inline"
       @site_page_loader.load_all( :inline )
     end
 
@@ -366,9 +399,14 @@ module Awestruct
       return_value = [Awestruct::ExceptionHelper::EXITCODES[:success]]
       begin
         return_value = Parallel.map(@site.pages, site.generation) do |page|
-          generate_page( page )
+          start_time = DateTime.now
+          return_value = generate_page( page )
+          $LOG.trace "Total time generating #{page.output_path} #{DateTime.now.to_time - start_time.to_time} seconds" if site.config.verbose
+
+          return_value
         end
       rescue Exception => e
+        Awestruct::ExceptionHelper.log_error e
         return_value = [Awestruct::ExceptionHelper::EXITCODES[:generation_error]]
       end
 
@@ -380,24 +418,31 @@ module Awestruct
     end
 
     def generate_page(page, produce_output=true)
-      if ( produce_output )
-        $LOG.debug "Generating: #{generated_path}" if $LOG.debug? && config.verbose
+      if produce_output
+        generated_path = File.join( site.config.output_dir, page.output_path )
+        $LOG.debug "Generating: #{generated_path}" if config.verbose
 
-        c = page.rendered_content
-        c = site.engine.pipeline.apply_transformers( site, page, c )
+        c = ''
+        begin
+          c = page.rendered_content
+          c = site.engine.pipeline.apply_transformers( site, page, c )
 
-        generated_path = File.join( site.config.output_dir, page.output_path )
-        FileUtils.mkdir_p( File.dirname( generated_path ) )
+          FileUtils.mkdir_p( File.dirname( generated_path ) )
 
-        File.open( generated_path, 'wb' ) do |file|
-          file << c
+          File.open( generated_path, 'wb' ) do |file|
+            file << c
+          end
+        rescue Exception => e
+          Awestruct::ExceptionHelper.log_building_error e, page.relative_source_path
+        ensure
+          return Awestruct::ExceptionHelper::EXITCODES[:generation_error] if c.include? 'Backtrace:'
         end
-        return Awestruct::ExceptionHelper::EXITCODES[:generation_error] if c.include? 'Backtrace:'
-      elsif ( site.config.track_dependencies )
+        Awestruct::ExceptionHelper::EXITCODES[:success]
+      elsif site.config.track_dependencies
         if page.dependencies.load!
-          $LOG.debug "Cached:     #{generated_path}" if $LOG.debug?
+          $LOG.debug "Cached:     #{generated_path}"
         else
-          $LOG.debug "Analyzing:  #{generated_path}" if $LOG.debug?
+          $LOG.debug "Analyzing:  #{generated_path}"
           page.rendered_content
         end
         return Awestruct::ExceptionHelper::EXITCODES[:success]
@@ -406,9 +451,9 @@ module Awestruct
 
     # path - relative to output dir
     def page_by_source_path(path)
-      if (path.include? '_layout')
+      if path.include? '_layout'
         site.layouts.find { |p| p.source_path.to_s.include? path }
-      elsif (path.include? '_partial')
+      elsif path.include? '_partial'
         site.partials.find { |p| p.source_path.to_s.include? path }
       else
         site.pages.find { |p| p.source_path.to_s.include? path }
@@ -427,10 +472,10 @@ module Awestruct
 
       regen_pages = page_dependencies( page )
 
-      $LOG.debug "Starting regeneration of content dependent pages:" if regen_pages.size > 0 && $LOG.debug?
+      $LOG.debug 'Starting regeneration of content dependent pages:' if regen_pages.size > 0
 
       regen_pages.each do |p|
-        $LOG.info "Regenerating page #{p.output_path}" if $LOG.info?
+        $LOG.info "Regenerating page #{p.output_path}"
         generate_page_internal(p)
       end
 
@@ -465,7 +510,7 @@ module Awestruct
       load_pipeline
       execute_pipeline(true)
 
-      if ( generate )
+      if generate
         site.pages.each do |p|
           generate_page_internal(p)
         end
@@ -474,7 +519,7 @@ module Awestruct
     end
 
     def generate_page_internal(p)
-      unless ( p.output_path.nil? || p.__is_layout || !p.stale_output?(p.output_path) )
+      unless p.output_path.nil? || p.__is_layout || !p.stale_output?(p.output_path)
         generate_page( p )
       end
     end
@@ -485,7 +530,7 @@ module Awestruct
 
     def load_page(path, options={})
       page = @site_page_loader.load_page( path )
-      if ( options[:relative_path] )
+      if options[:relative_path]
         fixed_relative_path = ( options[:relative_path].nil? ? nil : File.join( '', options[:relative_path] ) )
         page.relative_path = fixed_relative_path
       end
@@ -493,7 +538,11 @@ module Awestruct
     end
 
     def load_site_page(relative_path)
-      load_page( File.join( site.config.dir, relative_path ) )
+      if Pathname.new(relative_path).absolute?
+        load_page( relative_path )
+      else
+        load_page( Pathname.new(File.join(site.config.dir, relative_path)) )
+      end
     end
 
     def find_and_load_site_page(simple_path)