h2o-configurator 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d2957f2852560a37a815a8171aada782b3ea07cab3d9133d6a57c5717233de8
-  data.tar.gz: e9666263537665189b952a890566ffbe02d8e0b25dd66192864b40cbfc67c0a2
+  metadata.gz: 9aabac121ceb4c0d23fb3c192e63ec9c0c6d880fd342fca83f920f384ee6ea3d
+  data.tar.gz: 4e48dcb4143a0c2ae0558f6f16bf3d3efa0ecedbb495b88ad80d5ec17e26bc15
 SHA512:
-  metadata.gz: 17ec61f8ea25907e6ab70da9d8423c624fd2861d5af1289a47c218e26f58303f3ba86237752d088a82da44fc30ade271e5c114eb388f041849ac85a2228c9c4b
-  data.tar.gz: 592624ac582fcee91acbe29b9beaf123e537a8a8054fe1e9da80b739d76f5252a133e429361da5baedc2e5b3fe4423938c2fd7d9aeb117c92d80293e1e71ec95
+  metadata.gz: c43dbe0b66c4d3fa6617c87be84a16a1e4a645e862f929f0322ffb2d6062a37eaed907a4c315c1c986bfca0fd73f6d1c7546749113151d9aacd886edfddcf899
+  data.tar.gz: ea3d7fbac40494bf30414f1f5f150dd8a654a25a386e8cb97638295900830ad50da007548c7b73bbc6946215bba8dadddbbec79931d1a91ae4063d6ccd4b1f60

data/bin/h2o-configurator

@@ -3,5 +3,9 @@
 require 'h2o-configurator'
 
 configurator = H2OConfigurator::Builder.new
-configurator.write_config
-configurator.check_config
+begin
+  configurator.write_config
+rescue H2OConfigurator::Error => e
+  warn "Failed to write configuration: #{e}"
+  exit(1)
+end

data/lib/h2o-configurator.rb

@@ -2,4 +2,28 @@ require 'path'
 require 'yaml'
 
 require 'h2o-configurator/builder'
-require 'h2o-configurator/version'
+require 'h2o-configurator/site'
+require 'h2o-configurator/version'
+
+module H2OConfigurator
+
+  SitesDirGlob = '/Users/*/Sites/*'
+  H2OEtcDir = Path.new('/usr/local/etc/h2o')
+  H2OLogDir = Path.new('/usr/local/var/log/h2o')
+  H2OConfFile = H2OEtcDir / 'h2o.conf'
+  HandlersDir = Path.new(__FILE__).dirname / 'h2o-configurator' / 'handlers'
+  InstalledHandlersDir = H2OEtcDir / 'handlers'
+  Handlers = {
+    'AutoExtensionHandler'  => 'auto-extension.rb',
+    'RedirectHandler'       => 'redirect.rb',
+  }
+  ErrorLogFile = H2OLogDir / 'error.log'
+  CertBaseDir = Path.new('/etc/letsencrypt/live')
+  ServerCertificateFilename = 'fullchain.pem'
+  PrivateKeyFilename = 'privkey.pem'
+  DomainPrefixes = %w{www.}
+  DomainSuffixes = %w{.test}
+
+  class Error < Exception; end
+
+end

data/lib/h2o-configurator/builder.rb

@@ -1,26 +1,7 @@
 module H2OConfigurator
 
-  SitesDirGlob = '/Users/*/Sites/*'
-  H2OEtcDir = Path.new('/usr/local/etc/h2o')
-  H2OLogDir = Path.new('/usr/local/var/log/h2o')
-  H2OConfFile = H2OEtcDir / 'h2o.conf'
-  AutoExtensionHandlerFile = Path.new(__FILE__).dirname / 'auto-extension-handler.rb'
-  RedirectHandlerFile = Path.new(__FILE__).dirname / 'redirect-handler.rb'
-  InstalledAutoExtensionHandlerFile = H2OEtcDir / AutoExtensionHandlerFile.basename
-  InstalledRedirectHandlerFile = H2OEtcDir / RedirectHandlerFile.basename
-  ErrorLogFile = H2OLogDir / 'error.log'
-  CertBaseDir = Path.new('/etc/letsencrypt/live')
-  ServerCertificateFilename = 'fullchain.pem'
-  PrivateKeyFilename = 'privkey.pem'
-  DomainPrefixes = %w{www.}
-  DomainSuffixes = %w{.test}
-
   class Builder
 
