octopress 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045208400d680e6ed16483ef0b5d48e1718f59a2
-  data.tar.gz: 85ad683ca592253eb8d3d79794a069d317cff2b4
+  metadata.gz: a1ecf013c475993247a4e21ebf6a200049643836
+  data.tar.gz: 6c3bfa0c82d3e731c0f47d7773b0cea0b882bdc7
 SHA512:
-  metadata.gz: 2b1b39861d32a93c2550fba4afd6a4406d787c62fb4b57310fbb5f0e49fdd239f75cee69a3e30661ac0ce8f2966c921feaaa26e0256a96d806bac76f60ceebc9
-  data.tar.gz: ebc71834ef2f837837d2a922d3592ddcd09697ef5cc66bc7ca43b2bd2a75557c723d553e822ea8208eff9a29e3ac22c4dfbb92bfbc1b64c173e6d86f2164eb1b
+  metadata.gz: 99d7ccb18b1b4c258c06f5347d4b6184664457e478719e533a6c1cff579d38400fc13aecb5ff15183672ae3ccc18f630823c9f996ddb5633e7866f75a25b0888
+  data.tar.gz: 13f9b04aa05cd35200bbf414edc53e638e91442482db37519c3ada28cb088959bf64662ee5b1b4a1d8c779c6fd0b27d4cb8877b2ff82a7518b1dacb81f0e15b6

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 3.0.7 (2015-06-01)
+- Fixed a bug where pages templates would only show dates if the `new page` command included a `--date` option. Now if a template has a date, the new page will have a date.
+
 ### 3.0.6 (2015-05-26)
 - Fixed issue with Bundler gem loading.
 

data/README.md

@@ -2,8 +2,8 @@
 
 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)
-[![Build Status](https://travis-ci.org/octopress/octopress.png?branch=master)](https://travis-ci.org/octopress/octopress)
+[![Gem Version](https://badge.fury.io/rb/octopress.svg)](http://badge.fury.io/rb/octopress)
+[![Build Status](https://travis-ci.org/octopress/octopress.svg?branch=master)](https://travis-ci.org/octopress/octopress)
 
 ## Installation
 
@@ -33,6 +33,7 @@ publish <POST>      # Publish a draft from _drafts to _posts
 unpublish <POST>    # Search for a post and convert it into a draft
 isolate [POST]      # Stash all posts but the one you're working on for a faster build
 integrate           # Restores all posts, doing the opposite of the isolate command
+deploy              # deploy your site via S3, Cloudfront, Rsync, or to GitHub pages.
 ```
 
 Run `octopress --help` to list sub commands and `octopress <subcommand> --help` to learn more about any subcommand and see its options.
@@ -181,7 +182,7 @@ a handful of local variables you can use when working with templates.
 | `date`             | The date (if set) or Time.now.iso8601     |
 | `title`            | The title of the page (if set)            |
 | `slug`             | The title in slug form                    |
-| `ymd`              | The date string, YYYY/MM/DD format        |
+| `ymd`              | The date string, YYYY-MM-DD format        |
 | `year`             | The date's year                           |
 | `month`            | The date's month, MM                      |
 | `day`              | The date's day, DD                        |
@@ -244,6 +245,26 @@ page_template: page
 draft_template: draft
 ```
 
+## Deployment
+
+The Octopress gem comes with [octopress-deploy](https://github.com/octopress/deploy) which allows you to easily deploy your site with Rsync, on S3 or Cloudfront, to GitHub pages, or other Git based deployment hosting platforms.
+
+### Basic usage
+
+```
+octopress deploy init METHOD [options]  # git, s3, or rsync - Create a _deploy.yml configuration
+octopress deploy                        # Deploys _site based on deployment configuration
+octopress pull DIR                      # Download your deployed site to the specified DIR
+```
+
+You can find more detailed documentation by running:
+
+```
+$ octopress deploy --help
+```
+
+Or by visiting the [Octopress deploy project page](https://github.com/octopress/deploy).
+
 ## Contributing
 
 1. Fork it ( https://github.com/octopress/octopress/fork )

data/lib/octopress/page.rb

@@ -164,10 +164,11 @@ module Octopress
       # Allow templates to use date fragments
       #
       date = Time.parse(vars['date'] || Time.now.iso8601)
+      vars['date'] = date.iso8601
       vars['year'] = date.year
       vars['month'] = date.strftime('%m')
       vars['day'] = date.strftime('%d')
-      vars['ymd'] = date.strftime('%D')
+      vars['ymd'] = date.strftime('%Y-%m-%d')
 
       # If possible only parse the YAML front matter.
       # If YAML front-matter dashes aren't present parse the whole 

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.6"
+  VERSION = "3.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.6
+  version: 3.0.7
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary