octopress 3.0.0.rc.24 → 3.0.0.rc.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80b8a068d4811564da346c04165ff5958a72545b
-  data.tar.gz: 38db301d32c4ab9eebcfc5a4ad9ea9df4e5bb08a
+  metadata.gz: fdfdb7113136116ba0904db0b22ef2886137fae3
+  data.tar.gz: ae1f9fa89708f4960bbe79ce38553551654e0427
 SHA512:
-  metadata.gz: bc120b3c743aa1d11bc6ab6f553f6a4c08f7b295a983560c609439119d162a9f86f45a4c9981d5608da0dc76f536b4cbebfb1732950dae9fa93444f521e10c1e
-  data.tar.gz: 060dfc709a8f52b7fb910d3a3ff194490b64bd67a16820432fc43f2b99ebd421c820a5b61a0f28799c560b864bb2390388badd171de94fbeed37fd116cdcf53f
+  metadata.gz: 680a6330b39ad2101d428990788b044e8feec7b64239b7f7dca7ec563e9d47041ddb28a0102c523f6554ca4613eed99cf58345eb2a43d13075ccaf3c17e4fa26
+  data.tar.gz: b14dafba9c5b8d1116e25d9173817c92951bde34f48cd374d07fdb01ad6f7dbbbe5cfdfb78d44c27a7031f2c28e58817335a20b3684417c9e0f59da9730166ad

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Octopress Changelog
 
+### 3.0.0 RC25 - 2015-01-02
+
+- Fixed missing scaffolding.
+
 ### 3.0.0 RC24 - 2015-01-02
 
 - Absorbed Octopress Docs features

data/assets/docs/index.md

@@ -2,36 +2,22 @@
 title: Using Octopress
 ---
 
-## Installation
+{% include install.html %}
 
-Add this line to your application's Gemfile:
+## Octopress Commands
 
-    gem 'octopress', '~> 3.0.0.rc'
+Here are the subcommands for Octopress.
 
-And then execute:
+- `init <PATH>`          Adds Octopress scaffolding to your site.
+- `new <PATH>`           Like `jekyll new` + `octopress init`
+- `new post <TITLE>`     Add a new post to your site
+- `new page <PATH>`      Add a new page to your site
+- `new draft <TITLE>`    Add a new draft post to your site
+- `publish <PATH>`       Publish a draft from _drafts to _posts
+- `isolate [search]`     Isolate one or more posts for a faster build
+- `integrate`            Restores all posts, reverting isolation.
 
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install octopress --pre
-
-## Commands
-
-Here are the commands for Octopress.
-
-| Option                          | Description                                   |
-|:--------------------------------|:----------------------------------------------|
-| `octopress init <PATH>`         |  Adds Octopress scaffolding to your site      |
-| `octopress new <PATH>`          |  Like `jekyll new` + `octopress init`         |
-| `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 isolate [search]`    |  Isolate one or more posts for a faster build |
-| `octopress integrate`           |  Restores all posts, reverting isolation.     |
-
-Run `octopress [command] --help` to learn more about any command and see its options.
+Run `octopress --help` to list sub commands and `octopress <subcommand> --help` to learn more about any subcommand and see its options.
 
 ### Init
 

data/lib/octopress.rb

@@ -89,11 +89,13 @@ end
 
 Octopress::Docs.add({
   name:        "Octopress",
+  gem:         "octopress",
+  version:     Octopress::VERSION,
   description: "A framework for writing Jekyll sites ",
   base_url:    "octopress",
   path:        File.expand_path(File.join(File.dirname(__FILE__), "../")),
   source_url:  "https://github.com/octopress/octopress",
-  website:     "http://octopress.org"
+  website:     "http://octopress.org",
 })
 
 Octopress.require_blessed_gems

data/lib/octopress/docs.rb

@@ -93,6 +93,9 @@ module Octopress
         name: plugin.name,
         slug: plugin.slug,
         type: plugin.type,
+        version: plugin.version,
+        gem: plugin.gem,
+        description: plugin.description,
         path: plugin.path,
         source_url: plugin.source_url,
         website: plugin.website,
@@ -221,6 +224,7 @@ module Octopress
       require "octopress/docs/liquid_filters"
       require "octopress/docs/jekyll/convertible"
       require "octopress/docs/jekyll/page"
+      require "octopress-escape-code"
 
       if !options.nil?
         # Look at the local site and require all of its plugins
@@ -233,8 +237,6 @@ module Octopress
         #
         options = Docs.site.config.merge(options)
       end
-
-      require "octopress-escape-code"
       options
     end
 

data/lib/octopress/docs/doc.rb

@@ -1,19 +1,21 @@
 module Octopress
   module Docs
     class Doc
-      attr_reader :filename, :plugin_name, :plugin_slug, :base_url, :plugin_type, :description, :source_url
+      attr_reader :filename, :name, :slug, :base_url, :type, :description, :source_url, :version, :gem
 
       def initialize(options={})
         @file            = options[:file]
         @path            = options[:path] ||= '.'
         @file_dir        = File.dirname(@file)
-        @plugin_name     = options[:name]
-        @plugin_slug     = options[:slug]
-        @plugin_type     = options[:type]
+        @name            = options[:name]
+        @slug            = options[:slug]
+        @type            = options[:type]
         @base_url        = options[:base_url]
         @source_url      = options[:source_url]
         @description     = options[:description]
         @data            = options[:data] || {}
+        @gem             = options[:gem]
+        @version         = options[:version]
       end
 
       # Add doc page to Jekyll pages
@@ -41,12 +43,14 @@ module Octopress
           p.data['escape_code'] = true
 
           p.data['plugin'] = { 
-            'name'        => @plugin_name, 
-            'slug'        => @plugin_slug,
-            'type'        => @plugin_type,
+            'name'        => @name, 
+            'slug'        => @slug,
+            'type'        => @type,
             'source_url'  => @source_url,
             'description' => @description,
-            'url'         => @base_url
+            'url'         => @base_url,
+            'version'     => @version,
+            'gem'         => @gem,
           }
 
           p.data['dir'] = doc_dir
@@ -67,7 +71,7 @@ module Octopress
       end
 
       def plugin_slug
-        Jekyll::Utils.slugify(@plugin_type == 'theme' ? 'theme' : @plugin_slug)
+        Jekyll::Utils.slugify(@type == 'theme' ? 'theme' : @slug)
       end
 
       def page_dir

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.24"
+  VERSION = "3.0.0.rc.25"
 end

data/scaffold/_templates/draft

@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+---

data/scaffold/_templates/page

@@ -0,0 +1,4 @@
+---
+layout: {{ layout }}
+title: {{ title }}
+---

data/scaffold/_templates/post

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

data/site/Gemfile

@@ -5,8 +5,19 @@ gem "pry-byebug"
 
 group :jekyll_plugins do
   gem "octopress", path: "../"
-  gem "octopress-ink", path: "../../ink"
-  gem "octopress-solarized", path: "../../solarized"
-  gem "octopress-asset-pipeline", path: "../../asset-pipeline"
+  gem "octopress-ink"#, path: "../../ink"
+  gem "octopress-deploy"#, path: "../../deploy"
+  gem "octopress-solarized"#, path: "../../solarized"
+  gem "octopress-asset-pipeline"#, path: "../../asset-pipeline"
+  gem "octopress-codefence"#, path: "../../codefence"
+  gem "octopress-codeblock"#, path: "../../codeblock"
+  gem "octopress-render-code"#, path: "../../render-code"
+  gem "octopress-gist"#, path: "../../gist"
+  gem "octopress-abort-tag"#, path: "../../abort-tag"
+  gem "octopress-include-tag"#, path: "../../include-tag"
+  gem "octopress-render-tag"#, path: "../../render-tag"
+  gem "octopress-return-tag"#, path: "../../return-tag"
+  gem "octopress-minify-html"#, path: "../../minify-html"
+  gem "clash", path: "../../clash"
 end
 

data/site/_config.yml

@@ -1,7 +1,6 @@
 markdown: redcarpet
 exclude:
   - Gemfile
-gems:
-  - octopress-asset-pipeline
 redcarpet:
   extensions: ["no_intra_emphasis", "fenced_code_blocks", "autolink", "tables", "with_toc_data"]
+minify_html: false

data/site/_data/_plugins.yml

@@ -0,0 +1,35 @@
+site_tools:
+  - octopress
+  - octopress-deploy
+  - octopress-linkblog
+  - octopress-asset-pipeline
+  - octopress-blockquote-tag
+  - octopress-date-format
+  - octopress-feed
+  - octopress-minify-html
+
+themes:
+  - octopress-genesis-theme
+
+developer_tools:
+  - octopress-ink
+  - octopress-codefence
+  - octopress-gist
+  - octopress-render-code
+  - octopress-codeblock
+  - octopress-solarized
+  - clash
+
+liquid_plugins:
+  - octopress-include-tag
+  - octopress-render-tag
+  - octopress-wrap-tag
+  - octopress-abort-tag
+  - octopress-abort-tag
+  - octopress-assign-tag
+  - octopress-capture-tag
+  - octopress-filter-tag
+  - octopress-return-tag
+  - octopress-comment-tag
+  - octopress-content-for
+  - octopress-markdown-block

data/site/_includes/install.html

@@ -0,0 +1,24 @@
+<section class='install'>
+<h2>Installation</h2>
+<h3>Using Bundler</h3>
+
+<p>Add this gem to your site's Gemfile in the <code>:jekyll_plugins</code> group:</p>
+
+<pre><code>group :jekyll_plugins do
+  gem '{{ page.plugin.gem }}'
+end</code></pre>
+
+<p>Then install the gem with Bundler</p>
+
+<pre><code>$ bundle</code></pre>
+
+<h3>Manual Installation</h3>
+
+<pre><code>$ gem install {{ page.plugin.gem }}</code></pre>
+
+<p>Then add the gem to your Jekyll configuration.</p>
+
+<pre></code>gems:
+  - {{ page.plugin.gem }}
+</code></pre>
+</section>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.24
+  version: 3.0.0.rc.25
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-02 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -212,8 +212,13 @@ files:
 - local/_sass/_solarized.scss
 - local/index.html
 - local/stylesheets/site.scss
+- scaffold/_templates/draft
+- scaffold/_templates/page
+- scaffold/_templates/post
 - site/Gemfile
 - site/_config.yml
+- site/_data/_plugins.yml
+- site/_includes/install.html
 - site/_includes/nav.html
 - site/_layouts/default.html
 - site/_layouts/docs.html