guard-falcon 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa18154a04c687d5d1d2dac1e5d897ac177fcd07ed82c04dcda9c31a1f8560e1
-  data.tar.gz: 1c6691acb31d9d562da4b48e4f368e17752bc019207bc634eaca68db4e7ba950
+  metadata.gz: 597497205f8bbc9c367dd26c1fdc6fab587df1397b2c06981ebc5f11ce061fab
+  data.tar.gz: 7cad97652d3d9a06a617367c7651bf62df5839e47b3eee7026b5841d02a27f47
 SHA512:
-  metadata.gz: 904c9f12f8fa454c30c77f49910c77e307f31216bd15c5b95935b92e5c389f56e77c4b54a3601034b6b0a35def5370ba5921ce08705bcda86fb515bd5861bf65
-  data.tar.gz: 66d7af623938189f87417b6c34a4c0b11f31fce272627c0ed9a05fb39336df5fc3ff9100fb58f915c4d5987023aef8c25d49b02a8ff4728f2d91cf803fb3824c
+  metadata.gz: cb9c6d4fc693e84c44632ee976bc21e45641a29c0ebe301693052433a2f5872b76dec94ec6b6de0f56c60e0878ec874fb3f8aa32b227115b5c83059e485afbd9
+  data.tar.gz: 7d406b13031d492e86a5a06d6de6496f58c7b47a06fde871c8be8e735c12f5f21639cef47fc7b026d765dab5c7d747091bcc7c39f9169123c27e3cb894030467

data/.travis.yml

@@ -1,21 +1,24 @@
 language: ruby
-sudo: false
-dist: trusty
+dist: xenial
 cache: bundler
 
-before_script:
-  - gem update --system
-  - gem install bundler
-
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - jruby-head
-  - ruby-head
-  - rbx-3
 matrix:
+  include:
+    - rvm: 2.4
+    - rvm: 2.5
+    - rvm: 2.6
+    - rvm: 2.7
+    - rvm: 2.6
+      env: COVERAGE=Summary,Coveralls
+    - rvm: 2.7
+    - rvm: truffleruby
+    - rvm: jruby-head
+      env: JRUBY_OPTS="--debug -X+O"
+    - rvm: ruby-head
+    - rvm: 2.6
+      os: osx
   allow_failures:
+    - rvm: truffleruby
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-3
+    - rvm: truffleruby

data/guard-falcon.gemspec

@@ -16,7 +16,9 @@ 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.31")
+	spec.add_dependency("falcon", "~> 0.35")
+	
+	spec.add_dependency("async-container", "~> 0.16.0")
 	
 	spec.add_dependency("guard")
 	spec.add_dependency("guard-compat", "~> 1.2")

data/lib/guard/falcon.rb

@@ -18,12 +18,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'falcon/controller'
+require_relative 'falcon/plugin'
 
 module Guard
 	module Falcon
 		def self.new(*args)
-			Controller.new(*args)
+			Plugin.new(*args)
 		end
 		
 		# Workaround for https://github.com/guard/guard/pull/872

data/lib/guard/falcon/{controller.rb → plugin.rb}

@@ -21,37 +21,39 @@
 require 'guard/compat/plugin'
 
 require 'rack/builder'
-require 'rack/server'
 
 require 'async/logger'
 require 'async/container'
 
-require 'async/io/host_endpoint'
-require 'async/io/shared_endpoint'
-
 require 'falcon/server'
 require 'falcon/endpoint'
+require 'falcon/controller/serve'
 
 module Guard
 	module Falcon
-		class Controller < Plugin
+		class Plugin < Guard::Plugin
 			DEFAULT_OPTIONS = {
 				config: 'config.ru',
 				count: 1,
 				verbose: false,
 			}
-
+			
 			def initialize(**options)
 				super
 				
 				@options = DEFAULT_OPTIONS.merge(options)
+				
 				@endpoint = nil
-				@container = nil
+				
+				@controller = ::Falcon::Controller::Serve.new(self)
 			end
-
-			# As discussed in https://github.com/guard/guard/issues/713
-			def logger
-				Async.logger
+			
+			def container_class
+				Async::Container::Threaded
+			end
+			
+			def container_options
+				{}
 			end
 			
 			private def build_endpoint
@@ -70,49 +72,33 @@ module Guard
 				@endpoint ||= build_endpoint
 			end
 			
-			def run_server(container = Async::Container::Threaded.new)
-				@bound_endpoint ||= Async::Reactor.run do
-					Async::IO::SharedEndpoint.bound(endpoint)
-				end.wait
-				
-				logger.info("Starting Falcon HTTP server on #{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, @bound_endpoint, endpoint.protocol, endpoint.scheme)
-					
-					server.run
-				end
+			def load_app
+				rack_app, options = Rack::Builder.parse_file(@options[:config])
 				
-				return container
+				return ::Falcon::Server.middleware(rack_app, verbose: @options[:verbose]), options
 			end
-
+			
+			# As discussed in https://github.com/guard/guard/issues/713
+			def logger
+				Async.logger
+			end
+			
 			def start
-				@container = run_server
+				@controller.start
 			end
-
+			
 			def running?
-				!@container.nil?
+				@controller.running?
 			end
-
+			
 			def reload
-				stop
-				start
+				@controller.restart
 			end
-
+			
 			def stop
-				if @container
-					@container.stop(false)
-					@container = nil
-				end
+				@controller.stop
 			end
-
+			
 			def run_on_change(paths)
 				reload
 			end

data/lib/guard/falcon/version.rb

@@ -20,6 +20,6 @@
 
 module Guard
 	module Falcon
-		VERSION = "0.10.0"
+		VERSION = "0.11.0"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: guard-falcon
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-05 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: falcon
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.35'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.31'
+        version: '0.35'
+- !ruby/object:Gem::Dependency
+  name: async-container
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -110,7 +124,7 @@ files:
 - Rakefile
 - guard-falcon.gemspec
 - lib/guard/falcon.rb
-- lib/guard/falcon/controller.rb
+- lib/guard/falcon/plugin.rb
 - lib/guard/falcon/templates/Guardfile
 - lib/guard/falcon/version.rb
 homepage: https://github.com/socketry/guard-falcon
@@ -131,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A guard plugin to run an instance of the falcon web server.