guard-jekyll-plus 1.1.0 → 1.1.1

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+### 1.0.0
+- Initial release. A nice guard watcher for Jekyll projects.
+
+### 1.1.0
+- Added support for Jekyll serve.
+
+### 1.1.1
+- Improved colorized output.
+- Rescued errors kill the Jekyll WEBrick server.

data/README.md

@@ -8,6 +8,11 @@ Features:
 - 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)
+- Clear and colorized output
+
+Here's a look
+
+![Colorized output](http://cl.ly/QAK9/content.png)
 
 ## Installation
 

data/lib/guard/jekyll/version.rb

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

data/lib/guard/jekyll.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'guard'
 require 'guard/guard'
 
@@ -34,10 +36,10 @@ module Guard
       if @options[:serve]
         start_server
 
-        UI.info "Guard::Jekyll is watching files and serving at #{@config['host']}:#{@config['port']}#{@config['baseurl']}".bold
+        UI.info "Guard::Jekyll " + "watching and serving at #{@config['host']}:#{@config['port']}#{@config['baseurl']}"
       else
         build
-        UI.info "Guard::Jekyll is watching".bold
+        UI.info "Guard::Jekyll " + "watching"
       end
     end
 
@@ -64,61 +66,84 @@ module Guard
     end
 
     def run_on_removals(paths)
-      paths.each { |file| remove file }
+      remove paths
     end
 
 
     private
 
-    def build
+    def build(changes=nil)
       begin
-        UI.info "Guard::Jekyll "+" building".yellow + " source: #{@source}, destination: #{@destination}"
+        UI.info "Guard::Jekyll " + "building...".yellow
+        if changes
+          puts '| ' # spacing
+          changes.each { |file| puts '|' + "  ~ ".yellow + file }
+          puts '| ' # spacing
+        end
         @site.process
-        UI.info "Guard::Jekyll "+" complete".green + " #{@source} built to #{@destination}"
+        UI.info "Guard::Jekyll " + "build complete ".green + "#{@source} → #{@destination}"
 
       rescue Exception => e
         UI.error "Guard::Jekyll build has failed"
+        stop_server
         throw :task_has_failed
       end
     end
 
     # Copy static files to destination directory
     #
-    def copy(file)
+    def copy(files=[])
       begin
-        path = destination_path file
-        FileUtils.mkdir_p File.dirname(path)
-        FileUtils.cp file, path
-        UI.info "Guard::Jekyll" + "    copied ".green + "#{file} -> #{path}"
+        message = 'copied file'
+        message += 's' if files.size > 1
+        UI.info "Guard::Jekyll #{message.green}"
+        puts '| ' #spacing
+        files.each do |file|
+          path = destination_path file
+          FileUtils.mkdir_p File.dirname(path)
+          FileUtils.cp file, path
+          puts '|' + "  → ".green + path
+        end
+        puts '| ' #spacing
+
       rescue Exception => e
         UI.error "Guard::Jekyll copy has failed"
         UI.error e
+        stop_server
         throw :task_has_failed
       end
+      true
     end
 
     # Remove deleted source file/directories from destination
     #
-    def remove(file)
-      path = destination_path file
-      if File.exist? path
-        begin
-
-          FileUtils.rm path
-          UI.info "Guard::Jekyll" + "   removed ".red + path
+    def remove(files=[])
+      begin
+        message = 'removed file'
+        message += 's' if files.size > 1
+        UI.info "Guard::Jekyll #{message.red}"
+        puts '| ' #spacing
+
+        files.each do |file|
+          path = destination_path file
+          if File.exist? path
+            FileUtils.rm path
+            puts '|' + "  x ".red + path
+          end
 
           dir = File.dirname path
           if Dir[dir+'/*'].empty?
             FileUtils.rm_r(dir) 
-            UI.info "Guard::Jekyll" + "   removed ".red + dir
+            puts '|' + "  x ".red + dir
           end
-
-        rescue Exception => e
-          UI.error "Guard::Jekyll remove has failed"
-          UI.error e
-          throw :task_has_failed
         end
+        puts '| ' #spacing
 
+      rescue Exception => e
+        UI.error "Guard::Jekyll remove has failed"
+        UI.error e
+        stop_server
+        throw :task_has_failed
       end
       true
     end
@@ -138,9 +163,9 @@ module Guard
       # If changes match Jekyll extensions, trigger a build else, copy files manually
       # 
       if matches.length > 0
-        build
+        build(matches)
       else
-        copy_files.each   { |f| copy f }
+        copy(copy_files)
       end
     end
 

data/test/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/test/_override.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-09 00:00:00.000000000 Z
+date: 2013-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
@@ -51,6 +51,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt