lib/jekyll/watcher.rb in jekyll-watch-1.3.0 vs lib/jekyll/watcher.rb in jekyll-watch-1.3.1

@@ -3,26 +3,28 @@
 module Jekyll
   module Watcher
     extend self
 
     def watch(options)
+      ENV["LISTEN_GEM_DEBUGGING"] ||= "1" if options['verbose']
+
       site = Jekyll::Site.new(options)
       listener = build_listener(site, options)
       listener.start
 
-      Jekyll.logger.info "Auto-regeneration:", "enabled for '#{options['source']}'"
+      Jekyll.logger.info "Auto-regeneration:", "enabled for '#{options["source"]}'"
 
       unless options['serving']
         trap("INT") do
           listener.stop
           puts "     Halting auto-regeneration."
           exit 0
         end
 
         sleep_forever
       end
-    rescue ThreadError => e
+    rescue ThreadError
       # You pressed Ctrl-C, oh my!
     end
 
     # TODO: shouldn't be public API
     def build_listener(site, options)
@@ -33,32 +35,33 @@
         &(listen_handler(site))
       )
     end
 
     def listen_handler(site)
-      proc { |modified, added, removed|
+      proc do |modified, added, removed|
         t = Time.now
         c = modified + added + removed
         n = c.length
-        print Jekyll.logger.message("Regenerating:", "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")} ")
+        print Jekyll.logger.message("Regenerating:",
+          "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")} ")
         begin
           site.process
-          puts  "...done in #{Time.now - t} seconds."
+          puts "...done in #{Time.now - t} seconds."
         rescue => e
           puts "...error:"
           Jekyll.logger.warn "Error:", e.message
           Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
         end
-      }
+      end
     end
 
     def custom_excludes(options)
       Array(options['exclude']).map { |e| Jekyll.sanitized_path(options['source'], e) }
     end
 
     def config_files(options)
-      %w[yml yaml toml].map do |ext|
+      %w(yml yaml toml).map do |ext|
         Jekyll.sanitized_path(options['source'], "_config.#{ext}")
       end
     end
 
     def to_exclude(options)
@@ -78,20 +81,19 @@
       source       = Pathname.new(options['source']).expand_path
       paths        = to_exclude(options)
 
       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
+        next unless 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.compact + [/\.jekyll\-metadata/]
     end
 
     def sleep_forever