bunto-watch 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d4b98805e89224a1e9e541261229c977e619e9d
-  data.tar.gz: de0872346252a32b53592875495158e23d102b53
+  metadata.gz: a1bf6f85dc0309457abed8306b761b5b7dd1d962
+  data.tar.gz: 6ada62fd9f25e790ac937be5619cec850cf677ef
 SHA512:
-  metadata.gz: 5b239aa37a7b56eb029391cd4a1c9143899fe69a3972d812eab7a40ad66546ca7edf858c756514dc3c3b42f3da0fd57cacbb38af422711403898130447f0d7c3
-  data.tar.gz: 15f1fc033d27c56fe4ae7719bcccd6c070a4037b1c6c969d2d4887fb6f291c62d7657ae1a544e7904b325fa9f9cacc6dd52747c5efc00da4a0f0784badf86e28
+  metadata.gz: fa8689e769de92e82466ef1108845aa160a4fce439f2b0d00dc4477c77dd40186ae266f09f173cf4275901537ec77de7b9738507d33f857fc7f6285567e95806
+  data.tar.gz: 3c303842d8d1110158f3bf9d04cb6d8b2e8f50c02ccbf1ce6439d5a2609e34fb63cd1bf9b3f10d1b32d32fb5796b918006806b5903d4ec951a57335581f4f1e3

data/lib/bunto-watch.rb

@@ -1,2 +1,2 @@
-require_relative "bunto/watcher"
-require_relative "bunto/commands/watch"
+require_relative "bunto/watcher"
+require_relative "bunto/commands/watch"

data/lib/bunto/commands/watch.rb

@@ -1,28 +1,28 @@
-module Bunto
-  module Commands
-    module Watch
-      extend self
-
-      def init_with_program(prog)
-      end
-
-      # Build your bunto site
-      # Continuously watch if `watch` is set to true in the config.
-      def process(options)
-        Bunto.logger.log_level = :error if options['quiet']
-        watch(site, options) if options['watch']
-      end
-
-      # Watch for file changes and rebuild the site.
-      #
-      # site - A Bunto::Site instance
-      # options - A Hash of options passed to the command
-      #
-      # Returns nothing.
-      def watch(_site, options)
-        Bunto::Watcher.watch(options)
-      end
-
-    end
-  end
-end
+module Bunto
+  module Commands
+    module Watch
+      extend self
+
+      def init_with_program(prog)
+      end
+
+      # Build your bunto site
+      # Continuously watch if `watch` is set to true in the config.
+      def process(options)
+        Bunto.logger.log_level = :error if options['quiet']
+        watch(site, options) if options['watch']
+      end
+
+      # Watch for file changes and rebuild the site.
+      #
+      # site - A Bunto::Site instance
+      # options - A Hash of options passed to the command
+      #
+      # Returns nothing.
+      def watch(_site, options)
+        Bunto::Watcher.watch(options)
+      end
+
+    end
+  end
+end

data/lib/bunto/watcher.rb

@@ -1,104 +1,116 @@
-require 'listen'
-
-module Bunto
-  module Watcher
-    extend self
-
-    def watch(options)
-      ENV["LISTEN_GEM_DEBUGGING"] ||= "1" if options['verbose']
-
-      site = Bunto::Site.new(options)
-      listener = build_listener(site, options)
-      listener.start
-
-      Bunto.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
-      # You pressed Ctrl-C, oh my!
-    end
-
-    # TODO: shouldn't be public API
-    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
-        print Bunto.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."
-        rescue => e
-          puts "...error:"
-          Bunto.logger.warn "Error:", e.message
-          Bunto.logger.warn "Error:", "Run bunto build --trace for more information."
-        end
-      end
-    end
-
-    def custom_excludes(options)
-      Array(options['exclude']).map { |e| Bunto.sanitized_path(options['source'], e) }
-    end
-
-    def config_files(options)
-      %w(yml yaml toml).map do |ext|
-        Bunto.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))
-            Bunto.logger.debug "Watcher:", "Ignoring #{path_to_ignore}"
-            path_to_ignore
-          end
-        rescue ArgumentError
-          # Could not find a relative path
-        end
-      end.compact + [/\.bunto\-metadata/]
-    end
-
-    def sleep_forever
-      loop { sleep 1000 }
-    end
-  end
-end
+require 'listen'
+
+module Bunto
+  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 Bunto 3.2)
+    #           (optional, default: nil)
+    #
+    # Returns nothing.
+    def watch(options, site = nil)
+      ENV["LISTEN_GEM_DEBUGGING"] ||= "1" if options['verbose']
+
+      site ||= Bunto::Site.new(options)
+      listener = build_listener(site, options)
+      listener.start
+
+      Bunto.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
+      # You pressed Ctrl-C, oh my!
+    end
+
+    # TODO: shouldn't be public API
+    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
+        print Bunto.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."
+        rescue => e
+          puts "...error:"
+          Bunto.logger.warn "Error:", e.message
+          Bunto.logger.warn "Error:", "Run bunto build --trace for more information."
+        end
+      end
+    end
+
+    def custom_excludes(options)
+      Array(options['exclude']).map { |e| Bunto.sanitized_path(options['source'], e) }
+    end
+
+    def config_files(options)
+      %w(yml yaml toml).map do |ext|
+        Bunto.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))
+            Bunto.logger.debug "Watcher:", "Ignoring #{path_to_ignore}"
+            path_to_ignore
+          end
+        rescue ArgumentError
+          # Could not find a relative path
+        end
+      end.compact + [/\.bunto\-metadata/]
+    end
+
+    def sleep_forever
+      loop { sleep 1000 }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bunto-watch
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Parker Moore
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-07 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: listen
@@ -18,6 +18,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,6 +28,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: wdm
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Rebuild your Bunto site when a file changes with the `--watch` switch.