guard-jekyll-plus 1.1.2 → 1.2.0

data/CHANGELOG.md

@@ -9,3 +9,19 @@
 ### 1.1.1
 - Improved colorized output.
 - Rescued errors kill the Jekyll WEBrick server.
+
+## 1.1.2
+
+New config options
+
+- `config_hash` allows passing a config hash instead of an array of config files.
+- `silent` allows you to prevent all output other than exception errors.
+
+### 1.2.0
+
+**Changed** Now you must use jekyllplus in your guard file. Check the readme for updates.
+
+- Changed guard name to jekyllplus to avoid issues with Guard Jekyll.
+- Fixed installation of template guardfile
+- Improved handling of Jekyll WEBrick server
+

data/README.md

@@ -38,7 +38,7 @@ Navigate to your Jekyll project directory and create a Guardfile using:
 Or if you already have a Guardfile, add a Jekyll guard.
 
 ```ruby
-guard :jekyll do
+guard :jekyllplus do
   watch /.*/
   ignore /^_site/
 end
@@ -59,7 +59,7 @@ If your Jekyll project has a non-standard directory stucture like this:
 You would do this instead:
 
 ```ruby
-guard :jekyll do
+guard :jekyllplus do
   watch /^source/
   watch /_config.yml/
 end
@@ -88,7 +88,7 @@ This guard has two configurations.
 Here's how you would add `txt` to the list of file extensions which triggers a Jekyll build.
 
 ```ruby
-guard :jekyll, :extensions => ['txt'] do
+guard :jekyllplus, :extensions => ['txt'] do
   watch /.*/
   ignore /^_site/
 end
@@ -102,7 +102,7 @@ which don't match these extensions will be simply copied over to the destination
 Here's how you might tell Jekyll to read from multiple configuration files.
 
 ```ruby
-guard :jekyll, :config => ['settings.yml', 'override.yml'] do
+guard :jekyllplus, :config => ['settings.yml', 'override.yml'] do
   watch /.*/
   ignore /^_site/
 end

data/guard-jekyll-plus.gemspec

@@ -1,11 +1,11 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'guard/jekyll/version'
+require 'guard/jekyll-plus/version'
 
 Gem::Specification.new do |gem|
   gem.name          = "guard-jekyll-plus"
-  gem.version       = Guard::JekyllVersion::VERSION
+  gem.version       = Guard::JekyllPlusVersion::VERSION
   gem.authors       = ["Brandon Mathis"]
   gem.email         = ["brandon@imathis.com"]
   gem.description   = %q{A Guard plugin for smarter Jekyll watching}

data/lib/guard/{jekyll → jekyll-plus}/templates/Guardfile

@@ -1,4 +1,4 @@
-guard :jekyll do
+guard :jekyllplus do
   watch /.*/
   ignore /^_site/
 end

data/lib/guard/jekyll-plus/version.rb

@@ -0,0 +1,5 @@
+module Guard
+  class JekyllPlusVersion
+    VERSION = "1.2.0"
+  end
+end

data/lib/guard/{jekyll.rb → jekyllplus.rb}

@@ -6,7 +6,7 @@ require 'guard/guard'
 require 'jekyll'
 
 module Guard
-  class Jekyll < Guard
+  class Jekyllplus < Guard
 
     def initialize (watchers=[], options={})
       super
@@ -25,21 +25,13 @@ module Guard
 
       # The config_hash option should be a hash ready to be consumed by Jekyll's Site class.
       #
-      @config = @options[:config_hash] || jekyll_config(@options)
+      @config = jekyll_config(@options)
 
-      # Override configuration with passed values
+      # Override configuration with guard option values
       #
       @config['show_drafts'] ||= @options[:drafts]
       @config['future']      ||= @options[:future]
 
-      # Ensure required configurations are set
-      # This ensures that config_hash option will succeed if set
-      #
-      @config['source']      ||= Dir.pwd
-      @config['desitnation'] ||= File.join(Dir.pwd, '_site')
-      @config['permalink']   ||= 'date'
-      @config['limit_posts'] ||= 0
-      
       # Store vars for easy internal access
       #
       @source = local_path @config['source']
@@ -65,7 +57,7 @@ module Guard
 
       if @options[:serve]
         start_server
-
+        build
         UI.info "#{@label} " + "watching and serving at #{@config['host']}:#{@config['port']}#{@config['baseurl']}" unless @config[:silent]
       else
         build
@@ -200,9 +192,15 @@ module Guard
     end
 
     def jekyll_config(options)
-      config_files = options[:config]
-      config_files = [config_files] unless config_files.is_a? Array
-      ::Jekyll.configuration({ "config" => config_files })
+      puts options
+      if options[:config_hash]
+        config = options[:config_hash]
+      elsif options[:config]
+        config_files = options[:config]
+        config_files = [config_files] unless config_files.is_a? Array
+        config = { "config" => config_files}
+      end
+      ::Jekyll.configuration(config)
     end
 
     def local_path(path)
@@ -224,8 +222,8 @@ module Guard
       end
     end
 
-    def server
-      proc{ Process.spawn "jekyll server --config #{@options[:config].join(',')}" }
+    def server(config)
+      proc{ Process.fork { ::Jekyll::Commands::Serve.process(config) } }
     end
 
     def kill
@@ -234,7 +232,7 @@ module Guard
 
     def start_server
       return @pid if alive?
-      @pid = instance_eval &server
+      @pid = instance_eval &server(@config)
     end
 
     def stop_server

data/test/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    guard-jekyll-plus (1.1.2)
+    guard-jekyll-plus (1.2.0)
       guard (>= 1.1.0)
       jekyll (>= 1.0.0)
 
@@ -25,7 +25,7 @@ GEM
       pry (>= 0.9.10)
       thor (>= 0.14.6)
     highline (1.6.19)
-    jekyll (1.0.3)
+    jekyll (1.1.0)
       classifier (~> 1.3)
       colorator (~> 0.1)
       commander (~> 4.1.3)
@@ -34,6 +34,7 @@ GEM
       liquid (~> 2.3)
       maruku (~> 0.5)
       pygments.rb (~> 0.5.0)
+      redcarpet (~> 2.2.2)
       safe_yaml (~> 0.7.0)
     kramdown (1.0.2)
     liquid (2.5.0)
@@ -50,7 +51,7 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pygments.rb (0.5.1)
+    pygments.rb (0.5.2)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rb-fsevent (0.9.3)
@@ -58,6 +59,7 @@ GEM
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
+    redcarpet (2.2.2)
     safe_yaml (0.7.1)
     slop (3.4.5)
     syntax (1.0.0)

data/test/Guardfile

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

data/test/_config.yml

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

data/test/index.html

@@ -10,4 +10,4 @@ title: Your New Jekyll Site
       <li><span>{{ post.date | date_to_string }}</span> &raquo; <a href="{{ post.url }}">{{ post.title }}</a></li>
     {% endfor %}
   </ul>
-</div>
+</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -58,9 +58,9 @@ files:
 - README.md
 - Rakefile
 - guard-jekyll-plus.gemspec
-- lib/guard/jekyll.rb
-- lib/guard/jekyll/templates/Guardfile
-- lib/guard/jekyll/version.rb
+- lib/guard/jekyll-plus/templates/Guardfile
+- lib/guard/jekyll-plus/version.rb
+- lib/guard/jekyllplus.rb
 - test/.gitignore
 - test/Gemfile
 - test/Gemfile.lock

data/lib/guard/jekyll/version.rb

@@ -1,5 +0,0 @@
-module Guard
-  class JekyllVersion
-    VERSION = "1.1.2"
-  end
-end