guard-falcon 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc106f7f62266b53e684a6f9ee45cdf381f01d3a05cfd6d0c6ec86edea119165
-  data.tar.gz: f4b35e3e902962375aaf28595a71d82330805cd67c3f32a74aca9874ae8b93a4
+  metadata.gz: 7685a5e5552489ae5ab115648fb653dc2b24fbebb5f5cb09a9b693bd2e92f2af
+  data.tar.gz: d82ac65a1fbff7a313b6e4d5cd0cfae411c011fcb1e47cc6eef5ecd543f0fd73
 SHA512:
-  metadata.gz: 7820f43182ae38f3ffd4e67a983a1d136a157b039e78a1f78cfb31af3de7c49c1b834f023ec99290dfe6d727718b2761dcfe3a416eb48a6146bf1c8c42e4e925
-  data.tar.gz: fa220c38aa29747cbc6eb15b0d7383938a9802ec9f770ba0d5db739f8c1a4d451c1ee8d81b723932e6d8d42bf0f73a38f4d945449c732bd89a8ffbbb1eb587e9
+  metadata.gz: cbd56a403c2042b478338c45ef594fffa42d0e1932650f7096c4f93674a0fb30b01dac2635ec3133c5a7bf3c984d8c5e45f92910205c15395d1d3694b1aab8a5
+  data.tar.gz: c5296b93d397169bd5509097f7ce1474e321a3dc5ee94b9540d0c94295b0b8ae91b5b89bc8eba072b24b1965eff6c495fed8738b6b035be702a6a20435b2bf78

data/guard-falcon.gemspec

@@ -16,7 +16,7 @@ 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.16.0")
+	spec.add_dependency("falcon", "~> 0.17.0")
 	
 	spec.add_dependency("guard")
 	spec.add_dependency("guard-compat", "~> 1.2")

data/lib/guard/falcon/controller.rb

@@ -27,9 +27,9 @@ require 'async/container/forked'
 
 require 'async/io/host_endpoint'
 require 'async/http/url_endpoint'
+require 'async/io/shared_endpoint'
 
 require 'falcon/server'
-require 'falcon/adapters/rack'
 
 module Guard
 	module Falcon
@@ -37,12 +37,14 @@ module Guard
 			DEFAULT_OPTIONS = {
 				config: 'config.ru',
 				concurrency: 2,
+				verbose: false,
 			}
 
 			def initialize(**options)
 				super
 				
 				@options = DEFAULT_OPTIONS.merge(options)
+				@endpoint = nil
 				@container = nil
 			end
 
@@ -50,15 +52,8 @@ module Guard
 			def logger
 				Compat::UI
 			end
-
-			def run_server
-				begin
-					app, options = Rack::Builder.parse_file(@options[:config])
-				rescue
-					logger.error "Failed to load #{@options[:config]}: #{$!}"
-					logger.error $!.backtrace
-				end
-				
+			
+			private def bind_endpoint
 				# Support existing use cases where only port: is specified.
 				if @options[:endpoint]
 					endpoint = @options[:endpoint]
@@ -69,10 +64,28 @@ module Guard
 					endpoint = Async::HTTP::URLEndpoint.parse("http://localhost:9292", reuse_port: true)
 				end
 				
+				Async::Reactor.run do
+					Async::IO::SharedEndpoint.bound(endpoint)
+				end.result
+			end
+			
+			def endpoint
+				@endpoint ||= bind_endpoint
+			end
+			
+			def run_server
 				logger.info("Starting Falcon HTTP server on #{endpoint}.")
 				
 				Async::Container::Forked.new(concurrency: @options[:concurrency]) do
-					server = ::Falcon::Server.new(::Falcon::Adapters::Rack.new(app), endpoint)
+					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, @endpoint)
 					
 					Process.setproctitle "Guard::Falcon HTTP Server: #{endpoint}"
 					

data/lib/guard/falcon/version.rb

@@ -20,6 +20,6 @@
 
 module Guard
 	module Falcon
-		VERSION = "0.8.1"
+		VERSION = "0.8.2"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-falcon
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: falcon
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement