guard-jekyll-plus 1.1.1 → 1.1.2

data/README.md

@@ -12,7 +12,7 @@ Features:
 
 Here's a look
 
-![Colorized output](http://cl.ly/QAK9/content.png)
+![Colorized output](http://cl.ly/Q9qK/content.png)
 
 ## Installation
 
@@ -71,11 +71,15 @@ 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', 'mkd', 'markdown', 'textile', 'html', 'haml', 'slim', 'xml', 'yml'] |
-| `config`     | Array of configuration files                     | ['_config.yml']                                                            |
-| `serve`      | Use Jekyll's build in WEBrick server             | false                                                                      |
+| Config        | Description                                      | Default
+|:--------------|:-------------------------------------------------|:-----------------------------------------------------------------------------------|
+| `extensions`  | Array of file extensions to trigger Jekyll build | ['md', 'mkd', 'mkdn', 'markdown', 'textile', 'html', 'haml', 'slim', 'xml', 'yml'] |
+| `config`      | Array of configuration files                     | ['_config.yml']                                                                    |
+| `serve`       | Use Jekyll's build in WEBrick server             | false                                                                              |
+| `drafts`      | Build your site with draft posts                 | false                                                                              |
+| `future`      | Build your site with future dated posts          | false                                                                              |
+| `config_hash` | Use a config hash instead of an array of files   | nil                                                                                |
+| `silent`      | Slience all output other than exception message  | false                                                                              |
 
 **Note:** customizations to the `extensions` configuration are additive.
 

data/lib/guard/jekyll/version.rb

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

data/lib/guard/jekyll.rb

@@ -11,24 +11,54 @@ module Guard
     def initialize (watchers=[], options={})
       super
 
-      default_extensions = ['md','mkd','markdown','textile','html','haml','slim','xml','yml']
+      default_extensions = ['md','mkd','mkdn','markdown','textile','html','haml','slim','xml','yml']
 
       @options = {
         :extensions => [], 
         :config => ['_config.yml'],
-        :serve => false
+        :serve => false,
+        :drafts => false,
+        :future => false,
+        :config_hash => nil,
+        :silent => false
       }.merge(options)
 
-      @pid = nil
-      @config = jekyll_config(@options)
-      @site = ::Jekyll::Site.new @config
+      # The config_hash option should be a hash ready to be consumed by Jekyll's Site class.
+      #
+      @config = @options[:config_hash] || jekyll_config(@options)
+
+      # Override configuration with passed 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']
       @destination = local_path @config['destination']
-      
-      extensions = @options[:extensions].concat(default_extensions).flatten.uniq
+      @label = "Guard::Jekyll"
+ 
       # Convert array of extensions into a regex for matching file extensions eg, /\.md$|\.markdown$|\.html$/i
+      #
+      extensions  = @options[:extensions].concat(default_extensions).flatten.uniq
       @extensions = Regexp.new extensions.map { |e| (e << '$').gsub('\.', '\\.') }.join('|'), true
 
+      # set Jekyll server process id to nil
+      #
+      @pid = nil
+
+      # Create a Jekyll site
+      #
+      @site = ::Jekyll::Site.new @config
+
     end
 
     def start
@@ -36,10 +66,10 @@ module Guard
       if @options[:serve]
         start_server
 
-        UI.info "Guard::Jekyll " + "watching and serving at #{@config['host']}:#{@config['port']}#{@config['baseurl']}"
+        UI.info "#{@label} " + "watching and serving at #{@config['host']}:#{@config['port']}#{@config['baseurl']}" unless @config[:silent]
       else
         build
-        UI.info "Guard::Jekyll " + "watching"
+        UI.info "#{@label} " + "watching" unless @config[:silent]
       end
     end
 
@@ -74,17 +104,17 @@ module Guard
 
     def build(changes=nil)
       begin
-        UI.info "Guard::Jekyll " + "building...".yellow
+        UI.info "#{@label} " + "building...".yellow unless @config[:silent]
         if changes
           puts '| ' # spacing
           changes.each { |file| puts '|' + "  ~ ".yellow + file }
           puts '| ' # spacing
         end
         @site.process
-        UI.info "Guard::Jekyll " + "build complete ".green + "#{@source} → #{@destination}"
+        UI.info "#{@label} " + "build complete ".green + "#{@source} → #{@destination}" unless @config[:silent]
 
       rescue Exception => e
-        UI.error "Guard::Jekyll build has failed"
+        UI.error "#{@label} build has failed" unless @config[:silent]
         stop_server
         throw :task_has_failed
       end
@@ -96,7 +126,7 @@ module Guard
       begin
         message = 'copied file'
         message += 's' if files.size > 1
-        UI.info "Guard::Jekyll #{message.green}"
+        UI.info "#{@label} #{message.green}" unless @config[:silent]
         puts '| ' #spacing
         files.each do |file|
           path = destination_path file
@@ -107,7 +137,7 @@ module Guard
         puts '| ' #spacing
 
       rescue Exception => e
-        UI.error "Guard::Jekyll copy has failed"
+        UI.error "#{@label} copy has failed" unless @config[:silent]
         UI.error e
         stop_server
         throw :task_has_failed
@@ -121,7 +151,7 @@ module Guard
       begin
         message = 'removed file'
         message += 's' if files.size > 1
-        UI.info "Guard::Jekyll #{message.red}"
+        UI.info "#{@label} #{message.red}" unless @config[:silent]
         puts '| ' #spacing
 
         files.each do |file|
@@ -140,7 +170,7 @@ module Guard
         puts '| ' #spacing
 
       rescue Exception => e
-        UI.error "Guard::Jekyll remove has failed"
+        UI.error "#{@label} remove has failed" unless @config[:silent]
         UI.error e
         stop_server
         throw :task_has_failed
@@ -226,8 +256,6 @@ module Guard
         false
       end
     end
-
-
   end
 end
 

data/test/Gemfile.lock

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -72,6 +72,10 @@ files:
 - test/_posts/2013-07-08-welcome-to-jekyll.markdown
 - test/css/main.css
 - test/css/syntax.css
+- test/images/app.net.png
+- test/images/facebook.png
+- test/images/logo.png
+- test/images/twitter.png
 - test/index.html
 homepage: http://github.com/imathis/guard-jekyll-plus
 licenses: []