guard-falcon 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c50d55e76713e7b5e3117b2ad4afc08e9dc69f85
-  data.tar.gz: b2f9733ddfbbd33884cc5c254d6bb1e2812fcc6f
+  metadata.gz: ca8f7786cc49b12b390f9dc881dd08bb17c11a52
+  data.tar.gz: bc9e3180f55c5ccd22f7ebf1324983c1832cbd51
 SHA512:
-  metadata.gz: b4e37e32a0e16ce8023525e0641e47f98cad4e99655a3fdc013abcde5208d714937ab4b6853b20d9d488a5dcdf0a611ef8b87aced6728e8dc16462dca563e0f8
-  data.tar.gz: 262ec584d5bd5cb43b4fcc65a97456a9a894b6933c0a6c0dcc4ddf1695c266da3d289902ceaa8327cc6ebbb567a1657259b1c02324e5010bc11b1220d51f09ed
+  metadata.gz: 68b790dc399be8fa42a53543b196f786c14a75b100a86fbd4599bec61cda6931f05dbf7e874d7d5ca440d8e3c70d9492f4120b16a2918180db6b91f555e08e35
+  data.tar.gz: b3f5b549ebc6bd313a6c0795cee8398e8d1427f75cb20de9b59126fb0a8d8991bc95bfbd410ee3a6d48e103eba8971883922170b775a2b8f516cec9caffe1359

data/lib/guard/falcon.rb

@@ -18,68 +18,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'guard/compat/plugin'
-
-require 'rack/builder'
-require 'rack/server'
-
-require 'async/container'
-require "falcon/server"
+require_relative 'falcon/controller'
 
 module Guard
-	class Falcon < Plugin
-		attr_reader :options, :runner
-
-		def self.default_env
-			ENV.fetch('RACK_ENV', 'development')
-		end
-
-		DEFAULT_OPTIONS = {
-			:bind => "tcp://localhost:9000",
-			:environment => default_env,
-			:config => 'config.ru',
-		}
-
-		def initialize(**options)
-			super
-			
-			@options = DEFAULT_OPTIONS.merge(options)
-			@container = nil
-		end
-
-		def run_server
-			app, options = Rack::Builder.parse_file(@options[:config])
-			
-			UI.info("Starting HTTP server on #{@options[:bind]}.")
-			
-			Async::Container::Threaded.new(concurrency: 2) do
-				server = ::Falcon::Server.new(app, [
-					Async::IO::Address.parse(@options[:bind], reuse_port: true)
-				])
-				
-				server.run
-			end
-		rescue
-			
-			return nil
+	module Falcon
+		def self.new(*args)
+			Controller.new(*args)
 		end
-
-		def start
-			@container = run_server
-		end
-
-		def reload
-			stop
-			start
-		end
-
-		def stop
-			@container.stop
-			@container = nil
-		end
-
-		def run_on_change(paths)
-			reload
+		
+		# Workaround for https://github.com/guard/guard/pull/872
+		def self.superclass
+			nil
 		end
 	end
 end

data/lib/guard/falcon/controller.rb

@@ -0,0 +1,100 @@
+# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+require 'guard/compat/plugin'
+
+require 'rack/builder'
+require 'rack/server'
+
+require 'async/container/forked'
+require 'falcon/server'
+
+module Guard
+	module Falcon
+		class Controller < Plugin
+			def self.default_env
+				ENV.fetch('RACK_ENV', 'development')
+			end
+
+			DEFAULT_OPTIONS = {
+				:bind => "tcp://localhost:9000",
+				:environment => default_env,
+				:config => 'config.ru',
+			}
+
+			def initialize(**options)
+				super
+				
+				@options = DEFAULT_OPTIONS.merge(options)
+				@container = nil
+			end
+
+			# As discussed in https://github.com/guard/guard/issues/713
+			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
+				
+				logger.info("Starting Falcon HTTP server on #{@options[:bind]}.")
+				
+				Async::Container::Forked.new(concurrency: 2) do
+					server = ::Falcon::Server.new(app, [
+						Async::IO::Address.parse(@options[:bind], reuse_port: true)
+					])
+					
+					Process.setproctitle "Falcon HTTP #{@options[:bind]}"
+					
+					server.run
+				end
+			end
+
+			def start
+				@container = run_server
+			end
+
+			def running?
+				!@container.nil?
+			end
+
+			def reload
+				stop
+				start
+			end
+
+			def stop
+				if @container
+					@container.stop
+					@container = nil
+				end
+			end
+
+			def run_on_change(paths)
+				reload
+			end
+		end
+	end
+end

data/lib/guard/falcon/version.rb

@@ -20,6 +20,6 @@
 
 module Guard
 	module Falcon
-		VERSION = "0.1.0"
+		VERSION = "0.2.0"
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: guard-falcon
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -109,6 +109,7 @@ files:
 - Rakefile
 - guard-falcon.gemspec
 - lib/guard/falcon.rb
+- lib/guard/falcon/controller.rb
 - lib/guard/falcon/templates/Guardfile
 - lib/guard/falcon/version.rb
 homepage: https://github.com/socketry/guard-falcon