octopress 3.0.6 → 3.0.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +3 -0
  3. data/README.md +24 -3
  4. data/lib/octopress/page.rb +2 -1
  5. data/lib/octopress/version.rb +1 -1
  6. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 045208400d680e6ed16483ef0b5d48e1718f59a2
4
- data.tar.gz: 85ad683ca592253eb8d3d79794a069d317cff2b4
3
+ metadata.gz: a1ecf013c475993247a4e21ebf6a200049643836
4
+ data.tar.gz: 6c3bfa0c82d3e731c0f47d7773b0cea0b882bdc7
5
5
  SHA512:
6
- metadata.gz: 2b1b39861d32a93c2550fba4afd6a4406d787c62fb4b57310fbb5f0e49fdd239f75cee69a3e30661ac0ce8f2966c921feaaa26e0256a96d806bac76f60ceebc9
7
- data.tar.gz: ebc71834ef2f837837d2a922d3592ddcd09697ef5cc66bc7ca43b2bd2a75557c723d553e822ea8208eff9a29e3ac22c4dfbb92bfbc1b64c173e6d86f2164eb1b
6
+ metadata.gz: 99d7ccb18b1b4c258c06f5347d4b6184664457e478719e533a6c1cff579d38400fc13aecb5ff15183672ae3ccc18f630823c9f996ddb5633e7866f75a25b0888
7
+ data.tar.gz: 13f9b04aa05cd35200bbf414edc53e638e91442482db37519c3ada28cb088959bf64662ee5b1b4a1d8c779c6fd0b27d4cb8877b2ff82a7518b1dacb81f0e15b6
data/CHANGELOG.md CHANGED
@@ -1,5 +1,8 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.7 (2015-06-01)
4
+ - 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.
5
+
3
6
  ### 3.0.6 (2015-05-26)
4
7
  - Fixed issue with Bundler gem loading.
5
8
 
data/README.md CHANGED
@@ -2,8 +2,8 @@
2
2
 
3
3
  Octopress is an obsessively designed toolkit for writing and deploying Jekyll blogs. Pretty sweet, huh?
4
4
 
5
- [![Gem Version](https://badge.fury.io/rb/octopress.png)](http://badge.fury.io/rb/octopress)
6
- [![Build Status](https://travis-ci.org/octopress/octopress.png?branch=master)](https://travis-ci.org/octopress/octopress)
5
+ [![Gem Version](https://badge.fury.io/rb/octopress.svg)](http://badge.fury.io/rb/octopress)
6
+ [![Build Status](https://travis-ci.org/octopress/octopress.svg?branch=master)](https://travis-ci.org/octopress/octopress)
7
7
 
8
8
  ## Installation
9
9
 
@@ -33,6 +33,7 @@ publish <POST> # Publish a draft from _drafts to _posts
33
33
  unpublish <POST> # Search for a post and convert it into a draft
34
34
  isolate [POST] # Stash all posts but the one you're working on for a faster build
35
35
  integrate # Restores all posts, doing the opposite of the isolate command
36
+ deploy # deploy your site via S3, Cloudfront, Rsync, or to GitHub pages.
36
37
  ```
37
38
 
38
39
  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.
181
182
  | `date` | The date (if set) or Time.now.iso8601 |
182
183
  | `title` | The title of the page (if set) |
183
184
  | `slug` | The title in slug form |
184
- | `ymd` | The date string, YYYY/MM/DD format |
185
+ | `ymd` | The date string, YYYY-MM-DD format |
185
186
  | `year` | The date's year |
186
187
  | `month` | The date's month, MM |
187
188
  | `day` | The date's day, DD |
@@ -244,6 +245,26 @@ page_template: page
244
245
  draft_template: draft
245
246
  ```
246
247
 
248
+ ## Deployment
249
+
250
+ 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.
251
+
252
+ ### Basic usage
253
+
254
+ ```
255
+ octopress deploy init METHOD [options] # git, s3, or rsync - Create a _deploy.yml configuration
256
+ octopress deploy # Deploys _site based on deployment configuration
257
+ octopress pull DIR # Download your deployed site to the specified DIR
258
+ ```
259
+
260
+ You can find more detailed documentation by running:
261
+
262
+ ```
263
+ $ octopress deploy --help
264
+ ```
265
+
266
+ Or by visiting the [Octopress deploy project page](https://github.com/octopress/deploy).
267
+
247
268
  ## Contributing
248
269
 
249
270
  1. Fork it ( https://github.com/octopress/octopress/fork )
data/lib/octopress/page.rb CHANGED
@@ -164,10 +164,11 @@ module Octopress
164
164
  # Allow templates to use date fragments
165
165
  #
166
166
  date = Time.parse(vars['date'] || Time.now.iso8601)
167
+ vars['date'] = date.iso8601
167
168
  vars['year'] = date.year
168
169
  vars['month'] = date.strftime('%m')
169
170
  vars['day'] = date.strftime('%d')
170
- vars['ymd'] = date.strftime('%D')
171
+ vars['ymd'] = date.strftime('%Y-%m-%d')
171
172
 
172
173
  # If possible only parse the YAML front matter.
173
174
  # If YAML front-matter dashes aren't present parse the whole
data/lib/octopress/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.6"
2
+ VERSION = "3.0.7"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: octopress
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.6
4
+ version: 3.0.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-05-26 00:00:00.000000000 Z
12
+ date: 2015-06-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary