jekyll-watch 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19fc2330fdbdf644e689711dbb2bf8f43dd941c4
-  data.tar.gz: 27208f23e082bb1f42d8a48bfd8857e0f750353c
+  metadata.gz: 9855455db8909487179a72ecb00a1f4fe815e37d
+  data.tar.gz: 78c2b869b915f9f4d4f82938eb595a782fc77884
 SHA512:
-  metadata.gz: e0e826d78bc318b9f68e37bd38007c18367b4e824e3cde0349846ea2737b7ec7b108d0d7c1fce1d2d1e6028bdb5667e2ea1e4de4bb2aee01bca12f88906edc2e
-  data.tar.gz: e864b8310cf3325b04a2cd34aba6426a9825b5f613e298a3e0e2f581f9e687c00353f72b78770d7fcebe92d7d247b65414c2f50374c1816b9965647ce21266c5
+  metadata.gz: c1229d13b045a137e5b7576ad5e691d0ed343ba4dc96555a62f53541ca72250f616812940b78a80e3b3bb030cc6eef5b8443e58605aabb29eb7ad32fcb421f94
+  data.tar.gz: 86d75902d758067629d35e0427fef1872176c745f4ff7a5577391f712cbfaea021e569ecf324fab524340e5e77e10a0b2be46598f24be502f64debbd81555d7b

data/lib/jekyll/watcher.rb

@@ -48,35 +48,43 @@ module Jekyll
       }
     end
 
+    def custom_excludes(options)
+      Array(options['exclude']).map { |e| Jekyll.sanitized_path(options['source'], e) }
+    end
+
+    def to_exclude(options)
+      config_files = [
+        "_config.yml",
+        "_config.yaml",
+        "_config.toml"
+      ].map { |config_file| Jekyll.sanitized_path(options['source'], config_file) }
+      [config_files, options['destination'], custom_excludes(options)].flatten
+    end
+
     # Paths to ignore for the watch option
     #
     # options - A Hash of options passed to the command
     #
     # Returns a list of relative paths from source that should be ignored
     def listen_ignore_paths(options)
-      source       = options['source']
-      destination  = options['destination']
-      config_files = Jekyll.sanitized_path(source, "_config.yml")
-      paths = (
-        Array(config_files) \
-        + Array(destination) \
-        + Array(options['exclude']).map { |e| Jekyll.sanitized_path(source, e) }
-      )
-      ignored = []
+      source       = Pathname.new(options['source']).expand_path
+      paths        = to_exclude(options)
 
-      source_abs = Pathname.new(source).expand_path
-      paths.each do |p|
-        path_abs = Pathname.new(p).expand_path
-        begin
-          rel_path = path_abs.relative_path_from(source_abs).to_s
-          ignored << Regexp.new(Regexp.escape(rel_path)) unless rel_path.start_with?('../')
-        rescue ArgumentError
-          # Could not find a relative path
+      paths.map do |p|
+        absolute_path = Pathname.new(p).expand_path
+        if absolute_path.exist?
+          begin
+            relative_path = absolute_path.relative_path_from(source).to_s
+            unless relative_path.start_with?('../')
+              path_to_ignore = Regexp.new(Regexp.escape(relative_path))
+              Jekyll.logger.debug "Watcher:", "Ignoring #{path_to_ignore}"
+              path_to_ignore
+            end
+          rescue ArgumentError
+            # Could not find a relative path
+          end
         end
-      end
-
-      Jekyll.logger.debug "Watcher:", "Ignoring #{ignored.map(&:inspect).join(', ')}"
-      ignored
+      end.compact
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-watch
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-05 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen