guard-falcon 0.8.8 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f4f2f8fc400f0ee136d5a0d10032d7c15d3d0a9411bf9bbbb6608d896ddb13f
-  data.tar.gz: d2b70f2e5fa43fdc538eb7ae7ae06c620cf09efadf3b364a72889180b2dba02a
+  metadata.gz: 343581d49c2971d7066c9410b267dc83b896646737d91120020f382bfeafad0f
+  data.tar.gz: b7c853123e707167e60ebc42537d1c814ed787191c6f1ea8ae15c6dce27dc18e
 SHA512:
-  metadata.gz: e810a25892496a161911863ff656e4626b705da64a692753bfa7b2fb2a36e9d8820293504a0202a951682b24494fb3d3437598cb8a047309113472ed4a81f946
-  data.tar.gz: 3ad46d63e9922281d2930d1f02f47cc473bb1ad247672f095bd5d6208cfcf91d1f25237da03c9194783b90be0cbb9e009dd58c16f3100a7e4530f687f3b34766
+  metadata.gz: 63762868bc91631caf1ffd227ce7bc9632e4c5bc1838bc5be805341b5ca686264c0f1f645846b9dab025e4a157eca18b7f445333c193bdfa1bda38fd338a0b17
+  data.tar.gz: 53fb8ebab9d4ea42de8c4327cd5f626b94737b38c0a5b3d39bddf78d9bdd99ff4a1ba72c5501ab74632a3517a799726b794d9a2849f251c0cfd5228f5aa35807

data/.travis.yml

@@ -8,9 +8,9 @@ before_script:
   - gem install bundler
 
 rvm:
-  - 2.3
   - 2.4
   - 2.5
+  - 2.6
   - jruby-head
   - ruby-head
   - rbx-3

data/guard-falcon.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency("falcon", "~> 0.19")
+	spec.add_dependency("falcon", "~> 0.31")
 	
 	spec.add_dependency("guard")
 	spec.add_dependency("guard-compat", "~> 1.2")
 	
-	spec.add_development_dependency "bundler", "~> 1.3"
+	spec.add_development_dependency "bundler"
 	spec.add_development_dependency "rspec", "~> 3.6"
 	spec.add_development_dependency "rake"
 end

data/lib/guard/falcon/controller.rb

@@ -23,10 +23,10 @@ require 'guard/compat/plugin'
 require 'rack/builder'
 require 'rack/server'
 
-require 'async/container/forked'
+require 'async/logger'
+require 'async/container'
 
 require 'async/io/host_endpoint'
-require 'async/http/url_endpoint'
 require 'async/io/shared_endpoint'
 
 require 'falcon/server'
@@ -46,7 +46,7 @@ module Guard
 				
 				@options = DEFAULT_OPTIONS.merge(options)
 				@endpoint = nil
-				@thread = nil
+				@container = nil
 			end
 
 			# As discussed in https://github.com/guard/guard/issues/713
@@ -70,39 +70,39 @@ module Guard
 				@endpoint ||= build_endpoint
 			end
 			
-			def run_server
-				@shared_endpoint ||= Async::Reactor.run do
+			def run_server(container = Async::Container.new)
+				bound_endpoint ||= Async::Reactor.run do
 					Async::IO::SharedEndpoint.bound(endpoint)
 				end.wait
 				
 				logger.info("Starting Falcon HTTP server on #{endpoint}.")
 				
-				return Thread.new do
-					container = Async::Container::Forked.new
-					
-					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
+				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
 					
-					container.wait
+					app = ::Falcon::Server.middleware(rack_app, verbose: @options[:verbose])
+					server = ::Falcon::Server.new(app, bound_endpoint, endpoint.protocol, endpoint.scheme)
+					
+					server.run
 				end
+				
+				container.attach do
+					bound_endpoint.close
+				end
+				
+				return container
 			end
 
 			def start
-				@thread = run_server
+				@container = run_server
 			end
 
 			def running?
-				!@thread.nil?
+				!@container.nil?
 			end
 
 			def reload
@@ -111,10 +111,9 @@ module Guard
 			end
 
 			def stop
-				if @thread
-					@thread.kill
-					@thread.join
-					@thread = nil
+				if @container
+					@container.stop(false)
+					@container = nil
 				end
 			end
 

data/lib/guard/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-falcon
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.9.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: falcon
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.31'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '0.31'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement