servel 0.31.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9764905c7e72d90eecf301bf30c25c5542602d70df065803e18c03ab8353322
-  data.tar.gz: cf989ead1073528b04fc5c2c86d2f57ce37beace6c110fe40955c802390e4d58
+  metadata.gz: 283ef8ff838b1a149aee4379a02233d006d5dfec7887de4791e20c2e61cbe86e
+  data.tar.gz: b6fa99503294d5bba7b338c86fd0eb9bb46b06944de3fe2b10b225a6120b6794
 SHA512:
-  metadata.gz: ed18495a7e3c37f25fd22655f7eebd8e78e712782d3970f15a46b205cc9c5e92da2ddb884277cae0558043b66754dac9936fd8dfcbd9dd9333c324caed2931b3
-  data.tar.gz: fadfa698ea51f4c95deee988c4ecfbd8edfff80776cf406fb780b5551f0d0207826110d8058ec150af763422d16901bb2a17431d2111cce855bd0346dd30933a
+  metadata.gz: d44b0fef9dac7e95483e13856f4b030813019c26ed7676a8154cdad88eef8b9db9b5075c4a463dc374353c0e73a09b9c408aa069b79f80da58c221451a227bc3
+  data.tar.gz: d7a4126762ab129714b328aaf1dd492a17d1354870f4f943f799e2816f490de1ef85af253f8f4fcb96bd1d879fff5a134a7043f48112f2fe00bce7eac4af237a

data/lib/servel.rb

@@ -1,5 +1,6 @@
 require 'rack'
 require 'rack/handler/puma'
+require 'puma/configuration'
 require 'hamlit'
 require 'active_support/all'
 require 'lru_redux'

data/lib/servel/cli.rb

@@ -1,6 +1,12 @@
 class Servel::CLI
+  ALLOWED_PUMA_OPTIONS = [
+    :Host,
+    :Port,
+    :binds
+  ]
+
   def start
-    Rack::Handler::Puma.run(Servel.build_app(path_map))
+    Rack::Handler::Puma.run(Servel.build_app(path_map), **puma_options)
   end
 
   def path_map
@@ -11,4 +17,8 @@ class Servel::CLI
       [Pathname.new(root).realpath, url_root]
     end.to_h
   end
+
+  def puma_options
+    Servel.config.to_h.transform_keys(&:to_sym).slice(*ALLOWED_PUMA_OPTIONS)
+  end
 end

data/lib/servel/config_parser.rb

@@ -12,6 +12,7 @@ class Servel::ConfigParser
     @config.read if @config.exist?
 
     @config.append(*parse_argv, to: :listings)
+    parse_binds
   end
 
   def parse_argv
@@ -20,4 +21,23 @@ class Servel::ConfigParser
       { root => url_root }
     end
   end
+
+  def parse_binds
+    return parse_ssl_bind if @config.fetch(:cert) && @config.fetch(:key)
+
+    host = @config.fetch(:host)
+    port = @config.fetch(:port)
+    @config.set(:Host, value: host) if host
+    @config.set(:Port, value: port) if port
+  end
+
+  def parse_ssl_bind
+    host = @config.fetch(:host, default: ::Puma::ConfigDefault::DefaultTCPHost)
+    port = @config.fetch(:port, default: ::Puma::ConfigDefault::DefaultTCPPort)
+    key = Pathname.new(@config.fetch(:key)).expand_path
+    cert = Pathname.new(@config.fetch(:cert)).expand_path
+
+    query = URI.encode_www_form(key: key, cert: cert)
+    @config.append("ssl://#{host}:#{port}?#{query}", to: :binds)
+  end
 end

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.31.0"
+  VERSION = "0.32.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler