awestruct 0.5.4.rc → 0.5.4.rc2

data/lib/awestruct/handlers/front_matter_handler.rb

@@ -1,3 +1,4 @@
+require 'awestruct/util/exception_helper'
 require 'awestruct/handlers/base_handler'
 
 require 'yaml'
@@ -84,9 +85,9 @@ module Awestruct
         end
 
         begin
-          @front_matter = yaml_content.empty? ? {} : (YAML.load yaml_content)
+          @front_matter = yaml_content.empty? ? {} : (YAML.load(yaml_content) || {})
         rescue => e
-          $LOG.error "could not parse #{relative_source_path}" if $LOG.error?
+          ExceptionHelper.log_message "could not parse #{relative_source_path}"
           raise e
         end
 

data/lib/awestruct/handlers/interpolation_handler.rb

@@ -1,4 +1,4 @@
-
+require 'awestruct/util/exception_helper'
 require 'awestruct/handlers/base_handler'
 
 module Awestruct
@@ -23,8 +23,7 @@ module Awestruct
         begin
           c = context.instance_eval( content )
         rescue Exception => e # Don't barf all over ourselves if an exception is thrown
-          $LOG.error "Exception thrown interpolating content. #{e.to_s}" if $LOG.error?
-          $LOG.error e.backtrace.join("\n") if $LOG.error?
+          ExceptionHelper.log_building_error e, relative_source_path
           c = delegate.raw_content
         end
         c

data/lib/awestruct/handlers/restructuredtext_handler.rb

@@ -1,4 +1,4 @@
-
+require 'awestruct/util/exception_helper'
 require 'awestruct/handler_chain'
 require 'awestruct/handlers/base_handler'
 require 'awestruct/handlers/file_handler'
@@ -47,7 +47,6 @@ module Awestruct
         if front_matter['initial_header_level'].to_s =~ /^[1-6]$/
           hl = front_matter['initial_header_level']
         end
-        rendered = ''
         begin
           doc = execute_shell( [ "rst2html",
                                  "--strip-comments",
@@ -55,12 +54,11 @@ module Awestruct
                                  " --initial-header-level=#{hl}" ].join(' '), 
                                  content )
           content = Nokogiri::HTML( doc ).at( '/html/body/div[@class="document"]' ).inner_html.strip
-          content = content.gsub( "\r", '' )
+          content.gsub( "\r", '' )
         rescue => e
-          $LOG.error e if $LOG.error?
-          $LOG.error e.backtrace.join( "\n" ) if $LOG.error?
+          ExceptionHelper.log_building_error e, relative_source_path
+          ExceptionHelper.html_error_report e, relative_source_path
         end
-        content
       end
     end
   end

data/lib/awestruct/page.rb

@@ -42,8 +42,9 @@ module Awestruct
     end
 
     def inherit_front_matter_from(hash)
+      $LOG.debug "inherit_front_matter_from for #{self.inspect}"  if $LOG.debug?
       hash.each do |k,v|
-        $LOG.debug "#{self.output_path} overwrite key: #{k}:#{self[k]} -> #{v}" if ( key?( k ) and !self[k].nil? and !self[k].eql? v) if $LOG.debug?
+        $LOG.debug "#{output_path} overwrite key: #{k}:#{self[k]} -> #{v}" if ( key?( k ) and !self[k].nil? and !self[k].eql? v) if $LOG.debug?
         unless ( key?( k ) )
           self[k.to_sym] = v
         end

data/lib/awestruct/util/exception_helper.rb

@@ -0,0 +1,29 @@
+module Awestruct
+  class ExceptionHelper
+    def self.log_message message
+      $LOG.error message if $LOG.error
+    end
+
+    def self.log_error exception
+      $LOG.error "An error occurred: #{exception.message}" if $LOG.error
+    end
+
+    def self.log_backtrace exception
+      $LOG.error "#{exception.backtrace.join("\n")}" if $LOG.error
+    end
+    
+    def self.log_building_error exception, relative_source_path
+      $LOG.error "While processing file #{relative_source_path}"
+      self.log_error exception
+      self.log_backtrace exception
+    end
+
+    def self.html_error_report exception, relative_source_path
+"<h1>#{exception.message}</h1>
+<h2>Rendering file #{relative_source_path} resulted in a failure.</h2>
+<p>Line: #{(exception.respond_to? :line) ? exception.line : 'unknown'}</p>
+<p>Backtrace:</p>
+<pre>#{exception.backtrace.join "\n"}</pre>"
+   end
+  end
+end

data/lib/awestruct/version.rb

@@ -1,4 +1,3 @@
-
 module Awestruct
-  VERSION='0.5.4.rc'
+  VERSION = '0.5.4.rc2'
 end

data/man/awestruct.adoc

