livereload 1.3 → 1.4

data/bin/livereload

@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 require 'rubygems'
-require 'livereload'
+require File.join(File.dirname(__FILE__), '..', 'lib', 'livereload')
 require 'optparse'
 
 def parse_command_line_config(args)
@@ -16,7 +16,7 @@ def parse_command_line_config(args)
         config.host = v
       end
 
-      opts.on("--port [PORT]", Integer, "TCP port to listen on (default is 10083)") do |v|
+      opts.on("--port [PORT]", Integer, "TCP port to listen on (default is 35729)") do |v|
         config.port = v.to_i
       end
 

data/lib/livereload.rb

@@ -1,6 +1,7 @@
 require 'em-websocket'
-require 'directory_watcher'
+require 'em-dir-watcher'
 require 'json/objects'
+require 'stringio'
 
 # Chrome sometimes sends HTTP/1.0 requests in violation of WebSockets spec
 # hide the warning about redifinition of a constant
@@ -20,8 +21,8 @@ class Object
 end
 
 module LiveReload
-  GEM_VERSION = "1.3"
-  API_VERSION = "1.3"
+  GEM_VERSION = "1.4"
+  API_VERSION = "1.4"
 
   PROJECT_CONFIG_FILE_TEMPLATE = <<-END.strip.split("\n").collect { |line| line.strip + "\n" }.join("")
   # Lines starting with pound sign (#) are ignored.
@@ -40,11 +41,14 @@ module LiveReload
   #config.apply_js_live = false
   # reload the whole page when .css changes
   #config.apply_css_live = false
+
+  # wait 100ms for more changes before reloading a page
+  #config.grace_period = 0.1
   END
 
   # note that host and port options do not make sense in per-project config files
   class Config
-    attr_accessor :host, :port, :exts, :exclusions, :debug, :apply_js_live, :apply_css_live
+    attr_accessor :host, :port, :exts, :exts_overwrite, :exclusions, :debug, :apply_js_live, :apply_css_live, :grace_period
 
     def initialize &block
       @host           = nil
@@ -54,13 +58,19 @@ module LiveReload
       @exclusions     = []
       @apply_js_live  = nil
       @apply_css_live = nil
+      @grace_period   = nil
 
       update!(&block) if block
     end
 
     def update!
+      @exts = [nil] + @exts  # nil is used as a marker to detect if the array has been overwritten
+
       yield self
 
+      @exts_overwrite = @exts.empty? || ! @exts.first.nil?
+      @exts = @exts.compact
+
       # remove leading dots
       @exts = @exts.collect { |e| e.sub(/^\./, '') }
     end
@@ -68,11 +78,16 @@ module LiveReload
     def merge! other
       @host           = other.host             if other.host
       @port           = other.port             if other.port
-      @exts          += other.exts
+      if other.exts_overwrite
+        @exts         = other.exts
+      else
+        @exts        += other.exts.compact
+      end
       @exclusions     = other.exclusions + @exclusions
       @debug          = other.debug            if other.debug != nil
       @apply_js_live  = other.apply_js_live    if other.apply_js_live != nil
       @apply_css_live = other.apply_css_live   if other.apply_css_live != nil
+      @grace_period   = other.grace_period     if other.grace_period != nil
 
       self
     end
@@ -92,7 +107,7 @@ module LiveReload
       end
 
       def merge *configs
-        configs.reduce(Config.new) { |merged, config| config && merged.merge!(config) || merged }
+        configs.inject(Config.new) { |merged, config| config && merged.merge!(config) || merged }
       end
     end
   end
@@ -100,11 +115,12 @@ module LiveReload
   DEFAULT_CONFIG = Config.new do |config|
     config.debug = false
     config.host  = '0.0.0.0'
-    config.port  = 10083
+    config.port  = 35729
     config.exts  = %w/html css js png gif jpg php php5 py rb erb/
     config.exclusions = %w!*/.git/* */.svn/* */.hg/*!
     config.apply_js_live  = true
     config.apply_css_live = true
+    config.grace_period = 0.05
   end
 
   USER_CONFIG_FILE = File.expand_path("~/.livereload")
@@ -143,18 +159,8 @@ module LiveReload
       if @config.exclusions.size > 0
         puts "  - excluding changes in: " + @config.exclusions.join(" ")
       end
-    end
-    
-    def is_excluded? path
-      basename = File.basename(path)
-      @config.exclusions.any? do |exclusion|
-        if Regexp === exclusion
-          path =~ exclusion
-        elsif exclusion.include? '/'
-          File.fnmatch?(File.join(@directory, exclusion), path)
-        else
-          File.fnmatch?(exclusion, basename)
-        end
+      if @config.grace_period > 0
+        puts "  - with a grace period of #{sprintf('%0.2f', @config.grace_period)} sec after each change"
       end
     end
 
@@ -166,15 +172,16 @@ module LiveReload
       if @dw
         @dw.stop
       end
-      @dw = DirectoryWatcher.new @directory, :glob => "{.livereload,**/*.{#{@config.exts.join(',')}}}", :scanner => :em, :pre_load => true
-      @dw.add_observer do |*args|
+      @dw = EMDirWatcher.watch @directory,
+            :include_only => (['/.livereload'] + @config.exts.collect { |ext| ["*.#{ext}", ".*.#{ext}"]}).flatten,
+            :exclude => @config.exclusions,
+            :grace_period => @config.grace_period do |paths|
         begin
-          args.each do |event|
-            path = event[:path]
+          paths.each do |path|
             if File.basename(path) == '.livereload'
               @when_changes_detected.call [:config_changed, path]
-            elsif event[:type] == :modified
-              @when_changes_detected.call [if is_excluded?(path) then :excluded else :modified end, path]
+            else
+              @when_changes_detected.call [:modified, path]
             end
           end
         rescue
@@ -182,7 +189,6 @@ module LiveReload
           puts $!.backtrace
         end
       end
-      @dw.start
     end
   end
 

metadata

@@ -4,8 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 3
-  version: "1.3"
+  - 4
+  version: "1.4"
 platform: ruby
 authors: 
 - Andrey Tarantsov
@@ -31,17 +31,16 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: directory_watcher
+  name: em-dir-watcher
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 0
         - 1
-        - 3
-        - 2
-        version: 1.3.2
+        version: "0.1"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency