github-pages 145 → 146
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 +4 -4
- data/lib/github-pages/configuration.rb +12 -6
- data/lib/github-pages/dependencies.rb +1 -1
- data/lib/github-pages/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 3452fa8d2e89e11358362570bc8086e2cc02abd7
|
|
4
|
+
data.tar.gz: f80e078ca0c05736dccc47beb03a83c8e3be4dd3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 77aed80494b99bb92ff35e5820b2ff19274a6c7c6e52484a071540351d098bd4215813592409d771300579d31c30f77100001bc029802cdd78cc4c866c66e6f1
|
|
7
|
+
data.tar.gz: 48c391a7bb3b14be1df9c57cdfa4803161e84d285686eaa40afc1adf1a2b7a3fef1d5588526fd6dc725e58a74bf509b9d54d02769d5332522a59109832313d72
|
|
@@ -24,11 +24,12 @@ module GitHubPages
|
|
|
24
24
|
},
|
|
25
25
|
}.freeze
|
|
26
26
|
|
|
27
|
-
#
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
27
|
+
# User-overwritable defaults used only in production for practical reasons
|
|
28
|
+
PRODUCTION_DEFAULTS = Jekyll::Utils.deep_merge_hashes DEFAULTS, {
|
|
29
|
+
"sass" => {
|
|
30
|
+
"style" => "compressed",
|
|
31
|
+
},
|
|
32
|
+
}.freeze
|
|
32
33
|
|
|
33
34
|
# Options which GitHub Pages sets, regardless of the user-specified value
|
|
34
35
|
#
|
|
@@ -82,6 +83,11 @@ module GitHubPages
|
|
|
82
83
|
Jekyll.env == "development"
|
|
83
84
|
end
|
|
84
85
|
|
|
86
|
+
def defaults_for_env
|
|
87
|
+
defaults = development? ? DEFAULTS : PRODUCTION_DEFAULTS
|
|
88
|
+
Jekyll::Utils.deep_merge_hashes Jekyll::Configuration::DEFAULTS, defaults
|
|
89
|
+
end
|
|
90
|
+
|
|
85
91
|
# Given a user's config, determines the effective configuration by building a user
|
|
86
92
|
# configuration sandwhich with our overrides overriding the user's specified
|
|
87
93
|
# values which themselves override our defaults.
|
|
@@ -91,7 +97,7 @@ module GitHubPages
|
|
|
91
97
|
# Note: this is a highly modified version of Jekyll#configuration
|
|
92
98
|
def effective_config(user_config)
|
|
93
99
|
# Merge user config into defaults
|
|
94
|
-
config = Jekyll::Utils.deep_merge_hashes(
|
|
100
|
+
config = Jekyll::Utils.deep_merge_hashes(defaults_for_env, user_config)
|
|
95
101
|
.fix_common_issues
|
|
96
102
|
.add_default_collections
|
|
97
103
|
|
data/lib/github-pages/version.rb
CHANGED
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: '
|
|
4
|
+
version: '146'
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- GitHub, Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-07-
|
|
11
|
+
date: 2017-07-20 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: jekyll
|
|
@@ -86,14 +86,14 @@ dependencies:
|
|
|
86
86
|
requirements:
|
|
87
87
|
- - '='
|
|
88
88
|
- !ruby/object:Gem::Version
|
|
89
|
-
version: 1.3.
|
|
89
|
+
version: 1.3.5
|
|
90
90
|
type: :runtime
|
|
91
91
|
prerelease: false
|
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
|
93
93
|
requirements:
|
|
94
94
|
- - '='
|
|
95
95
|
- !ruby/object:Gem::Version
|
|
96
|
-
version: 1.3.
|
|
96
|
+
version: 1.3.5
|
|
97
97
|
- !ruby/object:Gem::Dependency
|
|
98
98
|
name: jekyll-redirect-from
|
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|