octopress 3.0.0.rc.20 → 3.0.0.rc.21

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0b6b342aec9d9952a0eea261d006fb8c25731829
4
- data.tar.gz: f734839f845e5e53105a0e773a7ed81382a72eca
3
+ metadata.gz: 1025c426a7234b22c9ab9ba7423c82d440b4c6b1
4
+ data.tar.gz: a41487f1bb363f312c95f95ae80df407af318ba9
5
5
  SHA512:
6
- metadata.gz: 4cdf194fad9835c4ae9aa6d2db8b6aaf7fb5199eb03d5b5a9928881d6f2aae374f20b223ff06553c62c92763c843cbc9b32b7d1858895f6ec8afce7e68cb6bf5
7
- data.tar.gz: 561e88223e1fec6e6e5d91ca691c2a3f0f94d4a6628c7a169fde05e1925d7dbd552fec30028caebd64226abd07faedd499835b02b2af87f9c462ab68dab1201d
6
+ metadata.gz: c7ca12a98f4efb512503261146ec1e103a25c7c98c50c8f2fba5f8ee919c702394ab3f1f049e46c7cde63185a5d668b925c9b4e5fd7fa172a444b8f29d8e61f6
7
+ data.tar.gz: 05960c19e462cc18f05a4f8aedf9152bbca604604698c457978d599dc3ced5c5aae9aacba84832ea64c773a7efaa6b60c4c85470d9fe512226527b6d2e1a3f93
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Octopress Changelog
2
2
 
3
+ ### 3.0.1 RC20 - 2014-12-12
4
+
5
+ - Improved access to Jekyll site instance
6
+
3
7
  ### 3.0.0 RC20 - 2014-12-11
4
8
 
5
9
  - Minor improvements to config management system
data/lib/octopress.rb CHANGED
@@ -48,6 +48,17 @@ module Octopress
48
48
  @site
49
49
  end
50
50
 
51
+ # Allow site to set
52
+ #
53
+ def self.site=(site)
54
+ # Octopress historically used site.title
55
+ # This allows theme developers to expect site.name
56
+ # in consistancy with Jekyll's scaffold config
57
+ site.config['name'] ||= site.config['title']
58
+
59
+ @site = site
60
+ end
61
+
51
62
  def self.gem_dir(dir='')
52
63
  File.expand_path(File.join(File.dirname(__FILE__), '../', dir))
53
64
  end
@@ -67,7 +78,7 @@ require 'octopress-docs'
67
78
  Octopress::Docs.add({
68
79
  name: "Octopress",
69
80
  base_url: "/octopress",
70
- dir: File.expand_path(File.join(File.dirname(__FILE__), "../")),
81
+ path: File.expand_path(File.join(File.dirname(__FILE__), "../")),
71
82
  })
72
83
 
73
84
  Octopress.require_blessed_gems
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.0.rc.20"
2
+ VERSION = "3.0.0.rc.21"
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.0.rc.20
4
+ version: 3.0.0.rc.21
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: 2014-12-11 00:00:00.000000000 Z
12
+ date: 2014-12-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary