guard-jekyll-plus 1.4.0 → 1.4.1
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.
- data/CHANGELOG.md +4 -0
- data/Gemfile.lock +1 -1
- data/lib/guard/jekyll-plus.rb +4 -2
- data/lib/guard/jekyll-plus/version.rb +1 -1
- data/test/Gemfile.lock +4 -4
- metadata +1 -1
data/CHANGELOG.md
CHANGED
|
@@ -48,3 +48,7 @@ New config options
|
|
|
48
48
|
- Now allowing Rack server as an alternative to Jekyll's WEBrick server.
|
|
49
49
|
- Ships with an internal config for Rack, but users can override it in the guard config options.
|
|
50
50
|
|
|
51
|
+
### 1.4.1
|
|
52
|
+
|
|
53
|
+
- Rack root is now configured by Jekyll 'destination' configuration
|
|
54
|
+
|
data/Gemfile.lock
CHANGED
data/lib/guard/jekyll-plus.rb
CHANGED
|
@@ -58,7 +58,7 @@ module Guard
|
|
|
58
58
|
# Create a Jekyll site
|
|
59
59
|
#
|
|
60
60
|
@site = ::Jekyll::Site.new @config
|
|
61
|
-
@rack = ::Rack::Server.new(rack_config) if USE_RACK
|
|
61
|
+
@rack = ::Rack::Server.new(rack_config(@destination)) if USE_RACK
|
|
62
62
|
puts @rack
|
|
63
63
|
|
|
64
64
|
end
|
|
@@ -214,9 +214,11 @@ module Guard
|
|
|
214
214
|
::Jekyll.configuration(config)
|
|
215
215
|
end
|
|
216
216
|
|
|
217
|
-
def rack_config
|
|
217
|
+
def rack_config(root)
|
|
218
|
+
ENV['RACK_ROOT'] = root
|
|
218
219
|
default_config = File.expand_path("../rack/config.ru", File.dirname(__FILE__))
|
|
219
220
|
local_config = File.exist? 'config.ru' ? 'config.ru' : nil
|
|
221
|
+
|
|
220
222
|
config = (@config['rack_config'] || local_config || default_config)
|
|
221
223
|
puts config
|
|
222
224
|
{ :config => config, :Port => @config['port'], :Host => @config['host'] }
|
data/test/Gemfile.lock
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
PATH
|
|
2
2
|
remote: ../
|
|
3
3
|
specs:
|
|
4
|
-
guard-jekyll-plus (1.
|
|
4
|
+
guard-jekyll-plus (1.4.0)
|
|
5
5
|
guard (>= 1.1.0)
|
|
6
6
|
jekyll (>= 1.0.0)
|
|
7
7
|
|
|
@@ -25,19 +25,19 @@ GEM
|
|
|
25
25
|
pry (>= 0.9.10)
|
|
26
26
|
thor (>= 0.14.6)
|
|
27
27
|
highline (1.6.19)
|
|
28
|
-
jekyll (1.1.
|
|
28
|
+
jekyll (1.1.2)
|
|
29
29
|
classifier (~> 1.3)
|
|
30
30
|
colorator (~> 0.1)
|
|
31
31
|
commander (~> 4.1.3)
|
|
32
32
|
directory_watcher (~> 1.4.1)
|
|
33
33
|
kramdown (~> 1.0.2)
|
|
34
|
-
liquid (~> 2.
|
|
34
|
+
liquid (~> 2.5.1)
|
|
35
35
|
maruku (~> 0.5)
|
|
36
36
|
pygments.rb (~> 0.5.0)
|
|
37
37
|
redcarpet (~> 2.2.2)
|
|
38
38
|
safe_yaml (~> 0.7.0)
|
|
39
39
|
kramdown (1.0.2)
|
|
40
|
-
liquid (2.5.
|
|
40
|
+
liquid (2.5.1)
|
|
41
41
|
listen (1.2.2)
|
|
42
42
|
rb-fsevent (>= 0.9.3)
|
|
43
43
|
rb-inotify (>= 0.9)
|