octopress 3.0.0.rc.21 → 3.0.0.rc.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1025c426a7234b22c9ab9ba7423c82d440b4c6b1
-  data.tar.gz: a41487f1bb363f312c95f95ae80df407af318ba9
+  metadata.gz: 40768c60e9cab25b5233bcec62d459b32c75471d
+  data.tar.gz: 5b109ab755125ccd64708f453b00302afd907100
 SHA512:
-  metadata.gz: c7ca12a98f4efb512503261146ec1e103a25c7c98c50c8f2fba5f8ee919c702394ab3f1f049e46c7cde63185a5d668b925c9b4e5fd7fa172a444b8f29d8e61f6
-  data.tar.gz: 05960c19e462cc18f05a4f8aedf9152bbca604604698c457978d599dc3ced5c5aae9aacba84832ea64c773a7efaa6b60c4c85470d9fe512226527b6d2e1a3f93
+  metadata.gz: 0d96bad2fed52b8cc8926180361962afaa8a69da725fe6fb16756b7deeda6e99247786ddad00b1f59cb7d92a4a638c611129c5cada189aa69f30af0413002505
+  data.tar.gz: 87903feb5aa11d25d5fce8a775e20e9f466b9046d77b3e639c89fd2f4b0df21cf80b261b1d9c1071ab911c15269fcc3415b4a99b4ec398eed33e41dc4af55473

data/.clash.yml

@@ -1,17 +1,20 @@
 -
   tasks:
     reset_site:
-      - 'rm -rf _layouts _drafts _templates _posts _site pages site'
-      - 'octopress new . --blank --force'
-      - 'rm index.html'
-      - 'echo "<div class=post>{{ page.title }}{{ content }}</div>" > _layouts/post.html'
-      - 'echo "<div class=page>{{ page.title }}{{ content }}</div>" > _layouts/page.html'
+      - cleanup
+      - octopress new . --blank --force
+      - rm index.html
+      - echo "<div class=post>{{ page.title }}{{ content }}</div>" > _layouts/post.html
+      - echo "<div class=page>{{ page.title }}{{ content }}</div>" > _layouts/page.html
     new_draft:
-      - 'octopress new draft "Some Cool Idea" --date "2014-03-10 15:20 -0000"'
+      - octopress new draft "Some Cool Idea" --date "2014-03-10 15:20 -0000"
     new_posts:
-      - 'octopress new post "A random post" --date "2011-11-11 11:11 -0000"'
-      - 'octopress new post "Another random post" --date "2012-11-11 11:11 -0000"'
-      - 'octopress new post "This post is happy." --date "2013-11-11 11:11 -0000"'
+      - octopress new post "A random post" --date "2011-11-11 11:11 -0000"
+      - octopress new post "Another random post" --date "2012-11-11 11:11 -0000"
+      - octopress new post "This post is happy." --date "2013-11-11 11:11 -0000"
+    cleanup:
+      - echo "Cleaning up..."
+      - rm -rf _layouts _drafts _templates _posts _site pages site
 
 -
   title: Create a blank site
@@ -156,4 +159,6 @@
     - 'octopress integrate'
   compare:
     - _expected/integrate/_posts _posts
-
+-
+  title: Cleanup
+  before: cleanup

data/CHANGELOG.md

@@ -1,12 +1,17 @@
 # Octopress Changelog
 
-### 3.0.1 RC20 - 2014-12-12
+### 3.0.0 RC22 - 2014-12-13
 
-- Improved access to Jekyll site instance
+- Docs integration improvements.
+- Refactored and documented Jekyll site methods.
+
+### 3.0.0 RC21 - 2014-12-12
+
+- Improved access to Jekyll site instance.
 
 ### 3.0.0 RC20 - 2014-12-11
 
-- Minor improvements to config management system
+- Minor improvements to config management system.
 
 ### 3.0.0 RC19 - 2014-12-09
 

data/lib/octopress.rb

@@ -9,6 +9,7 @@ module Octopress
   require 'octopress/commands/publish'
   require 'octopress/commands/isolate'
   require 'octopress/isolate'
+  require 'octopress-docs'
 
   autoload :Page, 'octopress/page'
   autoload :Post, 'octopress/post'
@@ -40,23 +41,31 @@ module Octopress
   # Cache Jekyll's site
   #
   def self.site(options={})
-    if !@site
-      Jekyll.logger.log_level = :error
-      @site = Jekyll::Site.new(configuration(options))
-      Jekyll.logger.log_level = :info
-    end
-    @site
+    @site ||= read_site(options)
   end
 
-  # Allow site to set
+  # Quietly read from Jekyll's site
+  #
+  def self.read_site(options={})
+    Jekyll.logger.log_level = :error
+    s = Jekyll::Site.new(configuration(options))
+    Jekyll.logger.log_level = :info
+    alias_site_title(s)
+  end
+
+  # Allow site to be set
   #
   def self.site=(site)
-    # Octopress historically used site.title
-    # This allows theme developers to expect site.name
-    # in consistancy with Jekyll's scaffold config 
-    site.config['name'] ||= site.config['title']
+    @site = alias_site_title(site)
+  end
 
-    @site = site
+  # Octopress historically used site.title
+  # This ensures we can all use site.name to be
+  # compatible with Jekyll's scaffold convention
+  #
+  def self.alias_site_title(site)
+    site.config['name'] ||= site.config['title']
+    site
   end
 
   def self.gem_dir(dir='')
@@ -73,12 +82,13 @@ module Octopress
   end
 end
 
-require 'octopress-docs'
-
 Octopress::Docs.add({
   name:        "Octopress",
-  base_url:    "/octopress",
+  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"
 })
 
 Octopress.require_blessed_gems

data/lib/octopress/version.rb

@@ -1,3 +1,3 @@
 module Octopress
-  VERSION = "3.0.0.rc.21"
+  VERSION = "3.0.0.rc.22"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc.21
+  version: 3.0.0.rc.22
 platform: ruby
 authors:
 - Brandon Mathis
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
@@ -221,8 +221,6 @@ files:
 - test/_expected/publish-draft-date/_posts/2014-03-11-some-cool-idea.markdown
 - test/_expected/publish-draft-dir/_posts/ideas/2014-03-10-some-cool-idea.markdown
 - test/_expected/publish-draft/_posts/2014-03-10-some-cool-idea.markdown
-- test/_layouts/page.html
-- test/_layouts/post.html
 homepage: http://octopress.org
 licenses:
 - MIT
@@ -281,5 +279,3 @@ test_files:
 - test/_expected/publish-draft-date/_posts/2014-03-11-some-cool-idea.markdown
 - test/_expected/publish-draft-dir/_posts/ideas/2014-03-10-some-cool-idea.markdown
 - test/_expected/publish-draft/_posts/2014-03-10-some-cool-idea.markdown
-- test/_layouts/page.html
-- test/_layouts/post.html

data/test/_layouts/page.html

@@ -1 +0,0 @@
-<div class=page>{{ page.title }}{{ content }}</div>

data/test/_layouts/post.html

@@ -1 +0,0 @@
-<div class=post>{{ page.title }}{{ content }}</div>