falcon 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fab1eafce5a511075f7339beabec2ef2364693ffeb050b84e90a8223e3faf614
-  data.tar.gz: 6f2512f83e06c16ab5600c66ceefc0d2ea910e6f8a53df3d8d919600c75671af
+  metadata.gz: 5d8f6d04def38b5f391b3cdcc17935b06612a9c95137bfaf563c58ac21cc0edc
+  data.tar.gz: '085234503af9930b2d0a9bf7430673bb896456c2093cc627eee83fb7a6d9e1a3'
 SHA512:
-  metadata.gz: 0ce28b54426aa8ccbba9801e18c548a284ffbc8c64b54a9cf03b6d3af75ed11b029b999de1e923509b8e16ff525c465ac82695e6a37c9a207f002447333d5c83
-  data.tar.gz: 916bf5e17a59d440c633471a809fad988693f050d8912dd236150983bbb81a4fd2235406418f5a740072aec8e21ed8844593c123d47533d6b6255ddaa7221d14
+  metadata.gz: 41223e695feb4428ef06b260dd4b4a178c35f8889708198f5f94f4f598b6322b2c0d431e0268372debe54fd670fdb146efa2126295d8022a956a4878dd9ce095
+  data.tar.gz: 33728e72a25355cb7025b0ae1c4f4883fc200251d82fe8d7ee1011c240ec9f49769c601a95da80801736a6cfeb3c1f78f3d499ac9c013425cc82c27c90987016

data/README.md

@@ -52,7 +52,7 @@ falcon [--verbose | --quiet] [-h/--help] [-v/--version] <command>
 	An asynchronous HTTP server.
 
 	[--verbose | --quiet]  Verbosity of output for debugging.
-	[-h/--help]            Print out help information.       
+	[-h/--help]            Print out help information.
 	[-v/--version]         Print out the application version.
 	<command>              One of: serve, virtual.             Default: serve
 
@@ -60,15 +60,16 @@ falcon [--verbose | --quiet] [-h/--help] [-v/--version] <command>
 		Run an HTTP server.
 
 		[-b/--bind <address>]               Bind to the given hostname/address                               Default: https://localhost:9292
-		[-p/--port <number>]                Override the specified port                                    
+		[-p/--port <number>]                Override the specified port
 		[-h/--hostname <hostname>]          Specify the hostname which would be used for certificates, etc.
-		[-t/--timeout <duration>]           Specify the maximum time to wait for blocking operations.        Default: 60                    
-		[--reuse-port]                      Enable SO_REUSEPORT if possible.                                 Default: false                 
-		[-c/--config <path>]                Rackup configuration file to load                                Default: config.ru             
-		[--forked | --threaded | --hybrid]  Select a specific parallelism model                              Default: forked                
-		[-n/--count <count>]                Number of instances to start.                                    Default: 8                     
-		[--forks <count>]                   Number of forks (hybrid only).                                 
-		[--threads <count>]                 Number of threads (hybrid only). ```
+		[-t/--timeout <duration>]           Specify the maximum time to wait for blocking operations.        Default: 60
+		[--reuse-port]                      Enable SO_REUSEPORT if possible.                                 Default: false
+		[-c/--config <path>]                Rackup configuration file to load                                Default: config.ru
+		[--forked | --threaded | --hybrid]  Select a specific parallelism model                              Default: forked
+		[-n/--count <count>]                Number of instances to start.                                    Default: 8
+		[--forks <count>]                   Number of forks (hybrid only).
+		[--threads <count>]                 Number of threads (hybrid only).
+```
 
 To run on a different port:
 

data/bin/falcon

@@ -23,6 +23,6 @@
 require_relative '../lib/falcon'
 
 begin
-	Falcon::Command.parse(ARGV).invoke
+	Falcon::Command.call
 rescue Interrupt
 end

data/falcon.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency "rack", ">= 1.0"
 	
-	spec.add_dependency 'samovar', "~> 1.3"
+	spec.add_dependency 'samovar', "~> 2.1"
 	spec.add_dependency 'localhost', "~> 1.1"
 	spec.add_dependency 'build-environment', '~> 1.6'
 	

data/lib/falcon/command.rb

@@ -28,8 +28,8 @@ require 'logger'
 
 module Falcon
 	module Command
-		def self.parse(*args)
-			Top.parse(*args)
+		def self.call(*args)
+			Top.call(*args)
 		end
 		
 		class Top < Samovar::Command
@@ -41,7 +41,7 @@ module Falcon
 				option '-v/--version', "Print out the application version."
 			end
 			
-			nested '<command>', {
+			nested :command, {
 				'serve' => Serve,
 				'virtual' => Virtual
 			}, default: 'serve'
@@ -54,7 +54,7 @@ module Falcon
 				@options[:logging] == :quiet
 			end
 			
-			def invoke(program_name: File.basename($0))
+			def call
 				if verbose?
 					Async.logger.level = Logger::DEBUG
 				elsif quiet?
@@ -64,11 +64,11 @@ module Falcon
 				end
 				
 				if @options[:version]
-					puts "falcon v#{Falcon::VERSION}"
-				elsif @options[:help] or @command.nil?
-					print_usage(program_name)
+					puts "#{self.name} v#{Falcon::VERSION}"
+				elsif @options[:help]
+					self.print_usage
 				else
-					@command.invoke(self)
+					@command.call
 				end
 			end
 		end

data/lib/falcon/command/serve.rb

@@ -146,7 +146,7 @@ module Falcon
 				return container
 			end
 			
-			def invoke(parent)
+			def call
 				container = run(parent.verbose?)
 				
 				container.wait

data/lib/falcon/command/virtual.rb

@@ -59,7 +59,7 @@ module Falcon
 				return hosts.run(@options)
 			end
 			
-			def invoke(parent)
+			def call
 				container = run(parent.verbose?)
 				
 				container.wait

data/lib/falcon/configuration.rb

@@ -94,6 +94,12 @@ module Falcon
 				end
 			end
 			
+			add(:lets_encrypt, :ssl) do
+				lets_encrypt_root '/etc/letsencrypt/live'
+				ssl_certificate_path {File.join(lets_encrypt_root, authority, "fullchain.pem")}
+				ssl_private_key_path {File.join(lets_encrypt_root, authority, "privkey.pem")}
+			end
+			
 			add(:self_signed, :ssl) do
 				ssl_context do
 					contexts = Localhost::Authority.fetch(authority)
@@ -189,7 +195,7 @@ module Falcon
 		end
 		
 		def load_file(path)
-			self.instance_eval(File.read(path), path)
+			self.instance_eval(File.read(path), File.realpath(path))
 		end
 	end
 end

data/lib/falcon/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: falcon
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-protocol
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: localhost
   requirement: !ruby/object:Gem::Requirement
@@ -321,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A fast, asynchronous, rack-compatible web server.