hx 0.20.0 → 0.21.0

data/VERSION

@@ -1 +1 @@
-0.20.0
+0.21.0

data/lib/hx/cli.rb

@@ -27,6 +27,7 @@ require 'optparse'
 require 'pathname'
 require 'tempfile'
 require 'webrick'
+require 'thread'
 require 'rack'
 require 'rack/mock'
 require 'rack/handler/webrick'
@@ -107,21 +108,25 @@ def self.cmd_serve(site, port=nil)
   server.logger.info "Serving on #{base_url}"
 
   config_file = site.options[:config_file]
-  mtime = nil
+
+  reload_lock = Mutex.new
   site_app = nil
+  mtime = nil
 
   app = Proc.new { |env|
-    unless site_app and File.mtime(config_file) == mtime
-      # reload the site/config, folding in the new base URL
-      site = Hx::Site.load_file(config_file, :base_url => base_url)
-      mtime = File.mtime(config_file)
-      site_app = Hx::Rack::Application.new(site, site.options)
-    end
-    site_app.call(env)
+    reload_lock.synchronize {
+      unless File.mtime(config_file) == mtime
+        # reload the site/config, folding in the new base URL
+        site = Hx::Site.load_file(config_file, :base_url => base_url)
+        mtime = File.mtime(config_file)
+        site_app = Hx::Rack::Application.new(site, site.options)
+      end
+      site_app
+    }.call(env)
   }
 
   # force application load
-  Rack::MockRequest.new(app).get("/")
+  ::Rack::MockRequest.new(app).get("/")
 
   server.mount('/', ::Rack::Handler::WEBrick, app)
   %w(INT TERM).each { |s| trap(s) { server.shutdown } }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hx
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 75
   prerelease: false
   segments: 
   - 0
-  - 20
+  - 21
   - 0
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors: 
 - MenTaLguY