falcon 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffde5c3cd28c595389deccb1c4252be6d08b1de3
-  data.tar.gz: 34a3af82b5e312e0c942142aab09401f1ad3335e
+  metadata.gz: c34a59f385757f96b63f7a7072fb377e72832a9c
+  data.tar.gz: 614317654daa502e8521be52ffa7730b16068c29
 SHA512:
-  metadata.gz: 41f5be797dffbb54206cef86258b25efee38913270099c32b72dcdb02fea16f5add4b1a2c9b6e5291aef33171351863e1dd1f01f9801858079b117abe0d869f6
-  data.tar.gz: 1dfe0c9e4097c51029592fbd5b351c3ccb98d1d557205587bafb18834e737ea308c8e88162aebc484cf6927e339fd62fcd50ab155eef9402c03acf2176a4b68d
+  metadata.gz: 0fd5700a68dcba473e0f4c3e9e16dc77953609462749c2dbe14d8eed732e34911fc48821bde26508c868656415bfd08a2a08080e0866ef8ce5b55abf2e91097b
+  data.tar.gz: b283f4fb9e3cd6d6e49a923e6a24470851e2f04ac3e4433d310884f9aa6b5302ae66d261a2196d37fcc79758b8f49f66a5e14db26c2b3867f3c643b0000ddf0a

data/.travis.yml

@@ -2,16 +2,18 @@ language: ruby
 sudo: false
 dist: trusty
 cache: bundler
-rvm:
-  - 2.0
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - jruby-head
-  - ruby-head
-  - rbx-3
+
 matrix:
+  include:
+    - rvm: 2.0
+    - rvm: 2.1
+    - rvm: 2.2
+    - rvm: 2.3
+    - rvm: 2.4
+    - rvm: jruby-head
+      env: JRUBY_OPTS="--debug -X+O"
+    - rvm: ruby-head
+    - rvm: rbx-3
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head

data/examples/sinatra/Gemfile

@@ -0,0 +1,5 @@
+# A sample Gemfile
+source "https://rubygems.org"
+
+gem "sinatra"
+gem "falcon"

data/examples/sinatra/Gemfile.lock

@@ -0,0 +1,50 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    async (1.2.2)
+      nio4r
+      timers (~> 4.1)
+    async-container (0.2.2)
+      async (~> 1.0)
+    async-http (0.6.0)
+      async (~> 1.1)
+      async-io (~> 1.0)
+    async-io (1.2.1)
+      async (~> 1.0)
+    falcon (0.6.0)
+      async-container (~> 0.1)
+      async-http (~> 0.3)
+      async-io (~> 1.1)
+      rack (>= 1.0)
+      samovar (~> 1.3)
+    hitimes (1.2.6)
+    mapping (1.1.1)
+    mustermann (1.0.1)
+    nio4r (2.2.0)
+    rack (2.0.4)
+    rack-protection (2.0.0)
+      rack
+    rainbow (2.2.2)
+      rake
+    rake (12.3.0)
+    samovar (1.8.0)
+      mapping (~> 1.0)
+      rainbow (~> 2.0)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
+    tilt (2.0.8)
+    timers (4.1.2)
+      hitimes
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  falcon
+  sinatra
+
+BUNDLED WITH
+   1.16.0

data/examples/sinatra/config.ru

@@ -0,0 +1,15 @@
+#!/usr/bin/env falcon --verbose serve -c
+
+# Save this as `config.ru`, make it executable and then run it (or run falcon serve by hand)
+
+# Middleware that responds to incoming requests:
+require 'sinatra/base'
+class MyApp < Sinatra::Base
+	get "/" do
+		"hello world"
+	end
+end
+
+# Build the middleware stack:
+use MyApp # Then, it will get to Sinatra.
+run lambda {|env| [404, {}, []]} # Bottom of the stack, give 404.

data/falcon.gemspec

@@ -16,6 +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("async-io", "~> 1.1")
 	spec.add_dependency("async-http", "~> 0.3")
 	spec.add_dependency("async-container", "~> 0.1")
 	
@@ -23,7 +24,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency('samovar', "~> 1.3")
 	
-	spec.add_development_dependency "async-rspec", "~> 1.1"
+	spec.add_development_dependency "async-rspec", "~> 1.2"
 	
 	spec.add_development_dependency "bundler", "~> 1.3"
 	spec.add_development_dependency "rspec", "~> 3.6"

data/lib/falcon/command.rb

@@ -19,6 +19,7 @@
 # THE SOFTWARE.
 
 require_relative 'server'
+require_relative 'verbose'
 
 require 'async/container'
 
@@ -63,9 +64,21 @@ module Falcon
 				end
 			end
 			
-			def run
+			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]}]"
+				
 				container_class.new(concurrency: @options[:concurrency]) do
 					server = Falcon::Server.new(app, [
 						Async::IO::Endpoint.parse(@options[:bind], reuse_port: true)
@@ -75,8 +88,8 @@ module Falcon
 				end
 			end
 			
-			def invoke
-				run
+			def invoke(parent)
+				run(!parent.quiet?)
 				
 				sleep
 			end
@@ -85,6 +98,12 @@ module Falcon
 		class Top < Samovar::Command
 			self.description = "An asynchronous HTTP client/server toolset."
 			
+			options do
+				option '--verbose | --quiet', "Verbosity of output for debugging.", key: :logging
+				option '-h/--help', "Print out help information."
+				option '-v/--version', "Print out the application version."
+			end
+			
 			nested '<command>',
 				'serve' => Serve
 				# 'get' => Get
@@ -92,12 +111,30 @@ module Falcon
 				# 'head' => Head,
 				# 'put' => Put,
 				# 'delete' => Delete
-				
+			
+			def verbose?
+				@options[:logging] == :verbose
+			end
+			
+			def quiet?
+				@options[:logging] == :quiet
+			end
+			
 			def invoke(program_name: File.basename($0))
-				if @command
-					@command.invoke
+				if verbose?
+					Async.logger.level = Logger::DEBUG
+				elsif quiet?
+					Async.logger.level = Logger::WARN
 				else
+					Async.logger.level = Logger::INFO
+				end
+				
+				if @options[:version]
+					puts "falcon v#{Falcon::VERSION}"
+				elsif @options[:help] or @command.nil?
 					print_usage(program_name)
+				else
+					@command.invoke(self)
 				end
 			end
 		end

data/lib/falcon/verbose.rb

@@ -0,0 +1,52 @@
+# Copyright, 2018, 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 'async/logger'
+
+module Falcon
+	class Verbose
+		def initialize(app, logger = Async.logger)
+			@app = app
+			@logger = logger
+		end
+		
+		def log(start_time, env, response, error)
+			duration = Time.now - start_time
+			
+			request_method = env['REQUEST_METHOD']
+			request_path = env['PATH_INFO']
+			
+			if response
+				status, headers, body = response
+				@logger.info "#{request_method} #{request_path} -> #{status}; Content length #{headers.fetch('Content-Length', '-')} bytes; took #{duration} seconds"
+			else
+				@logger.info "#{request_method} #{request_path} -> #{error}; took #{duration} seconds"
+			end
+		end
+		
+		def call(env)
+			start_time = Time.now
+			
+			response = @app.call(env)
+		ensure
+			log(start_time, env, response, $!)
+		end
+	end
+end

data/lib/falcon/version.rb

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

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: async-io
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,10 +151,14 @@ files:
 - README.md
 - Rakefile
 - bin/falcon
+- examples/sinatra/Gemfile
+- examples/sinatra/Gemfile.lock
+- examples/sinatra/config.ru
 - falcon.gemspec
 - lib/falcon.rb
 - lib/falcon/command.rb
 - lib/falcon/server.rb
+- lib/falcon/verbose.rb
 - lib/falcon/version.rb
 - lib/rack/handler/falcon.rb
 homepage: https://github.com/socketry/falcon
@@ -162,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: ''