octopress 3.0.0.rc.14 → 3.0.0.rc.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe17080aee39ad3f2fae040eca71842cbd65f84
-  data.tar.gz: a699d7ff76b6b0ec4d4b062a488180eb5cbabcfb
+  metadata.gz: 2f7cac96f298bfc9a6c1ef49b1ca0a260fe92020
+  data.tar.gz: 002f74354fc7b7b6ad5e41b43214a1617bc222ef
 SHA512:
-  metadata.gz: e5bf0d1a2d1543581a9e895db7d3f16eca165e3716990d3697dc36724e827dc043c78c188fa786521320106a34f46ee9aed34e88b9fe87f9ed57065437ec65e7
-  data.tar.gz: a9bc9fc37b590ce5f1c638a312ff1032ed56e4af9f946f3fbb875fae7c3216150b43be6e4404b61f41974e01fbb5912a50873e27222e72970b632a542b5b416e
+  metadata.gz: 24649037612e91a43403c9ecc78656469068ee1467599aadc8aac78870d690939e386c0cec61cc3faf031f8b475dc7c356d5382a33710218b04b7ae49f3b83d0
+  data.tar.gz: 659d7d30a62c30149c2b2cac4c5f4c8e9ec44f6c25332ca9cdda302928b6c7801b4138ded9ded2b7feb123958a080d046f94b01bbfd8aee64e6ee82a0187238c

data/Rakefile

@@ -1,8 +1 @@
 require "bundler/gem_tasks"
-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.markdown', '/changelog/'
-end

data/lib/octopress.rb

@@ -46,3 +46,10 @@ module Octopress
     end
   end
 end
+
+require 'octopress-docs'
+
+Octopress::Docs.add({
+  name:        "Octopress",
+  dir:         File.expand_path(File.join(File.dirname(__FILE__), "../")),
+})

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.14"
+  VERSION = "3.0.0.rc.15"
 end

data/octopress.gemspec

@@ -21,9 +21,14 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "mercenary", "~> 0.3.2"
   spec.add_runtime_dependency "jekyll", "~> 2.0"
   spec.add_runtime_dependency "titlecase"
+  spec.add_runtime_dependency "octopress-docs"
+  spec.add_runtime_dependency "octopress-deploy"
 
   spec.add_development_dependency "octopress-ink"
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "pry-debugger"
   spec.add_development_dependency "rake"
+
+  if RUBY_VERSION >= "2"
+    spec.add_development_dependency "pry-byebug"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.14
+  version: 3.0.0.rc.15
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-26 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -53,6 +53,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-docs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-deploy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: octopress-ink
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: pry-debugger
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,8 +154,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- assets/docs/changelog.markdown
-- assets/docs/index.markdown
 - bin/octopress
 - lib/octopress.rb
 - lib/octopress/command.rb
@@ -139,7 +165,6 @@ files:
 - lib/octopress/commands/publish.rb
 - lib/octopress/commands/serve.rb
 - lib/octopress/configuration.rb
-- lib/octopress/docs.rb
 - lib/octopress/draft.rb
 - lib/octopress/page.rb
 - lib/octopress/post.rb
@@ -208,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Octopress is an obsessively designed framework for Jekyll blogging. It’s

data/assets/docs/changelog.markdown

@@ -1,55 +0,0 @@
----
-title: "Octopress Changelog"
-permalink: /changelog/
----
-
-## Current released version
-### 3.0.0 RC11 - 2014-05-23
-
-- 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)
-
-### 3.0.0 RC9 - 2014-05-07
-
-- Support for Jekyll 2.0
-
-### 3.0.0 RC8 - 2014-05-02
-
-- Improved draft date management [#35](https://github.com/octopress/octopress/issues/35)
-
-### 3.0.0 RC7 - 2014-03-24
-
-- Fixed Time.parse with `--date` option on new posts and pages.
-- Bumped Jekyll to 1.5.
-
-### 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.
-
-### 3.0.0 RC4 - 2014-03-18
-- Updated mercenary. Fixed issue: #34
-
-### 3.0.0 RC3 - 2014-03-18
-- `serve --watch` fixed. Fixed issue: #33
-
-### 3.0.0 RC2 - 2014-03-18
-- `new post` command has new `--dir` option to save new posts in _posts/<DIR>/. Fixed issue #31
-
-### 3.0.0 RC1 - 2014-03-17
-- Initial release of Octopress CLI
-

data/assets/docs/index.markdown

@@ -1,185 +0,0 @@
----
-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)-->
-[![Build Status](https://travis-ci.org/octopress/octopress.png?branch=master)](https://travis-ci.org/octopress/octopress)
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'octopress', '~> 3.0.0.rc.12'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install octopress --pre
-
-## Basic Usage
-
-Here are the commands for Octopress.
-
-| Option                          | Description                               |
-|:--------------------------------|:------------------------------------------|
-| `octopress init <PATH>`         |  Adds Octopress scaffolding to your site  |
-| `octopress new post <TITLE>`    |  Add a new post to your site              |
-| `octopress new page <PATH>`     |  Add a new page to your site              |
-| `octopress new draft <TITLE>`   |  Add a new draft post to your site        |
-| `octopress publish <PATH>`      |  Publish a draft from _drafts to _posts   |
-| `octopress new <PATH>`          |  works just like `jekyll new`             |
-| `octopress build`               |  works just like `jekyll build`           |
-| `octopress serve`               |  works just like `jekyll serve`           |
-| `octopress doctor`              |  works just like `jekyll doctor`          |
-
-Run `octopress [command] --help` to learn more about any command and see its options.
-
-### Deployment
-
-You can deploy your Octopress or Jekyll blog via git, rsync or Amazon S3. The deployment system ships with the [octopress-deploy][] gem which extends the Octopress CLI with the `deploy` command.
-
-[octopress-deploy]: https://github.com/octopress/deploy
-
-## Configuration
-
-Octopress reads its configurations from `_octopress.yml`. Here's what the configuration looks like by default.
-
-```yaml
-# Default extension for new posts and pages
-post_ext: markdown
-page_ext: html
-
-# Default templates for posts and pages
-# Found in _templates/
-post_layout: post
-page_layout: page
-
-# Format titles with titlecase?
-titlecase: true
-```
-
-## Commands
-
-### Init
-
-
-```sh
-$ 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:
-
-```
-_octopress.yml
-_templates/
-  post
-  page
-```
-
-### New Post
-
-This automates the creation of a new post.
-
-```sh
-$ octopress new post "My Title"
-```
-
-This will create a new file at `_posts/YYYY-MM-DD-my-title.markdown` with the following YAML front-matter already added.
-
-```
-layout: post
-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:
-
-| Option               | Description                             |
-|:---------------------|:----------------------------------------|
-| `--template PATH`    | Use a template from <path>              |
-| `--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 existing file.                |
-
-### New Page
-
-```
-$ octopress new page some-page           # ./some-page.html
-$ octopress new page docs/               # ./docs/index.html
-$ octopress new page about.html          # ./about.html
-```
-
-| Option               | Description                             |
-|:---------------------|:----------------------------------------|
-| `--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 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
-
-```sh
-$ octopress new draft "My Title"
-```
-
-This will create a new post in your `_drafts` directory.
-
-| Option             | Description                               |
-|:-------------------|:------------------------------------------|
-| `--template PATH`    | Use a template from <path>              |
-| `--date DATE`      | The date for the draft. Should be parseable by [Time#parse](http://ruby-doc.org/stdlib-2.1.0/libdoc/time/rdoc/Time.html#method-i-parse) (defaults to Time.now) |
-| `--slug SLUG`      | The slug for the new post.                |
-| `--force`          | Overwrite exsiting file.                  |
-
-### Publish draft
-
-```sh
-$ octopress publish _drafts/some-post.md
-```
-
-This will move your draft to the `_posts` directory and rename the file with the proper date.
-
-| Option             | Description                               |
-|:-------------------|:------------------------------------------|
-| `--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 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.
-
-### Templates for Posts and pages
-
-Octopress post and page templates look like this.
-
-```
----
-layout: {{ layout }}
-title: {{ title }}
----
-
-```
-
-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
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/lib/octopress/docs.rb

@@ -1,25 +0,0 @@
-module Octopress
-  class CLIDocs < Octopress::Ink::Plugin
-    def configuration
-      {
-        name:        "Octopress",
-        description: "An obsessively designed framework for Jekyll sites.",
-        slug:        "cli",
-        assets_path: Octopress.gem_dir('assets'),
-        version:     Octopress::VERSION
-      }
-    end
-
-    def docs_base_path
-      'docs/cli'
-    end
-
-    def info(options)
-      if options['docs']
-        super
-      else
-        ''
-      end
-    end
-  end
-end