guard-falcon 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c88e11d5af7b1fee995bb3687917649c2f45825f493f9b5756589c79dadfe58e
-  data.tar.gz: d65c7dd82e9c26d0fc0135499c746facf4fa30c0444188393ea765406abf793e
+  metadata.gz: 5f4f2f8fc400f0ee136d5a0d10032d7c15d3d0a9411bf9bbbb6608d896ddb13f
+  data.tar.gz: d2b70f2e5fa43fdc538eb7ae7ae06c620cf09efadf3b364a72889180b2dba02a
 SHA512:
-  metadata.gz: 30e4e685a546d09f4086ab2c84c6960bf573989054b044b3f0047ebbe8a565652aa670b0f7fa1b22291e1eb3936b319a1dcb85dce39a7c7c1be1d5768e8b9f0c
-  data.tar.gz: f08928eede9818c04c32afcf74d60b80b7c4867b31ca68d0927fbe82e892767d84d4c8f9d9937e9dc00ca5ae0fcea247c7dc03ff6b8bf2ec8a1cc6055dbcc4fe
+  metadata.gz: e810a25892496a161911863ff656e4626b705da64a692753bfa7b2fb2a36e9d8820293504a0202a951682b24494fb3d3437598cb8a047309113472ed4a81f946
+  data.tar.gz: 3ad46d63e9922281d2930d1f02f47cc473bb1ad247672f095bd5d6208cfcf91d1f25237da03c9194783b90be0cbb9e009dd58c16f3100a7e4530f687f3b34766

data/Gemfile

@@ -4,6 +4,5 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-	gem 'simplecov'
-	gem 'coveralls', require: false
+	gem 'covered'
 end

data/lib/guard/falcon/controller.rb

@@ -37,7 +37,7 @@ module Guard
 		class Controller < Plugin
 			DEFAULT_OPTIONS = {
 				config: 'config.ru',
-				concurrency: 2,
+				count: 1,
 				verbose: false,
 			}
 
@@ -46,12 +46,12 @@ module Guard
 				
 				@options = DEFAULT_OPTIONS.merge(options)
 				@endpoint = nil
-				@container = nil
+				@thread = nil
 			end
 
 			# As discussed in https://github.com/guard/guard/issues/713
 			def logger
-				Compat::UI
+				Async.logger
 			end
 			
 			private def build_endpoint
@@ -71,39 +71,38 @@ module Guard
 			end
 			
 			def run_server
-				shared_endpoint = Async::Reactor.run do
+				@shared_endpoint ||= Async::Reactor.run do
 					Async::IO::SharedEndpoint.bound(endpoint)
 				end.wait
 				
 				logger.info("Starting Falcon HTTP server on #{endpoint}.")
 				
-				container = Async::Container::Forked.new(concurrency: @options[:concurrency]) do
-					begin
-						rack_app, options = Rack::Builder.parse_file(@options[:config])
-					rescue
-						logger.error "Failed to load #{@options[:config]}: #{$!}"
-						logger.error $!.backtrace
-					end
-					
-					app = ::Falcon::Server.middleware(rack_app, verbose: @options[:verbose])
-					server = ::Falcon::Server.new(app, shared_endpoint, endpoint.protocol, endpoint.scheme)
+				return Thread.new do
+					container = Async::Container::Forked.new
 					
-					Process.setproctitle "Guard::Falcon HTTP Server: #{endpoint}"
+					container.run(count: @options[:count], restart: true, name: "Guard::Falcon: #{endpoint}") do
+						begin
+							rack_app, options = Rack::Builder.parse_file(@options[:config])
+						rescue => error
+							logger.error(error) {"Failed to load #{@options[:config]}"}
+						end
+						
+						app = ::Falcon::Server.middleware(rack_app, verbose: @options[:verbose])
+						server = ::Falcon::Server.new(app, @shared_endpoint, endpoint.protocol, endpoint.scheme)
+						
+						server.run
+					end
 					
-					server.run
+					container.wait
 				end
-				
-				shared_endpoint.close
-				
-				return container
 			end
 
 			def start
-				@container = run_server
+				@thread = run_server
 			end
 
 			def running?
-				!@container.nil?
+				!@thread.nil?
 			end
 
 			def reload
@@ -112,9 +111,10 @@ module Guard
 			end
 
 			def stop
-				if @container
-					@container.stop
-					@container = nil
+				if @thread
+					@thread.kill
+					@thread.join
+					@thread = nil
 				end
 			end
 

data/lib/guard/falcon/version.rb

@@ -20,6 +20,6 @@
 
 module Guard
 	module Falcon
-		VERSION = "0.8.7"
+		VERSION = "0.8.8"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-falcon
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-20 00:00:00.000000000 Z
+date: 2019-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: falcon
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: A guard plugin to run an instance of the falcon web server.