-    def initialize
-      H2OLogDir.mkpath
-    end
-
     def make_config
       config = {
         'compress' => 'ON',
@@ -30,158 +11,23 @@ module H2OConfigurator
       }
       Path.glob(SitesDirGlob).reject { |p| p.extname == '.old' || p.extname == '.new' }.each do |site_dir|
         site = Site.new(site_dir)
+        puts "%30s => %s" % [site.name, site.dir]
         config['hosts'].merge!(site.make_config)
       end
       config
     end
 
     def write_config
-      RedirectHandlerFile.copy(InstalledRedirectHandlerFile)
-      AutoExtensionHandlerFile.copy(InstalledAutoExtensionHandlerFile)
       H2OConfFile.write(YAML.dump(make_config))
-      check_config
-    end
-
-    def check_config
-      system('h2o', '-t', '-c', H2OConfFile.to_s)
-      exit($?.to_i) unless $?.success?
-    end
-
-  end
-
-  class Site
-
-    attr_accessor :dir
-    attr_accessor :name
-
-    def initialize(dir)
-      @dir = dir
-      @name = dir.basename.to_s
-    end
-
-    def make_config
-      config = {}
-      if cert_dir.exist?
-        https_redirect_host_config = make_https_redirect_host_config(80)
-        host_config = make_host_config(443)
-      else
-        https_redirect_host_config = nil
-        host_config = make_host_config(80)
-      end
-      domains.each do |domain|
-        if https_redirect_host_config
-          config["#{domain}:80"] = https_redirect_host_config
-          config["#{domain}:443"] = host_config
-        else
-          config["#{domain}:80"] = host_config
-        end
-      end
-      config
-    end
-
-    def domains
-      ([''] + DomainPrefixes).map do |prefix|
-        ([''] + DomainSuffixes).map do |suffix|
-          "#{prefix}#{@name}#{suffix}"
-        end
-      end.flatten
-    end
-
-    def make_host_config(port=80)
-      config = {
-        'listen' => {
-          'port' => port,
-        },
-        'access-log' => access_log_file.to_s,
-        'setenv' => { 'HOST_DIR' => @dir.to_s },
-        'paths' => {
-          '/' => make_handlers,
-        },
-      }
-      if server_certificate_file.exist? && private_key_file.exist?
-        config['listen']['ssl'] = {
-          'certificate-file' => server_certificate_file.to_s,
-          'key-file' => private_key_file.to_s,
-        }
-      end
-      config
-    end
-
-    def make_https_redirect_host_config(port=80)
-      {
-        'listen' => port,
-        'paths' => {
-          '/' => {
-            'redirect' => "https://#{@name}",
-          }
-        }
-      }
-    end
-
-    def make_handlers
-      handlers = []
-      if htpasswd_file.exist?
-        handlers << RubyHandler.make(
-          %Q{
-            require 'htpasswd'
-            Htpasswd.new('#{htpasswd_file}', '#{@name}')
-          }
-        )
-      end
-      handlers << RubyHandler.make(
-        %Q{
-          require '#{H2OConfigurator::InstalledRedirectHandlerFile}'
-          H2OConfigurator::RedirectHandler.new
-        },
-      )
-      handlers << RubyHandler.make(
-        %Q{
-          require '#{H2OConfigurator::InstalledAutoExtensionHandlerFile}'
-          H2OConfigurator::AutoExtensionHandler.new
-        }
-      )
-      handlers << FileDirHandler.make(@dir)
-      handlers
-    end
-
-    def cert_dir
-      H2OConfigurator::CertBaseDir / @name
-    end
-
-    def server_certificate_file
-      cert_dir / H2OConfigurator::ServerCertificateFilename
-    end
-
-    def private_key_file
-      cert_dir / H2OConfigurator::PrivateKeyFilename
-    end
-
-    def htpasswd_file
-      @dir / '.htpasswd'
-    end
-
-    def access_log_file
-      H2OConfigurator::H2OLogDir / "#{@name}.access.log"
-    end
-
-  end
-
-  class RubyHandler
-
-    def self.make(code)
-      {
-        'mruby.handler' => code.gsub(/\n\s+/, "\n").strip,
-      }
+      InstalledHandlersDir.rmtree if InstalledHandlersDir.exist?
+      HandlersDir.cp_r(InstalledHandlersDir)
+      H2OLogDir.mkpath
+      check_config(H2OConfFile)
     end
 
-  end
-
-  class FileDirHandler
-
-    def self.make(dir)
-      {
-        'file.dir' => dir.to_s,
-      }
+    def check_config(file)
+      system('h2o', '--mode=test', '--conf', file.to_s)
+      raise Error, "h2o check failed: status #{$?.to_i}" unless $?.success?
     end
 
   end

data/lib/h2o-configurator/site.rb

@@ -0,0 +1,130 @@
+module H2OConfigurator
+
+  class Site
+
+    attr_accessor :dir
+    attr_accessor :name
+
+    def initialize(dir)
+      @dir = dir
+      @name = dir.basename.to_s
+    end
+
+    def make_config
+      config = {}
+      if cert_dir.exist?
+        https_redirect_host_config = make_https_redirect_host_config(80)
+        host_config = make_host_config(443)
+      else
+        https_redirect_host_config = nil
+        host_config = make_host_config(80)
+      end
+      domains.each do |domain|
+        if https_redirect_host_config
+          config["#{domain}:80"] = https_redirect_host_config
+          config["#{domain}:443"] = host_config
+        else
+          config["#{domain}:80"] = host_config
+        end
+      end
+      config
+    end
+
+    def domains
+      ([''] + DomainPrefixes).map do |prefix|
+        ([''] + DomainSuffixes).map do |suffix|
+          "#{prefix}#{@name}#{suffix}"
+        end
+      end.flatten
+    end
+
+    def make_host_config(port)
+      config = {
+        'listen' => {
+          'port' => port,
+        },
+        'access-log' => access_log_file.to_s,
+        'setenv' => { 'HOST_DIR' => @dir.to_s },
+        'paths' => {
+          '/' => make_handlers,
+        },
+      }
+      if server_certificate_file.exist? && private_key_file.exist?
+        config['listen']['ssl'] = {
+          'certificate-file' => server_certificate_file.to_s,
+          'key-file' => private_key_file.to_s,
+        }
+      end
+      config
+    end
+
+    def make_https_redirect_host_config(port)
+      {
+        'listen' => port,
+        'paths' => {
+          '/' => {
+            'redirect' => "https://#{@name}",
+          }
+        }
+      }
+    end
+
+    def make_handlers
+      handlers = []
+      if htpasswd_file.exist?
+        handlers << make_ruby_handler(
+          %Q{
+            require 'htpasswd'
+            Htpasswd.new('#{htpasswd_file}', '#{@name}')
+          }
+        )
+      end
+      handlers << make_ruby_external_handler('RedirectHandler')
+      handlers << make_ruby_external_handler('AutoExtensionHandler')
+      handlers << make_file_dir_handler(@dir)
+      handlers
+    end
+
+    def make_ruby_handler(code)
+      {
+        'mruby.handler' => code.gsub(/\n\s+/, "\n").strip,
+      }
+    end
+
+    def make_ruby_external_handler(klass)
+      file = InstalledHandlersDir / H2OConfigurator::Handlers[klass]
+      make_ruby_handler %Q{
+        require '#{file}'
+        H2OConfigurator::#{klass}.new
+      }
+    end
+
+    def make_file_dir_handler(dir)
+      {
+        'file.dir' => dir.to_s,
+      }
+    end
+
+    def cert_dir
+      H2OConfigurator::CertBaseDir / @name
+    end
+
+    def server_certificate_file
+      cert_dir / H2OConfigurator::ServerCertificateFilename
+    end
+
+    def private_key_file
+      cert_dir / H2OConfigurator::PrivateKeyFilename
+    end
+
+    def htpasswd_file
+      @dir / '.htpasswd'
+    end
+
+    def access_log_file
+      H2OConfigurator::H2OLogDir / "#{@name}.access.log"
+    end
+
+  end
+
+end

data/lib/h2o-configurator/version.rb

@@ -1,5 +1,5 @@
 module H2OConfigurator
 
-  VERSION = '0.4'
+  VERSION = '0.5'
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: h2o-configurator
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - John Labovitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-08 00:00:00.000000000 Z
+date: 2018-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: path
@@ -53,9 +53,10 @@ files:
 - bin/h2o-configurator
 - h2o-configurator.gemspec
 - lib/h2o-configurator.rb
-- lib/h2o-configurator/auto-extension-handler.rb
 - lib/h2o-configurator/builder.rb
-- lib/h2o-configurator/redirect-handler.rb
+- lib/h2o-configurator/handlers/auto-extension.rb
+- lib/h2o-configurator/handlers/redirect.rb
+- lib/h2o-configurator/site.rb
 - lib/h2o-configurator/version.rb
 homepage: https://github.com/jslabovitz/h2o-configurator
 licenses: