octopress 3.0.0.rc.23 → 3.0.0.rc.24

Sign up to get free protection for your applications and to get access to all the features.
Files changed (73) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +4 -0
  3. data/assets/docs/docs.md +28 -0
  4. data/lib/octopress.rb +2 -1
  5. data/lib/octopress/commands/docs.rb +41 -0
  6. data/lib/octopress/docs.rb +256 -0
  7. data/lib/octopress/docs/doc.rb +91 -0
  8. data/lib/octopress/docs/hooks.rb +19 -0
  9. data/lib/octopress/docs/jekyll/convertible.rb +32 -0
  10. data/lib/octopress/docs/jekyll/page.rb +52 -0
  11. data/lib/octopress/docs/liquid_filters.rb +14 -0
  12. data/lib/octopress/version.rb +1 -1
  13. data/local/Gemfile +11 -0
  14. data/local/_config.yml +5 -0
  15. data/local/_includes/nav.html +7 -0
  16. data/local/_layouts/default.html +12 -0
  17. data/local/_layouts/docs.html +15 -0
  18. data/local/_layouts/docs_index.html +7 -0
  19. data/local/_plugins/docs.rb +5 -0
  20. data/local/_sass/_solarized.scss +1 -0
  21. data/local/index.html +13 -0
  22. data/local/stylesheets/site.scss +3 -0
  23. data/site/Gemfile +12 -0
  24. data/site/_config.yml +7 -0
  25. data/site/_includes/nav.html +7 -0
  26. data/site/_layouts/default.html +14 -0
  27. data/site/_layouts/docs.html +15 -0
  28. data/site/_layouts/docs_index.html +7 -0
  29. data/site/_plugins/docs.rb +2 -0
  30. data/site/index.html +13 -0
  31. data/site/stylesheets/site.scss +2 -0
  32. metadata +50 -82
  33. data/.clash.yml +0 -164
  34. data/.gitignore +0 -21
  35. data/.travis.yml +0 -8
  36. data/Gemfile +0 -4
  37. data/Rakefile +0 -1
  38. data/octopress.gemspec +0 -35
  39. data/scaffold/_templates/draft +0 -4
  40. data/scaffold/_templates/page +0 -4
  41. data/scaffold/_templates/post +0 -5
  42. data/test/Gemfile +0 -3
  43. data/test/_config.yml +0 -3
  44. data/test/_expected/blank/_config.yml +0 -1
  45. data/test/_expected/blank/_templates/draft +0 -4
  46. data/test/_expected/blank/_templates/page +0 -4
  47. data/test/_expected/blank/_templates/post +0 -5
  48. data/test/_expected/blank/index.html +0 -0
  49. data/test/_expected/integrate/_posts/2011-11-11-a-random-post.markdown +0 -6
  50. data/test/_expected/integrate/_posts/2012-11-11-another-random-post.markdown +0 -6
  51. data/test/_expected/integrate/_posts/2013-11-11-this-post-is-happy.markdown +0 -6
  52. data/test/_expected/isolate-path/_posts/2011-11-11-a-random-post.markdown +0 -6
  53. data/test/_expected/isolate-path/_posts/_exile/2012-11-11-another-random-post.markdown +0 -6
  54. data/test/_expected/isolate-path/_posts/_exile/2013-11-11-this-post-is-happy.markdown +0 -6
  55. data/test/_expected/isolate-search/_posts/2011-11-11-a-random-post.markdown +0 -6
  56. data/test/_expected/isolate-search/_posts/2012-11-11-another-random-post.markdown +0 -6
  57. data/test/_expected/isolate-search/_posts/_exile/2013-11-11-this-post-is-happy.markdown +0 -6
  58. data/test/_expected/isolate/_posts/2013-11-11-this-post-is-happy.markdown +0 -6
  59. data/test/_expected/isolate/_posts/_exile/2011-11-11-a-random-post.markdown +0 -6
  60. data/test/_expected/isolate/_posts/_exile/2012-11-11-another-random-post.markdown +0 -6
  61. data/test/_expected/new-draft-slug/_drafts/idea.markdown +0 -5
  62. data/test/_expected/new-draft/_drafts/some-cool-idea.markdown +0 -6
  63. data/test/_expected/new-page-date/pages/awesome-page.html +0 -6
  64. data/test/_expected/new-page-extension/pages/awesome-page.md +0 -5
  65. data/test/_expected/new-page-index/pages/index.html +0 -5
  66. data/test/_expected/new-page-template/pages/awesome-page.html +0 -6
  67. data/test/_expected/new-page/pages/awesome-page.html +0 -5
  68. data/test/_expected/new-post-dir/_posts/stuff/2014-02-11-some-stuff.markdown +0 -6
  69. data/test/_expected/new-post-slug/_posts/2014-03-13-awesome.markdown +0 -6
  70. data/test/_expected/new-post/_posts/2014-03-12-awesome-stuff.markdown +0 -6
  71. data/test/_expected/publish-draft-date/_posts/2014-03-11-some-cool-idea.markdown +0 -6
  72. data/test/_expected/publish-draft-dir/_posts/ideas/2014-03-10-some-cool-idea.markdown +0 -6
  73. data/test/_expected/publish-draft/_posts/2014-03-10-some-cool-idea.markdown +0 -6
data/.clash.yml DELETED
@@ -1,164 +0,0 @@
1
- -
2
- tasks:
3
- reset_site:
4
- - cleanup
5
- - octopress new . --blank --force
6
- - rm index.html
7
- - echo "<div class=post>{{ page.title }}{{ content }}</div>" > _layouts/post.html
8
- - echo "<div class=page>{{ page.title }}{{ content }}</div>" > _layouts/page.html
9
- new_draft:
10
- - octopress new draft "Some Cool Idea" --date "2014-03-10 15:20 -0000"
11
- new_posts:
12
- - octopress new post "A random post" --date "2011-11-11 11:11 -0000"
13
- - octopress new post "Another random post" --date "2012-11-11 11:11 -0000"
14
- - octopress new post "This post is happy." --date "2013-11-11 11:11 -0000"
15
- cleanup:
16
- - echo "Cleaning up..."
17
- - rm -rf _layouts _drafts _templates _posts _site pages site
18
-
19
- -
20
- title: Create a blank site
21
- before:
22
- - 'rm -rf site'
23
- - 'octopress new site --blank'
24
- - 'echo "timezone: GMT" > site/_config.yml'
25
- compare: _expected/blank site
26
-
27
- -
28
- title: Add a new post
29
- before:
30
- - reset_site
31
- - 'octopress new post "Awesome stuff" --date "2014-03-12 05:10 -0000"'
32
- compare:
33
- - _expected/new-post/_posts _posts
34
- -
35
- title: Add a post with a slug
36
- before:
37
- - reset_site
38
- - 'octopress new post "Super Awesome stuff" --slug awesome --date "2014-03-13 15:20 -0000"'
39
- compare:
40
- - _expected/new-post-slug/_posts _posts
41
- -
42
- title: Add a post in a subdirectory
43
- before:
44
- - reset_site
45
- - 'octopress new post "Some stuff" --dir stuff --date "2014-02-11 05:10 -0000"'
46
- compare:
47
- - _expected/new-post-dir/_posts _posts
48
- -
49
- title: Add a draft
50
- before:
51
- - reset_site
52
- - new_draft
53
- compare:
54
- - _expected/new-draft/_drafts _drafts
55
- -
56
- title: Add a draft with a slug
57
- before:
58
- - reset_site
59
- - 'octopress new draft "Some great idea for a post" --slug idea'
60
- compare:
61
- - _expected/new-draft-slug/_drafts _drafts
62
- -
63
- title: Publish a draft
64
- before:
65
- - reset_site
66
- - new_draft
67
- - 'octopress publish _drafts/some-cool-idea.markdown'
68
- compare:
69
- - _expected/publish-draft/_posts _posts
70
- enforce_missing: drafts/*
71
-
72
- -
73
- title: Publish a draft with a date
74
- before:
75
- - reset_site
76
- - new_draft
77
- - 'octopress publish _drafts/some-cool-idea.markdown --date "2014-03-11 20:20 -0000"'
78
- compare:
79
- - _expected/publish-draft-date/_posts _posts
80
- enforce_missing: drafts/*
81
-
82
- -
83
- title: Publish a draft in a dir
84
- before:
85
- - reset_site
86
- - new_draft
87
- - 'octopress publish _drafts/some-cool-idea.markdown --dir ideas'
88
- compare:
89
- - _expected/publish-draft-dir/_posts _posts
90
- enforce_missing: drafts/*
91
-
92
- -
93
- title: Add a page
94
- before:
95
- - reset_site
96
- - 'octopress new page pages/awesome-page --title "Awesome Page"'
97
- compare:
98
- - _expected/new-page/pages pages
99
-
100
- -
101
- title: Add a page with an extension
102
- before:
103
- - reset_site
104
- - 'octopress new page pages/awesome-page.md --title "Awesome Page"'
105
- compare:
106
- - _expected/new-page-extension/pages pages
107
- -
108
- title: Add an index page
109
- before:
110
- - reset_site
111
- - 'octopress new page pages/ --title "Awesome Page"'
112
- compare:
113
- - _expected/new-page-index/pages pages
114
- -
115
- title: Add a page with a custom template
116
- before:
117
- - reset_site
118
- - 'echo "---\nlayout: {{ layout }}\ntitle: {{ title }}\nkittens: true\n---" > _templates/other_page'
119
- - 'octopress new page pages/awesome-page --template other_page'
120
- compare:
121
- - _expected/new-page-template/pages pages
122
- -
123
- title: Add a page with a date
124
- before:
125
- - reset_site
126
- - 'octopress new page pages/awesome-page --date "2011-11-11 11:11 -0000"'
127
- compare:
128
- - _expected/new-page-date/pages pages
129
- -
130
- title: Isolate posts
131
- before:
132
- - reset_site
133
- - new_posts
134
- - 'octopress isolate'
135
- compare:
136
- - _expected/isolate/_posts _posts
137
- -
138
- title: Isolate posts with search
139
- before:
140
- - reset_site
141
- - new_posts
142
- - 'octopress isolate random-post'
143
- compare:
144
- - _expected/isolate-search/_posts _posts
145
- -
146
- title: Isolate posts with path
147
- before:
148
- - reset_site
149
- - new_posts
150
- - 'octopress isolate --path _posts/2011-11-11-a-random-post.markdown'
151
- compare:
152
- - _expected/isolate-path/_posts _posts
153
- -
154
- title: Integrate posts
155
- before:
156
- - reset_site
157
- - new_posts
158
- - octopress isolate
159
- - 'octopress integrate'
160
- compare:
161
- - _expected/integrate/_posts _posts
162
- -
163
- title: Cleanup
164
- before: cleanup
data/.gitignore DELETED
@@ -1,21 +0,0 @@
1
- *.gem
2
- *.rbc
3
- .bundle
4
- .config
5
- .yardoc
6
- Gemfile.lock
7
- InstalledFiles
8
- _yardoc
9
- coverage
10
- doc/
11
- lib/bundler/man
12
- pkg
13
- rdoc
14
- spec/reports
15
- test/tmp
16
- test/version_tmp
17
- tmp
18
- .sass-cache
19
- .code-highlighter-cache
20
- test-site
21
- .DS_Store
@@ -1,8 +0,0 @@
1
- language: ruby
2
- rvm:
3
- - 2.0.0
4
- - 1.9.3
5
- script: bundle exec clash test
6
- notifications:
7
- slack:
8
- secure: dncCjIXWEWS8q79MK6OgR9puH3I3W/DrToPo047+rTw4txCr2WZ9o8bcwTCdvuqHQmTB+ofz38ZZQvfF+q0SrG4AP3HPLXc6zv3QOv4Koy7JXDFWg9UMBUvvDSXneOmAJj/wdHAnvrx6LFAFUqutSgJUh6sqOS/yoUlQs5LDPxY=
data/Gemfile DELETED
@@ -1,4 +0,0 @@
1
- source 'https://rubygems.org'
2
-
3
- # Specify your gem's dependencies in octopress.gemspec
4
- gemspec
data/Rakefile DELETED
@@ -1 +0,0 @@
1
- require "bundler/gem_tasks"
@@ -1,35 +0,0 @@
1
- # coding: utf-8
2
- lib = File.expand_path('../lib', __FILE__)
3
- $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
- require 'octopress/version'
5
-
6
- Gem::Specification.new do |spec|
7
- spec.name = "octopress"
8
- spec.version = Octopress::VERSION
9
- spec.authors = ["Brandon Mathis", "Parker Moore"]
10
- spec.email = ["brandon@imathis.com", "parkrmoore@gmail.com"]
11
- spec.description = %q{Octopress is an obsessively designed framework for Jekyll blogging. It’s easy to configure and easy to deploy. Sweet huh?}
12
- spec.summary = %q{Octopress is an obsessively designed framework for Jekyll blogging. It’s easy to configure and easy to deploy. Sweet huh?}
13
- spec.homepage = "http://octopress.org"
14
- spec.license = "MIT"
15
-
16
- spec.files = `git ls-files`.split($/)
17
- spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
18
- spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
19
- spec.require_paths = ["lib"]
20
-
21
- spec.add_runtime_dependency "mercenary", "~> 0.3.2"
22
- spec.add_runtime_dependency "jekyll", "~> 2.0"
23
- spec.add_runtime_dependency "titlecase"
24
- spec.add_runtime_dependency "octopress-docs"
25
- spec.add_runtime_dependency "octopress-deploy"
26
-
27
- spec.add_development_dependency "octopress-ink", "~> 1.0.0.rc"
28
- spec.add_development_dependency "bundler", "~> 1.3"
29
- spec.add_development_dependency "rake"
30
- spec.add_development_dependency "clash"
31
-
32
- if RUBY_VERSION >= "2"
33
- spec.add_development_dependency "pry-byebug"
34
- end
35
- end
@@ -1,4 +0,0 @@
1
- ---
2
- layout: {{ layout }}
3
- title: {{ title }}
4
- ---
@@ -1,4 +0,0 @@
1
- ---
2
- layout: {{ layout }}
3
- title: {{ title }}
4
- ---
@@ -1,5 +0,0 @@
1
- ---
2
- layout: {{ layout }}
3
- title: {{ title }}
4
- date: {{ date }}
5
- ---
@@ -1,3 +0,0 @@
1
- source 'https://rubygems.org'
2
-
3
- gemspec path: "../"
@@ -1,3 +0,0 @@
1
- timezone: GMT
2
- exclude:
3
- - Gemfile*
@@ -1 +0,0 @@
1
- timezone: GMT
@@ -1,4 +0,0 @@
1
- ---
2
- layout: {{ layout }}
3
- title: {{ title }}
4
- ---
@@ -1,4 +0,0 @@
1
- ---
2
- layout: {{ layout }}
3
- title: {{ title }}
4
- ---
@@ -1,5 +0,0 @@
1
- ---
2
- layout: {{ layout }}
3
- title: {{ title }}
4
- date: {{ date }}
5
- ---
File without changes
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "A Random Post"
4
- date: 2011-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "Another Random Post"
4
- date: 2012-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "This Post Is Happy."
4
- date: 2013-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "A Random Post"
4
- date: 2011-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "Another Random Post"
4
- date: 2012-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "This Post Is Happy."
4
- date: 2013-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "A Random Post"
4
- date: 2011-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "Another Random Post"
4
- date: 2012-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "This Post Is Happy."
4
- date: 2013-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "This Post Is Happy."
4
- date: 2013-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "A Random Post"
4
- date: 2011-11-11T11:11:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "Another Random Post"
4
- date: 2012-11-11T11:11:00Z
5
- ---
6
-
@@ -1,5 +0,0 @@
1
- ---
2
- layout: post
3
- title: "Some Great Idea for a Post"
4
- ---
5
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "Some Cool Idea"
4
- date: 2014-03-10T15:20:00Z
5
- ---
6
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: page
3
- title: ""
4
- date: 2011-11-11T11:11:00Z
5
- ---
6
-
@@ -1,5 +0,0 @@
1
- ---
2
- layout: page
3
- title: "Awesome Page"
4
- ---
5
-
@@ -1,5 +0,0 @@
1
- ---
2
- layout: page
3
- title: "Awesome Page"
4
- ---
5
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: page
3
- title: ""
4
- kittens: true
5
- ---
6
-
@@ -1,5 +0,0 @@
1
- ---
2
- layout: page
3
- title: "Awesome Page"
4
- ---
5
-
@@ -1,6 +0,0 @@
1
- ---
2
- layout: post
3
- title: "Some Stuff"
4
- date: 2014-02-11T05:10:00Z
5
- ---
6
-