guard-livereload 1.0.1 → 1.0.2

data/lib/guard/livereload/reactor.rb

@@ -1,5 +1,6 @@
 require 'em-websocket'
 require 'multi_json'
+require 'thread'
 
 module Guard
   class LiveReload
@@ -8,6 +9,7 @@ module Guard
       attr_reader :thread, :web_sockets
 
       def initialize(options)
+        @mutex = Mutex.new
         @web_sockets = []
         @options     = options
         @thread      = start_threaded_reactor(options)
@@ -18,15 +20,17 @@ module Guard
       end
 
       def reload_browser(paths = [])
-        UI.info "Reloading browser: #{paths.join(' ')}"
-        paths.each do |path|
-          data = MultiJson.encode(['refresh', {
-            :path           => "#{Dir.pwd}/#{path}",
-            :apply_js_live  => @options[:apply_js_live],
-            :apply_css_live => @options[:apply_css_live]
-          }])
-          UI.debug data
-          @web_sockets.each { |ws| ws.send(data) }
+        @mutex.synchronize do
+          UI.info "Reloading browser: #{paths.join(' ')}"
+          paths.each do |path|
+            data = MultiJson.encode(['refresh', {
+              :path           => "#{Dir.pwd}/#{path}",
+              :apply_js_live  => @options[:apply_js_live],
+              :apply_css_live => @options[:apply_css_live]
+            }])
+            UI.debug data
+            @web_sockets.each { |ws| ws.send(data) }
+          end
         end
       end
 
@@ -38,13 +42,15 @@ module Guard
             UI.info "LiveReload #{options[:api_version]} is waiting for a browser to connect."
             EventMachine.start_server(options[:host], options[:port], EventMachine::WebSocket::Connection, {}) do |ws|
               ws.onopen do
-                begin
-                  UI.info "Browser connected."
-                  ws.send "!!ver:#{options[:api_version]}"
-                  @web_sockets << ws
-                rescue
-                  UI.errror $!
-                  UI.errror $!.backtrace
+                @mutex.synchronize do
+                  begin
+                    UI.info "Browser connected."
+                    ws.send "!!ver:#{options[:api_version]}"
+                    @web_sockets << ws
+                  rescue
+                    UI.errror $!
+                    UI.errror $!.backtrace
+                  end
                 end
               end
 
@@ -53,8 +59,10 @@ module Guard
               end
 
               ws.onclose do
-                @web_sockets.delete ws
-                UI.info "Browser disconnected."
+                @mutex.synchronize do
+                  @web_sockets.delete ws
+                  UI.info "Browser disconnected."
+                end
               end
             end
           end

data/lib/guard/livereload/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module LiveReloadVersion
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-livereload
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2012-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard