hawkins 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f929af2fc50c880c9eddc8e616f2021356374156
-  data.tar.gz: eab14413e1a78b4153a341f66f68c0d653ab607f
+  metadata.gz: 08351443faff94c7f57124889029acf7a027265e
+  data.tar.gz: d4ec1c35cd3952a106d04527f9e9736281d7becb
 SHA512:
-  metadata.gz: 9686c48fe8d922021257cec7f623c579f52b21f61de2988855549b94ee78502c86e6bffd3bc2c43a517cb271ea1d7899d55c65242325beb28c40f8279b76946b
-  data.tar.gz: 0bf0b78f452ef86dc79c0b23fdbe8d77eb123d8920c0e83be414adc25a4de137cfdb02123560e52ef80b5ca89b937d537638336e7a8a6148c14fce5de31315d9
+  metadata.gz: 91f12d9f6525263a18b0dd49a629ecb4aa64d679121e272fa2797599760f740d7f18fb339efd9cee497ce00a6c2c8bd5929dbd2af6a31f53157d31dc190980a7
+  data.tar.gz: e8c86d3a6f4c958a37456efb492a8225aa40bb225e0b63b0614846c596025934c95edc1a343d4c4a27324952a771666df2433fbe270d50d3ca96bdd811a03f28

data/lib/hawkins/liveserve.rb

@@ -3,7 +3,6 @@ require 'thread'
 module Hawkins
   module Commands
     class LiveServe < Jekyll::Command
-
       # Based on pattern described in
       # https://emptysqua.re/blog/an-event-synchronization-primitive-for-ruby/
       @mutex = Mutex.new
@@ -61,7 +60,6 @@ module Hawkins
           setup(destination)
 
           @reload_reactor.start(opts)
-
           @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
 
           @server.mount("#{opts['baseurl']}/__livereload",
@@ -96,7 +94,7 @@ module Hawkins
           # path matching is very loose so that a message to reload "/" will always
           # lead the page to reload since every page starts with "/".
           Jekyll::Hooks.register(:site, :post_write) do
-            unless @changed_pages.nil? || !@reload_reactor.running?
+            if @changed_pages && @reload_reactor && @reload_reactor.running?
               ignore, @changed_pages = @changed_pages.partition do |p|
                 Array(opts["ignore"]).any? do |filter|
                   File.fnmatch(filter, Jekyll.sanitized_path(p.relative_path))
@@ -260,6 +258,13 @@ module Hawkins
           unless detached
             proc do
               mutex.synchronize do
+                unless @reload_reactor.nil?
+                  @reload_reactor.reactor_mutex.synchronize do
+                    unless EM.reactor_running?
+                      @reload_reactor.reactor_running_cond.wait(@reload_reactor.reactor_mutex)
+                    end
+                  end
+                end
                 @is_running = true
                 Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
                 running_cond.signal
@@ -273,7 +278,14 @@ module Hawkins
           unless detached
             proc do
               mutex.synchronize do
-                @reload_reactor.stop unless @reload_reactor.nil?
+                unless @reload_reactor.nil?
+                  @reload_reactor.stop
+                  @reload_reactor.reactor_mutex.synchronize do
+                    if EM.reactor_running?
+                      @reload_reactor.reactor_running_cond.wait(@reload_reactor.reactor_mutex)
+                    end
+                  end
+                end
                 @is_running = false
                 running_cond.signal
               end

data/lib/hawkins/servlet.rb

@@ -87,11 +87,16 @@ module Hawkins
           @new_body = @new_body.join
         end
 
-        def host_to_use
-          (@options["host"] || 'localhost').gsub(%r{:.*}, '')
-        end
-
         def template
+          # Unclear what "snipver" does. Doc at
+          # https://github.com/livereload/livereload-js states that the recommended
+          # setting is 1.
+
+          # Complicated JavaScript to ensure that livereload.js is loaded from the
+          # same origin as the page.  Mostly useful for dealing with the browser's
+          # distinction between 'localhost' and 127.0.0.1
+
+          # Use 'src="//..."' to mirror the protocol used to load the page itself.
           template = <<-TEMPLATE
           <% if with_swf? %>
             <script type="text/javascript">
@@ -101,21 +106,20 @@ module Hawkins
             <script type="text/javascript" src="<%= @options["baseurl"] %>/__livereload/swfobject.js"></script>
             <script type="text/javascript" src="<%= @options["baseurl"] %>/__livereload/web_socket.js"></script>
           <% end %>
-          <script type="text/javascript">
-            document.write('<script src="<%= livereload_source %>"></' + 'script>');
+          <script>
+            document.write(
+              '<script src="//' +
+              (location.host || 'localhost').split(':')[0] +
+              ':<%=@options["reload_port"] %>/livereload.js?snipver=1<%= livereload_args %>"' +
+              '></' +
+              'script>');
           </script>
           TEMPLATE
           ERB.new(Jekyll::Utils.strip_heredoc(template))
         end
 
-        def livereload_source
-          use_ssl = @options["ssl_cert"] && @options["ssl_key"]
-          protocol = use_ssl ? "https" : "http"
-
-          # Unclear what "snipver" does.  https://github.com/livereload/livereload-js states
-          # that the recommended setting is 1.
-          src = "#{protocol}://#{host_to_use}:#{@options['reload_port']}/livereload.js?snipver=1"
-
+        def livereload_args
+          src = ''
           # XHTML standard requires ampersands to be encoded as entities when in attributes
           # See http://stackoverflow.com/a/2190292
           src << "&amp;mindelay=#{@options['min_delay']}" if @options["min_delay"]

data/lib/hawkins/version.rb

@@ -1,3 +1,3 @@
 module Hawkins
-  VERSION = "2.0.4".freeze
+  VERSION = "2.0.5".freeze
 end

data/lib/hawkins/websockets.rb

@@ -27,7 +27,7 @@ module Hawkins
 
       reload_file = File.join(LIVERELOAD_DIR, "livereload.js")
       @reload_body = File.read(reload_file)
-      @reload_size = File.size(reload_file)
+      @reload_size = @reload_body.bytesize
     end
 
     def dispatch(data)
@@ -67,11 +67,14 @@ module Hawkins
   class LiveReloadReactor
     attr_reader :thread
     attr_reader :opts
+    attr_reader :reactor_mutex, :reactor_running_cond
 
     def initialize
       @thread = nil
       @websockets = []
       @connections_count = 0
+      @reactor_mutex = Mutex.new
+      @reactor_running_cond = ConditionVariable.new
     end
 
     def stop
@@ -80,14 +83,13 @@ module Hawkins
     end
 
     def running?
-      !@thread.nil? && @thread.alive?
+      EM.reactor_running?
     end
 
     def start(opts)
       @thread = Thread.new do
         # Use epoll if the kernel supports it
         EM.epoll
-        # TODO enable SSL
         EM.run do
           Jekyll.logger.info("LiveReload Server:", "#{opts['host']}:#{opts['reload_port']}")
           EM.start_server(opts['host'], opts['reload_port'], HttpAwareConnection, opts) do |ws|
@@ -103,8 +105,22 @@ module Hawkins
               print_message(msg)
             end
           end
+
+          # Notify blocked threads that EventMachine has started or shutdown
+          EM.schedule do
+            @reactor_mutex.synchronize do
+              @reactor_running_cond.broadcast
+            end
+          end
+
+          EM.add_shutdown_hook do
+            @reactor_mutex.synchronize do
+              @reactor_running_cond.broadcast
+            end
+          end
         end
       end
+      @thread.abort_on_exception = true
     end
 
     # For a description of the protocol see http://feedback.livereload.com/knowledgebase/articles/86174-livereload-protocol

data/test/test_liveserve.rb

@@ -70,6 +70,7 @@ module Hawkins
         @thread = Thread.new do
           Commands::LiveServe.start(opts)
         end
+        @thread.abort_on_exception = true
 
         Commands::LiveServe.mutex.synchronize do
           unless Commands::LiveServe.is_running
@@ -121,8 +122,7 @@ module Hawkins
         client.ssl_config.add_trust_ca(cert)
         content = client.get_content(
           "https://#{opts['host']}:#{opts['port']}/#{opts['baseurl']}/hello.html")
-        expect(content).to include(
-          "src=\"https://#{opts['host']}:#{opts['reload_port']}/livereload.js")
+        expect(content).to include(%q(src="//'))
       end
 
       it "serves nothing else over HTTP on the default LiveReload port" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hawkins
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Alex Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll