octopress 3.0.0.rc.22 → 3.0.0.rc.23

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: 40768c60e9cab25b5233bcec62d459b32c75471d
4
- data.tar.gz: 5b109ab755125ccd64708f453b00302afd907100
3
+ metadata.gz: 6e523447917ea22e1ab48694250218ccd5f33a4a
4
+ data.tar.gz: 8e6e25505a1162bed932bc5b27fb37d9bd81600d
5
5
  SHA512:
6
- metadata.gz: 0d96bad2fed52b8cc8926180361962afaa8a69da725fe6fb16756b7deeda6e99247786ddad00b1f59cb7d92a4a638c611129c5cada189aa69f30af0413002505
7
- data.tar.gz: 87903feb5aa11d25d5fce8a775e20e9f466b9046d77b3e639c89fd2f4b0df21cf80b261b1d9c1071ab911c15269fcc3415b4a99b4ec398eed33e41dc4af55473
6
+ metadata.gz: 01a45cfc7ee54255478289f8e21a29bf888d8a59aa9f7df25fb2d5a937c7998cb7fa2b466c57826b4e75ac62d10dc2a96023d052f7e5434f616b8ec6f2713518
7
+ data.tar.gz: f97fb94fc513b972c6ee6c170dcdcb659c123c6b75b9474c20075e6f3f3c2364e8d19dd51ef0dd8616903760691622a2aa69eef4508925f5f88e74a8fd2094b7
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Octopress Changelog
2
2
 
3
+ ### 3.0.0 RC23 - 2014-12-19
4
+
5
+ - Fixed issue with site configuration caching
6
+
3
7
  ### 3.0.0 RC22 - 2014-12-13
4
8
 
5
9
  - Docs integration improvements.
@@ -29,7 +33,7 @@
29
33
  ### 3.0.0 RC16 - 2014-11-24
30
34
 
31
35
  - Added `integrate` and `isolate` commands.
32
- - Removed unnecessary Jekyll pass-through commands.
36
+ - Removed unnecessary Jekyll pass-through commands (`serve`, `build` and `doctor`).
33
37
 
34
38
  ### 3.0.0 RC14 - 2014-07-26
35
39
 
data/lib/octopress.rb CHANGED
@@ -31,13 +31,17 @@ module Octopress
31
31
  # Cache Jekyll's site configuration
32
32
  #
33
33
  def self.configuration(options={})
34
- if @site
34
+ if site?
35
35
  @site.config
36
36
  else
37
37
  @config ||= Jekyll.configuration(options)
38
38
  end
39
39
  end
40
40
 
41
+ def self.site?
42
+ !@site.nil?
43
+ end
44
+
41
45
  # Cache Jekyll's site
42
46
  #
43
47
  def self.site(options={})
@@ -48,7 +52,7 @@ module Octopress
48
52
  #
49
53
  def self.read_site(options={})
50
54
  Jekyll.logger.log_level = :error
51
- s = Jekyll::Site.new(configuration(options))
55
+ s = Jekyll::Site.new(Jekyll.configuration(options))
52
56
  Jekyll.logger.log_level = :info
53
57
  alias_site_title(s)
54
58
  end
@@ -1,3 +1,3 @@
1
1
  module Octopress
2
- VERSION = "3.0.0.rc.22"
2
+ VERSION = "3.0.0.rc.23"
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.22
4
+ version: 3.0.0.rc.23
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-13 00:00:00.000000000 Z
12
+ date: 2014-12-19 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: mercenary
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
241
241
  version: 1.3.1
242
242
  requirements: []
243
243
  rubyforge_project:
244
- rubygems_version: 2.4.1
244
+ rubygems_version: 2.2.2
245
245
  signing_key:
246
246
  specification_version: 4
247
247
  summary: Octopress is an obsessively designed framework for Jekyll blogging. It’s