Added template path CLI option

Author: bert-mccutchen

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-nginx (1.0.0.pre.beta.3)
+    ruby-nginx (1.0.0.pre.beta.4)
       erb
       thor
       tty-command (~> 0.10, >= 0.10.1)

README.md

@@ -156,6 +156,7 @@ Options:
   -r,          [--root-path=ROOT_PATH]                                # default: $PWD
   -s,          [--ssl], [--no-ssl], [--skip-ssl]                      # default: false
   -l,          [--log], [--no-log], [--skip-log]                      # default: false
+  -t,          [--template-path=TEMPLATE_PATH]                        # default: [GEM_PATH]/nginx/templates/nginx.conf
   -cert-file,  [--ssl-certificate-path=SSL_CERTIFICATE_PATH]          # default: ~/.ruby-nginx/certs/_[DOMAIN].pem
   -key-file,   [--ssl-certificate-key-path=SSL_CERTIFICATE_KEY_PATH]  # default: ~/.ruby-nginx/certs/_[DOMAIN]-key.pem
   -access-log, [--access-log-path=ACCESS_LOG_PATH]                    # default: ~/.ruby-nginx/logs/[DOMAIN].access.log

lib/ruby/nginx/cli.rb

@@ -25,6 +25,7 @@ def self.default_paths(param)
       method_option :root_path, aliases: "-r", type: :string, desc: "default: $PWD"
       method_option :ssl, aliases: "-s", type: :boolean, desc: defaults(:ssl)
       method_option :log, aliases: "-l", type: :boolean, desc: defaults(:log)
+      method_option :template_path, aliases: "-t", type: :string, desc: "default: [GEM_PATH]/nginx/templates/nginx.conf"
       method_option :ssl_certificate_path, aliases: "-cert-file", type: :string, desc: default_paths(:ssl_certificate_path)
       method_option :ssl_certificate_key_path, aliases: "-key-file", type: :string, desc: default_paths(:ssl_certificate_key_path)
       method_option :access_log_path, aliases: "-access-log", type: :string, desc: default_paths(:access_log_path)
@@ -35,6 +36,7 @@ def add
           port: options.port,
           host: options.host,
           root_path: options.root_path,
+          template_path: options.template_path,
           ssl: options.ssl,
           log: options.log,
           ssl_certificate_path: options.ssl_certificate_path,

lib/ruby/nginx/configuration.rb

@@ -36,7 +36,7 @@ def generate!
         create_ssl_certs! if options[:ssl]
         create_log_files! if options[:log]
 
-        ERB.new(File.read(options[:template_path])).result(binding)
+        ERB.new(load_template).result(binding)
       end
 
       def defaults
@@ -82,6 +82,16 @@ def apply_dynamic_defaults!
         self.options = default_paths.merge(options)
       end
 
+      def load_template
+        File.read(options[:template_path])
+      rescue Errno::EISDIR
+        raise Ruby::Nginx::AbortError, "Template is a directory: #{options[:template_path]}"
+      rescue Errno::ENOENT
+        raise Ruby::Nginx::AbortError, "Template does not exist at: #{options[:template_path]}"
+      rescue => e
+        raise Ruby::Nginx::AbortError, "Failed to read template.", cause: e
+      end
+
       def create_ssl_certs!
         System::Mkcert.create!(
           options[:domain],

lib/ruby/nginx/version.rb

@@ -2,7 +2,7 @@
 
 module Ruby
   module Nginx
-    VERSION = "1.0.0-beta.3"
+    VERSION = "1.0.0-beta.4"
 
     Version = Gem::Version
   end