jekyll-watch 2.1.2 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dda724abafdf9fc5f34aac080d4c6e77319f4dae189ef0a28ca3bce7faf2d655
-  data.tar.gz: 6af86020a15252b2116ed64b8c93b7d75f9293a32c78a4c7f2bbc2989052bdf2
+  metadata.gz: 53f200cbdc7896048b0b6c113e6f839e0366755fc267f9a9ef89d6e91cea8c4b
+  data.tar.gz: 3d8dc1bf483aa05ca7dbd77b83047cd2957aff25235dd36aea80804dff1e1e1c
 SHA512:
-  metadata.gz: fb27525b7571140af739402ad8d4dd1178d07a2574a813e0afd3368d4f46c139c2e3b57576526a9931b4a989d4022fee551283cd190d565fea9e9d50d99b30f1
-  data.tar.gz: 80f9cefcf191d4bd4f9bbe7a7b1365c52a029d90fe7475cbc61de04f61698c90126d1b8f23700efcc090d49aad521cf358d49b8748d00c8b516029dd83718bce
+  metadata.gz: a8af1a4494b66f55c177e75da957167ca1a9076580f4069f0f759dd1e3dfcc592d31fd64cce41ebc00c00faf8003a40d2bd8cbc2cdb082fd9ff3ba63aa078674
+  data.tar.gz: 93ae2cd3a37995549186eb78c12a3513c2fc880a702edd9cb40c6a639d5510faa9c3676511f6c9f429e6f0ba73b02b0c36a779209a71b6862f18f12b8e1fdaca

data/lib/jekyll-watch.rb

@@ -1,5 +1,5 @@
-# frozen_string_literal: true
-
-require "jekyll-watch/version"
-require_relative "jekyll/watcher"
-require_relative "jekyll/commands/watch"
+# frozen_string_literal: true
+
+require "jekyll-watch/version"
+require_relative "jekyll/watcher"
+require_relative "jekyll/commands/watch"

data/lib/jekyll-watch/version.rb

@@ -1,7 +1,7 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Watch
-    VERSION = "2.1.2"
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Watch
+    VERSION = "2.2.1"
+  end
+end

data/lib/jekyll/commands/watch.rb

@@ -1,18 +1,18 @@
-# frozen_string_literal: true
-
-module Jekyll
-  module Commands
-    module Watch
-      extend self
-
-      def init_with_program(prog); end
-
-      # Build your jekyll site
-      # Continuously watch if `watch` is set to true in the config.
-      def process(options)
-        Jekyll.logger.log_level = :error if options["quiet"]
-        Jekyll::Watcher.watch(options) if options["watch"]
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Jekyll
+  module Commands
+    module Watch
+      extend self
+
+      def init_with_program(prog); end
+
+      # Build your jekyll site
+      # Continuously watch if `watch` is set to true in the config.
+      def process(options)
+        Jekyll.logger.log_level = :error if options["quiet"]
+        Jekyll::Watcher.watch(options) if options["watch"]
+      end
+    end
+  end
+end

data/lib/jekyll/watcher.rb

