guard-jekyll 1.1.0 → 1.2.0

data/Gemfile

@@ -1,4 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
-# Specify your gem's dependencies in guard-sprockets.gemspec
 gemspec

data/README.markdown

@@ -1,26 +1,41 @@
-## What?
-Run jekyll for you.
+# Guard::Jekyll
 
-## Use
-if you haven't already `gem install jekyll`  
-then `gem install guard-jekyll`  
-in your project's directory root  
-`guard init`  
-`guard init jekyll`  
+This is a guard for [jekyll](http://jekyllrb.com/).
 
-which will add this to your Guardfile  
+## Installation
 
-    guard 'jekyll' do
-      watch /.*/
-    end
+Add this line to your application's Gemfile:
 
-## TODO
-tests
+    gem 'guard-jekyll'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install guard-jekyll
+
+## Usage
+
+Enter the jekyll site directory for which you want to use Guard::Jekyll. Create a Guardfile using `guard init`:
+
+    $ guard init jekyll
+
+Execute guard:
+
+    $ guard
+
+Whenever you change a file in the jekyll site directory now, the site will be rebuilt!
+
+## Options
+* `:source` the source directory which jekyll reads files from (default `'./'`)
+* `:destination` the directory where Jekyll will write files to (default is `'./_site'`)
+* `:config` array of configuration files which jekyll will read (default `['./_config.yml']`)
 
 ## License
-(The MIT License)
 
-Copyright (c) 2011 David Haslem
+(MIT License)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the 'Software'), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/guard/jekyll.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'guard'
 require 'guard/guard'
 
@@ -7,62 +5,43 @@ require 'jekyll'
 
 module Guard
   class Jekyll < Guard
-
     def initialize(watchers = [], options = {})
-      super
-      @source = options[:source] || File.dirname('.')
+      defaults = {
+        :source => './',
+        :destination => './_site',
+        :config => ['_config.yml'],
+      }
+
+      super(watchers, options.merge(defaults))
     end
 
     def start
       UI.info 'Guard::Jekyll is watching for file changes'
-      create_site(@source)
+      rebuild
     end
 
     def run_all
-      jekyll!
+      rebuild
     end
 
     def run_on_changes(paths)
-      jekyll!
-    end
-
-    def run_on_additions(paths)
-      jekyll!
-    end
-
-    def run_on_modifications(paths)
-      jekyll!
-    end
-
-    def run_on_removals(paths)
-      jekyll!
+      rebuild
     end
 
     private
 
-    def jekyll!
-      UI.info 'Guard::Jekyll running'
+    # rebuilds the entire jekyll site
+    #
+    def rebuild
+      UI.info 'Guard::Jekyll regenerating'
 
-      @jekyll_site.process
+      site = ::Jekyll::Site.new(::Jekyll.configuration(options))
+      site.process
 
-      UI.info 'Guard::Jekyll complete'
+      UI.info 'Guard::Jekyll done.'
     rescue Exception => e
       UI.error "Guard::Jekyll failed: #{e}"
       throw :task_has_failed
     end
-
-    def create_site(source)
-      working_path = File.expand_path(source)
-
-      options = {'source' => working_path}
-
-      unless File.exists? File.join(working_path, '_config.yml')
-        options['destination'] = File.join(working_path, '_site')
-        options['plugins'] = File.join(working_path, '_plugins')
-      end
-
-      config = ::Jekyll.configuration(options)
-      @jekyll_site = ::Jekyll::Site.new(config)
-    end
   end
 end

data/lib/guard/jekyll/templates/Guardfile

@@ -1,3 +1,4 @@
 guard 'jekyll' do
   watch /.*/
+  ignore /_site/
 end

data/lib/guard/jekyll/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module JekyllVersion
-    VERSION = '1.1.0'
+    VERSION = '1.2.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -50,7 +50,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
 - Gemfile
 - README.markdown
 - Rakefile

data/.gitignore

@@ -1 +0,0 @@
-*.un~