hawkins 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1bd11a41ba71a67896b81cb43ee0c52027290a5
-  data.tar.gz: b51ee35d4b5fa17c4c28591370d2e1abb064276b
+  metadata.gz: f929af2fc50c880c9eddc8e616f2021356374156
+  data.tar.gz: eab14413e1a78b4153a341f66f68c0d653ab607f
 SHA512:
-  metadata.gz: 627dd5cc3dfdc7a2cbd9be3ec967c050bc29f43419e13605a9b74988842ab3cd2ee6f2293b9d4fc79982c92084a907ea732d12c400a5ea08e8262c9c37f437b0
-  data.tar.gz: 8e48083f7781a9155b95685b9a85d8cf725e666c3f313147242d96b230e41fe819664a3d0b60893033ebbc10c42452427c76473de5a40fff37c53fdba0084a1a
+  metadata.gz: 9686c48fe8d922021257cec7f623c579f52b21f61de2988855549b94ee78502c86e6bffd3bc2c43a517cb271ea1d7899d55c65242325beb28c40f8279b76946b
+  data.tar.gz: 0bf0b78f452ef86dc79c0b23fdbe8d77eb123d8920c0e83be414adc25a4de137cfdb02123560e52ef80b5ca89b937d537638336e7a8a6148c14fce5de31315d9

data/lib/hawkins/liveserve.rb

@@ -3,6 +3,13 @@ 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
+      @running_cond = ConditionVariable.new
+      @is_running = false
+
       class << self
         COMMAND_OPTIONS = {
           "swf"      => ["--swf", "Use Flash for WebSockets support"],
@@ -14,6 +21,8 @@ module Hawkins
 
         LIVERELOAD_PORT = 35729
 
+        attr_reader :mutex, :running_cond, :is_running
+
         #
 
         def init_with_program(prog)
@@ -51,7 +60,6 @@ module Hawkins
           destination = opts["destination"]
           setup(destination)
 
-          @running = Queue.new
           @reload_reactor.start(opts)
 
           @server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
@@ -65,12 +73,8 @@ module Hawkins
           boot_or_detach(@server, opts)
         end
 
-        def running?
-          !(@running.nil? || @running.empty?)
-        end
-
         def shutdown
-          @server.shutdown if running?
+          @server.shutdown if @is_running
         end
 
         private
@@ -185,9 +189,9 @@ module Hawkins
         private
         def launch_browser(server, opts)
           command =
-            if Utils::Platforms.windows?
+            if Jekyll::Utils::Platforms.windows?
               "start"
-            elsif Utils::Platforms.osx?
+            elsif Jekyll::Utils::Platforms.osx?
               "open"
             else
               "xdg-open"
@@ -255,8 +259,11 @@ module Hawkins
         def start_callback(detached)
           unless detached
             proc do
-              @running << '.'
-              Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
+              mutex.synchronize do
+                @is_running = true
+                Jekyll.logger.info("Server running...", "press ctrl-c to stop.")
+                running_cond.signal
+              end
             end
           end
         end
@@ -265,8 +272,11 @@ module Hawkins
         def stop_callback(detached)
           unless detached
             proc do
-              @reload_reactor.stop
-              @running.clear
+              mutex.synchronize do
+                @reload_reactor.stop unless @reload_reactor.nil?
+                @is_running = false
+                running_cond.signal
+              end
             end
           end
         end

data/lib/hawkins/version.rb

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

data/test/test_liveserve.rb

@@ -57,8 +57,10 @@ module Hawkins
           Commands::LiveServe.shutdown
         end
 
-        while Commands::LiveServe.running?
-          sleep(0.1)
+        Commands::LiveServe.mutex.synchronize do
+          if Commands::LiveServe.is_running
+            Commands::LiveServe.running_cond.wait(Commands::LiveServe.mutex)
+          end
         end
 
         FileUtils.remove_entry_secure(temp_dir, true)
@@ -69,8 +71,10 @@ module Hawkins
           Commands::LiveServe.start(opts)
         end
 
-        while !Commands::LiveServe.running?
-          sleep(0.1)
+        Commands::LiveServe.mutex.synchronize do
+          unless Commands::LiveServe.is_running
+            Commands::LiveServe.running_cond.wait(Commands::LiveServe.mutex)
+          end
         end
       end
 

metadata

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