guard-livereload 1.1.3 → 1.2.0

data/lib/guard/livereload.rb

@@ -3,8 +3,10 @@ require 'guard/guard'
 
 module Guard
   class LiveReload < Guard
-    attr_accessor :reactor
-    autoload :Reactor, 'guard/livereload/reactor'
+    require 'guard/livereload/websocket'
+    require 'guard/livereload/reactor'
+
+    attr_accessor :reactor, :options
 
     # =================
     # = Guard methods =
@@ -13,17 +15,15 @@ module Guard
     def initialize(watchers = [], options = {})
       super
       @options = {
-        :api_version => '1.6',
         :host => '0.0.0.0',
-        :port => '35729',
-        :apply_js_live => true,
         :apply_css_live => true,
+        :override_url => false,
         :grace_period => 0
       }.update(options)
     end
 
     def start
-      @reactor = Reactor.new(@options)
+      @reactor = Reactor.new(options)
     end
 
     def stop
@@ -31,7 +31,7 @@ module Guard
     end
 
     def run_on_changes(paths)
-      sleep @options[:grace_period]
+      sleep options[:grace_period]
       reactor.reload_browser(paths)
     end
 

data/lib/guard/livereload/reactor.rb

@@ -1,11 +1,9 @@
-require 'em-websocket'
 require 'multi_json'
 
 module Guard
   class LiveReload
     class Reactor
-
-      attr_reader :thread, :web_sockets
+      attr_reader :web_sockets, :thread, :options
 
       def initialize(options)
         @web_sockets = []
@@ -20,13 +18,16 @@ module Guard
       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]
-          }])
+          data = {
+            :command  => 'reload',
+            :path     => "#{Dir.pwd}/#{path}",
+            :liveCSS  => @options[:apply_css_live]
+          }
+          if options[:override_url] && File.exist?(path)
+            data[:overrideURL] = '/' + path
+          end
           UI.debug data
-          @web_sockets.each { |ws| ws.send(data) }
+          web_sockets.each { |ws| ws.send(MultiJson.encode(data)) }
         end
       end
 
@@ -35,12 +36,16 @@ module Guard
       def start_threaded_reactor(options)
         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|
+            UI.info "LiveReload is waiting for a browser to connect."
+            EventMachine.start_server(options[:host], 35729, WebSocket, {}) do |ws|
               ws.onopen do
                 begin
                   UI.info "Browser connected."
-                  ws.send "!!ver:#{options[:api_version]}"
+                  ws.send MultiJson.encode({
+                    :command    => 'hello',
+                    :protocols  => ['http://livereload.com/protocols/official-7'],
+                    :serverName => 'guard-livereload'
+                  })
                   @web_sockets << ws
                 rescue
                   UI.errror $!
@@ -49,11 +54,14 @@ module Guard
               end
 
               ws.onmessage do |msg|
-                UI.info "Browser URL: #{msg}"  if msg =~ /^(https?|file):/
+                msg = MultiJson.decode(msg)
+                if msg['command'] == 'url'
+                  UI.info "Browser URL: #{msg['url']}"
+                end
               end
 
               ws.onclose do
-                @web_sockets.delete ws
+                @web_sockets.delete(ws)
                 UI.info "Browser disconnected."
               end
             end

data/lib/guard/livereload/version.rb

@@ -1,5 +1,5 @@
 module Guard
   module LiveReloadVersion
-    VERSION = "1.1.3"
+    VERSION = "1.2.0"
   end
 end

data/lib/guard/livereload/websocket.rb

@@ -0,0 +1,39 @@
+require 'eventmachine'
+require 'em-websocket'
+require "http/parser"
+
+module Guard
+  class LiveReload
+    class WebSocket < EventMachine::WebSocket::Connection
+      def dispatch data
+        parser = Http::Parser.new
+        parser << data
+        if parser.http_method != 'GET' || parser.upgrade?
+          super #pass the request to websocket
+        elsif parser.request_path == '/livereload.js'
+          serve_file File.expand_path("../../../../js/livereload.js", __FILE__)
+        elsif File.exist?(parser.request_path[1..-1])
+          serve_file parser.request_path[1..-1] # Strip leading slash
+        else
+          send_data "HTTP/1.1 404 Not Found\r\nContent-Type: text/plain\r\nContent-Length: 13\r\n\r\n404 Not Found"
+          close_connection_after_writing
+        end
+      end
+
+      def serve_file path
+        UI.debug "Serving file #{path}"
+        content_type = case File.extname(path)
+        when '.css' then 'text/css'
+        when '.js' then 'application/ecmascript'
+        when '.gif' then 'image/gif'
+        when '.jpeg', '.jpg' then 'image/jpeg'
+        when '.png' then 'image/png'
+        else; 'text/plain'
+        end
+        send_data "HTTP/1.1 200 OK\r\nContent-Type: #{content_type}\r\nContent-Length: #{File.size path}\r\n\r\n"
+        stream_file_data(path).callback { close_connection_after_writing }
+      end
+
+    end
+  end
+end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: guard-livereload
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - Thibaud Guillaume-Gentil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,51 +55,31 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 description: Guard::LiveReload automatically reloads your browser when 'view' files
   are modified.
 email:
@@ -118,31 +91,32 @@ files:
 - lib/guard/livereload/reactor.rb
 - lib/guard/livereload/templates/Guardfile
 - lib/guard/livereload/version.rb
+- lib/guard/livereload/websocket.rb
 - lib/guard/livereload.rb
 - LICENSE
 - README.md
+- js/livereload.js
 homepage: http://rubygems.org/gems/guard-livereload
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: guard-livereload
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Guard gem for livereload
 test_files: []