octopress 3.0.0.rc.11 → 3.0.0.rc.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f890b49b0468bf8cea9498b00ab637505eb9bf62
-  data.tar.gz: 8e9b290d772534b231f13eef5cedf218aa4f46e3
+  metadata.gz: af8aa291d4f97bb0fe20c1fc5965758ee4701999
+  data.tar.gz: 4f995072d9b4192bc48a12449f21ff35eaacc8a3
 SHA512:
-  metadata.gz: 0bad3975b63a5d5c4d35451f62b1fd6609824df851ce780d3534c12ad88fb85e67832a0c7a6ccfa8856e5b83dd04d02fa83bad193308ef52c4beaeb5ae77fd6f
-  data.tar.gz: 49f2e67e03d06fba6f38c11eba0f98436cb0f0c7f711907974493658fbd1042beb7924eeef79db1f4e8a51b0708aeda99a58d6dbe4f5805454b30fa217ff9826
+  metadata.gz: 58c2b53290232258b67eb395d03297b8ebe9bb01b21c5be8e1c4acd87e33bc95aef431e8d1f65a3612a2d14b41b9270502a0447d7146f30fcd6d3d7e586f698d
+  data.tar.gz: 5edb343188cb88856c57fc0cb8f20ca4d7037611ff4e1edaf715f6840d5be92732fd2c292a73fa339e59b6063e93326ad43cd7e06c6443c833e08a1482b973de

data/CHANGELOG.md

@@ -1,14 +1,18 @@
 # Octopress Changelog
 
 ## Current released version
+### 3.0.0 RC11 - 2014-05-23
 
-### 3.0.0 RC11 - 2014-19-07
-
-- Replaced Hash extensions with Jekyll utility methods
-- Replaced String extension "titlecase" with Octopress utility method
+- Change: Default page template no longer includes a date.
+- Improved date management when publishing a draft.
 
 ## Past versions
 
+### 3.0.0 RC11 - 2014-05-07
+
+- Replaced Hash extensions with Jekyll utility methods.
+- Replaced String extension "titlecase" with Octopress utility method.
+
 ### 3.0.0 RC10 - 2014-05-07
 
 - Now using SafeYAML.load instead of YAML.safe_load [#38](https://github.com/octopress/octopress/issues/38)

data/README.md

@@ -1,6 +1,5 @@
 # Octopress
 
-
 Octopress is an obsessively designed toolkit for writing and deploying Jekyll blogs. Pretty sweet, huh?
 
 <!--[![Gem Version](https://badge.fury.io/rb/octopress.png)](http://badge.fury.io/rb/octopress)-->
@@ -10,7 +9,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress', '~> 3.0.0.rc.11'
+    gem 'octopress', '~> 3.0.0.rc.12'
 
 And then execute:
 
@@ -96,7 +95,7 @@ title: "My Title"
 date: YYYY-MM-DDTHH:MM:SS-00:00
 ```
 
-"Ok, great? What else can I do?" Great question! Check out these other options:
+"OK, great? What else can I do?" Great question! Check out these other options:
 
 | Option               | Description                             |
 |:---------------------|:----------------------------------------|
@@ -104,7 +103,7 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 | `--date DATE`        | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
 | `--slug SLUG`        | Slug for the new post.                  |
 | `--dir DIR`          | Create post at _posts/DIR/.             |
-| `--force`            | Overwrite exsiting file.                |
+| `--force`            | Overwrite existing file.                |
 
 ### New Page
 
@@ -119,7 +118,11 @@ $ octopress new page about.html          # ./about.html
 | `--template PATH`    | Use a template from <path>              |
 | `--title TITLE`      | The title of the new page               |
 | `--date DATE`        | The date for the page. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
-| `--force`            | Overwrite exsiting file.                |
+| `--force`            | Overwrite existing file.                |
+
+Note: The default page template doesn't expect a date. If you want to add dates
+to your posts, consider adding `date: {{ date }}` to the default template
+`_templates/page`, or create a new template to use for dated pages.
 
 ### New Draft
 
@@ -149,7 +152,7 @@ This will move your draft to the `_posts` directory and rename the file with the
 | `--date DATE`      | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
 | `--slug SLUG`      | Change the slug for the new post.         |
 | `--dir DIR`        | Create post at _posts/DIR/.               |
-| `--force`          | Overwrite exsiting file.                  |
+| `--force`          | Overwrite existing file.                  |
 
 When publishing a draft, the new post will use the draft's date. Pass the option `--date now` to the publish command to set the new post date from your system clock. As usual, you can pass any compatible date string as well.
 
@@ -161,7 +164,6 @@ Octopress post and page templates look like this.
 ---
 layout: {{ layout }}
 title: {{ title }}
-date: {{ date }}
 ---
 
 ```

data/assets/docs/changelog.markdown

@@ -4,14 +4,18 @@ permalink: /changelog/
 ---
 
 ## Current released version
+### 3.0.0 RC11 - 2014-05-23
 
-### 3.0.0 RC11 - 2014-19-07
-
-- Replaced Hash extensions with Jekyll utility methods
-- Replaced String extension "titlecase" with Octopress utility method
+- Change: Default page template no longer includes a date.
+- Improved date management when publishing a draft.
 
 ## Past versions
 
+### 3.0.0 RC11 - 2014-05-07
+
+- Replaced Hash extensions with Jekyll utility methods.
+- Replaced String extension "titlecase" with Octopress utility method.
+
 ### 3.0.0 RC10 - 2014-05-07
 
 - Now using SafeYAML.load instead of YAML.safe_load [#38](https://github.com/octopress/octopress/issues/38)

data/assets/docs/index.markdown

@@ -2,7 +2,6 @@
 title: "Octopress"
 ---
 
-
 Octopress is an obsessively designed toolkit for writing and deploying Jekyll blogs. Pretty sweet, huh?
 
 <!--[![Gem Version](https://badge.fury.io/rb/octopress.png)](http://badge.fury.io/rb/octopress)-->
@@ -12,7 +11,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress', '~> 3.0.0.rc.11'
+    gem 'octopress', '~> 3.0.0.rc.12'
 
 And then execute:
 
@@ -98,7 +97,7 @@ title: "My Title"
 date: YYYY-MM-DDTHH:MM:SS-00:00
 ```
 
-"Ok, great? What else can I do?" Great question! Check out these other options:
+"OK, great? What else can I do?" Great question! Check out these other options:
 
 | Option               | Description                             |
 |:---------------------|:----------------------------------------|
@@ -106,7 +105,7 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 | `--date DATE`        | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
 | `--slug SLUG`        | Slug for the new post.                  |
 | `--dir DIR`          | Create post at _posts/DIR/.             |
-| `--force`            | Overwrite exsiting file.                |
+| `--force`            | Overwrite existing file.                |
 
 ### New Page
 
@@ -121,7 +120,11 @@ $ octopress new page about.html          # ./about.html
 | `--template PATH`    | Use a template from <path>              |
 | `--title TITLE`      | The title of the new page               |
 | `--date DATE`        | The date for the page. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
-| `--force`            | Overwrite exsiting file.                |
+| `--force`            | Overwrite existing file.                |
+
+Note: The default page template doesn't expect a date. If you want to add dates
+to your posts, consider adding `date: {{ date }}` to the default template
+`_templates/page`, or create a new template to use for dated pages.
 
 ### New Draft
 
@@ -151,7 +154,7 @@ This will move your draft to the `_posts` directory and rename the file with the
 | `--date DATE`      | The date for the post. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) |
 | `--slug SLUG`      | Change the slug for the new post.         |
 | `--dir DIR`        | Create post at _posts/DIR/.               |
-| `--force`          | Overwrite exsiting file.                  |
+| `--force`          | Overwrite existing file.                  |
 
 When publishing a draft, the new post will use the draft's date. Pass the option `--date now` to the publish command to set the new post date from your system clock. As usual, you can pass any compatible date string as well.
 
@@ -163,7 +166,6 @@ Octopress post and page templates look like this.
 ---
 layout: {{ layout }}
 title: {{ title }}
-date: {{ date }}
 ---
 
 ```

data/lib/octopress/draft.rb

@@ -77,7 +77,7 @@ module Octopress
     # read_draft_date
     #
     def read_draft_date
-      match = read.match(/date:\s+(.+)?$/)
+      match = read.match(/date:\s+(\d.+)$/)
       match[1] if match
     end
     
@@ -87,7 +87,7 @@ module Octopress
     def read_draft_content
       if @options['date']
         # remove date if it exists
-        content = read.sub(/date:\s+.+?\n/, "")
+        content = read.sub(/date:.*$\n/, "")
         
         # Insert date after title
         content.sub(/(title:.+$)/i, '\1'+"\ndate: #{@options['date']}")

data/lib/octopress/page.rb

@@ -82,13 +82,13 @@ module Octopress
       end
     end
 
-    # Load the user provide or default template for a new post or page.
+    # Load the user provided or default template for a new post or page.
     #
     def content
 
       # Handle case where user passes the full path
       #
-      file = @options['template']
+      file = @options['template'] || default_template
 
       if file
         file.sub(/^_templates\//, '')
@@ -103,6 +103,10 @@ module Octopress
       end
     end
 
+    def default_template
+      'page'
+    end
+
     # Render Liquid vars in YAML front-matter.
     def parse_template(input)
 
@@ -111,12 +115,13 @@ module Octopress
       # If YAML front-matter dashes aren't present parse the whole 
       # template and add dashes.
       #
-      parsed = if input =~ /\A-{3}\s+(.+?)\s+-{3}\s+(.+)/m
+
+      parsed = if input =~ /\A-{3}\s+(.+?)\s+-{3}(.+)?/m
         template = Liquid::Template.parse($1)
-        "---\n#{template.render(@options).strip}\n---\n\n#{$2}"
+        "---\n#{template.render(@options).strip}\n---\n#{$2}"
       else
         template = Liquid::Template.parse(input)
-        "---\n#{template.render(@options).strip}\n---\n\n"
+        "---\n#{template.render(@options).strip}\n---\n"
       end
     end
 
@@ -135,7 +140,11 @@ module Octopress
     # Page template defaults
     #
     def default_content
-      front_matter %w{layout title date}
+      if @options['date']
+        front_matter %w{layout title date}
+      else
+        front_matter %w{layout title}
+      end
     end
 
   end

data/lib/octopress/post.rb

@@ -17,6 +17,16 @@ module Octopress
       File.join(dir, name)
     end
 
+    def default_template
+      'post'
+    end
+    
+    # Post template defaults
+    #
+    def default_content
+      front_matter %w{layout title date}
+    end
+
     # Returns a string which is url compatible.
     #
     def title_slug

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.11"
+  VERSION = "3.0.0.rc.12"
 end

data/scaffold/_templates/page

@@ -1,6 +1,4 @@
 ---
 layout: {{ layout }}
 title: {{ title }}
-date: {{ date }}
 ---
-

data/scaffold/_templates/post

@@ -3,4 +3,3 @@ layout: {{ layout }}
 title: {{ title }}
 date: {{ date }}
 ---
-

data/test/expected/_site/custom-template-page.html

@@ -0,0 +1 @@
+<div class='page'>Some Date Page</div>

data/test/expected/_site/date-page.html

@@ -0,0 +1 @@
+<div class='page'>Some Date Page</div>

data/test/expected/_templates/date_page

@@ -0,0 +1,5 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+date: {{ date }}
+---

data/test/expected/_templates/other_page

@@ -0,0 +1,5 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+kittens: true
+---

data/test/expected/_templates/page

@@ -1,6 +1,4 @@
 ---
 layout: {{ layout }}
 title: {{ title }}
-date: {{ date }}
 ---
-

data/test/expected/_templates/post

@@ -3,4 +3,3 @@ layout: {{ layout }}
 title: {{ title }}
 date: {{ date }}
 ---
-

data/test/expected/custom-template-page.html

@@ -0,0 +1,6 @@
+---
+layout: page
+title: "Some Date Page"
+kittens: true
+---
+

data/test/expected/date-page.html

@@ -0,0 +1,6 @@
+---
+layout: page
+title: "Some Date Page"
+date: 2011-11-11T11:11:00Z
+---
+

data/test/test.rb

@@ -8,7 +8,7 @@ FileUtils.cd('test-site') do |dir|
   
   # Create a blank site
   #
-  test({
+  test_cmd({
     desc: 'Create a blank site',
     cmd: [
       'octopress new . --blank',
@@ -21,7 +21,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Init Octopress scaffolding
   #
-  test({
+  test_cmd({
     desc: 'Init Octopress scaffolding',
     cmd: 'octopress init .',
     expect: "Octopress scaffold added to ."
@@ -29,7 +29,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add a new post
   #
-  test({
+  test_cmd({
     desc: 'Add a new post',
     cmd: 'octopress new post "Awesome stuff" --date "2014-03-12 05:10 -0000"',
     expect: '_posts/2014-03-12-awesome-stuff.markdown',
@@ -37,7 +37,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add another new post with a slug
   #
-  test({
+  test_cmd({
     desc: 'Add another new post with a slug',
     cmd: 'octopress new post "Super Awesome stuff" --slug awesome --date "2014-03-13 15:20 -0000"',
     expect: '_posts/2014-03-13-awesome.markdown',
@@ -45,7 +45,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add a new post in a subdirectory
   #
-  test({
+  test_cmd({
     desc: 'Add a new post',
     cmd: 'octopress new post "Some stuff" --dir stuff --date "2014-02-11 05:10 -0000"',
     expect: '_posts/stuff/2014-02-11-some-stuff.markdown',
@@ -53,7 +53,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add a draft
   #
-  test({
+  test_cmd({
     desc: 'Add a draft',
     cmd: 'octopress new draft "Stupid idea" --date "2014-03-10 15:20 -0000"',
     expect: '_drafts/stupid-idea.markdown',
@@ -61,7 +61,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add another draft
   #
-  test({
+  test_cmd({
     desc: 'Add another draft',
     cmd: 'octopress new draft "Another idea" --date "2014-02-10 15:20 -0000"',
     expect: '_drafts/another-idea.markdown',
@@ -69,7 +69,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add a draft with a slug
   #
-  test({
+  test_cmd({
     desc: 'Add a draft with a slug',
     cmd: 'octopress new draft "Some great idea for a post" --slug idea',
     expect: '_drafts/idea.markdown',
@@ -77,7 +77,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add yet another draft
   #
-  test({
+  test_cmd({
     desc: 'Add yet another draft',
     cmd: 'octopress new draft "yet another idea" --date "2014-02-13 15:20 -0000"',
     expect: '_drafts/yet-another-idea.markdown',
@@ -85,7 +85,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Publish a draft
   #
-  test({
+  test_cmd({
     desc: 'Publish a draft',
     cmd: 'octopress publish _drafts/another-idea.markdown',
     expect: '_posts/2014-02-10-another-idea.markdown',
@@ -93,7 +93,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Publish a draft with a date
   #
-  test({
+  test_cmd({
     desc: 'Publish a draft with a date',
     cmd: 'octopress publish _drafts/idea.markdown --date "2014-03-11 20:20 -0000"',
     expect: '_posts/2014-03-11-idea.markdown',
@@ -101,7 +101,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Publish a draft in a dir
   #
-  test({
+  test_cmd({
     desc: 'Publish a draft in a dir',
     cmd: 'octopress publish _drafts/yet-another-idea.markdown --dir ideas',
     expect: '_posts/ideas/2014-02-13-yet-another-idea.markdown',
@@ -109,7 +109,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add a page
   #
-  test({
+  test_cmd({
     desc: 'Add a page',
     cmd: 'octopress new page awesome-page --title "Awesome Page"',
     expect: 'awesome-page.html',
@@ -117,7 +117,7 @@ FileUtils.cd('test-site') do |dir|
 
   # Add a page with an extension
   #
-  test({
+  test_cmd({
     desc: 'Add a page with an extension',
     cmd: 'octopress new page cool-page.html --title "some cool page"',
     expect: 'cool-page.html',
@@ -125,17 +125,38 @@ FileUtils.cd('test-site') do |dir|
 
   # Add a page with a directory
   #
-  test({
+  test_cmd({
     desc: 'Add a page with a directory',
     cmd: 'octopress new page okay-page/ --title "This page is meh"',
     expect: 'okay-page/index.html',
   })
 
+  # Add a page with a date
+  #
+  test_cmd({
+    desc: 'Add a page with a custom template',
+    cmd: [
+      'echo "---\nlayout: {{ layout }}\ntitle: {{ title }}\nkittens: true\n---" > _templates/other_page',
+      'octopress new page custom-template-page.html --title "some date page" --template other_page'
+    ],
+    expect: 'custom-template-page.html',
+  })
+
+  # Add a page with a date
+  #
+  test_cmd({
+    desc: 'Add a page with a date',
+    cmd: [
+      'echo "---\nlayout: {{ layout }}\ntitle: {{ title }}\ndate: {{ date }}\n---" > _templates/date_page',
+      'octopress new page date-page.html --title "some date page" --date "2011-11-11 11:11 -0000" --template date_page'
+    ],
+    expect: 'date-page.html',
+  })
 end
 
 # Build the site
 #
 system "cd test-site; octopress build; cd -"
-compare_directories('test-site', 'expected')
+test_dirs('Compare directories', 'test-site', 'expected')
 
 print_results

data/test/test_suite.rb

@@ -4,6 +4,22 @@ require 'find'
 # This is a makeshift integration test-suite.
 # It is unapologetically pragmatic.
 
+
+# Build Jekyll
+#
+def build(options={})
+  if options[:octopress_config]
+    FileUtils.cp options[:octopress_config], '_octopress.yml'
+  end
+
+  config = ['_config.yml'] << options[:config]
+  cmd = "rm -rf site && bundle exec jekyll build --config #{config.join(',')}"
+
+  `#{cmd}`
+  `rm _octopress.yml` if options[:octopress_config]
+end
+
+
 # Find all files in a given directory
 #
 def dir_files(dir)
@@ -14,31 +30,62 @@ end
 #
 # This will walk through dir1 and diff matching paths in dir2
 #
-def compare_directories(dir1, dir2)
+def test_dirs(desc, dir1, dir2)
+
+  test_missing_files(desc, dir1, dir2)
+
   dir_files(dir1).each do |file|
     file2 = file.sub(dir1, dir2)
     if File.exist?(file2)
-      diff = diff_file(file, file2)
-      if diff =~ /(<.+?\n)?(---\n)?(>.+)/
+      if diff = diff_file(file, file2)
         @failures << {
-          desc: "Diff of file: #{file} in #{dir2}",
-          expected: $1,
-          result: $3
+          desc: "#{desc}\nDiff of file: #{file.sub(dir1+'/', '')}\n",
+          result: format_diff(diff)
         }
         pout 'F'.red
       else
         pout '.'.green
       end
-    else
-      @failures << {
-        desc: "Diff of file: #{file} in #{dir2}",
-        message: "No such file or directory: #{file2}"
-      }
-      pout 'F'.red
     end
   end
 end
 
+def format_diff(diff)
+  "#{diff.gsub(/\A.+?\n/,'').gsub(/^[^><].+/,'---').gsub(/^>.+/){|m| 
+    m.green
+  }.gsub(/^(<.+?)$/){ |m| 
+    m.red
+  }}"
+end
+
+# List differences between files in two directories
+#
+def test_missing_files(desc, dir1, dir2)
+  files1 = dir_files(dir1).map {|f| f.sub(dir1,'') }
+  files2 = dir_files(dir2).map {|f| f.sub(dir2,'') }
+
+  missing = []
+
+  (files2 - files1).each do |file|
+    missing << File.join(dir1, file)
+  end
+
+  (files1 - files2).each do |file|
+    missing << File.join(dir2, file)
+  end
+
+  if !missing.empty?
+    @failures << {
+      desc: "#{desc}\nMissing files:\n",
+      result: " - " + missing.join("\n - ")
+    }
+
+    pout 'F'.red
+  else
+    pout '.'.green
+  end
+end
+
 # Diff two files
 #
 def diff_file(file1, file2)
@@ -50,7 +97,7 @@ def diff_file(file1, file2)
   end
 end
 
-# Run test cases
+# Test command output
 #
 # Input: options hash, format:
 #   {
@@ -59,22 +106,30 @@ end
 #     expect: expected output from command
 #   } 
 #
-def test(options)
+def test_cmd(options)
   if cmd = options[:cmd]
     cmd = [cmd] unless cmd.is_a? Array
+
+    # In debug mode command output is printed
+    #
     if options[:debug]
       system cmd.join('; ')
     else
       output = `#{cmd.join('; ')}`.gsub(/#{Dir.pwd}\/*/,'').strip
+
+      # Remove character color codes
+      output = output.gsub("\e",'').gsub(/\[\d+m/,'').gsub("\[0m",'')
     end
-    if options[:expect].strip == output
+    if options[:expect] && options[:expect].strip == output
       pout '.'.green
     else
       pout 'F'.red
       @failures << {
-        desc: options[:desc],
-        expected: options[:expect],
-        result: output,
+        desc: options[:desc]+"\n",
+        result: <<-HERE
+expected: #{(options[:expect] || '').strip.green}
+result: #{(output || '').strip.red}
+HERE
       }
     end
   end
@@ -93,14 +148,9 @@ end
 def print_results
   if !@failures.empty?
     @failures.each do |test|
-      puts "\nFailed: #{test[:desc]}"
-      if test[:message]
-        puts test[:message].yellow
-      else
-        puts (test[:expected] || '').green
-        puts test[:result].red
-      end
-     # print a newline for easier reading
+      pout "\nFailed: #{test[:desc]}"
+      puts test[:result]
+      # print a newline for easier reading
       puts ""
     end
     abort

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.11
+  version: 3.0.0.rc.12
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -155,12 +155,18 @@ files:
 - test/expected/_site/2014/03/13/awesome.html
 - test/expected/_site/awesome-page.html
 - test/expected/_site/cool-page.html
+- test/expected/_site/custom-template-page.html
+- test/expected/_site/date-page.html
 - test/expected/_site/index.html
 - test/expected/_site/okay-page/index.html
+- test/expected/_templates/date_page
+- test/expected/_templates/other_page
 - test/expected/_templates/page
 - test/expected/_templates/post
 - test/expected/awesome-page.html
 - test/expected/cool-page.html
+- test/expected/custom-template-page.html
+- test/expected/date-page.html
 - test/expected/index.html
 - test/expected/okay-page/index.html
 - test/test.rb
@@ -210,12 +216,18 @@ test_files:
 - test/expected/_site/2014/03/13/awesome.html
 - test/expected/_site/awesome-page.html
 - test/expected/_site/cool-page.html
+- test/expected/_site/custom-template-page.html
+- test/expected/_site/date-page.html
 - test/expected/_site/index.html
 - test/expected/_site/okay-page/index.html
+- test/expected/_templates/date_page
+- test/expected/_templates/other_page
 - test/expected/_templates/page
 - test/expected/_templates/post
 - test/expected/awesome-page.html
 - test/expected/cool-page.html
+- test/expected/custom-template-page.html
+- test/expected/date-page.html
 - test/expected/index.html
 - test/expected/okay-page/index.html
 - test/test.rb