awestruct 0.5.7.RC2 → 0.5.7

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.7.RC2'
+  VERSION = '0.5.7'
 end

data/spec/awestruct/cli/invoker_spec.rb

@@ -79,5 +79,9 @@ describe Awestruct::CLI::Invoker do
     expect(Awestruct::CLI::Invoker.new( %w(--source-dir spec/support/test-config --generate) ).invoke!).to be_falsey
   end
 
+  it 'should create the .awestruct/perf.log file' do
+    Awestruct::CLI::Invoker.new( %w(-d --source-dir spec/support/test-config/ --perf) )
+    expect(File.exists? 'spec/support/test-config/.awestruct/perf.log' ).to eql true
+  end
 
 end

data/spec/awestruct/cli/options_spec.rb

@@ -28,7 +28,7 @@ describe Awestruct::CLI::Options do
     options.source_dir == File.join( __FILE__, '..' )
   end
 
-  describe 'parsing' do
+  context 'parsing' do
     def parse!(*args)
       Awestruct::CLI::Options.parse! args
     end
@@ -108,6 +108,27 @@ describe Awestruct::CLI::Options do
       result.source_dir.should eql '/tmp'
       result.output_dir.should eql '/tmp/_site' 
     end
+
+    it 'by default, perf logging should be disabled' do
+      result = Awestruct::CLI::Options.parse!(%w(--source-dir /tmp))
+      result.perf_log.should eql false
+      end
+
+    it '--perf should enable perf logging' do
+      result = Awestruct::CLI::Options.parse!(%w(--source-dir /tmp --perf))
+      result.perf_log.should eql true
+    end
+
+    context 'source dir should not override output dir' do
+      context 'source dir first' do
+        result = Awestruct::CLI::Options.parse!(%w(--source-dir /tmp --output-dir /tmp/output))
+        it { expect(result.output_dir).to eq '/tmp/output' }
+      end
+      context 'output dir first' do
+        result = Awestruct::CLI::Options.parse!(%w(--output-dir /tmp/output --source-dir /tmp))
+        it { expect(result.output_dir).to eq '/tmp/output' }
+      end
+    end
   end
 
 end

data/spec/awestruct/engine_spec.rb

@@ -138,9 +138,13 @@ describe Awestruct::Engine do
     output_dir = Dir.mktmpdir 'engine-generate-no-errors'
 
     begin
-      log = StringIO.new
-      $LOG = Logger.new(log)
-      $LOG.level = Logger::DEBUG
+      Logging.init :trace, :debug, :verbose, :info, :warn, :error, :fatal
+      $LOG = Logging.logger.new 'awestruct'
+      $LOG.add_appenders(
+          Logging.appenders.string_io({level: :info, layout: Logging.layouts.pattern(pattern: "%m\n"),
+                                       color_scheme: :default})
+      )
+      $LOG.level = :debug
 
       opts = Awestruct::CLI::Options.new
       opts.source_dir = test_data_dir 'engine-generate-no-errors'
@@ -161,9 +165,13 @@ describe Awestruct::Engine do
     output_dir = Dir.mktmpdir 'engine-generate-no-errors'
 
     begin
-      log = StringIO.new
-      $LOG = Logger.new(log)
-      $LOG.level = Logger::DEBUG
+      Logging.init :trace, :debug, :verbose, :info, :warn, :error, :fatal
+      $LOG = Logging.logger.new 'awestruct'
+      $LOG.add_appenders(
+          Logging.appenders.string_io({level: :info, layout: Logging.layouts.pattern(pattern: "%m\n"),
+                                    color_scheme: :default})
+      )
+      $LOG.level = :debug
 
       opts = Awestruct::CLI::Options.new
       opts.source_dir = test_data_dir 'engine-generate-no-errors'
@@ -185,9 +193,13 @@ describe Awestruct::Engine do
     output_dir = Dir.mktmpdir 'engine-generate-with-errors'
 
     begin
-      log = StringIO.new
-      $LOG = Logger.new(log)
-      $LOG.level = Logger::DEBUG
+      Logging.init :trace, :debug, :verbose, :info, :warn, :error, :fatal
+      $LOG = Logging.logger.new 'awestruct'
+      $LOG.add_appenders(
+          Logging.appenders.string_io({level: :info, layout: Logging.layouts.pattern(pattern: "%m\n"),
+                                       color_scheme: :default})
+      )
+      $LOG.level = :debug
 
       opts = Awestruct::CLI::Options.new
       opts.source_dir = test_data_dir 'engine-generate-with-errors'
@@ -209,9 +221,13 @@ describe Awestruct::Engine do
     output_dir = Dir.mktmpdir 'engine-generate-with-errors'
 
     begin
-      log = StringIO.new
-      $LOG = Logger.new(log)
-      $LOG.level = Logger::DEBUG
+      Logging.init :trace, :debug, :verbose, :info, :warn, :error, :fatal
+      $LOG = Logging.logger.new 'awestruct'
+      $LOG.add_appenders(
+          Logging.appenders.string_io({level: :info, layout: Logging.layouts.pattern(pattern: "%m\n"),
+                                       color_scheme: :default})
+      )
+      $LOG.level = :debug
 
       opts = Awestruct::CLI::Options.new
       opts.source_dir = test_data_dir 'engine-generate-with-errors'

data/spec/awestruct/handlers/file_handler_spec.rb

@@ -9,12 +9,9 @@ describe Awestruct::Handlers::FileHandler do
     end
   end 
 
-  before :all do
+  before :each do
     @site = Hashery::OpenCascade[ { :encoding=>false, :dir=>Pathname.new( test_data_dir '' )}]
     @site.engine = Hashery::OpenCascade[]
-  end
-
-  before :each do
     @filename = Pathname.new( test_data_dir 'simple-file.txt' )
     @handler = Awestruct::Handlers::FileHandler.new( @site, @filename )
     @page = Awestruct::Page.new( @site, @handler )
@@ -50,10 +47,10 @@ describe Awestruct::Handlers::FileHandler do
   end
 
   it "should provide reasonable paths" do
-    @handler.relative_source_path.should == '/simple-file.txt'
+    @handler.relative_source_path.to_s.should == '/simple-file.txt'
     @handler.output_filename.should == 'simple-file.txt'
     @handler.output_extension.should == '.txt'
-    @handler.output_path.should == '/simple-file.txt'
+    @handler.output_path.to_s.should == '/simple-file.txt'
   end
 
   it "should be able to create an appropriate context" do

data/spec/awestruct/handlers/page_delegating_handler_spec.rb

@@ -7,7 +7,7 @@ require 'hashery'
 
 describe Awestruct::Handlers::PageDelegatingHandler do
 
-  before :all do
+  before :each do
     @config = Hashery::OpenCascade[ { :dir=>Pathname.new( test_data_dir 'handlers' ) } ]
     @engine = Awestruct::Engine.new( @config )
     @site = @engine.site
@@ -45,7 +45,10 @@ describe Awestruct::Handlers::PageDelegatingHandler do
   it "should provide for laying out both inner and outer page content" do
     inner_page = @engine.load_site_page( "inner-page.html.haml" )
 
-    page = Awestruct::Page.new( @site, Awestruct::Handlers::LayoutHandler.new( @site, Awestruct::Handlers::PageDelegatingHandler.new( @site, inner_page) ) )
+    page = Awestruct::Page.new( @site,
+                                Awestruct::Handlers::LayoutHandler.new( @site,
+                                                                        Awestruct::Handlers::PageDelegatingHandler.new( @site,
+                                                                                                                        inner_page) ) )
     page.layout = 'outer-layout'
     page.output_path = '/outer-page.html'
 

data/spec/awestruct/handlers/tilt_handler_spec.rb

@@ -41,7 +41,7 @@ describe Awestruct::Handlers::TiltHandler do
   end
 
   def handler_file(path)
-    "#{@site.config.dir}/#{path}"
+    @site.config.dir.join(path)
   end
 
   def create_context
@@ -82,7 +82,6 @@ describe Awestruct::Handlers::TiltHandler do
     file_handler = Awestruct::Handlers::FileHandler.new( @site, handler_file( "asciidoc-page.asciidoc" ) )
     handler = Awestruct::Handlers::TiltHandler.new( @site, file_handler )
 
-    handler.relative_source_path.should be_nil 
     handler.simple_name.should eql 'asciidoc-page'
     handler.content_syntax.should eql :asciidoc
     handler.output_extension.should eql '.html'
@@ -95,13 +94,11 @@ describe Awestruct::Handlers::TiltHandler do
     file_handler = Awestruct::Handlers::FileHandler.new( @site, handler_file( "warp-1.0.0.Alpha2.textile" ) )
     handler = Awestruct::Handlers::TiltHandler.new( @site, file_handler )
 
-    handler.relative_source_path.should be_nil
     handler.simple_name.should eql 'warp-1.0.0.Alpha2'
     handler.content_syntax.should eql :textile
     handler.output_extension.should eql '.html'
     handler.input_extension.should eql '.textile'
     handler.output_filename.should eql 'warp-1.0.0.Alpha2.html'
-
   end
 
   context 'when loading an engine not installed' do

data/spec/awestruct/page_loader_spec.rb

@@ -19,14 +19,13 @@ describe Awestruct::PageLoader do
     page = @loader.load_page( File.join( @config.dir, "page-one.md" ) )
     page.should_not be_nil
     page.handler.to_chain.collect{|e| e.class}.should be_include Awestruct::Handlers::TiltHandler
-    page.relative_source_path.to_s.should == "/page-one.md" 
+    page.relative_source_path.to_s.should == "/page-one.md"
   end
 
   it "should be able to load an out-of-site page" do
     page = @loader.load_page( File.join( @config.dir, '../out-of-site', "page-three.html.haml" ) )
     page.should_not be_nil
     page.handler.to_chain.collect{|e| e.class }.should be_include Awestruct::Handlers::TiltHandler
-    page.relative_source_path.should be_nil
   end
 
   it "should be able to load all non-draft site pages" do
@@ -35,11 +34,11 @@ describe Awestruct::PageLoader do
 
     @site.pages.sort!{|l,r| l.relative_source_path <=> r.relative_source_path }
 
-    @site.pages[0].relative_source_path.should == '/page-one.md'
-    @site.pages[0].output_path.should          == '/page-one.html'
+    @site.pages[0].relative_source_path.to_s.should == '/page-one.md'
+    @site.pages[0].output_path.to_s.should          == '/page-one.html'
 
-    @site.pages[1].relative_source_path.should == '/page-two.html.haml'
-    @site.pages[1].output_path.should          == '/page-two.html'
+    @site.pages[1].relative_source_path.to_s.should == '/page-two.html.haml'
+    @site.pages[1].output_path.to_s.should          == '/page-two.html'
   end
 
   it "should be able to load all site pages (even drafts) if show_drafts is true" do
@@ -49,14 +48,14 @@ describe Awestruct::PageLoader do
 
     @site.pages.sort!{|l,r| l.relative_source_path <=> r.relative_source_path }
 
-    @site.pages[0].relative_source_path.should == '/page-draft.md'
-    @site.pages[0].output_path.should          == '/page-draft.html'
+    @site.pages[0].relative_source_path.to_s.should == '/page-draft.md'
+    @site.pages[0].output_path.to_s.should          == '/page-draft.html'
 
-    @site.pages[1].relative_source_path.should == '/page-one.md'
-    @site.pages[1].output_path.should          == '/page-one.html'
+    @site.pages[1].relative_source_path.to_s.should == '/page-one.md'
+    @site.pages[1].output_path.to_s.should          == '/page-one.html'
 
-    @site.pages[2].relative_source_path.should == '/page-two.html.haml'
-    @site.pages[2].output_path.should          == '/page-two.html'
+    @site.pages[2].relative_source_path.to_s.should == '/page-two.html.haml'
+    @site.pages[2].output_path.to_s.should          == '/page-two.html'
 
   end
 
@@ -75,7 +74,7 @@ describe Awestruct::PageLoader do
       page = @loader.load_page( File.join( @config.dir, "_layouts", "layout-one.md" ) )
       page.should_not be_nil
       page.handler.to_chain.collect{|e| e.class}.should be_include Awestruct::Handlers::TiltHandler
-      page.relative_source_path.to_s.should == "/_layouts/layout-one.md" 
+      page.relative_source_path.to_s.should == "/_layouts/layout-one.md"
     end
 
     it "should be able to load all site layouts" do
@@ -84,11 +83,11 @@ describe Awestruct::PageLoader do
 
       @site.layouts.sort!{|l,r| l.relative_source_path <=> r.relative_source_path }
 
-      @site.layouts[0].relative_source_path.should == '/_layouts/layout-one.md'
-      @site.layouts[0].output_path.should          == '/_layouts/layout-one.html'
+      @site.layouts[0].relative_source_path.to_s.should == '/_layouts/layout-one.md'
+      @site.layouts[0].output_path.to_s.should          == '/_layouts/layout-one.html'
 
-      @site.layouts[1].relative_source_path.should == '/_layouts/layout-two.html.haml'
-      @site.layouts[1].output_path.should          == '/_layouts/layout-two.html'
+      @site.layouts[1].relative_source_path.to_s.should == '/_layouts/layout-two.html.haml'
+      @site.layouts[1].output_path.to_s.should          == '/_layouts/layout-two.html'
     end
 
   end

data/spec/awestruct/rack/debug_spec.rb

@@ -33,8 +33,8 @@ describe Awestruct::Rack::Debug do
 
     struct = debug.introspect(model, {}, ['A'], depth = 3)
 
-    struct.size.should == 1
-    struct[:A].size.should == 0
+    struct.size.should eql 1
+    struct[:A].size.should eql 2
 
   end
 
@@ -42,24 +42,10 @@ describe Awestruct::Rack::Debug do
 
     struct = debug.introspect(model, {}, ['*', 'A'], depth = 3)
 
-    struct.size.should == 1
-    struct[:A].size.should == 2
-    struct[:A][:a_one].should == 1
-    struct[:A][:a_two].should == 2
-
-  end
-
-  it "should include empty array on next level" do
-
-    struct = debug.introspect(model, {}, ['c_one', 'C'], depth = 3)
-
-    puts struct
-
-    struct.size.should == 1
-    struct[:C].size.should == 1
-    struct[:C][:c_one].size.should == 2
-    expect(struct[:C][:c_one][0]).to be_empty
-    expect(struct[:C][:c_one][1]).to be_empty
+    struct.size.should eql 1
+    struct[:A].size.should eql 2
+    struct[:A][:a_one].should eql '1'
+    struct[:A][:a_two].should eql '2'
 
   end
 
@@ -69,9 +55,9 @@ describe Awestruct::Rack::Debug do
 
     puts struct
 
-    struct.size.should == 1
-    struct[:C].size.should == 1
-    struct[:C][:c_one].size.should == 2
+    struct.size.should eql 1
+    struct[:C].size.should eql 1
+    struct[:C][:c_one].size.should eql 2
     expect(struct[:C][:c_one][0]).not_to be_empty
     expect(struct[:C][:c_one][1]).not_to be_empty
 
@@ -83,9 +69,9 @@ describe Awestruct::Rack::Debug do
 
     puts struct
 
-    struct.size.should == 1
-    struct[:C].size.should == 1
-    struct[:C][:c_one].size.should == 2
+    struct.size.should eql 1
+    struct[:C].size.should eql 1
+    struct[:C][:c_one].size.should eql 2
     expect(struct[:C][:c_one][0]).to be_empty
     expect(struct[:C][:c_one][1]).not_to be_empty
 
@@ -97,9 +83,9 @@ describe Awestruct::Rack::Debug do
 
     puts struct
 
-    struct.size.should == 1
-    struct[:CUST].size.should == 1
-    struct[:CUST][:obj].size.should == 1
+    struct.size.should eql 1
+    struct[:CUST].size.should eql 1
+    struct[:CUST][:obj].size.should eql 1
     expect(struct[:CUST][:obj][0]).not_to be_empty
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.7.RC2
+  version: 0.5.7
 platform: ruby
 authors:
 - Bob McWhirter
@@ -10,12 +10,13 @@ authors:
 - Dan Allen
 - Torsten Curdt
 - other contributors
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -24,9 +25,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.5
-  name: haml
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -36,6 +36,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.5
 - !ruby/object:Gem::Dependency
+  name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -44,9 +45,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-  name: asciidoctor
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -56,6 +56,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -64,9 +65,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.1
-  name: tilt
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -76,20 +76,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.1
 - !ruby/object:Gem::Dependency
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-  name: mime-types
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -98,9 +99,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.2
-  name: rest-client
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -110,6 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.7.2
 - !ruby/object:Gem::Dependency
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,9 +119,8 @@ dependencies:
     - - "<="
       - !ruby/object:Gem::Version
         version: '4.0'
-  name: listen
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,6 +130,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -138,9 +139,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.2
-  name: rack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -150,6 +150,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.2
 - !ruby/object:Gem::Dependency
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -158,9 +159,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.6
-  name: git
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -170,60 +170,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.6
 - !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
-  name: guard-livereload
-  prerelease: false
+        version: 2.13.0
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.2
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
+  name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
-  name: colorize
-  prerelease: false
+        version: 2.1.2
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
+  name: oga
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  name: oga
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
+  name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -232,9 +247,8 @@ dependencies:
     - - ">"
       - !ruby/object:Gem::Version
         version: 1.1.1
-  name: parallel
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -244,6 +258,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.1
 - !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -252,9 +267,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.10
-  name: nokogiri
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -264,6 +278,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.5.10
 - !ruby/object:Gem::Dependency
+  name: compass-960-plugin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -272,9 +287,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.10.4
-  name: compass-960-plugin
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -284,6 +298,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.4
 - !ruby/object:Gem::Dependency
+  name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -292,9 +307,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0.2
-  name: bootstrap-sass
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -304,6 +318,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0.2
 - !ruby/object:Gem::Dependency
+  name: zurb-foundation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -312,9 +327,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.3.2
-  name: zurb-foundation
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -324,34 +338,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.3.2
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-  name: guard-rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
-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.
+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
@@ -453,7 +472,6 @@ files:
 - lib/awestruct/handlers/verbatim_file_handler.rb
 - lib/awestruct/handlers/yaml_handler.rb
 - lib/awestruct/layouts.rb
-- lib/awestruct/logger.rb
 - lib/awestruct/page.rb
 - lib/awestruct/page_loader.rb
 - lib/awestruct/pipeline.rb
@@ -622,7 +640,7 @@ homepage: http://awestruct.org
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -634,17 +652,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - |
   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.
   Compass and sass are no longer hard dependencies. You'll need too add them on your own should you want them. We also should be able to work with sassc.
 rubyforge_project: awestruct
-rubygems_version: 2.4.8
-signing_key:
+rubygems_version: 2.5.1
+signing_key: 
 specification_version: 4
 summary: Static site baking and publishing tool
 test_files: