octopress 3.0.0.rc.24 → 3.0.0.rc.25
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/assets/docs/index.md +12 -26
- data/lib/octopress.rb +3 -1
- data/lib/octopress/docs.rb +4 -2
- data/lib/octopress/docs/doc.rb +13 -9
- data/lib/octopress/version.rb +1 -1
- data/scaffold/_templates/draft +4 -0
- data/scaffold/_templates/page +4 -0
- data/scaffold/_templates/post +5 -0
- data/site/Gemfile +14 -3
- data/site/_config.yml +1 -2
- data/site/_data/_plugins.yml +35 -0
- data/site/_includes/install.html +24 -0
- metadata +7 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fdfdb7113136116ba0904db0b22ef2886137fae3
|
4
|
+
data.tar.gz: ae1f9fa89708f4960bbe79ce38553551654e0427
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 680a6330b39ad2101d428990788b044e8feec7b64239b7f7dca7ec563e9d47041ddb28a0102c523f6554ca4613eed99cf58345eb2a43d13075ccaf3c17e4fa26
|
7
|
+
data.tar.gz: b14dafba9c5b8d1116e25d9173817c92951bde34f48cd374d07fdb01ad6f7dbbbe5cfdfb78d44c27a7031f2c28e58817335a20b3684417c9e0f59da9730166ad
|
data/CHANGELOG.md
CHANGED
data/assets/docs/index.md
CHANGED
@@ -2,36 +2,22 @@
|
|
2
2
|
title: Using Octopress
|
3
3
|
---
|
4
4
|
|
5
|
-
|
5
|
+
{% include install.html %}
|
6
6
|
|
7
|
-
|
7
|
+
## Octopress Commands
|
8
8
|
|
9
|
-
|
9
|
+
Here are the subcommands for Octopress.
|
10
10
|
|
11
|
-
|
11
|
+
- `init <PATH>` Adds Octopress scaffolding to your site.
|
12
|
+
- `new <PATH>` Like `jekyll new` + `octopress init`
|
13
|
+
- `new post <TITLE>` Add a new post to your site
|
14
|
+
- `new page <PATH>` Add a new page to your site
|
15
|
+
- `new draft <TITLE>` Add a new draft post to your site
|
16
|
+
- `publish <PATH>` Publish a draft from _drafts to _posts
|
17
|
+
- `isolate [search]` Isolate one or more posts for a faster build
|
18
|
+
- `integrate` Restores all posts, reverting isolation.
|
12
19
|
|
13
|
-
|
14
|
-
|
15
|
-
Or install it yourself as:
|
16
|
-
|
17
|
-
$ gem install octopress --pre
|
18
|
-
|
19
|
-
## Commands
|
20
|
-
|
21
|
-
Here are the commands for Octopress.
|
22
|
-
|
23
|
-
| Option | Description |
|
24
|
-
|:--------------------------------|:----------------------------------------------|
|
25
|
-
| `octopress init <PATH>` | Adds Octopress scaffolding to your site |
|
26
|
-
| `octopress new <PATH>` | Like `jekyll new` + `octopress init` |
|
27
|
-
| `octopress new post <TITLE>` | Add a new post to your site |
|
28
|
-
| `octopress new page <PATH>` | Add a new page to your site |
|
29
|
-
| `octopress new draft <TITLE>` | Add a new draft post to your site |
|
30
|
-
| `octopress publish <PATH>` | Publish a draft from _drafts to _posts |
|
31
|
-
| `octopress isolate [search]` | Isolate one or more posts for a faster build |
|
32
|
-
| `octopress integrate` | Restores all posts, reverting isolation. |
|
33
|
-
|
34
|
-
Run `octopress [command] --help` to learn more about any command and see its options.
|
20
|
+
Run `octopress --help` to list sub commands and `octopress <subcommand> --help` to learn more about any subcommand and see its options.
|
35
21
|
|
36
22
|
### Init
|
37
23
|
|
data/lib/octopress.rb
CHANGED
@@ -89,11 +89,13 @@ end
|
|
89
89
|
|
90
90
|
Octopress::Docs.add({
|
91
91
|
name: "Octopress",
|
92
|
+
gem: "octopress",
|
93
|
+
version: Octopress::VERSION,
|
92
94
|
description: "A framework for writing Jekyll sites ",
|
93
95
|
base_url: "octopress",
|
94
96
|
path: File.expand_path(File.join(File.dirname(__FILE__), "../")),
|
95
97
|
source_url: "https://github.com/octopress/octopress",
|
96
|
-
website: "http://octopress.org"
|
98
|
+
website: "http://octopress.org",
|
97
99
|
})
|
98
100
|
|
99
101
|
Octopress.require_blessed_gems
|
data/lib/octopress/docs.rb
CHANGED
@@ -93,6 +93,9 @@ module Octopress
|
|
93
93
|
name: plugin.name,
|
94
94
|
slug: plugin.slug,
|
95
95
|
type: plugin.type,
|
96
|
+
version: plugin.version,
|
97
|
+
gem: plugin.gem,
|
98
|
+
description: plugin.description,
|
96
99
|
path: plugin.path,
|
97
100
|
source_url: plugin.source_url,
|
98
101
|
website: plugin.website,
|
@@ -221,6 +224,7 @@ module Octopress
|
|
221
224
|
require "octopress/docs/liquid_filters"
|
222
225
|
require "octopress/docs/jekyll/convertible"
|
223
226
|
require "octopress/docs/jekyll/page"
|
227
|
+
require "octopress-escape-code"
|
224
228
|
|
225
229
|
if !options.nil?
|
226
230
|
# Look at the local site and require all of its plugins
|
@@ -233,8 +237,6 @@ module Octopress
|
|
233
237
|
#
|
234
238
|
options = Docs.site.config.merge(options)
|
235
239
|
end
|
236
|
-
|
237
|
-
require "octopress-escape-code"
|
238
240
|
options
|
239
241
|
end
|
240
242
|
|
data/lib/octopress/docs/doc.rb
CHANGED
@@ -1,19 +1,21 @@
|
|
1
1
|
module Octopress
|
2
2
|
module Docs
|
3
3
|
class Doc
|
4
|
-
attr_reader :filename, :
|
4
|
+
attr_reader :filename, :name, :slug, :base_url, :type, :description, :source_url, :version, :gem
|
5
5
|
|
6
6
|
def initialize(options={})
|
7
7
|
@file = options[:file]
|
8
8
|
@path = options[:path] ||= '.'
|
9
9
|
@file_dir = File.dirname(@file)
|
10
|
-
@
|
11
|
-
@
|
12
|
-
@
|
10
|
+
@name = options[:name]
|
11
|
+
@slug = options[:slug]
|
12
|
+
@type = options[:type]
|
13
13
|
@base_url = options[:base_url]
|
14
14
|
@source_url = options[:source_url]
|
15
15
|
@description = options[:description]
|
16
16
|
@data = options[:data] || {}
|
17
|
+
@gem = options[:gem]
|
18
|
+
@version = options[:version]
|
17
19
|
end
|
18
20
|
|
19
21
|
# Add doc page to Jekyll pages
|
@@ -41,12 +43,14 @@ module Octopress
|
|
41
43
|
p.data['escape_code'] = true
|
42
44
|
|
43
45
|
p.data['plugin'] = {
|
44
|
-
'name' => @
|
45
|
-
'slug' => @
|
46
|
-
'type' => @
|
46
|
+
'name' => @name,
|
47
|
+
'slug' => @slug,
|
48
|
+
'type' => @type,
|
47
49
|
'source_url' => @source_url,
|
48
50
|
'description' => @description,
|
49
|
-
'url' => @base_url
|
51
|
+
'url' => @base_url,
|
52
|
+
'version' => @version,
|
53
|
+
'gem' => @gem,
|
50
54
|
}
|
51
55
|
|
52
56
|
p.data['dir'] = doc_dir
|
@@ -67,7 +71,7 @@ module Octopress
|
|
67
71
|
end
|
68
72
|
|
69
73
|
def plugin_slug
|
70
|
-
Jekyll::Utils.slugify(@
|
74
|
+
Jekyll::Utils.slugify(@type == 'theme' ? 'theme' : @slug)
|
71
75
|
end
|
72
76
|
|
73
77
|
def page_dir
|
data/lib/octopress/version.rb
CHANGED
data/site/Gemfile
CHANGED
@@ -5,8 +5,19 @@ gem "pry-byebug"
|
|
5
5
|
|
6
6
|
group :jekyll_plugins do
|
7
7
|
gem "octopress", path: "../"
|
8
|
-
gem "octopress-ink"
|
9
|
-
gem "octopress-
|
10
|
-
gem "octopress-
|
8
|
+
gem "octopress-ink"#, path: "../../ink"
|
9
|
+
gem "octopress-deploy"#, path: "../../deploy"
|
10
|
+
gem "octopress-solarized"#, path: "../../solarized"
|
11
|
+
gem "octopress-asset-pipeline"#, path: "../../asset-pipeline"
|
12
|
+
gem "octopress-codefence"#, path: "../../codefence"
|
13
|
+
gem "octopress-codeblock"#, path: "../../codeblock"
|
14
|
+
gem "octopress-render-code"#, path: "../../render-code"
|
15
|
+
gem "octopress-gist"#, path: "../../gist"
|
16
|
+
gem "octopress-abort-tag"#, path: "../../abort-tag"
|
17
|
+
gem "octopress-include-tag"#, path: "../../include-tag"
|
18
|
+
gem "octopress-render-tag"#, path: "../../render-tag"
|
19
|
+
gem "octopress-return-tag"#, path: "../../return-tag"
|
20
|
+
gem "octopress-minify-html"#, path: "../../minify-html"
|
21
|
+
gem "clash", path: "../../clash"
|
11
22
|
end
|
12
23
|
|
data/site/_config.yml
CHANGED
@@ -0,0 +1,35 @@
|
|
1
|
+
site_tools:
|
2
|
+
- octopress
|
3
|
+
- octopress-deploy
|
4
|
+
- octopress-linkblog
|
5
|
+
- octopress-asset-pipeline
|
6
|
+
- octopress-blockquote-tag
|
7
|
+
- octopress-date-format
|
8
|
+
- octopress-feed
|
9
|
+
- octopress-minify-html
|
10
|
+
|
11
|
+
themes:
|
12
|
+
- octopress-genesis-theme
|
13
|
+
|
14
|
+
developer_tools:
|
15
|
+
- octopress-ink
|
16
|
+
- octopress-codefence
|
17
|
+
- octopress-gist
|
18
|
+
- octopress-render-code
|
19
|
+
- octopress-codeblock
|
20
|
+
- octopress-solarized
|
21
|
+
- clash
|
22
|
+
|
23
|
+
liquid_plugins:
|
24
|
+
- octopress-include-tag
|
25
|
+
- octopress-render-tag
|
26
|
+
- octopress-wrap-tag
|
27
|
+
- octopress-abort-tag
|
28
|
+
- octopress-abort-tag
|
29
|
+
- octopress-assign-tag
|
30
|
+
- octopress-capture-tag
|
31
|
+
- octopress-filter-tag
|
32
|
+
- octopress-return-tag
|
33
|
+
- octopress-comment-tag
|
34
|
+
- octopress-content-for
|
35
|
+
- octopress-markdown-block
|
@@ -0,0 +1,24 @@
|
|
1
|
+
<section class='install'>
|
2
|
+
<h2>Installation</h2>
|
3
|
+
<h3>Using Bundler</h3>
|
4
|
+
|
5
|
+
<p>Add this gem to your site's Gemfile in the <code>:jekyll_plugins</code> group:</p>
|
6
|
+
|
7
|
+
<pre><code>group :jekyll_plugins do
|
8
|
+
gem '{{ page.plugin.gem }}'
|
9
|
+
end</code></pre>
|
10
|
+
|
11
|
+
<p>Then install the gem with Bundler</p>
|
12
|
+
|
13
|
+
<pre><code>$ bundle</code></pre>
|
14
|
+
|
15
|
+
<h3>Manual Installation</h3>
|
16
|
+
|
17
|
+
<pre><code>$ gem install {{ page.plugin.gem }}</code></pre>
|
18
|
+
|
19
|
+
<p>Then add the gem to your Jekyll configuration.</p>
|
20
|
+
|
21
|
+
<pre></code>gems:
|
22
|
+
- {{ page.plugin.gem }}
|
23
|
+
</code></pre>
|
24
|
+
</section>
|
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.0.rc.
|
4
|
+
version: 3.0.0.rc.25
|
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-01-
|
12
|
+
date: 2015-01-05 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: mercenary
|
@@ -212,8 +212,13 @@ files:
|
|
212
212
|
- local/_sass/_solarized.scss
|
213
213
|
- local/index.html
|
214
214
|
- local/stylesheets/site.scss
|
215
|
+
- scaffold/_templates/draft
|
216
|
+
- scaffold/_templates/page
|
217
|
+
- scaffold/_templates/post
|
215
218
|
- site/Gemfile
|
216
219
|
- site/_config.yml
|
220
|
+
- site/_data/_plugins.yml
|
221
|
+
- site/_includes/install.html
|
217
222
|
- site/_includes/nav.html
|
218
223
|
- site/_layouts/default.html
|
219
224
|
- site/_layouts/docs.html
|