@@ -1,127 +1,137 @@
-# frozen_string_literal: true
-
-require "listen"
-
-module Jekyll
-  module Watcher
-    extend self
-
-    # Public: Continuously watch for file changes and rebuild the site
-    # whenever a change is detected.
-    #
-    # If the optional site argument is populated, that site instance will be
-    # reused and the options Hash ignored. Otherwise, a new site instance will
-    # be instantiated from the options Hash and used.
-    #
-    # options - A Hash containing the site configuration
-    # site    - The current site instance (populated starting with Jekyll 3.2)
-    #           (optional, default: nil)
-    #
-    # Returns nothing.
-    def watch(options, site = nil)
-      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"]}'"
-
-      unless options["serving"]
-        trap("INT") do
-          listener.stop
-          Jekyll.logger.info "", "Halting auto-regeneration."
-          exit 0
-        end
-
-        sleep_forever
-      end
-    rescue ThreadError
-      # You pressed Ctrl-C, oh my!
-    end
-
-    private
-
-    def build_listener(site, options)
-      Listen.to(
-        options["source"],
-        :ignore        => listen_ignore_paths(options),
-        :force_polling => options["force_polling"],
-        &listen_handler(site)
-      )
-    end
-
-    def listen_handler(site)
-      proc do |modified, added, removed|
-        t = Time.now
-        c = modified + added + removed
-        n = c.length
-
-        Jekyll.logger.info "Regenerating:",
-                           "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")}"
-
-        c.each { |path| Jekyll.logger.info "", path["#{site.source}/".length..-1] }
-        process(site, t)
-      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|
-        Jekyll.sanitized_path(options["source"], "_config.#{ext}")
-      end
-    end
-
-    def to_exclude(options)
-      [
-        config_files(options),
-        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 = Pathname.new(options["source"]).expand_path
-      paths  = to_exclude(options)
-
-      paths.map do |p|
-        absolute_path = Pathname.new(p).expand_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 + [%r!\.jekyll\-metadata!]
-    end
-
-    def sleep_forever
-      loop { sleep 1000 }
-    end
-
-    def process(site, time)
-      begin
-        site.process
-        Jekyll.logger.info "", "...done in #{Time.now - time} seconds."
-      rescue => e
-        Jekyll.logger.warn "Error:", e.message
-        Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
-      end
-      Jekyll.logger.info ""
-    end
-  end
-end
+# frozen_string_literal: true
+
+require "listen"
+
+module Jekyll
+  module Watcher
+    extend self
+
+    # Public: Continuously watch for file changes and rebuild the site
+    # whenever a change is detected.
+    #
+    # If the optional site argument is populated, that site instance will be
+    # reused and the options Hash ignored. Otherwise, a new site instance will
+    # be instantiated from the options Hash and used.
+    #
+    # options - A Hash containing the site configuration
+    # site    - The current site instance (populated starting with Jekyll 3.2)
+    #           (optional, default: nil)
+    #
+    # Returns nothing.
+    def watch(options, site = nil)
+      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"]}'"
+
+      unless options["serving"]
+        trap("INT") do
+          listener.stop
+          Jekyll.logger.info "", "Halting auto-regeneration."
+          exit 0
+        end
+
+        sleep_forever
+      end
+    rescue ThreadError
+      # You pressed Ctrl-C, oh my!
+    end
+
+    private
+
+    def build_listener(site, options)
+      Listen.to(
+        options["source"],
+        :ignore        => listen_ignore_paths(options),
+        :force_polling => options["force_polling"],
+        &listen_handler(site)
+      )
+    end
+
+    def listen_handler(site)
+      proc do |modified, added, removed|
+        t = Time.now
+        c = modified + added + removed
+        n = c.length
+
+        Jekyll.logger.info "Regenerating:",
+                           "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")}"
+
+        c.each { |path| Jekyll.logger.info "", path["#{site.source}/".length..-1] }
+        process(site, t)
+      end
+    end
+
+    def normalize_encoding(obj, desired_encoding)
+      case obj
+      when Array
+        obj.map { |entry| entry.encode!(desired_encoding, entry.encoding) }
+      when String
+        obj.encode!(desired_encoding, obj.encoding)
+      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|
+        Jekyll.sanitized_path(options["source"], "_config.#{ext}")
+      end
+    end
+
+    def to_exclude(options)
+      [
+        config_files(options),
+        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 = Pathname.new(options["source"]).expand_path
+      paths  = to_exclude(options)
+
+      paths.map do |p|
+        absolute_path = Pathname.new(normalize_encoding(p, options["source"].encoding)).expand_path
+        next unless absolute_path.exist?
+
+        begin
+          relative_path = absolute_path.relative_path_from(source).to_s
+          relative_path = File.join(relative_path, "") if absolute_path.directory?
+          unless relative_path.start_with?("../")
+            path_to_ignore = %r!^#{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 + [%r!^\.jekyll\-metadata!]
+    end
+
+    def sleep_forever
+      loop { sleep 1000 }
+    end
+
+    def process(site, time)
+      begin
+        site.process
+        Jekyll.logger.info "", "...done in #{Time.now - time} seconds."
+      rescue StandardError => e
+        Jekyll.logger.warn "Error:", e.message
+        Jekyll.logger.warn "Error:", "Run jekyll build --trace for more information."
+      end
+      Jekyll.logger.info ""
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-watch
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.2.1
 platform: ruby
 authors:
 - Parker Moore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-17 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -28,30 +28,36 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jekyll
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
 description: 
 email:
 - parkrmoore@gmail.com
@@ -125,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Rebuild your Jekyll site when a file changes with the `--watch` switch.