@@ -0,0 +1,135 @@
+awestruct(1)
+============
+:doctype: manpage
+
+
+NAME
+----
+awestruct - generates a static HTML site from templates in the current project
+
+
+SYNOPSIS
+--------
+*awestruct* ['OPTION']...
+
+
+DESCRIPTION
+-----------
+The awestruct(1) command generates a static HTML site for the current project.
+Awestruct recognizes a variety of templates supported by the Ruby ecosystem, many of which are handled by Tilt.
+
+This command must be run from the root of the project.
+
+
+OPTIONS
+-------
+
+Project Setup
+~~~~~~~~~~~~~
+
+*-i, --init*::
+   Initialize a new project in the 'current' directory.
+
+*-f, --framework*='FRAMEWORK'::
+   Specify a Compass framework during initialization to use in the project. ('bootstrap', 'foundation', 'blueprint', '960')
+
+*--[no-]scaffold*::
+   Create scaffolding during initialization. (default: true)
+
+Site Generation / Preview
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*-d, --dev*::
+   Run in development mode. (implies *--auto*, *--server*, *--port 4242* and *--profile development*)
+
+*--auto*::
+   Auto-generate files whenever changes are noticed.
+
+*-p, --port*='PORT'::
+   The server port to use when running a local server. (default: 4242)
+
+*-b, --bind*='BIND'::
+   The server address to use when running a local server. (default: 0.0.0.0)
+
+*-g, --[no-]generate*::
+   Generate the site.
+
+*-P, --profile*='PROFILE'::
+   Activate a configuration profile.
+
+*--force*::
+   Force a regeneration of all files.
+
+*-s, --server*::
+   Serve the generated site from an embedded server.
+
+*-u, --url*='URL'::
+   Set the site.base_url property.
+
+*--output-dir*='DIR'::
+    The location of the output directory. Defaults to './_site'. Must either be absolute or relative to the current directory.
+
+*--source-dir*='DIR'::
+    The location of the director containing (or will contain) site sources. Defaults to the current directory. Must either be absolute or relative to the current directory.
+
+////
+*--run*='SCRIPT'::
+   Run a script before regenerating the site.
+////
+
+Site Deployment
+~~~~~~~~~~~~~~~
+
+*--deploy*::
+   Deploy the site.
+
+Processing Information
+~~~~~~~~~~~~~~~~~~~~~~
+
+*-w, --verbose*::
+    Verbosely print processing information and configuration file checks to STDERR.
+
+Program Information
+~~~~~~~~~~~~~~~~~~~
+
+*-h, --help*::
+    Show the help message.
+
+*-v, --version*::
+    Print program version number.
+
+
+EXIT STATUS
+-----------
+*0*::
+    Success
+
+*1*::
+    Failure (syntax or usage error; configuration error; document processing failure; unexpected error).
+
+
+BUGS
+----
+See the *Awestruct* issue tracker: <**https://github.com/awestruct/awestruct/issues?state=open**>
+
+
+AUTHORS
+-------
+*Awestruct* was created by Bob McWhirter and has received contributions from many other individuals.
+The tool was inspired by Jekyll in the same genre.
+
+RESOURCES
+---------
+Git source repository on GitHub: <**https://github.com/awestruct/awestruct**>
+
+Project web site: <**http://awestruct.org**>
+
+GitHub organization: <**http://github.com/awestruct**>
+
+Mailinglist / forum: <**http://talk.awestruct.org**>
+
+
+COPYING
+-------
+Copyright \(C) Bob McWhirter 2013.
+Free use of this software is granted under the terms of the MIT License.

data/spec/deploy_spec.rb

@@ -44,6 +44,7 @@ describe Awestruct::CLI::Deploy do
 
     deploy_config = mock
     deploy_config.stub(:[]).with('gzip').and_return true
+    deploy_config.stub(:[]).with('gzip_level')
     deploy_config.stub(:[]).with('source_dir').and_return '.'
     deploy_config.stub(:[]).with('scm').and_return nil
     deploy_config.stub(:[]).with('uncommitted').and_return true
@@ -64,16 +65,17 @@ describe Awestruct::CLI::Deploy do
 
     deploy_config = mock
     deploy_config.stub(:[]).with('gzip').and_return true
+    deploy_config.stub(:[]).with('gzip_level')
     deploy_config.stub(:[]).with('source_dir').and_return '.'
     deploy_config.stub(:[]).with('scm').and_return nil
     deploy_config.stub(:[]).with('uncommitted').and_return nil
 
     deployer = Awestruct::Deploy::Base.new(site_config, deploy_config)
-    deployer.should_receive(:gzip_file).with("#{site_dir}/yes.html")
-    deployer.should_receive(:gzip_file).with("#{site_dir}/yes.js")
-    deployer.should_receive(:gzip_file).with("#{site_dir}/subdir/yes.css")
-    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.txt")
-    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.html.gz")
+    deployer.should_receive(:gzip_file).with("#{site_dir}/yes.html", Zlib::BEST_COMPRESSION)
+    deployer.should_receive(:gzip_file).with("#{site_dir}/yes.js", Zlib::BEST_COMPRESSION)
+    deployer.should_receive(:gzip_file).with("#{site_dir}/subdir/yes.css", Zlib::BEST_COMPRESSION)
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.txt", Zlib::BEST_COMPRESSION)
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.html.gz", Zlib::BEST_COMPRESSION)
     deployer.gzip_site(site_dir)
   end
 
@@ -88,6 +90,7 @@ describe Awestruct::CLI::Deploy do
 
     deploy_config = mock
     deploy_config.stub(:[]).with('gzip').and_return true
+    deploy_config.stub(:[]).with('gzip_level')
     deploy_config.stub(:[]).with('source_dir').and_return '.'
     deploy_config.stub(:[]).with('scm').and_return nil
     deploy_config.stub(:[]).with('uncommitted').and_return nil
@@ -96,11 +99,37 @@ describe Awestruct::CLI::Deploy do
     deployer.gzip_site(site_dir)
 
     # Gzip only once
-    deployer.should_not_receive(:gzip_file).with("#{site_dir}/yes.html")
-    deployer.should_not_receive(:gzip_file).with("#{site_dir}/yes.js")
-    deployer.should_not_receive(:gzip_file).with("#{site_dir}/subdir/yes.css")
-    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.txt")
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/yes.html", Zlib::BEST_COMPRESSION)
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/yes.js", Zlib::BEST_COMPRESSION)
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/subdir/yes.css", Zlib::BEST_COMPRESSION)
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.txt", Zlib::BEST_COMPRESSION)
     deployer.gzip_site(site_dir)
   end
 
+  it "should gzip with the compression level" do
+    site_tmp_dir = Dir.mktmpdir("site_dir")
+    site_src_dir = File.join(File.dirname(__FILE__), 'test-data/gzip')
+    FileUtils.cp_r(site_src_dir, site_tmp_dir)
+    site_dir = "#{site_tmp_dir}/gzip"
+
+    site_config = mock
+    site_config.stub(:output_dir).and_return "#{site_dir}"
+
+    deploy_config = mock
+    deploy_config.stub(:[]).with('gzip').and_return true
+    deploy_config.stub(:[]).with('gzip_level').and_return 6
+    deploy_config.stub(:[]).with('source_dir').and_return '.'
+    deploy_config.stub(:[]).with('scm').and_return nil
+    deploy_config.stub(:[]).with('uncommitted').and_return nil
+
+    deployer = Awestruct::Deploy::Base.new(site_config, deploy_config)
+    deployer.should_receive(:gzip_file).with("#{site_dir}/yes.html", 6)
+    deployer.should_receive(:gzip_file).with("#{site_dir}/yes.js", 6)
+    deployer.should_receive(:gzip_file).with("#{site_dir}/subdir/yes.css", 6)
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.txt", 6)
+    deployer.should_not_receive(:gzip_file).with("#{site_dir}/no.html.gz", 6)
+    deployer.gzip_site(site_dir)
+  end
+
+
 end

data/spec/front_matter_handler_spec.rb

@@ -28,6 +28,12 @@ describe Awestruct::Handlers::FrontMatterHandler do
     handler.raw_content.strip.should == 'This is some content'
   end
 
+  it 'should be able to split empty front-matter from content' do
+    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-empty.txt') )
+    handler.front_matter.should == {} 
+    handler.raw_content.strip.should == 'This is some content'
+  end
+
   it 'should be able to split front-matter from content for files without actual front-matter' do
     handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-file-no-front.txt') )
     handler.front_matter.should_not be_nil

data/spec/github_pages_deploy_spec.rb

@@ -11,6 +11,7 @@ describe Awestruct::Deploy::GitHubPagesDeploy do
     @deploy_config.stub(:[]).with('branch').and_return('the-branch')
     @deploy_config.stub(:[]).with('repository').and_return('the-repo')
     @deploy_config.stub(:[]).with('gzip').and_return('false')
+    @deploy_config.stub(:[]).with('gzip_level')
     @deploy_config.stub(:[]).with('scm').and_return('git')
     @deploy_config.stub(:[]).with('source_dir').and_return('.')
     @deploy_config.stub(:[]).with('uncommitted').and_return('false')

data/spec/test-data/.awestruct_ignore

@@ -0,0 +1,2 @@
+Rakefile
+Gemfile

data/spec/test-data/front-matter-empty.txt

@@ -0,0 +1,3 @@
+---
+---
+This is some content

data/spec/textile_handler_spec.rb

@@ -8,6 +8,10 @@ verify_with_span = lambda { |output|
    output.should == "<h3>Test</h3>\n<p>the <span class=\"caps\">WHO</span></p>"
 }
 
+verify_empty = lambda { |output|
+   output.should == ""
+}
+
 theories =
   [
     {
@@ -24,6 +28,13 @@ theories =
       :extension => '.html',
       :matcher => verify_with_span,
       :site_overrides => { :textile => { :no_span_caps => false } }
+    },
+    {
+      :page => "textile-empty-page.textile",
+      :simple_name => "textile-empty-page",
+      :syntax => :textile,
+      :extension => '.html',
+      :matcher => verify_empty
     }
   ]
 

metadata

@@ -1,15 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.4.rc
+  version: 0.5.4.rc2
   prerelease: 6
 platform: ruby
 authors:
-- Bob McWhirter and other contributors
+- Bob McWhirter
+- Jason Porter
+- Lance Ball
+- Dan Allen
+- Torsten Curdt
+- other contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -112,17 +117,33 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 4.0.9
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: '1.25'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -160,17 +181,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -187,240 +208,261 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.5.2
-description: Awestruct is a framework for creating static HTML sites.
-email: bob@mcwhirter.org
+description: Awestruct is a static site baking and publishing tool. It supports an
+  extensive list of both templating and markup languages via Tilt (Haml, Slim, AsciiDoc,
+  Markdown, Sass via Compass, etc), provides mobile-first layout and styling via Bootstrap
+  or Foundation, offers a variety of deployment options (rsync, git, S3), handles
+  site optimizations (minification, compression, cache busting), includes built-in
+  extensions such as blog post management and is highly extensible.
+email:
+- bob@mcwhirter.org
+- lightguard.jp@gmail.com
+- lball@redhat.com
+- dan.j.allen@gmail.com
+- tcurdt@vafer.org
 executables:
 - awestruct
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
-- lib/awestruct/layouts.rb
+- Gemfile
+- LICENSE.txt
+- README.md
+- Rakefile
+- awestruct.gemspec
+- lib/awestruct/astruct.rb
+- lib/awestruct/astruct_mixin.rb
+- lib/awestruct/cli/auto.rb
+- lib/awestruct/cli/deploy.rb
+- lib/awestruct/cli/generate.rb
+- lib/awestruct/cli/init.rb
+- lib/awestruct/cli/invoker.rb
+- lib/awestruct/cli/manifest.rb
+- lib/awestruct/cli/options.rb
+- lib/awestruct/cli/server.rb
+- lib/awestruct/compatibility.rb
 - lib/awestruct/config.rb
-- lib/awestruct/handler_chains.rb
+- lib/awestruct/config/default-site.yml
 - lib/awestruct/context.rb
+- lib/awestruct/context_helper.rb
+- lib/awestruct/dependencies.rb
+- lib/awestruct/deploy/base_deploy.rb
+- lib/awestruct/deploy/github_pages_deploy.rb
+- lib/awestruct/deploy/rsync_deploy.rb
+- lib/awestruct/deploy/s3_deploy.rb
+- lib/awestruct/deployers.rb
+- lib/awestruct/engine.rb
+- lib/awestruct/extensions/assets.rb
+- lib/awestruct/extensions/atomizer.rb
+- lib/awestruct/extensions/cachebuster.rb
+- lib/awestruct/extensions/coffeescripttransform.rb
+- lib/awestruct/extensions/data_dir.rb
+- lib/awestruct/extensions/disqus.rb
+- lib/awestruct/extensions/extend_string.rb
+- lib/awestruct/extensions/flattr.rb
+- lib/awestruct/extensions/google_analytics.rb
+- lib/awestruct/extensions/gsub.rb
+- lib/awestruct/extensions/indexifier.rb
+- lib/awestruct/extensions/intense_debate.rb
+- lib/awestruct/extensions/minify.rb
+- lib/awestruct/extensions/obfuscate.rb
+- lib/awestruct/extensions/paginator.rb
+- lib/awestruct/extensions/partial.rb
+- lib/awestruct/extensions/pipeline.rb
+- lib/awestruct/extensions/posts.rb
+- lib/awestruct/extensions/relative.rb
+- lib/awestruct/extensions/remotePartial.rb
+- lib/awestruct/extensions/sitemap.rb
+- lib/awestruct/extensions/sitemap.xml.haml
+- lib/awestruct/extensions/tag_cloud.html.haml
+- lib/awestruct/extensions/tag_cloud.rb
+- lib/awestruct/extensions/tagger.rb
+- lib/awestruct/extensions/template.atom.haml
 - lib/awestruct/frameworks/960/base_layout.html.haml
+- lib/awestruct/frameworks/base_Gemfile
+- lib/awestruct/frameworks/base_Rakefile
 - lib/awestruct/frameworks/base_awestruct_ignore
 - lib/awestruct/frameworks/base_index.html.haml
 - lib/awestruct/frameworks/base_pipeline.rb
 - lib/awestruct/frameworks/base_site.yml
-- lib/awestruct/frameworks/base_Gemfile
-- lib/awestruct/frameworks/bootstrap/base_layout.html.haml
+- lib/awestruct/frameworks/blueprint/base_layout.html.haml
 - lib/awestruct/frameworks/bootstrap/base_index.html.haml
-- lib/awestruct/frameworks/foundation/base_layout.html.haml
+- lib/awestruct/frameworks/bootstrap/base_layout.html.haml
 - lib/awestruct/frameworks/foundation/base_index.html.haml
+- lib/awestruct/frameworks/foundation/base_layout.html.haml
 - lib/awestruct/frameworks/foundation/humans.txt
-- lib/awestruct/frameworks/blueprint/base_layout.html.haml
-- lib/awestruct/frameworks/base_Rakefile
-- lib/awestruct/rack/app.rb
-- lib/awestruct/astruct.rb
-- lib/awestruct/pipeline.rb
-- lib/awestruct/deploy/base_deploy.rb
-- lib/awestruct/deploy/s3_deploy.rb
-- lib/awestruct/deploy/github_pages_deploy.rb
-- lib/awestruct/deploy/rsync_deploy.rb
-- lib/awestruct/context_helper.rb
+- lib/awestruct/handler_chain.rb
+- lib/awestruct/handler_chains.rb
+- lib/awestruct/handlers/asciidoctor_handler.rb
 - lib/awestruct/handlers/base_handler.rb
-- lib/awestruct/handlers/page_delegating_handler.rb
-- lib/awestruct/handlers/string_handler.rb
+- lib/awestruct/handlers/base_tilt_handler.rb
+- lib/awestruct/handlers/css_tilt_handler.rb
+- lib/awestruct/handlers/file_handler.rb
+- lib/awestruct/handlers/front_matter_handler.rb
 - lib/awestruct/handlers/interpolation_handler.rb
-- lib/awestruct/handlers/verbatim_file_handler.rb
-- lib/awestruct/handlers/restructuredtext_handler.rb
-- lib/awestruct/handlers/no_op_handler.rb
-- lib/awestruct/handlers/tilt_handler.rb
 - lib/awestruct/handlers/javascript_handler.rb
 - lib/awestruct/handlers/layout_handler.rb
-- lib/awestruct/handlers/asciidoctor_handler.rb
-- lib/awestruct/handlers/template/mustache.rb
+- lib/awestruct/handlers/no_op_handler.rb
+- lib/awestruct/handlers/page_delegating_handler.rb
+- lib/awestruct/handlers/redirect_handler.rb
+- lib/awestruct/handlers/restructuredtext_handler.rb
+- lib/awestruct/handlers/string_handler.rb
 - lib/awestruct/handlers/template/asciidoc.rb
-- lib/awestruct/handlers/front_matter_handler.rb
+- lib/awestruct/handlers/template/mustache.rb
+- lib/awestruct/handlers/tilt_handler.rb
+- lib/awestruct/handlers/verbatim_file_handler.rb
 - lib/awestruct/handlers/yaml_handler.rb
-- lib/awestruct/handlers/css_tilt_handler.rb
-- lib/awestruct/handlers/file_handler.rb
-- lib/awestruct/handlers/redirect_handler.rb
-- lib/awestruct/handlers/base_tilt_handler.rb
+- lib/awestruct/layouts.rb
+- lib/awestruct/logger.rb
+- lib/awestruct/page.rb
+- lib/awestruct/page_loader.rb
+- lib/awestruct/pipeline.rb
+- lib/awestruct/rack/app.rb
+- lib/awestruct/scm/git.rb
+- lib/awestruct/site.rb
 - lib/awestruct/util/COPYING
 - lib/awestruct/util/default_inflections.rb
+- lib/awestruct/util/exception_helper.rb
 - lib/awestruct/util/inflector.rb
-- lib/awestruct/config/default-site.yml
-- lib/awestruct/site.rb
-- lib/awestruct/deployers.rb
-- lib/awestruct/scm/git.rb
-- lib/awestruct/astruct_mixin.rb
 - lib/awestruct/version.rb
-- lib/awestruct/page_loader.rb
-- lib/awestruct/handler_chain.rb
-- lib/awestruct/cli/options.rb
-- lib/awestruct/cli/auto.rb
-- lib/awestruct/cli/invoker.rb
-- lib/awestruct/cli/generate.rb
-- lib/awestruct/cli/init.rb
-- lib/awestruct/cli/server.rb
-- lib/awestruct/cli/deploy.rb
-- lib/awestruct/cli/manifest.rb
-- lib/awestruct/extensions/posts.rb
-- lib/awestruct/extensions/tag_cloud.html.haml
-- lib/awestruct/extensions/google_analytics.rb
-- lib/awestruct/extensions/atomizer.rb
-- lib/awestruct/extensions/pipeline.rb
-- lib/awestruct/extensions/indexifier.rb
-- lib/awestruct/extensions/template.atom.haml
-- lib/awestruct/extensions/data_dir.rb
-- lib/awestruct/extensions/sitemap.xml.haml
-- lib/awestruct/extensions/tag_cloud.rb
-- lib/awestruct/extensions/cachebuster.rb
-- lib/awestruct/extensions/relative.rb
-- lib/awestruct/extensions/flattr.rb
-- lib/awestruct/extensions/coffeescripttransform.rb
-- lib/awestruct/extensions/extend_string.rb
-- lib/awestruct/extensions/assets.rb
-- lib/awestruct/extensions/paginator.rb
-- lib/awestruct/extensions/gsub.rb
-- lib/awestruct/extensions/intense_debate.rb
-- lib/awestruct/extensions/tagger.rb
-- lib/awestruct/extensions/disqus.rb
-- lib/awestruct/extensions/partial.rb
-- lib/awestruct/extensions/sitemap.rb
-- lib/awestruct/extensions/obfuscate.rb
-- lib/awestruct/extensions/remotePartial.rb
-- lib/awestruct/extensions/minify.rb
-- lib/awestruct/page.rb
-- lib/awestruct/compatibility.rb
-- lib/awestruct/page.rb.old
-- lib/awestruct/dependencies.rb
-- lib/awestruct/logger.rb
-- lib/awestruct/engine.rb
 - man/awestruct.1
-- spec/yaml_handler_spec.rb
-- spec/mustache_handler_spec.rb
+- man/awestruct.adoc
+- spec/asciidoc_handler_spec.rb
+- spec/astruct_spec.rb
 - spec/awestruct/scm/git_spec.rb
-- spec/options_spec.rb
-- spec/posts_archive_spec.rb
+- spec/coffeescript_handler_spec.rb
+- spec/config_spec.rb
+- spec/context_helper_spec.rb
+- spec/deploy_spec.rb
+- spec/disqus_spec.rb
+- spec/engine_spec.rb
+- spec/erb_handler_spec.rb
+- spec/file_handler_spec.rb
 - spec/front_matter_handler_spec.rb
+- spec/github_pages_deploy_spec.rb
+- spec/haml_handler_spec.rb
+- spec/handler_chain_spec.rb
+- spec/handler_chains_spec.rb
+- spec/interpolation_handler_spec.rb
+- spec/invoker_spec.rb
+- spec/javascript_handler_spec.rb
+- spec/layout_handler_spec.rb
+- spec/layouts_spec.rb
+- spec/less_handler_spec.rb
+- spec/markdown_handler_spec.rb
+- spec/minify_spec.rb
+- spec/mustache_handler_spec.rb
+- spec/options_spec.rb
 - spec/orgmode_handler_spec.rb
-- spec/support/shared_handler_example.rb
-- spec/support/emmet_matchers.rb
-- spec/support/nokogiri_matchers.rb
-- spec/astruct_spec.rb
-- spec/engine_spec.rb
+- spec/page_delegating_handler_spec.rb
+- spec/page_loader_spec.rb
+- spec/page_loader_spec_for_layouts.rb
+- spec/page_spec.rb
+- spec/pipeline_spec.rb
+- spec/posts_archive_spec.rb
+- spec/redirect_handler_spec.rb
 - spec/restructuredtext_handler_spec.rb
 - spec/rsync_deploy_spec.rb
-- spec/coffeescript_handler_spec.rb
-- spec/pipeline_spec.rb
-- spec/page_loader_spec.rb
-- spec/tilt_handler_spec.rb
-- spec/config_spec.rb
+- spec/sass_handler_spec.rb
 - spec/scss_handler_spec.rb
-- spec/page_delegating_handler_spec.rb
-- spec/test-data/page-loader/page-two.html.haml
-- spec/test-data/page-loader/page-one.md
-- spec/test-data/page-loader/page-draft.md
-- spec/test-data/page-loader/_layouts/layout-one.md
-- spec/test-data/page-loader/_layouts/layout-two.html.haml
-- spec/test-data/engine/_config/site.yml
-- spec/test-data/engine/_config/other.yml
+- spec/server_spec.rb
+- spec/slim_handler_spec.rb
+- spec/spec_helper.rb
+- spec/support/emmet_matchers.rb
+- spec/support/nokogiri_matchers.rb
+- spec/support/shared_handler_example.rb
+- spec/test-data/.awestruct_ignore
 - spec/test-data/engine/_config/arbitrary.yml
+- spec/test-data/engine/_config/other.yml
+- spec/test-data/engine/_config/site.yml
+- spec/test-data/front-matter-empty.txt
+- spec/test-data/front-matter-file-no-content.txt
 - spec/test-data/front-matter-file-no-front.txt
-- spec/test-data/front-matter-middle.txt
-- spec/test-data/stylesheets/screen.css
-- spec/test-data/out-of-site/page-three.html.haml
-- spec/test-data/front-matter-looking.txt
-- spec/test-data/subdir/index.html
 - spec/test-data/front-matter-file-utf8.txt
-- spec/test-data/handlers/hello.bogus
-- spec/test-data/handlers/scss-page-include.scss
-- spec/test-data/handlers/haml-layout-two.html.haml
-- spec/test-data/handlers/haml-error.html.haml
-- spec/test-data/handlers/haml-page.xml.haml
-- spec/test-data/handlers/markdown-page.mkd
-- spec/test-data/handlers/outside_relative/git_keep
-- spec/test-data/handlers/asciidoctor_with_front_matter.ad
-- spec/test-data/handlers/slim-page.html.slim
-- spec/test-data/handlers/empty-layout.haml
-- spec/test-data/handlers/mustache-page.html.mustache
-- spec/test-data/handlers/haml-page.atom.haml
-- spec/test-data/handlers/scss-page.scss
-- spec/test-data/handlers/markdown-page.markdown
-- spec/test-data/handlers/less-page-with-import.less
-- spec/test-data/handlers/asciidoc-page.adoc
-- spec/test-data/handlers/slim-page.xml.slim
-- spec/test-data/handlers/asciidoc-page.ad
-- spec/test-data/handlers/haml-with-textile-page.html.haml
-- spec/test-data/handlers/inner-page.html.haml
-- spec/test-data/handlers/mustache-page.xml.mustache
-- spec/test-data/handlers/haml-with-variables.html.haml
+- spec/test-data/front-matter-file.txt
+- spec/test-data/front-matter-looking.txt
+- spec/test-data/front-matter-middle.txt
+- spec/test-data/gzip/no.html.gz
+- spec/test-data/gzip/no.txt
+- spec/test-data/gzip/subdir/yes.css
+- spec/test-data/gzip/yes.html
+- spec/test-data/gzip/yes.js
+- spec/test-data/handlers/asciidoc-page.ad
+- spec/test-data/handlers/asciidoc-page.adoc
 - spec/test-data/handlers/asciidoc-page.asciidoc
-- spec/test-data/handlers/sass-page-include.sass
+- spec/test-data/handlers/asciidoc_with_attributes.ad
+- spec/test-data/handlers/asciidoc_with_interpolation.ad
+- spec/test-data/handlers/asciidoc_without_interpolation.ad
+- spec/test-data/handlers/asciidoctor_with_front_matter.ad
+- spec/test-data/handlers/asciidoctor_with_headers.ad
+- spec/test-data/handlers/coffeescript-page.coffee
+- spec/test-data/handlers/empty-layout.haml
+- spec/test-data/handlers/erb-page.html.erb
+- spec/test-data/handlers/erb-page.xml.erb
+- spec/test-data/handlers/erb-utf-page.html.erb
+- spec/test-data/handlers/haml-error.html.haml
+- spec/test-data/handlers/haml-layout-two.html.haml
+- spec/test-data/handlers/haml-layout.html.haml
+- spec/test-data/handlers/haml-page.atom.haml
 - spec/test-data/handlers/haml-page.html.haml
-- spec/test-data/handlers/slim-page.atom.slim
+- spec/test-data/handlers/haml-page.xml.haml
 - spec/test-data/handlers/haml-with-markdown-page.html.haml
-- spec/test-data/handlers/asciidoctor_with_headers.ad
-- spec/test-data/handlers/restructuredtext-page.rst
-- spec/test-data/handlers/javascript-page.js
-- spec/test-data/handlers/asciidoc_with_interpolation.ad
-- spec/test-data/handlers/slim-with-variables.html.slim
-- spec/test-data/handlers/slim-with-markdown-page.html.slim
+- spec/test-data/handlers/haml-with-textile-page.html.haml
 - spec/test-data/handlers/haml-with-utf.html.haml
+- spec/test-data/handlers/haml-with-variables.html.haml
+- spec/test-data/handlers/hello.bogus
+- spec/test-data/handlers/inner-page.html.haml
+- spec/test-data/handlers/javascript-page.js
 - spec/test-data/handlers/less-page-include.less
-- spec/test-data/handlers/slim-with-utf.html.slim
+- spec/test-data/handlers/less-page-with-import.less
 - spec/test-data/handlers/less-page.less
-- spec/test-data/handlers/redirect-page.redirect
+- spec/test-data/handlers/markdown-page.markdown
 - spec/test-data/handlers/markdown-page.md
-- spec/test-data/handlers/erb-page.html.erb
+- spec/test-data/handlers/markdown-page.mkd
+- spec/test-data/handlers/mustache-page.html.mustache
+- spec/test-data/handlers/mustache-page.xml.mustache
 - spec/test-data/handlers/orgmode-page.org
 - spec/test-data/handlers/outer-layout.html.haml
-- spec/test-data/handlers/asciidoc_without_interpolation.ad
-- spec/test-data/handlers/textile-page.textile
-- spec/test-data/handlers/coffeescript-page.coffee
-- spec/test-data/handlers/erb-utf-page.html.erb
-- spec/test-data/handlers/simple-redirect-page.redirect
-- spec/test-data/handlers/asciidoc_with_attributes.ad
-- spec/test-data/handlers/erb-page.xml.erb
-- spec/test-data/handlers/haml-layout.html.haml
+- spec/test-data/handlers/outside_relative/git_keep
+- spec/test-data/handlers/redirect-page.redirect
+- spec/test-data/handlers/restructuredtext-page.rst
+- spec/test-data/handlers/sass-page-include.sass
 - spec/test-data/handlers/sass-page.sass
+- spec/test-data/handlers/scss-page-include.scss
+- spec/test-data/handlers/scss-page.scss
+- spec/test-data/handlers/simple-redirect-page.redirect
+- spec/test-data/handlers/slim-page.atom.slim
+- spec/test-data/handlers/slim-page.html.slim
+- spec/test-data/handlers/slim-page.xml.slim
+- spec/test-data/handlers/slim-with-markdown-page.html.slim
+- spec/test-data/handlers/slim-with-utf.html.slim
+- spec/test-data/handlers/slim-with-variables.html.slim
+- spec/test-data/handlers/textile-empty-page.textile
+- spec/test-data/handlers/textile-page.textile
 - spec/test-data/images/logo.png
-- spec/test-data/gzip/no.txt
-- spec/test-data/gzip/no.html.gz
-- spec/test-data/gzip/yes.js
-- spec/test-data/gzip/subdir/yes.css
-- spec/test-data/gzip/yes.html
-- spec/test-data/front-matter-file-no-content.txt
-- spec/test-data/simple-file.txt
 - spec/test-data/index.html
-- spec/test-data/simple-data.yaml
-- spec/test-data/front-matter-file.txt
 - spec/test-data/javascript/bootstrap-dropdown.js
-- spec/file_handler_spec.rb
-- spec/interpolation_handler_spec.rb
-- spec/page_loader_spec_for_layouts.rb
-- spec/github_pages_deploy_spec.rb
-- spec/context_helper_spec.rb
-- spec/minify_spec.rb
-- spec/sass_handler_spec.rb
-- spec/disqus_spec.rb
+- spec/test-data/out-of-site/page-three.html.haml
+- spec/test-data/page-loader/_layouts/layout-one.md
+- spec/test-data/page-loader/_layouts/layout-two.html.haml
+- spec/test-data/page-loader/page-draft.md
+- spec/test-data/page-loader/page-one.md
+- spec/test-data/page-loader/page-two.html.haml
+- spec/test-data/simple-data.yaml
+- spec/test-data/simple-file.txt
+- spec/test-data/stylesheets/screen.css
+- spec/test-data/subdir/index.html
 - spec/textile_handler_spec.rb
-- spec/redirect_handler_spec.rb
-- spec/asciidoc_handler_spec.rb
-- spec/handler_chains_spec.rb
-- spec/slim_handler_spec.rb
-- spec/handler_chain_spec.rb
-- spec/javascript_handler_spec.rb
-- spec/server_spec.rb
-- spec/spec_helper.rb
-- spec/erb_handler_spec.rb
-- spec/page_spec.rb
-- spec/less_handler_spec.rb
-- spec/layout_handler_spec.rb
-- spec/haml_handler_spec.rb
-- spec/markdown_handler_spec.rb
-- spec/layouts_spec.rb
-- spec/invoker_spec.rb
-- spec/deploy_spec.rb
+- spec/tilt_handler_spec.rb
+- spec/yaml_handler_spec.rb
 - bin/awestruct
 homepage: http://awestruct.org
 licenses:
 - MIT
 post_install_message: 
-rdoc_options: []
+rdoc_options:
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -431,7 +473,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1858453196806018491
+      hash: -898131793492095079
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -439,137 +481,57 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements:
-- Any markup languages you are using and its dependencies
-- Haml and markdown filters are touchy things. Rdiscount works well if you're running
-  on mri. JRuby should be using haml 4.0.0+ with kramdown
-rubyforge_project: 
+- ! 'Any markup languages you are using and its dependencies.
+
+  Haml and Markdown filters are touchy things. Redcarpet or Rdiscount work well if
+  you''re running on MRI. JRuby should be using haml 4.0.0+ with Kramdown.''
+
+'
+rubyforge_project: awestruct
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: Static site-baking utility
+summary: Static site baking and publishing tool
 test_files:
-- spec/yaml_handler_spec.rb
-- spec/mustache_handler_spec.rb
-- spec/awestruct/scm/git_spec.rb
-- spec/options_spec.rb
-- spec/posts_archive_spec.rb
-- spec/front_matter_handler_spec.rb
-- spec/orgmode_handler_spec.rb
-- spec/support/shared_handler_example.rb
-- spec/support/emmet_matchers.rb
-- spec/support/nokogiri_matchers.rb
+- spec/asciidoc_handler_spec.rb
 - spec/astruct_spec.rb
-- spec/engine_spec.rb
-- spec/restructuredtext_handler_spec.rb
-- spec/rsync_deploy_spec.rb
+- spec/awestruct/scm/git_spec.rb
 - spec/coffeescript_handler_spec.rb
-- spec/pipeline_spec.rb
-- spec/page_loader_spec.rb
-- spec/tilt_handler_spec.rb
 - spec/config_spec.rb
-- spec/scss_handler_spec.rb
-- spec/page_delegating_handler_spec.rb
-- spec/test-data/page-loader/page-two.html.haml
-- spec/test-data/page-loader/page-one.md
-- spec/test-data/page-loader/page-draft.md
-- spec/test-data/page-loader/_layouts/layout-one.md
-- spec/test-data/page-loader/_layouts/layout-two.html.haml
-- spec/test-data/engine/_config/site.yml
-- spec/test-data/engine/_config/other.yml
-- spec/test-data/engine/_config/arbitrary.yml
-- spec/test-data/front-matter-file-no-front.txt
-- spec/test-data/front-matter-middle.txt
-- spec/test-data/stylesheets/screen.css
-- spec/test-data/out-of-site/page-three.html.haml
-- spec/test-data/front-matter-looking.txt
-- spec/test-data/subdir/index.html
-- spec/test-data/front-matter-file-utf8.txt
-- spec/test-data/handlers/hello.bogus
-- spec/test-data/handlers/scss-page-include.scss
-- spec/test-data/handlers/haml-layout-two.html.haml
-- spec/test-data/handlers/haml-error.html.haml
-- spec/test-data/handlers/haml-page.xml.haml
-- spec/test-data/handlers/markdown-page.mkd
-- spec/test-data/handlers/outside_relative/git_keep
-- spec/test-data/handlers/asciidoctor_with_front_matter.ad
-- spec/test-data/handlers/slim-page.html.slim
-- spec/test-data/handlers/empty-layout.haml
-- spec/test-data/handlers/mustache-page.html.mustache
-- spec/test-data/handlers/haml-page.atom.haml
-- spec/test-data/handlers/scss-page.scss
-- spec/test-data/handlers/markdown-page.markdown
-- spec/test-data/handlers/less-page-with-import.less
-- spec/test-data/handlers/asciidoc-page.adoc
-- spec/test-data/handlers/slim-page.xml.slim
-- spec/test-data/handlers/asciidoc-page.ad
-- spec/test-data/handlers/haml-with-textile-page.html.haml
-- spec/test-data/handlers/inner-page.html.haml
-- spec/test-data/handlers/mustache-page.xml.mustache
-- spec/test-data/handlers/haml-with-variables.html.haml
-- spec/test-data/handlers/asciidoc-page.asciidoc
-- spec/test-data/handlers/sass-page-include.sass
-- spec/test-data/handlers/haml-page.html.haml
-- spec/test-data/handlers/slim-page.atom.slim
-- spec/test-data/handlers/haml-with-markdown-page.html.haml
-- spec/test-data/handlers/asciidoctor_with_headers.ad
-- spec/test-data/handlers/restructuredtext-page.rst
-- spec/test-data/handlers/javascript-page.js
-- spec/test-data/handlers/asciidoc_with_interpolation.ad
-- spec/test-data/handlers/slim-with-variables.html.slim
-- spec/test-data/handlers/slim-with-markdown-page.html.slim
-- spec/test-data/handlers/haml-with-utf.html.haml
-- spec/test-data/handlers/less-page-include.less
-- spec/test-data/handlers/slim-with-utf.html.slim
-- spec/test-data/handlers/less-page.less
-- spec/test-data/handlers/redirect-page.redirect
-- spec/test-data/handlers/markdown-page.md
-- spec/test-data/handlers/erb-page.html.erb
-- spec/test-data/handlers/orgmode-page.org
-- spec/test-data/handlers/outer-layout.html.haml
-- spec/test-data/handlers/asciidoc_without_interpolation.ad
-- spec/test-data/handlers/textile-page.textile
-- spec/test-data/handlers/coffeescript-page.coffee
-- spec/test-data/handlers/erb-utf-page.html.erb
-- spec/test-data/handlers/simple-redirect-page.redirect
-- spec/test-data/handlers/asciidoc_with_attributes.ad
-- spec/test-data/handlers/erb-page.xml.erb
-- spec/test-data/handlers/haml-layout.html.haml
-- spec/test-data/handlers/sass-page.sass
-- spec/test-data/images/logo.png
-- spec/test-data/gzip/no.txt
-- spec/test-data/gzip/no.html.gz
-- spec/test-data/gzip/yes.js
-- spec/test-data/gzip/subdir/yes.css
-- spec/test-data/gzip/yes.html
-- spec/test-data/front-matter-file-no-content.txt
-- spec/test-data/simple-file.txt
-- spec/test-data/index.html
-- spec/test-data/simple-data.yaml
-- spec/test-data/front-matter-file.txt
-- spec/test-data/javascript/bootstrap-dropdown.js
-- spec/file_handler_spec.rb
-- spec/interpolation_handler_spec.rb
-- spec/page_loader_spec_for_layouts.rb
-- spec/github_pages_deploy_spec.rb
 - spec/context_helper_spec.rb
-- spec/minify_spec.rb
-- spec/sass_handler_spec.rb
+- spec/deploy_spec.rb
 - spec/disqus_spec.rb
-- spec/textile_handler_spec.rb
-- spec/redirect_handler_spec.rb
-- spec/asciidoc_handler_spec.rb
-- spec/handler_chains_spec.rb
-- spec/slim_handler_spec.rb
+- spec/engine_spec.rb
+- spec/erb_handler_spec.rb
+- spec/file_handler_spec.rb
+- spec/front_matter_handler_spec.rb
+- spec/github_pages_deploy_spec.rb
+- spec/haml_handler_spec.rb
 - spec/handler_chain_spec.rb
+- spec/handler_chains_spec.rb
+- spec/interpolation_handler_spec.rb
+- spec/invoker_spec.rb
 - spec/javascript_handler_spec.rb
-- spec/server_spec.rb
-- spec/spec_helper.rb
-- spec/erb_handler_spec.rb
-- spec/page_spec.rb
-- spec/less_handler_spec.rb
 - spec/layout_handler_spec.rb
-- spec/haml_handler_spec.rb
-- spec/markdown_handler_spec.rb
 - spec/layouts_spec.rb
-- spec/invoker_spec.rb
-- spec/deploy_spec.rb
+- spec/less_handler_spec.rb
+- spec/markdown_handler_spec.rb
+- spec/minify_spec.rb
+- spec/mustache_handler_spec.rb
+- spec/options_spec.rb
+- spec/orgmode_handler_spec.rb
+- spec/page_delegating_handler_spec.rb
+- spec/page_loader_spec.rb
+- spec/page_spec.rb
+- spec/pipeline_spec.rb
+- spec/posts_archive_spec.rb
+- spec/redirect_handler_spec.rb
+- spec/restructuredtext_handler_spec.rb
+- spec/rsync_deploy_spec.rb
+- spec/sass_handler_spec.rb
+- spec/scss_handler_spec.rb
+- spec/server_spec.rb
+- spec/slim_handler_spec.rb
+- spec/textile_handler_spec.rb
+- spec/tilt_handler_spec.rb
+- spec/yaml_handler_spec.rb