guard-jekyll-plus 1.0.0 → 1.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    guard-jekyll-plus (1.0.0)
+    guard-jekyll-plus (1.1.0)
       guard (>= 1.1.0)
       jekyll (>= 1.0.0)
 

data/README.md

@@ -4,8 +4,10 @@ A Guard plugin for smarter Jekyll watching.
 
 Features:
 
-- Changes to static files apply without triggering an unnecessary build.
-- Only template file changes trigger a Jekyll build.
+- Changing static files won't trigger a jekyll build! Files are copied/removed instead.
+- Batched processing! (Adding a directory of `n` files triggers a single build)
+- Reads options from your YAML config file(s)
+- Supports multiple config files (Jekyll 1.0)
 
 ## Installation
 
@@ -65,9 +67,10 @@ For the most part that's all you'll ever need to do. There are some things you c
 This guard has two configurations.
 
 | Config       | Description                                      | Default
-|:-------------|:-------------------------------------------------|:-------------------------------------------------------|
-| `extensions` | Array of file extensions to trigger Jekyll build | ['md','markdown','textile','html','haml','slim','xml'] |
-| `config`     | Array of configuration files                     | ['_config.yml']                                        |
+|:-------------|:-------------------------------------------------|:---------------------------------------------------------------------------|
+| `extensions` | Array of file extensions to trigger Jekyll build | ['md', 'mkd', 'markdown', 'textile', 'html', 'haml', 'slim', 'xml', 'yml'] |
+| `config`     | Array of configuration files                     | ['_config.yml']                                                            |
+| `serve`      | Use Jekyll's build in WEBrick server             | false                                                                      |
 
 **Note:** customizations to the `extensions` configuration are additive.
 
@@ -82,7 +85,7 @@ guard :jekyll, :extensions => ['txt'] do
 end
 ```
 
-Now Guard will be watching for changes to txt, md, markdown, textile, html, haml, slim, xml files. When these files change Guard will trigger a Jekyll build. Files
+Now Guard will be watching for changes to txt, md, mkd, markdown, textile, html, haml, slim, xml, yml files. When these files change Guard will trigger a Jekyll build. Files
 which don't match these extensions will be simply copied over to the destination directory when a change occurs, or deleted if appropriate.
 
 ### Configuring Jekyll config file

data/lib/guard/jekyll/version.rb

@@ -1,5 +1,5 @@
 module Guard
   class JekyllVersion
-    VERSION = "1.0.0"
+    VERSION = "1.1.0"
   end
 end

data/lib/guard/jekyll.rb

@@ -9,17 +9,19 @@ module Guard
     def initialize (watchers=[], options={})
       super
 
-      default_extensions = ['md','markdown','textile','html','haml','slim','xml','yml']
+      default_extensions = ['md','mkd','markdown','textile','html','haml','slim','xml','yml']
 
       @options = {
         :extensions => [], 
-        :config => ['_config.yml']
+        :config => ['_config.yml'],
+        :serve => false
       }.merge(options)
 
-      config = jekyll_config(@options)
-      @site = ::Jekyll::Site.new config
-      @source = local_path config['source']
-      @destination = local_path config['destination']
+      @pid = nil
+      @config = jekyll_config(@options)
+      @site = ::Jekyll::Site.new @config
+      @source = local_path @config['source']
+      @destination = local_path @config['destination']
       
       extensions = @options[:extensions].concat(default_extensions).flatten.uniq
       # Convert array of extensions into a regex for matching file extensions eg, /\.md$|\.markdown$|\.html$/i
@@ -27,14 +29,26 @@ module Guard
 
     end
 
-    # Calls #run_all if the :all_on_start option is present.
     def start
-      UI.info 'Guard::Jekyll is watching for file changes'
-      build
+
+      if @options[:serve]
+        start_server
+
+        UI.info "Guard::Jekyll is watching files and serving at #{@config['host']}:#{@config['port']}#{@config['baseurl']}".bold
+      else
+        build
+        UI.info "Guard::Jekyll is watching".bold
+      end
     end
 
-    def reload
-      build
+    def restart
+      stop if alive?
+      start
+    end
+
+
+    def stop
+      stop_server
     end
 
     def run_all
@@ -67,7 +81,7 @@ module Guard
         throw :task_has_failed
       end
     end
-    
+
     # Copy static files to destination directory
     #
     def copy(file)
@@ -155,6 +169,40 @@ module Guard
       end
     end
 
+    def server
+      proc{ Process.spawn "jekyll server --config #{@options[:config].join(',')}" }
+    end
+
+    def kill
+      proc{|pid| Process.kill("QUIT", pid)}
+    end
+
+    def start_server
+      return @pid if alive?
+      @pid = instance_eval &server
+    end
+
+    def stop_server
+      if alive?
+        instance_eval do
+          kill.call(@pid)
+          @pid = nil
+        end
+      end
+    end
+    
+    def alive?
+      return false unless @pid
+
+      begin
+        Process.getpgid(@pid)
+        true
+      rescue Errno::ESRCH => e
+        false
+      end
+    end
+
+
   end
 end
 

data/test/Guardfile

@@ -1,8 +1,11 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 #
+require 'guard/guard'
+require 'jekyll'
 
-guard :jekyll do
+guard :jekyll, :config => ['_config.yml', '_override.yml'], :serve => true do
   watch /.*/
   ignore /^_site/
 end
+

data/test/_config.yml

@@ -1,2 +1,3 @@
 name: Your New Jekyll Site
 pygments: true
+port: 4567

data/test/_override.yml

@@ -0,0 +1,2 @@
+port: 3500
+baseurl: dang

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -67,6 +67,7 @@ files:
 - test/_config.yml
 - test/_layouts/default.html
 - test/_layouts/post.html
+- test/_override.yml
 - test/_posts/2013-07-08-welcome-to-jekyll.markdown
 - test/css/main.css
 - test/css/syntax.css