guard-jekyll-plus 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -29,3 +29,8 @@ New config options
 
 - Removed accidental debugging output.
 
+### 1.2.2
+
+- Copy and remove ignore changes in directories beginning with an underscore.
+- Improved output for Jekyll build.
+

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

@@ -1,5 +1,5 @@
 module Guard
   class JekyllPlusVersion
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

data/lib/guard/jekyllplus.rb

@@ -54,7 +54,6 @@ module Guard
     end
 
     def start
-
       if @options[:serve]
         start_server
         build
@@ -75,31 +74,48 @@ module Guard
       stop_server
     end
 
-    def run_all
-      build
-    end
-
     def run_on_modifications(paths)
-      changes(paths)
+      matched = jekyll_matches paths
+      unmatched = non_jekyll_matches paths
+
+      if matched.size > 0
+        build(matched, "Files changed: ", "  ~ ".yellow)
+      elsif unmatched.size > 0
+        copy(unmatched)
+      end
     end
 
     def run_on_additions(paths)
-      changes(paths)
+      matched = jekyll_matches paths
+      unmatched = non_jekyll_matches paths
+
+      if matched.size > 0
+        build(matched, "Files added: ", "  + ".green)
+      elsif unmatched.size > 0
+        copy(unmatched)
+      end
     end
 
     def run_on_removals(paths)
-      remove paths
+      matched = jekyll_matches paths
+      unmatched = non_jekyll_matches paths
+
+      if matched.size > 0
+        build(matched, "Files removed: ", "  x ".red)
+      elsif unmatched.size > 0
+        remove(unmatched)
+      end
     end
 
 
     private
 
-    def build(changes=nil)
+    def build(files = nil, message = '', mark = nil)
       begin
-        UI.info "#{@label} " + "building...".yellow unless @config[:silent]
-        if changes
+        UI.info "#{@label} #{message}" + "building...".yellow unless @config[:silent]
+        if files
           puts '| ' # spacing
-          changes.each { |file| puts '|' + "  ~ ".yellow + file }
+          files.each { |file| puts '|' + mark + file }
           puts '| ' # spacing
         end
         @site.process
@@ -170,25 +186,12 @@ module Guard
       true
     end
 
-    def changes(paths)
-      matches = []
-      copy_files = []
-
-      paths.each do |file|
-        if file =~ @extensions
-          matches.push file 
-        else
-          copy_files.push file
-        end
-      end
+    def jekyll_matches(paths)
+      paths.select { |file| file =~ @extensions }
+    end
 
-      # If changes match Jekyll extensions, trigger a build else, copy files manually
-      # 
-      if matches.length > 0
-        build(matches)
-      else
-        copy(copy_files)
-      end
+    def non_jekyll_matches(paths)
+      paths.select { |file| !file.match(/^_/) and !file.match(@extensions) }
     end
 
     def jekyll_config(options)
@@ -221,6 +224,11 @@ module Guard
       end
     end
 
+    # Remove 
+    def ignore_underscores(paths)
+      paths.select { |file| file =~ /^[^_]/  }
+    end
+
     def server(config)
       proc{ Process.fork { ::Jekyll::Commands::Serve.process(config) } }
     end

data/test/Gemfile.lock

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

data/test/_config.yml

@@ -0,0 +1,2 @@
+source: ./
+port: 4000

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-jekyll-plus
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors: