octopress 3.0.4 → 3.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ca55c9c24a5374ec8cf04cce863a3c38272ad8a6
4
- data.tar.gz: 1eb7d555f92b3a4fda4296f293f016ed6459ba78
3
+ metadata.gz: 8853adf01a49df0352d97c3172b0cd10d83b1ce8
4
+ data.tar.gz: 6cff575d97cf58d1dc0ed07e9a32747945d940fa
5
5
  SHA512:
6
- metadata.gz: 663ca23814e4e44203e24142189343de2f047fd323db0066701144e95bbf3b09b759e6155d325aee82ffd89a690ace1edcbb2bda7f7a4241dd128fd71b8f857d
7
- data.tar.gz: 34e10d98e9a607c81dec18c562362e443445d5d36970383e8a10ddb89fa34ec48d57afd75bc1d4ec6296ec95fb424c41a103c502c4d9e259f80ea2712abd6576
6
+ metadata.gz: 1ec28f6de5831b7b1993b6d050ef2b7aad371ee670d0cb3cdfe2bbe0b0ba9f4183f29ddf8ae03cb711147121e387beb5c78226a2db20cdb09edab42aee36762d
7
+ data.tar.gz: a15844bf5fda99a0a7935e61e97d4bdcce36f01aa3d8b1e20df7c2083dde0201389c32c6328f3523eeadd9dc95926e6a147dc7d9ad41f6633760e1ecba37727d
data/CHANGELOG.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # Changelog
2
2
 
3
+ ### 3.0.5 (2015-05-12)
4
+ - Support for Jekyll 2 & 3
5
+ - Relaxed version requirements for Jekyll
6
+ - Added support for Jekyll Hooks when available
7
+ - Support for < Jekyll 2.5 by loading Jekyll plugins manually if necessary
8
+ - Updated documentation for adding doc pages to plugins
9
+ - Requiring Redcarpet because it gives us proper codefences for documentation pages (Ugh. I don't like Kramdown)
10
+
3
11
  ### 3.0.4 (2015-05-10)
4
12
  - Fix: Changed shortcode for `--dir` to `-D` so it doesn't interfere with `-d` for `--date`.
5
13
 
data/README.md CHANGED
@@ -9,7 +9,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
9
9
 
10
10
  Add this line to your application's Gemfile:
11
11
 
12
- gem 'octopress', '~> 3.0.0.rc'
12
+ gem 'octopress', '~> 3.0'
13
13
 
14
14
  And then execute:
15
15
 
@@ -17,7 +17,7 @@ And then execute:
17
17
 
18
18
  Or install it yourself as:
19
19
 
20
- $ gem install octopress --pre
20
+ $ gem install octopress
21
21
 
22
22
  ## Octopress Commands
23
23
 
data/assets/docs/docs.md CHANGED
@@ -16,6 +16,7 @@ the code below to automatically add your plugin's Readme, Changelog and any page
16
16
  if defined? Octopress::Docs
17
17
  Octopress::Docs.add({
18
18
  name: "Your Plugin",
19
+ gem_name: "your-gem",
19
20
  description: "This plugin causes awesomeness",
20
21
  path: File.expand_path(File.join(File.dirname(__FILE__), "../")), # gem root
21
22
  slug: "your-plugin", # optional
data/lib/octopress.rb CHANGED
@@ -66,8 +66,10 @@ module Octopress
66
66
  def read_site(options={})
67
67
  Jekyll.logger.log_level = :error
68
68
  s = Jekyll::Site.new(Jekyll.configuration(options))
69
- Jekyll::PluginManager.require_from_bundler
70
- s.plugin_manager.conscientious_require
69
+ if defined?(Jekyll::PluginManager) && Jekyll::PluginManager.respond_to?(:require_from_bundler)
70
+ Jekyll::PluginManager.require_from_bundler
71
+ s.plugin_manager.conscientious_require
72
+ end
71
73
  Jekyll.logger.log_level = :info
72
74
  alias_site_title(s)
73
75
  end
@@ -100,7 +102,7 @@ module Octopress
100
102
  end
101
103
  end
102
104
 
103
- def self.require_gems
105
+ def require_gems
104
106
  require_blessed_gems
105
107
 
106
108
  if !ENV["OCTOPRESS_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
@@ -108,6 +110,7 @@ module Octopress
108
110
  require "bundler"
109
111
  Bundler.require(:default)
110
112
  Bundler.require(:octopress)
113
+ Bundler.require(:jekyll_plugins)
111
114
  true
112
115
  rescue LoadError, Bundler::GemfileNotFound
113
116
  false
@@ -1,16 +1,28 @@
1
1
  module Octopress
2
2
  module Docs
3
- class DocsSiteHook < Octopress::Hooks::Site
4
- def pre_render(site)
3
+ if defined?(Jekyll::Hooks)
4
+ Jekyll::Hooks.register :site, :pre_render do |site, payload|
5
5
  if Octopress::Docs.enabled?
6
- Octopress.site = site
7
- site.pages.concat Octopress::Docs.pages
6
+ Octopress::Docs.pages_info.each do |key, val|
7
+ Octopress.site = site
8
+ site.pages.concat Octopress::Docs.pages
9
+ payload[key] = val
10
+ end
8
11
  end
9
12
  end
13
+ else
14
+ class DocsSiteHook < Octopress::Hooks::Site
15
+ def pre_render(site)
16
+ if Octopress::Docs.enabled?
17
+ Octopress.site = site
18
+ site.pages.concat Octopress::Docs.pages
19
+ end
20
+ end
10
21
 
11
- def merge_payload(payload, site)
12
- if Octopress::Docs.enabled?
13
- Octopress::Docs.pages_info
22
+ def merge_payload(payload, site)
23
+ if Octopress::Docs.enabled?
24
+ Octopress::Docs.pages_info
25
+ end
14
26
  end
15
27
  end
16
28
  end
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.4"
2
+ VERSION = "3.0.5"
3
3
  end
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.4
4
+ version: 3.0.5
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-05-10 00:00:00.000000000 Z
12
+ date: 2015-05-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary
@@ -31,14 +31,14 @@ dependencies:
31
31
  requirements:
32
32
  - - ">="
33
33
  - !ruby/object:Gem::Version
34
- version: '2.5'
34
+ version: '2.0'
35
35
  type: :runtime
36
36
  prerelease: false
37
37
  version_requirements: !ruby/object:Gem::Requirement
38
38
  requirements:
39
39
  - - ">="
40
40
  - !ruby/object:Gem::Version
41
- version: '2.5'
41
+ version: '2.0'
42
42
  - !ruby/object:Gem::Dependency
43
43
  name: titlecase
44
44
  requirement: !ruby/object:Gem::Requirement
@@ -96,19 +96,33 @@ dependencies:
96
96
  - !ruby/object:Gem::Version
97
97
  version: '2.0'
98
98
  - !ruby/object:Gem::Dependency
99
- name: octopress-ink
99
+ name: redcarpet
100
100
  requirement: !ruby/object:Gem::Requirement
101
101
  requirements:
102
102
  - - "~>"
103
103
  - !ruby/object:Gem::Version
104
- version: 1.0.0.rc
105
- type: :development
104
+ version: '3.0'
105
+ type: :runtime
106
106
  prerelease: false
107
107
  version_requirements: !ruby/object:Gem::Requirement
108
108
  requirements:
109
109
  - - "~>"
110
110
  - !ruby/object:Gem::Version
111
- version: 1.0.0.rc
111
+ version: '3.0'
112
+ - !ruby/object:Gem::Dependency
113
+ name: octopress-ink
114
+ requirement: !ruby/object:Gem::Requirement
115
+ requirements:
116
+ - - ">="
117
+ - !ruby/object:Gem::Version
118
+ version: '0'
119
+ type: :development
120
+ prerelease: false
121
+ version_requirements: !ruby/object:Gem::Requirement
122
+ requirements:
123
+ - - ">="
124
+ - !ruby/object:Gem::Version
125
+ version: '0'
112
126
  - !ruby/object:Gem::Dependency
113
127
  name: bundler
114
128
  requirement: !ruby/object:Gem::Requirement
@@ -165,8 +179,7 @@ dependencies:
165
179
  - - ">="
166
180
  - !ruby/object:Gem::Version
167
181
  version: '0'
168
- description: Octopress is an obsessively designed framework for Jekyll blogging. It’s
169
- easy to configure and easy to deploy. Sweet huh?
182
+ description:
170
183
  email:
171
184
  - brandon@imathis.com
172
185
  - parkrmoore@gmail.com