site_hook 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a179e2e28a03138fe1607d9b7a1b7402dcb9a0d6a217c343ba38ae5697b97e19
-  data.tar.gz: e5c47b34f65dc0ab9dfdbc1632869f4654a7ff8386947f237a60cfb84332b871
+  metadata.gz: faa8b1808f36f0c69588f9590568133fb9b2a6288a3077d9aba94d197786c3ee
+  data.tar.gz: 1972b2bb6b896b69b06b9967a9e21faf175e0f1dff4165859a7a71bec018098c
 SHA512:
-  metadata.gz: c1cd3c572ea15320ec9e76f7be95d5bf157e9d98f415cfa4e0acc94672aaa036ef0b0e21a57758a2980190f0f0d972e040d21a28ad80eb3b291ccb5be4deb923
-  data.tar.gz: 804b1103f68ab6661391058ba37186a1a75d3922c8e931727ea6a672b047207e307f18e3ee690f0219556096dc462ef97951376f5b1685ba5d02d606d717fae5
+  metadata.gz: 1dce31e06943728aa637c941bedc4baac41bed34010d1bc90b5749d509605a048400e926a42dd1392577b216e2fde6cc93bb80a1b875529f8fdcbe46bde8f96e
+  data.tar.gz: 8b4948f0045924d7b2b802accd893d7da2c2978daa75966253e55284cbaa8584296854c12b81b1b000650761d087de1b243977750074d11ea018527fbbd7215e

data/lib/site_hook.rb

@@ -20,6 +20,10 @@ module SiteHook
   autoload :Gem, 'site_hook/gem'
   autoload :Paths, 'site_hook/paths'
   # class SassHandler (inherits from Sinatra::Base)
+  module_function
+  def self.set_options(name, value)
+    SiteHook.const_set("#{name.upcase}", value)
+  end
   class SassHandler < Sinatra::Base
     set :views, Pathname(app_file).dirname.join('site_hook', 'static', 'sass').to_s
     get '/css/*.css' do

data/lib/site_hook/sender.rb

@@ -39,7 +39,7 @@ module SiteHook
           jekyll_source = Jekyll.instance_variable_get('@jekyll_source')
           build_dest = Jekyll.instance_variable_get('@build_dest')
           log = Jekyll.instance_variable_get('@log')
-          Open3.popen2e({'BUNDLE_GEMFILE' => Pathname(jekyll_source).join('Gemfile').to_path}, "bundle exec jekyll build --source #{Pathname(jekyll_source).realdirpath.to_path} --destination #{Pathname(build_dest).to_path}") { |in_io, outerr_io, thr|
+          Open3.popen2e({'BUNDLE_GEMFILE' => Pathname(jekyll_source).join('Gemfile').to_path}, "bundle exec jekyll build --source #{Pathname(jekyll_source).realdirpath.to_path} --destination #{Pathname(build_dest).to_path} --config #{Pathname(jekyll_source).join(@options[:config])}") { |in_io, outerr_io, thr|
             # pid = thr.pid
 
             outerr = outerr_io.read.lines
@@ -77,10 +77,11 @@ module SiteHook
       # @param [String,Pathname] jekyll_source Jekyll Source
       # @param [String,Pathname] build_dest Build Destination
       # @param [BuildLog] logger Build Logger Instance
-      def self.build(jekyll_source, build_dest, logger)
+      def self.build(jekyll_source, build_dest, logger, options:)
         @jekyll_source = jekyll_source
         @build_dest = build_dest
         @log = logger
+        @options = options
         instance = self::Build.new
         meths = [instance.do_grab_version, instance.do_pull, instance.do_build]
         begin

data/lib/site_hook/server_class.rb

@@ -17,10 +17,11 @@ module SiteHook
     method_option(:log_levels, type: :hash, banner: 'LEVELS', default: SiteHook::Logs.log_levels)
     method_option :host, type: :string, banner: 'BINDHOST', default: JPHRC.fetch('host', '127.0.0.1')
     method_option :port, type: :string, banner: 'BINDPORT', default: JPHRC.fetch('port', 9090)
+    method_option :config, type: :string, banner: 'CONFIGFILE', default: '_config.yml'
     desc 'listen', 'Start SiteHook'
     def listen
       SiteHook.mklogdir unless SiteHook::Paths.logs.exist?
-      SiteHook::Webhook.set_bind(options[:host], options[:port])
+      SiteHook::Webhook.set_options(options[:host], options[:port], options[:config])
       SiteHook::Webhook.run!
     end
   end

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/site_hook/webhook.rb

@@ -15,9 +15,15 @@ module SiteHook
     BUILDLOG = SiteHook::HookLogger::BuildLog.new(SiteHook::Logs.log_levels['build']).log
     APPLOG = SiteHook::HookLogger::AppLog.new(SiteHook::Logs.log_levels['app']).log
     JPHRC = YAML.load_file(Pathname(Dir.home).join('.jph', 'config'))
-    def self.set_bind(host, port)
+    def self.set_bind(host, port, config)
       self.set port: port
       self.set bind: host
+      if config == '_config.yml'
+        SiteHook.set_options(:BUILD_CONFIG, '_config.yml')
+      else
+        SiteHook.set_options(:BUILD_CONFIG, config)
+      end
+
     end
     set server: %w[thin]
     set quiet: true
@@ -146,17 +152,22 @@ module SiteHook
       end
       if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext, service: service)
         BUILDLOG.info 'Building...'
+        begin
+          jekyllbuild = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG, options: {config: SiteHook::BUILD_CONFIG})
+          jekyll_status = jekyllbuild
+          case jekyll_status
+
+          when 0
+            status 200
+            headers 'Content-Type' => 'application/json'
+            body { { 'status': 'success' }.to_json }
+          when -1, -2, -3
+            halt 400, { 'Content-Type' => 'application/json' }, { 'status': 'exception', error: jekyll_status.fetch(:message).to_s }
 
-        jekyllbuild = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG)
-        jekyll_status = jekyllbuild
-        case jekyll_status
+          end
 
-        when 0
-          status 200
-          headers 'Content-Type' => 'application/json'
-          body { { 'status': 'success' }.to_json }
-        when -1, -2, -3
-          halt 400, { 'Content-Type' => 'application/json' }, { 'status': 'exception', error: jekyll_status.fetch(:message).to_s }
+        rescue => e
+          halt 500, { 'Content-Type' => 'application/json' }, { 'status': 'exception', error: e.to_s}
 
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-10 00:00:00.000000000 Z
+date: 2019-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport