falcon 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 649afb10cb1c289a5cfe6d982514364c8390884ff41b82f96c8cd8f704ccd820
-  data.tar.gz: 98e3e690e776b90df7b41d3ccd1bcc7ca22a4dd1eb019840edded3a215c4da8c
+  metadata.gz: f6fcbe05b21493aa8d6d96470a66afa9c4810e4bbc13f2580d89e5cac6cd3146
+  data.tar.gz: be058b48b65e5c6310589bfc52a013ebc388f3caa8358a32a7323e676a01a789
 SHA512:
-  metadata.gz: 86ec7adc0c04b0bdbd0be2fc73f8def3e523de76188c1a2f2788659c226c34513d325f8e571c493506dad706753201392817c9692d643be61bfefd27f45cccf6
-  data.tar.gz: 20b36c690afdb98a5d619780fd4a04da43483d3aac31a3bd1265d25c367b894bb157833f505ebc04a063dd15c70bd354cb7c393e43f5ff3a752e17483cdb6e67
+  metadata.gz: 3ba4fe3543c5cdd51100c64d38d2d6eee0ca26d9ecf37a9c5acb3da9b74ee7d5eee25dc09d9ed8023df66d2d23caed2756e3397ff763b2819d50297dd6d4e56b
+  data.tar.gz: ff7f5dc43ce9cc3b81c48db67cf3c798c55ae4e52aa6643199dca56942a5224e76d7735a6ef6f11e24d1043ef72fb086b9ee9c199acb17cff36833a42a9e3f36

data/.travis.yml

@@ -1,15 +1,14 @@
 language: ruby
-sudo: false
-dist: trusty
+sudo: required
+dist: xenial
 cache: bundler
 
 matrix:
   include:
-    - rvm: 2.0
-    - rvm: 2.1
     - rvm: 2.2
     - rvm: 2.3
     - rvm: 2.4
+    - rvm: 2.5
     - rvm: jruby-head
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: ruby-head

data/falcon.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |spec|
 	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
 	spec.require_paths = ["lib"]
 
-	spec.add_dependency("async-io", "~> 1.3")
-	spec.add_dependency("async-http", "~> 0.3")
+	spec.add_dependency("async-io", "~> 1.5")
+	spec.add_dependency("async-http", "~> 0.8")
 	spec.add_dependency("async-container", "~> 0.1")
 	
 	spec.add_dependency("rack", ">= 1.0")

data/lib/falcon/command.rb

@@ -18,95 +18,17 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require_relative 'server'
-require_relative 'verbose'
-
-require 'async/container'
-require 'async/io/trap'
+require_relative 'command/serve'
+require_relative 'version'
 
 require 'samovar'
-require 'etc'
-
-require 'rack/builder'
-require 'rack/server'
 
 module Falcon
 	module Command
-		def self.default_concurrency
-			Etc.nprocessors
-		rescue
-			2
-		end
-		
 		def self.parse(*args)
 			Top.parse(*args)
 		end
 		
-		class Serve < Samovar::Command
-			self.description = "Run an HTTP server."
-			
-			options do
-				option '-c/--config <path>', "Rackup configuration file to load", default: 'config.ru'
-				option '-n/--concurrency <count>', "Number of processes to start", default: Command.default_concurrency, type: Integer
-				
-				option '-b/--bind <address>', "Bind to the given hostname/address", default: "tcp://localhost:9292"
-				
-				option '--forked | --threaded', "Select a specific concurrency model", key: :container, default: :threaded
-			end
-			
-			def container_class
-				case @options[:container]
-				when :threaded
-					require 'async/container/threaded'
-					return Async::Container::Threaded
-				when :forked
-					require 'async/container/forked'
-					return Async::Container::Forked
-				end
-			end
-			
-			def load_app(verbose)
-				app, options = Rack::Builder.parse_file(@options[:config])
-				
-				if verbose
-					app = Verbose.new(app)
-				end
-				
-				return app, options
-			end
-			
-			def run(verbose)
-				app, options = load_app(verbose)
-				
-				Async.logger.info "Falcon taking flight! Binding to #{@options[:bind]} [#{container_class} with concurrency: #{@options[:concurrency]}]"
-				
-				debug_trap = Async::IO::Trap.new(:USR1)
-				
-				container_class.new(concurrency: @options[:concurrency]) do |task|
-					task.async do
-						debug_trap.install!
-						Async.logger.info "Send `kill -USR1 #{Process.pid}` for detailed status :)"
-						
-						debug_trap.trap do
-							task.reactor.print_hierarchy($stderr)
-						end
-					end
-					
-					server = Falcon::Server.new(app, [
-						Async::IO::Endpoint.parse(@options[:bind], reuse_port: true)
-					])
-					
-					server.run
-				end
-			end
-			
-			def invoke(parent)
-				container = run(parent.verbose?)
-				
-				sleep
-			end
-		end
-		
 		class Top < Samovar::Command
 			self.description = "An asynchronous HTTP client/server toolset."
 			

data/lib/falcon/command/serve.rb

@@ -0,0 +1,106 @@
+# 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_relative '../server'
+require_relative '../verbose'
+
+require 'async/container'
+require 'async/io/trap'
+
+require 'samovar'
+require 'etc'
+
+require 'rack/builder'
+require 'rack/server'
+
+module Falcon
+	module Command
+		def self.default_concurrency
+			Etc.nprocessors
+		rescue
+			2
+		end
+		
+		class Serve < Samovar::Command
+			self.description = "Run an HTTP server."
+			
+			options do
+				option '-c/--config <path>', "Rackup configuration file to load", default: 'config.ru'
+				option '-n/--concurrency <count>', "Number of processes to start", default: Command.default_concurrency, type: Integer
+				
+				option '-b/--bind <address>', "Bind to the given hostname/address", default: "tcp://localhost:9292"
+				
+				option '--forked | --threaded', "Select a specific concurrency model", key: :container, default: :threaded
+			end
+			
+			def container_class
+				case @options[:container]
+				when :threaded
+					require 'async/container/threaded'
+					return Async::Container::Threaded
+				when :forked
+					require 'async/container/forked'
+					return Async::Container::Forked
+				end
+			end
+			
+			def load_app(verbose)
+				app, options = Rack::Builder.parse_file(@options[:config])
+				
+				if verbose
+					app = Verbose.new(app)
+				end
+				
+				return app, options
+			end
+			
+			def run(verbose)
+				app, options = load_app(verbose)
+				
+				endpoint = Async::IO::Endpoint.parse(@options[:bind], reuse_port: true)
+				
+				Async.logger.info "Falcon taking flight! Binding to #{endpoint} [#{container_class} with concurrency: #{@options[:concurrency]}]"
+				
+				debug_trap = Async::IO::Trap.new(:USR1)
+				
+				container_class.new(concurrency: @options[:concurrency]) do |task|
+					task.async do
+						debug_trap.install!
+						Async.logger.info "Send `kill -USR1 #{Process.pid}` for detailed status :)"
+						
+						debug_trap.trap do
+							task.reactor.print_hierarchy($stderr)
+						end
+					end
+					
+					server = Falcon::Server.new(app, endpoint)
+					
+					server.run
+				end
+			end
+			
+			def invoke(parent)
+				container = run(parent.verbose?)
+				
+				sleep
+			end
+		end
+	end
+end

data/lib/falcon/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Falcon
-	VERSION = "0.7.0"
+	VERSION = "0.8.0"
 end

data/lib/rack/handler/falcon.rb

@@ -6,19 +6,17 @@ require_relative '../../falcon'
 module Rack
 	module Handler
 		module Falcon
-			def self.addresses_for(**options)
+			def self.endpoint_for(**options)
 				host = options[:Host] || 'localhost'
 				port = Integer(options[:Port] || 9292)
 				
-				return [
-					Async::IO::Endpoint.tcp(host, port)
-				]
+				return Async::IO::Endpoint.tcp(host, port)
 			end
 			
 			def self.run(app, **options)
-				addresses = addresses_for(**options)
+				endpoint = endpoint_for(**options)
 				
-				server = ::Falcon::Server.new(app, addresses)
+				server = ::Falcon::Server.new(app, endpoint)
 				
 				Async::Reactor.run do
 					server.run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-io
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: async-container
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,7 @@ files:
 - falcon.gemspec
 - lib/falcon.rb
 - lib/falcon/command.rb
+- lib/falcon/command/serve.rb
 - lib/falcon/server.rb
 - lib/falcon/verbose.rb
 - lib/falcon/version.rb