lib/guard/livereload/reactor.rb in guard-livereload-1.0.3 vs lib/guard/livereload/reactor.rb in guard-livereload-1.1.0

@@ -1,38 +1,34 @@
 require 'em-websocket'
 require 'multi_json'
-require 'thread'
 
 module Guard
   class LiveReload
     class Reactor
 
       attr_reader :thread, :web_sockets
 
       def initialize(options)
-        @mutex = Mutex.new
         @web_sockets = []
         @options     = options
         @thread      = start_threaded_reactor(options)
       end
 
       def stop
         thread.kill
       end
 
       def reload_browser(paths = [])
-        @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
+        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
 
     private
 
@@ -40,30 +36,26 @@
         Thread.new do
           EventMachine.run do
             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
-                @mutex.synchronize do
-                  begin
-                    UI.info "Browser connected."
-                    ws.send "!!ver:#{options[:api_version]}"
-                    @web_sockets << ws
-                  rescue
-                    UI.errror $!
-                    UI.errror $!.backtrace
-                  end
+                begin
+                  UI.info "Browser connected."
+                  ws.send "!!ver:#{options[:api_version]}"
+                  @web_sockets << ws
+                rescue
+                  UI.errror $!
+                  UI.errror $!.backtrace
                 end
               end
 
               ws.onmessage do |msg|
                 UI.info "Browser URL: #{msg}"  if msg =~ /^(https?|file):/
               end
 
               ws.onclose do
-                @mutex.synchronize do
-                  @web_sockets.delete ws
-                  UI.info "Browser disconnected."
-                end
+                @web_sockets.delete ws
+                UI.info "Browser disconnected."
               end
             end
           end
         end
       end