usmu 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77196cca8367431f548de3b4a0ed85b2d128962c
-  data.tar.gz: a36c3f979f669bd89a31962bb0ab71b770b6767a
+  metadata.gz: ed2e494db784cf3a3c1eb959eb36cd23460e9f4e
+  data.tar.gz: 300f0c268563caa186ade7f41d84a12a2d72c4fe
 SHA512:
-  metadata.gz: a0fd7552173005b61b10310b20b5d882da9ce0007477dc1a3636b19f25cb9b3a99f322d165d02471b466426ef553f4cedd141eac353256d5ee87c1b145851fee
-  data.tar.gz: cb155deec549610d11dda459249894a7c94c26e44a7f07089871934620094ddab809895c7a6cd3060ddf3cff110b410b7264200cdeedf382e8411e64cad950c0
+  metadata.gz: e338182d6654d55cd1495d12702b3dbdac35a48fa9c79ebec0c846fb75bf01cbcbdbd230a2fa279c56eb01ccca9d0dd64e3aa92a996ec2d826debeb54e9b70ad
+  data.tar.gz: b528d3ccb26688545f2c3ea277edfab575abe72d266be8fc361d8fb1a1762c360d30cc905a8842da20232a8b2ab85d530a898f67804f9b8517f3e81527a0ec97

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.sass-cache
 /Gemfile*.lock
 /_yardoc/
 /test/coverage/
@@ -7,6 +8,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor
 *.bundle
 *.so
 *.o

data/.travis.yml

@@ -4,6 +4,7 @@ rvm:
   - 1.9.3
   - 2.0
   - 2.1
+  - 2.2
   - ruby-head
   - mruby-head
   - rbx-2.1

data/CHANGELOG.md

@@ -1,5 +1,56 @@
 # Usmu Change Log
 
+## 0.3.0
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Ignore vendored gems (5ed00eda230ad69d727d61197a2eff6269bcc640)
+* Bump CHANGELOG to 0.2.2 (daea8c79c04acfd7048aa7f801c9e34462e4a06d)
+* Fix a bug with #load_configuration (ab08a884c346fcbca784bf229b42e65bbff2b63a)
+* Enable rvm 2.2 for the latest and greatest (e28532f0fe25f46c03e18fd9e6a2dd05c388647e)
+* [\[\#12\]][GH-12] Fix layout loop issues finally (b3164c5bd0374837c56c1cab6554a2a7b7b207ef)
+* Add libnotify for guard (e51971a22b7d57bcb892e90fa2feb89571b2311b)
+* [\[\#14\]][GH-14] Don't list directories in Configuration#get_files (e56d81d7bfeae9d3312c84f2cfe3d03e268ca738)
+* [\[\#17\]][GH-17] Fix Sass processing (5b00cc3f29e32ce31d8a13c2979d953509b3a334)
+* [\[\#13\]][GH-13] Add page metadata to parent layouts (c2da294e1f19e6404df178ee650c3818cc0f3846)
+* Add a Sass partials exclude to default init site (4f70d5b1b5958b6c56338b8d077711c780c85763)
+
+## 0.2.2
+
+Matthew Scharley <matt.scharley@gmail.com>
+
+* Bump version to 0.3.0.dev for further dev (896cbde8191b8123a280b5a2c96af524d8055d07)
+* Ignore CR's in generated site to tame diff on Windows (839ab4bfea0bea1a1932b569b636540172d3e633)
+* Setup logging properly in Usmu::Plugin::Core (6b4f6cbc133830dc93248d3bc4fb71a2c2aab5a9)
+* Allow --trace from commander to function properly (815bb4f12ef7128cb404fe93745c130b990e073d)
+* [\[GH-8\]][GH-8] Add an init command (feb3fd659c0180b572449dbdc186d4ada5fb6c61)
+* [\[GH-8\]][GH-8] Add tests for the init command (5bbf4031708278b27b7779d170a2a54ca708dd9f)
+* Clean up the tmp folder with `rake clean` (2efe4a713fe75569d292bc17801dcd9b1ea2aa02)
+* Always use --trace with the acceptance tests (cf9cacccb9faef248d52053c90a0be92f60b7704)
+* Fix bug in init command where directories could be uncreated before usage (c53cf247923c48a6d6f84581fdf3e8845ad9d4da)
+* Update Rubinius runs for Travis (688f32a76a08a95f261fa6f35f12bce23a0daa39)
+* Remove the rbx-head exclude (6ded194e282909f9e7672e645f6c7b626f2ebb1c)
+* Remove rbx-2.0 from Travis again - unsupported (de6d536ac04f16352878e92cc7561c0f9a145f54)
+* Allow rbx-2.3 (7de8f4ca7fc27647edf9ac1e59d138ec2cd8ff1e)
+* Add jruby 2.0 runs (e865e35445ccffb91e20aebf5c17a948ab38f336)
+* Fix matrix excludes for jruby (9fa82f64cddb6096e891c418790aadddb00d58a8)
+* Fix matrix excludes (again) (hopefully) (4b3dd6370369310219cdc38d9c2ed1169ee28eca)
+* Last run at fixing the jruby 2.0 stuff (febb399e8cc5facd29cc1d164a0bddf75c953741)
+* Greatly simplify travis.yml using matrix include instead of exclude (5ad500f8ec428be5d86c400006735f8b4cf1c61f)
+* Fix gemfile name because I'm a derp (10e73938565049e8ff323da99fca35d024a34134)
+* Add a changelog (ea82ed9826517920c7e39d73a5e3df167f9512b4)
+* Enable rbx-2.4 build for testing (34fd5415af64ce0fafad3805188b34b99119f37e)
+* Track mruby compatibility (163cd5a5956f39a1e46fdf9c381c961d2d21e52d)
+* Officially support Rubinius 2.3 (2abe1da65e4f65d065d9d8f084bffae607045043)
+* Update compatibility information (1be9e1cee10f3aab20f514195dfbc17deb8138f4)
+* Bump slim to 3.0 (f258e53bb3f04187406a1ba0736c53be4105ee09)
+* Massive refactor to create the Usmu::Template namespace (425956dd04b199e5ac32582ed5856d01b6251e35)
+* Add an irb task to rake (e7506c686696344b506da2df8705d918bf1b0ba0)
+* [\[\#9\]][GH-9] Add tests for includes in slim (95f4c4992e4984fcdd95c0ba66805714da215cfc)
+* [\[\#9\]][GH-9] Implement includes (5a4e69aa8b45fac4a697d56814177023f052c585)
+* Remove RBX 2.3 again. (b8675c07d0fe066c466144c27e690f1863a88888)
+* Release 0.2.2 (986f611b167a0503108d41ac0a115e38d6aac2f9)
+
 ## 0.2.1
 
 Matthew Scharley <matt.scharley@gmail.com>
@@ -27,10 +78,10 @@ Matthew Scharley <matt.scharley@gmail.com>
 * Remove cucumber from the CI task (d4094db005db5205542eb8256e86f01d9cd49d05)
 * Allow the rspec rake task to find it's own spec files (35d6f7e4486f14034544884090b5cccfd7bd82ad)
 * Use Redcarpet 3.2! (5c7a9d34f5ec2c12089b1e045e174f26f34877f2)
-* [GH-7] Allow for excluding files via usmu.conf (da0f1123316ce1cede23a63cea8e6c46c3a17a01)
+* [\[GH-7\]][GH-7] Allow for excluding files via usmu.conf (da0f1123316ce1cede23a63cea8e6c46c3a17a01)
 * Add one more guard test on exclude globs (143460ea5f5427845e01119a8aba039207382a1b)
-* [GH-5] Add an initial pass at a plugin system (73588da4bfaf03fa27a47747b56f6e31d95c8704)
-* [GH-5] Transition to commander instead of trollop and make `generate` an official command (1aaaf43c0884c70980af3b7e6fcaa8ce57f7474c)
+* [\[GH-5\]][GH-5] Add an initial pass at a plugin system (73588da4bfaf03fa27a47747b56f6e31d95c8704)
+* [\[GH-5\]][GH-5] Transition to commander instead of trollop and make `generate` an official command (1aaaf43c0884c70980af3b7e6fcaa8ce57f7474c)
 * 1.9.3 compatibility (cba51ad465576ac542111d200cfcbb62835c097c)
 * Re-enable 1.9.3 CI and add some compat notes to the readme (cf34053aaaf6a85752ec8be70f7c9969a89990d9)
 * Bump to 0.2.0 release (7e7dde04c180b5ae63268db647ba45ef63a6b3f3)
@@ -80,3 +131,12 @@ Matthew Scharley <matt.scharley@gmail.com>
 * Small stylistic change (ae008aa5492b2463774e4e4659d90666059b45e0)
 * Add new custom rake tasks for building gems and fix a few small issues with the specs (5b1a4241cd9f31f39179ffaad49f7155617c0e6f)
 * Bump to full 0.1.0 release (fb91c2b54f79eeaeb615f98f874c990e4cdddfd3)
+
+  [GH-5]:  https://github.com/usmu/usmu/issues/5
+  [GH-7]:  https://github.com/usmu/usmu/issues/7
+  [GH-8]:  https://github.com/usmu/usmu/issues/8
+  [GH-9]:  https://github.com/usmu/usmu/issues/9
+  [GH-12]: https://github.com/usmu/usmu/issues/12
+  [GH-13]: https://github.com/usmu/usmu/issues/13
+  [GH-14]: https://github.com/usmu/usmu/issues/14
+  [GH-17]: https://github.com/usmu/usmu/issues/17

data/lib/usmu/configuration.rb

@@ -126,9 +126,11 @@ module Usmu
     # @param [Boolean] layout is this directory a layouts_path
     # @return [Array<Usmu::Layout>, Array<Usmu::StaticFile>] Either an array of Layouts or StaticFiles in the directory
     def get_files(directory)
-      Dir["#{directory}/**/{*,.??*}"].select {|f| !f.match(/\.meta.yml$/) }.map do |f|
-        f[(directory.length + 1)..f.length]
-      end.select {|f| not excluded? f}
+      Dir["#{directory}/**/{*,.??*}"].
+          select {|f| not File.directory? f }.
+          select {|f| !f.match(/\.meta.yml$/) }.
+          map {|f| f[(directory.length + 1)..f.length] }.
+          select {|f| not excluded? f }
     end
   end
 end

data/lib/usmu/site_generator.rb

@@ -56,9 +56,11 @@ module Usmu
     def generate
       @log.info("Source: #{@configuration.source_path}")
       @log.info("Destination: #{@configuration.destination_path}")
+      @log.info('')
 
       renderables.each do |page|
         @log.success("creating #{page.output_filename}...")
+        @log.debug("Rendering #{page.output_filename} from #{page.name}")
         file = File.join(@configuration.destination_path, page.output_filename)
         directory = File.dirname(file)
 

data/lib/usmu/template/layout.rb

@@ -46,6 +46,12 @@ module Usmu
 
         @parent = nil
         @parent = Layout.find_layout(configuration, self.metadata['layout'])
+
+        # Don't use the parent if it would result in weirdness
+        unless @parent.nil?
+          @parent = nil unless
+              output_extension == @parent.output_extension || output_extension.nil? || @parent.output_extension.nil?
+        end
       end
 
       # @!attribute [r] metadata
@@ -62,13 +68,22 @@ module Usmu
         end
       end
 
+      # This is a shortcut to accessing metadata.
+      #
+      # @see #metadata
+      def [](index)
+        metadata[index]
+      end
+
       # Renders the file with any templating language required and returns the result
       #
       # @param variables [Hash] Variables to be used in the template.
       # @return [String] The rendered file.
       def render(variables = {})
-        content = template_class.new("#{@name}.#{@type}", 1, @configuration[provider_name]) { @content }.
+        template_config = add_template_defaults(@configuration[provider_name] || {}, provider_name)
+        content = template_class.new("#{@name}", 1, template_config) { @content }.
             render(helpers, get_variables(variables))
+
         has_cr = content.index("\r")
         content += (has_cr ? "\r\n" : "\n") if content[-1] != "\n"
         if @parent.nil?
@@ -122,19 +137,33 @@ module Usmu
       #   that name is nilable and can also be passed in as an Usmu::Template::Layout already for testing purposes.
       # @return [Usmu::Layout]
       def self.find_layout(configuration, name)
-        if name === 'none'
-          nil
+        return nil if name.nil?
+
+        @layout_history = @layout_history || {}
+        @layout_history[configuration] = @layout_history[configuration] || {}
+        if @layout_history[configuration][name]
+          Logging.logger[self].debug("Layout loop detected. Current loaded layouts: #{@layout_history[configuration].inspect}")
+          return nil
+        else
+          Logging.logger[self].debug("Loading layout '#{name}'")
+          @layout_history[configuration][name] = true
+        end
+
+        ret = nil
+        if name === 'none' || name.nil?
         elsif name.class.name == 'String'
           Dir["#{configuration.layouts_path}/#{name}.*"].each do |f|
             filename = File.basename(f)
             if filename != "#{name}.meta.yml"
-              return new(configuration, f[(configuration.layouts_path.length + 1)..f.length])
+              ret = new(configuration, f[(configuration.layouts_path.length + 1)..f.length])
             end
           end
-          nil
         else
-          name
+          ret = name
         end
+
+        @layout_history[configuration][name] = nil
+        return ret
       end
 
       # Tests if a given file is a valid Tilt template based on the filename.
@@ -151,6 +180,17 @@ module Usmu
 
       protected
 
+      # @!attribute [r] parent
+      # @return [Usmu::Template::Layout] The template acting as a wrapper for this template, if any
+      attr_reader :parent
+
+      # Allows for protected level direct access to the metadata store.
+      #
+      # @see #metadata
+      def []=(index, value)
+        @metadata[index] = value
+      end
+
       # @!attribute [r] template_class
       # @return [Tilt::Template] the Tilt template engine for this layout
       def template_class
@@ -185,6 +225,22 @@ module Usmu
         @helpers ||= Usmu::Template::Helpers.new(@configuration)
       end
 
+      # Adds defaults for the given generator engine
+      #
+      # @param [Hash] overrides A hash of options provided by the user
+      # @param [String] engine The name of the rendering engine
+      # @return [Hash] Template options to pass into the engine
+      def add_template_defaults(overrides, engine)
+        case engine
+          when 'sass'
+            {
+                :load_paths => [@configuration.source_path + '/' + File.dirname(@name)]
+            }.deep_merge!(overrides)
+          else
+            overrides
+        end
+      end
+
       private
 
       # Utility function which collates variables to pass to the template engine.

data/lib/usmu/template/page.rb

@@ -4,6 +4,23 @@ module Usmu
   module Template
     # Represents a page in the source directory of the website.
     class Page < Layout
+
+      # @param configuration [Usmu::Configuration] The configuration for the website we're generating.
+      # @param name [String] The name of the file in the source directory.
+      # @param type [String] The type of template to use with the file. Used for testing purposes.
+      # @param content [String] The content of the file. Used for testing purposes.
+      # @param metadata [String] The metadata for the file. Used for testing purposes.
+      def initialize(configuration, name, type = nil, content = nil, metadata = nil)
+        super(configuration, name, type, content, metadata)
+
+        current_parent = parent
+        until current_parent.nil?
+          @log.debug("Injecting page #{name} into #{current_parent.name}")
+          current_parent['page'] = self
+          current_parent = current_parent.parent
+        end
+      end
+
       protected
 
       # @!attribute [r] content_path

data/lib/usmu/template/static_file.rb

@@ -5,8 +5,6 @@ module Usmu
     # Represents a static file which should be transferred to the destination unchanged. This also acts as the base
     # class for all layouts and page types. The basic interface defined here is used to process all types of files.
     class StaticFile
-      @log = Logging.logger[self]
-
       # @!attribute [r] name
       # @return [String] the name of the file in the source directory
       attr_reader :name
@@ -18,6 +16,9 @@ module Usmu
       # @param content [String] The content of the file. Used for testing purposes.
       # @param metadata [String] The metadata for the file. Used for testing purposes.
       def initialize(configuration, name, type = nil, content = nil, metadata = nil)
+        @log = Logging.logger[self]
+        @log.debug("Creating <##{self.class.name} @name=\"#{name}\">")
+
         @configuration = configuration
         @name = name
         @type = type

data/lib/usmu/ui/console.rb

@@ -37,6 +37,10 @@ module Usmu
         @commander.run!
       end
 
+      # Load a configuration from a file
+      #
+      # @param [String] config Name of configuration file to load
+      # @return [Usmu::Configuration] the configuration for the site we will generate.
       def load_configuration(config)
         @log.info("Usmu v#{Usmu::VERSION}")
         @log.info('')
@@ -48,6 +52,7 @@ module Usmu
           @log.fatal("Unable to find configuration file at #{config}")
           raise
         end
+        @configuration
       end
     end
   end

data/lib/usmu/version.rb

@@ -1,5 +1,5 @@
 
 module Usmu
   # The current version string for the gem
-  VERSION = '0.2.2'
+  VERSION = '0.3.0'
 end

data/share/init-site/usmu.yml

@@ -1,3 +1,6 @@
 ---
 
 title: Example site
+
+exclude:
+- '**/_*.s[ca]ss

data/test/expected-site/css/app.css

@@ -0,0 +1,2 @@
+body {
+  color: #000; }

data/test/expected-site/index.html

@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Default Title | Testing website</title>
+    <title>Index page | Testing website</title>
   </head>
   <body>
     <div id="content">

data/test/expected-site/posts/test-post.html

@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Default Title | Testing website</title>
+  </head>
+  <body>
+    <div id="content">
+      <h1>Hello world!</h1>
+      
+      <p>This is my first post.</p>
+      
+    </div>
+    <footer>
+      Copyright &copy; Testers Inc.
+    </footer>
+    
+  </body>
+</html>

data/test/site/content/css/_partial.scss

@@ -0,0 +1 @@
+$color: #000;

data/test/site/content/css/app.scss

@@ -0,0 +1,5 @@
+@import 'partial';
+
+body {
+  color: $color;
+}

data/test/site/content/posts/test-post.md

@@ -0,0 +1,3 @@
+# Hello world!
+
+This is my first post.

data/test/site/layouts/html.slim

@@ -1,7 +1,7 @@
 doctype html
 html
   head
-    title #{title} | #{site['title']}
+    title #{page['title']} | #{site['title']}
 
   body
     #content

data/test/site/usmu.yml

@@ -4,8 +4,11 @@ source: content
 destination: site
 title: Testing website
 
+exclude:
+- "**/_*.s[ac]ss"
+
 default meta:
-  title: Test website
+  title: Default Title
   layout: html
 
 slim:

data/test/spec/acceptance/steps/full_site_build_steps.rb

@@ -15,7 +15,7 @@ step 'I run usmu with the arguments :args' do |args|
 end
 
 step 'the directory :destination should match :test_folder' do |destination, test_folder|
-  run = %W{diff -qr --strip-trailing-cr #{destination} #{test_folder}}
+  run = %W{diff -ur --strip-trailing-cr #{test_folder} #{destination}}
   Open3.popen2e(*run) do |i, o, t|
     output = run.join(' ') + "\n" + o.read
     fail output if t.value != 0

data/test/spec/site_generator_spec.rb

@@ -11,12 +11,12 @@ RSpec.describe Usmu::SiteGenerator do
 
   it 'should have a list of renderable items' do
     expect(generator.respond_to? :renderables).to eq(true)
-    expect(generator.renderables.map {|r| r.name}.sort).to eq(%w{.dotfiletest.txt default.md embedded.md index.md robots.txt})
+    expect(generator.renderables.map {|r| r.name}.sort).to eq(%w{.dotfiletest.txt css/app.scss default.md embedded.md index.md posts/test-post.md robots.txt})
   end
 
   it 'should have pages' do
     expect(generator.respond_to? :pages).to eq(true)
-    expect(generator.pages.map {|p| p.name}.sort).to eq(%w{default.md embedded.md index.md})
+    expect(generator.pages.map {|p| p.name}.sort).to eq(%w{css/app.scss default.md embedded.md index.md posts/test-post.md})
   end
 
   it 'should have files' do
@@ -24,6 +24,11 @@ RSpec.describe Usmu::SiteGenerator do
     expect(generator.files.map {|f| f.name}.sort).to eq(%w{.dotfiletest.txt robots.txt})
   end
 
+  it 'should not list directories' do
+    expect(generator.respond_to? :files).to eq(true)
+    expect(generator.files.select {|f| f.name == 'posts'}.length).to eq(0)
+  end
+
   it 'should be able to generate a site' do
     expect(generator.respond_to? :generate).to eq(true)
   end

data/test/spec/support/shared_layout.rb

@@ -173,6 +173,15 @@ RSpec.shared_examples 'an embeddable layout' do
     EOF
   end
 
+  it 'only uses a wrapper layout if the output types match' do
+    parent = described_class.new(empty_configuration, 'html.slim', 'slim', wrapper, {})
+    layout = described_class.new(empty_configuration, 'app.scss', 'scss', 'body { color: #000; }', {'layout' => parent})
+    expect(layout.render({'content' => ''})).to eq(<<-EOF)
+body {
+  color: #000; }
+    EOF
+  end
+
   context 'and prioritises' do
     it 'metadata over parent metadata' do
       parent = described_class.new(empty_configuration, 'html.slim', 'slim', wrapper, {'title' => 'title'})

data/test/spec/template/layout_spec.rb

@@ -16,4 +16,25 @@ RSpec.describe Usmu::Template::Layout do
     expect(layout.respond_to? :input_path).to eq(true)
     expect(layout.input_path).to eq('layouts/html.slim')
   end
+
+  it 'should not allow circular references with #find_layout' do
+    # This will also get tested during the acceptance tests, though we test here explicitly to help aid narrow where
+    # the bug actually is.
+    configuration = Usmu::Configuration.from_file('test/site/usmu.yml')
+    layout = Usmu::Template::Layout.new(configuration, 'html.slim')
+  end
+
+  it 'should add a default load_path for sass templates' do
+    configuration = Usmu::Configuration.from_hash({'source' => 'src'}, 'test/usmu.yml')
+    layout = Usmu::Template::Layout.new(configuration, 'css/app.scss', 'scss', "body{color: #000;}", {})
+    defaults = layout.send :add_template_defaults, {}, 'sass'
+    expect(defaults[:load_paths]).to eq(['test/src/css'])
+  end
+
+  it 'should merge load_path\'s for sass templates' do
+    configuration = Usmu::Configuration.from_hash({'source' => 'src'}, 'test/usmu.yml')
+    layout = Usmu::Template::Layout.new(configuration, 'css/app.scss', 'scss', "body{color: #000;}", {})
+    defaults = layout.send :add_template_defaults, {load_paths: ['test/src/assets/scss']}, 'sass'
+    expect(defaults[:load_paths].sort).to eq(['test/src/assets/scss', 'test/src/css'])
+  end
 end

data/test/spec/ui/console_spec.rb

@@ -17,4 +17,9 @@ RSpec.describe Usmu::Ui::Console do
     expect(Usmu).to receive(:verbose_logging)
     Usmu::Ui::Console.new(%w{--verbose --config test/site/usmu.yml})
   end
+
+  it '#load_configuration returns a configuration' do
+    config = Usmu::Ui::Console.new(%w{--config test/site/usmu.yml}).load_configuration('test/site/usmu.yml')
+    expect(config.class.name).to eq('Usmu::Configuration')
+  end
 end

data/usmu.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'deep_merge', '~> 1.0'
   spec.add_dependency 'commander', '~> 4.2'
   spec.add_dependency 'logging', '~> 1.8'
+  #spec.add_dependency 'pry'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
   spec.add_development_dependency 'rake', '~> 10.0'
@@ -36,5 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.9'
   spec.add_development_dependency 'guard', '~> 2.8'
   spec.add_development_dependency 'guard-rspec', '~> 4.3'
+  spec.add_development_dependency 'libnotify', '~> 0.9'
   spec.add_development_dependency 'turnip', '~> 1.2'
+  spec.add_development_dependency 'sass', '~> 3.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usmu
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Matthew Scharley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-22 00:00:00.000000000 Z
+date: 2015-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim
@@ -212,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.3'
+- !ruby/object:Gem::Dependency
+  name: libnotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: turnip
   requirement: !ruby/object:Gem::Requirement
@@ -226,6 +240,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
 description: |2
       Usmu is a static site generator built in Ruby that leverages the Tilt API to support many different template
       engines. It supports local generation but is designed to be used with the web-based editor.
@@ -271,22 +299,26 @@ files:
 - share/init-site/source/index.md
 - share/init-site/usmu.yml
 - test/expected-site/.dotfiletest.txt
+- test/expected-site/css/app.css
 - test/expected-site/default.html
 - test/expected-site/embedded.html
 - test/expected-site/index.html
+- test/expected-site/posts/test-post.html
 - test/expected-site/robots.txt
 - test/site/content/.dotfiletest.txt
+- test/site/content/css/_partial.scss
+- test/site/content/css/app.scss
 - test/site/content/default.md
 - test/site/content/embedded.md
 - test/site/content/embedded.meta.yml
 - test/site/content/index.md
 - test/site/content/index.meta.yml
+- test/site/content/posts/test-post.md
 - test/site/content/robots.txt
 - test/site/includes/footer.meta.yml
 - test/site/includes/footer.slim
 - test/site/layouts/embedded.meta.yml
 - test/site/layouts/embedded.slim
-- test/site/layouts/html.meta.yml
 - test/site/layouts/html.slim
 - test/site/usmu.yml
 - test/spec/acceptance/full_site_build.feature
@@ -324,28 +356,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A static site generator with a web-based frontend for editing.
 test_files:
 - test/expected-site/.dotfiletest.txt
+- test/expected-site/css/app.css
 - test/expected-site/default.html
 - test/expected-site/embedded.html
 - test/expected-site/index.html
+- test/expected-site/posts/test-post.html
 - test/expected-site/robots.txt
 - test/site/content/.dotfiletest.txt
+- test/site/content/css/_partial.scss
+- test/site/content/css/app.scss
 - test/site/content/default.md
 - test/site/content/embedded.md
 - test/site/content/embedded.meta.yml
 - test/site/content/index.md
 - test/site/content/index.meta.yml
+- test/site/content/posts/test-post.md
 - test/site/content/robots.txt
 - test/site/includes/footer.meta.yml
 - test/site/includes/footer.slim
 - test/site/layouts/embedded.meta.yml
 - test/site/layouts/embedded.slim
-- test/site/layouts/html.meta.yml
 - test/site/layouts/html.slim
 - test/site/usmu.yml
 - test/spec/acceptance/full_site_build.feature

data/test/site/layouts/html.meta.yml

@@ -1,3 +0,0 @@
----
-title: Default Title
-layout: none