octopress 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca55c9c24a5374ec8cf04cce863a3c38272ad8a6
-  data.tar.gz: 1eb7d555f92b3a4fda4296f293f016ed6459ba78
+  metadata.gz: 8853adf01a49df0352d97c3172b0cd10d83b1ce8
+  data.tar.gz: 6cff575d97cf58d1dc0ed07e9a32747945d940fa
 SHA512:
-  metadata.gz: 663ca23814e4e44203e24142189343de2f047fd323db0066701144e95bbf3b09b759e6155d325aee82ffd89a690ace1edcbb2bda7f7a4241dd128fd71b8f857d
-  data.tar.gz: 34e10d98e9a607c81dec18c562362e443445d5d36970383e8a10ddb89fa34ec48d57afd75bc1d4ec6296ec95fb424c41a103c502c4d9e259f80ea2712abd6576
+  metadata.gz: 1ec28f6de5831b7b1993b6d050ef2b7aad371ee670d0cb3cdfe2bbe0b0ba9f4183f29ddf8ae03cb711147121e387beb5c78226a2db20cdb09edab42aee36762d
+  data.tar.gz: a15844bf5fda99a0a7935e61e97d4bdcce36f01aa3d8b1e20df7c2083dde0201389c32c6328f3523eeadd9dc95926e6a147dc7d9ad41f6633760e1ecba37727d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 3.0.5 (2015-05-12)
+- Support for Jekyll 2 & 3
+- Relaxed version requirements for Jekyll
+- Added support for Jekyll Hooks when available
+- Support for < Jekyll 2.5 by loading Jekyll plugins manually if necessary
+- Updated documentation for adding doc pages to plugins
+- Requiring Redcarpet because it gives us proper codefences for documentation pages (Ugh. I don't like Kramdown)
+
 ### 3.0.4 (2015-05-10)
 - Fix: Changed shortcode for `--dir` to `-D` so it doesn't interfere with `-d` for `--date`.
 

data/README.md

@@ -9,7 +9,7 @@ Octopress is an obsessively designed toolkit for writing and deploying Jekyll bl
 
 Add this line to your application's Gemfile:
 
-    gem 'octopress', '~> 3.0.0.rc'
+    gem 'octopress', '~> 3.0'
 
 And then execute:
 
@@ -17,7 +17,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install octopress --pre
+    $ gem install octopress
 
 ## Octopress Commands
 

data/assets/docs/docs.md

@@ -16,6 +16,7 @@ the code below to automatically add your plugin's Readme, Changelog and any page
 if defined? Octopress::Docs
   Octopress::Docs.add({
     name:        "Your Plugin",
+    gem_name:    "your-gem",
     description: "This plugin causes awesomeness",
     path:        File.expand_path(File.join(File.dirname(__FILE__), "../")), # gem root
     slug:        "your-plugin",                      # optional

data/lib/octopress.rb

@@ -66,8 +66,10 @@ module Octopress
   def read_site(options={})
     Jekyll.logger.log_level = :error
     s = Jekyll::Site.new(Jekyll.configuration(options))
-    Jekyll::PluginManager.require_from_bundler
-    s.plugin_manager.conscientious_require
+    if defined?(Jekyll::PluginManager) && Jekyll::PluginManager.respond_to?(:require_from_bundler)
+      Jekyll::PluginManager.require_from_bundler
+      s.plugin_manager.conscientious_require
+    end
     Jekyll.logger.log_level = :info
     alias_site_title(s)
   end
@@ -100,7 +102,7 @@ module Octopress
     end
   end
 
-  def self.require_gems
+  def require_gems
     require_blessed_gems
 
     if !ENV["OCTOPRESS_NO_BUNDLER_REQUIRE"] && File.file?("Gemfile")
@@ -108,6 +110,7 @@ module Octopress
         require "bundler"
         Bundler.require(:default)
         Bundler.require(:octopress)
+        Bundler.require(:jekyll_plugins)
         true
       rescue LoadError, Bundler::GemfileNotFound
         false

data/lib/octopress/docs/hooks.rb

@@ -1,16 +1,28 @@
 module Octopress
   module Docs
-    class DocsSiteHook < Octopress::Hooks::Site
-      def pre_render(site)
+    if defined?(Jekyll::Hooks)
+      Jekyll::Hooks.register :site, :pre_render do |site, payload|
         if Octopress::Docs.enabled?
-          Octopress.site = site
-          site.pages.concat Octopress::Docs.pages
+          Octopress::Docs.pages_info.each do |key, val|
+            Octopress.site = site
+            site.pages.concat Octopress::Docs.pages
+            payload[key] = val
+          end
         end
       end
+    else
+      class DocsSiteHook < Octopress::Hooks::Site
+        def pre_render(site)
+          if Octopress::Docs.enabled?
+            Octopress.site = site
+            site.pages.concat Octopress::Docs.pages
+          end
+        end
 
-      def merge_payload(payload, site)
-        if Octopress::Docs.enabled?
-          Octopress::Docs.pages_info
+        def merge_payload(payload, site)
+          if Octopress::Docs.enabled?
+            Octopress::Docs.pages_info
+          end
         end
       end
     end

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: titlecase
   requirement: !ruby/object:Gem::Requirement
@@ -96,19 +96,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: octopress-ink
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: octopress-ink
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -165,8 +179,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Octopress is an obsessively designed framework for Jekyll blogging. It’s
-  easy to configure and easy to deploy. Sweet huh?
+description: 
 email:
 - brandon@imathis.com
 - parkrmoore@gmail.com