github-pages 71 → 72

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: 92ff16a0bd12e1601913b69226209dd022a1f897
4
- data.tar.gz: 83b0d523b2bbc228b056bcadb2a8b360b7e5c73e
3
+ metadata.gz: 853426d5801e23f4e76b3d558dbb403805662e25
4
+ data.tar.gz: c938c888882ee3769d735d032b87f9b89d6e4bc9
5
5
  SHA512:
6
- metadata.gz: 8a67b6ca00ae88fe196fd94bcbe64f3591d80d8f2e941e1bdecc4335dde3724365b1e1d95d7747ba4481438df504645b0b08536e6caa424fa7d251bec0857f64
7
- data.tar.gz: 2a6c3bc6ef6ac9fae2d1d7c02c4e6a9a55f7c99edd8556672f11bec78c2ae132a8e1a144521816ed3cff6105be3de056edad992b0e22ef75c18851d22a08cfb4
6
+ metadata.gz: 7c97bfc4936c45715fdd4fc2772c1df2cdf0a4066d432038d8f873c4ae1d1dbb9b6a3f4a940363ec06089d81372fda3062d2f234f81eb3dac41e8ece973db41c
7
+ data.tar.gz: a44cf3ea8553d226470698de0ef21bcd18da5c83a8f41958dece87404eef02b755e749b50439f4817adaf5071b90d68e396c3263c8b2a935eb42859753b49371
@@ -12,8 +12,6 @@ module GitHubPages
12
12
  end
13
13
  end
14
14
 
15
- Jekyll.logger.debug "GitHub Pages:", "github-pages v#{GitHubPages::VERSION}"
16
- Jekyll.logger.debug "GitHub Pages:", "jekyll v#{Jekyll::VERSION}"
17
15
  Jekyll::Hooks.register :site, :after_reset do |site|
18
16
  GitHubPages::Configuration.set(site)
19
17
  end
@@ -54,7 +54,7 @@ module GitHubPages
54
54
  OVERRIDES = {
55
55
  "lsi" => false,
56
56
  "safe" => true,
57
- "plugins" => SecureRandom.hex,
57
+ "plugins_dir" => SecureRandom.hex,
58
58
  "whitelist" => PLUGIN_WHITELIST,
59
59
  "highlighter" => "rouge",
60
60
  "kramdown" => {
@@ -98,10 +98,11 @@ module GitHubPages
98
98
  # Merge user config into defaults
99
99
  config = Jekyll::Utils.deep_merge_hashes(MERGED_DEFAULTS, user_config)
100
100
  .fix_common_issues
101
+ .backwards_compatibilize
101
102
  .add_default_collections
102
103
 
103
- # Merge overwrites into user config
104
- config = Jekyll::Utils.deep_merge_hashes config, OVERRIDES
104
+ # Merge overwrites into user config & ensure fully compatible
105
+ config = Jekyll::Utils.deep_merge_hashes(config, OVERRIDES)
105
106
 
106
107
  # Ensure we have those gems we want.
107
108
  config["gems"] = Array(config["gems"]) | DEFAULT_PLUGINS
@@ -115,10 +116,16 @@ module GitHubPages
115
116
  # guards against double-processing via the value in #processed.
116
117
  def set(site)
117
118
  return if processed? site
119
+ print_debug_versions
118
120
  set!(site)
119
121
  processed(site)
120
122
  end
121
123
 
124
+ def print_debug_versions
125
+ Jekyll.logger.debug "GitHub Pages:", "github-pages v#{GitHubPages::VERSION}"
126
+ Jekyll.logger.debug "GitHub Pages:", "jekyll v#{Jekyll::VERSION}"
127
+ end
128
+
122
129
  # Set the site's configuration with all the proper defaults and overrides.
123
130
  # Should be called by #set to protect against multiple processings.
124
131
  def set!(site)
@@ -1,3 +1,3 @@
1
1
  module GitHubPages
2
- VERSION = 71
2
+ VERSION = 72
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: github-pages
3
3
  version: !ruby/object:Gem::Version
4
- version: '71'
4
+ version: '72'
5
5
  platform: ruby
6
6
  authors:
7
7
  - GitHub, Inc.
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-04-18 00:00:00.000000000 Z
11
+ date: 2016-04-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: jekyll