octopress 3.0.0.rc.6 → 3.0.0.rc.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fede7ae0afd1befce5f8987619090363089f210
-  data.tar.gz: c8558827ffd7810eb1cb0b9f032d5d0f054cea09
+  metadata.gz: 59c785e8fc0a2c991a658c34c50f52da7b4b4ca0
+  data.tar.gz: ce63bf02022b52d310125846721207f010005a38
 SHA512:
-  metadata.gz: 3345a39fa96775e47225ae13964e72c9252586a56fe9aa1066519096bc326ea3db34eee47aae131c506939c11f1dac6a2a82754b96f8c710298c104aa75587ed
-  data.tar.gz: efdcb8c284cfc4128a31e92081023261c7771f96304a62ef2c9cd897cb1ded096becd2cbb0bf4a4a25896419baca8347b7f8812995d25f46aca758649776524d
+  metadata.gz: 50806cb6a15a804aa1ebd0051455671b69f6030e6b89d106431cd4c93e4e0786cb197576b54e4f3ea950efe049541cc4e699d80d598b083e9a63a3c0183ec42a
+  data.tar.gz: 2efc75fbf39e73fa9ccec8493c87d5d81e38d5715050d5a682a5334dd523060bf8459a4d21b1782df0bef9924dcd5e461ea5c249547416809110904bb13ab069

data/CHANGELOG.md

@@ -2,13 +2,18 @@
 
 ## Current released version
 
+### 3.0.0 RC7 - 2014-03-24
+
+- Fixed Time.parse with `--date` option on new posts and pages.
+- Bumped Jekyll to 1.5.
+
+## Past versions
+
 ### 3.0.0 RC6 - 2014-03-22
 
 - Added support for octopress-ink documentation system.
 - Added a `update_docs` Rake task to update docs from the readme and changelog.
 
-## Past versions
-
 ### 3.0.0 RC5 - 2014-03-21
 - Added octopress-docs to blessed gem list.
 

data/README.md

@@ -1,5 +1,6 @@
 # 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)-->
@@ -67,7 +68,7 @@ titlecase: true
 
 
 ```sh
-octopress init <PATH> [options]
+$ octopress init <PATH> [options]
 ```
 
 This will copy Octopress's scaffolding into the specified directory. Use the `--force` option to overwrite existing files. The scaffolding is pretty simple:
@@ -83,7 +84,7 @@ _templates/
 
 This automates the creation of a new post.
 
-```bash
+```sh
 $ octopress new post "My Title"
 ```
 
@@ -107,7 +108,7 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 
 ### New Page
 
-```sh
+```
 $ octopress new page some-page           # ./some-page.html
 $ octopress new page docs/               # ./docs/index.html
 $ octopress new page about.html          # ./about.html
@@ -122,7 +123,7 @@ $ octopress new page about.html          # ./about.html
 
 ### New Draft
 
-```bash
+```sh
 $ octopress new draft "My Title"
 ```
 
@@ -137,7 +138,7 @@ This will create a new post in your `_drafts` directory.
 
 ### Publish draft
 
-```bash
+```sh
 $ octopress publish _drafts/some-post.md
 ```
 
@@ -149,7 +150,6 @@ This will move your draft to the `_posts` directory and rename the file with the
 | `--slug SLUG`      | Change the slug for the new post.         |
 | `--dir DIR`        | Create post at _posts/DIR/.               |
 | `--force`          | Overwrite exsiting 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.
 
@@ -157,7 +157,7 @@ When publishing a draft, the new post will use the draft's date. Pass the option
 
 Octopress post and page templates look like this.
 
-```html
+```
 ---
 layout: {{ layout }}
 title: {{ title }}
@@ -169,7 +169,7 @@ date: {{ date }}
 The YAML variables will be replaced with the correct content when you create a page or post. To modify this template create a `_templates/post` file and change it as you wish. You can add additional YAML front-matter or content, and you can even create multiple templates. Choose a custom template when creating a new post or page like this.
 
 ```sh
-octopress new post --template _templates/linkpost
+$ octopress new post --template _templates/linkpost
 ```
 
 ## Contributing

data/Rakefile

@@ -4,5 +4,5 @@ require "octopress-ink"
 desc "Copy Readme and Changelog into docs"
 task :update_docs do
   Octopress::Ink.copy_doc 'README.md', 'assets/docs/index.markdown'
-  Octopress::Ink.copy_doc 'CHANGELOG.md', 'assets/docs/changelog/index.markdown'
+  Octopress::Ink.copy_doc 'CHANGELOG.md', 'assets/docs/changelog.markdown', '/changelog/'
 end

data/assets/docs/{changelog/index.markdown → changelog.markdown}

@@ -1,20 +1,25 @@
 ---
 title: "Octopress Changelog"
+permalink: /changelog/
 ---
 
-### HEAD - 3.0.0 RC6
+## Current released version
 
-#### Minor Enhancements
-- Added support for octopress-ink documentation system.
-- Added a `update_docs` Rake task to update index/docs/index.markdown from README.md.
+### 3.0.0 RC7 - 2014-03-24
 
-## Current released version
+- Fixed Time.parse with `--date` option on new posts and pages.
+- Bumped Jekyll to 1.5.
+
+## Past versions
+
+### 3.0.0 RC6 - 2014-03-22
+
+- Added support for octopress-ink documentation system.
+- Added a `update_docs` Rake task to update docs from the readme and changelog.
 
 ### 3.0.0 RC5 - 2014-03-21
 - Added octopress-docs to blessed gem list.
 
-## Past versions
-
 ### 3.0.0 RC4 - 2014-03-18
 - Updated mercenary. Fixed issue: #34
 

data/assets/docs/index.markdown

@@ -2,6 +2,7 @@
 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)-->
@@ -69,7 +70,7 @@ titlecase: true
 
 
 ```sh
-octopress init <PATH> [options]
+$ octopress init <PATH> [options]
 ```
 
 This will copy Octopress's scaffolding into the specified directory. Use the `--force` option to overwrite existing files. The scaffolding is pretty simple:
@@ -85,7 +86,7 @@ _templates/
 
 This automates the creation of a new post.
 
-```bash
+```sh
 $ octopress new post "My Title"
 ```
 
@@ -109,7 +110,7 @@ date: YYYY-MM-DDTHH:MM:SS-00:00
 
 ### New Page
 
-```sh
+```
 $ octopress new page some-page           # ./some-page.html
 $ octopress new page docs/               # ./docs/index.html
 $ octopress new page about.html          # ./about.html
@@ -124,7 +125,7 @@ $ octopress new page about.html          # ./about.html
 
 ### New Draft
 
-```bash
+```sh
 $ octopress new draft "My Title"
 ```
 
@@ -139,7 +140,7 @@ This will create a new post in your `_drafts` directory.
 
 ### Publish draft
 
-```bash
+```sh
 $ octopress publish _drafts/some-post.md
 ```
 
@@ -151,7 +152,6 @@ This will move your draft to the `_posts` directory and rename the file with the
 | `--slug SLUG`      | Change the slug for the new post.         |
 | `--dir DIR`        | Create post at _posts/DIR/.               |
 | `--force`          | Overwrite exsiting 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.
 
@@ -159,7 +159,7 @@ When publishing a draft, the new post will use the draft's date. Pass the option
 
 Octopress post and page templates look like this.
 
-```html
+```
 ---
 layout: {{ layout }}
 title: {{ title }}
@@ -171,7 +171,7 @@ date: {{ date }}
 The YAML variables will be replaced with the correct content when you create a page or post. To modify this template create a `_templates/post` file and change it as you wish. You can add additional YAML front-matter or content, and you can even create multiple templates. Choose a custom template when creating a new post or page like this.
 
 ```sh
-octopress new post --template _templates/linkpost
+$ octopress new post --template _templates/linkpost
 ```
 
 ## Contributing

data/lib/octopress/page.rb

@@ -74,7 +74,7 @@ module Octopress
         @options['date'] = Time.now.iso8601
       else
         begin
-          Time.parse(date.to_s).iso8601
+          Time.parse(date.to_s, Time.now).iso8601
         rescue => error
           puts 'Could not parse date. Try formatting it like YYYY-MM-DD HH:MM'
           abort error.message

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.6"
+  VERSION = "3.0.0.rc.7"
 end

data/octopress.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "mercenary", "~> 0.3.2"
-  spec.add_runtime_dependency "jekyll", "~> 1.4.3"
+  spec.add_runtime_dependency "jekyll", "~> 1.5", ">= 1.5.0"
 
   spec.add_development_dependency "octopress-ink"
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.6
+  version: 3.0.0.rc.7
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -31,14 +31,20 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '1.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: '1.5'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: octopress-ink
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +118,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- assets/docs/changelog/index.markdown
+- assets/docs/changelog.markdown
 - assets/docs/index.markdown
 - bin/octopress
 - lib/octopress.rb