site_hook 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab4199b8ddec4e89c17d5dd8dee0e5f76b0808952c48c8207c889741755a3350
-  data.tar.gz: 8fa41c7c5bc360fb097ee12d7525e0b1a1df98ca3b51b12b7cc4b2fc57cdd664
+  metadata.gz: c99430b340e0a3ac2c311d2e7688289fb9252598ec0bdc752566f41394503161
+  data.tar.gz: a258fbcacc3b2a918b807530c64c0efab06adde90e910ade3915c33d297c97c0
 SHA512:
-  metadata.gz: 72548825721c132e94a4b24831bc888e0fc8cfc5f818a27d5041da7a5ef5e33dea1538bd0972890cca9ef9d5332573934a47f816531b86e63f94ef6308e06e73
-  data.tar.gz: a9cc0f7acf41daf93cf6ad3feb368cf8de76c27f73479365b811afe6e5ae1b3d62773f97f099cf25fdcce738dfe2db5032d34116c0cdca70ca95fcc45493395b
+  metadata.gz: b62d2d23daeca75c2d03a63d0bd11b3f55a3206e1355f4946d2c22470fbe1b4f273760732484e135565db78085aa4d579b40dabd266ec59ecc8980f61f64e0a6
+  data.tar.gz: 8365b6eebe10b49633b4e070ebb491f6d2fea1b94774c2127b000a58130271227415229eb459bf9fc648c16c565b20a70a23a87b2e0e08cc320ea539b3249714

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    site_hook (0.6.7)
+    site_hook (0.6.8)
       activesupport (~> 5.1)
       git (~> 1.3)
       haml (~> 5.0)

data/lib/site_hook.rb

@@ -2,7 +2,10 @@
 
 require 'site_hook/version'
 require 'site_hook/sender'
+require 'site_hook/gem'
+require 'site_hook/log'
 require 'site_hook/logger'
+require 'site_hook/spinner'
 require 'recursive-open-struct'
 require 'site_hook/cli'
 require 'sinatra'
@@ -11,35 +14,12 @@ require 'sass'
 require 'json'
 require 'sinatra/json'
 require 'yaml'
+
 module SiteHook
+  autoload :Logs, 'site_hook/log'
+  autoload :Gem, 'site_hook/gem'
+  autoload :Paths, 'site_hook/paths'
   # rubocop:disable Metrics/ClassLength, Metrics/LineLength, MethodLength, BlockLength
-  module Gem
-    # class Info
-    class Info
-      def self.name
-        'site_hook'
-      end
-
-      def self.constant_name
-        'SiteHook'
-      end
-
-      def self.author
-        'Ken Spencer <me@iotaspencer.me>'
-      end
-    end
-
-    # Paths: Paths to gem resources and things
-    class Paths
-      def self.config
-        Pathname(Dir.home).join('.jph', 'config').to_s
-      end
-
-      def self.logs
-        Pathname(Dir.home).join('.jph', 'logs')
-      end
-    end
-  end
   # class SassHandler (inherits from Sinatra::Base)
   class SassHandler < Sinatra::Base
     set :views, Pathname(app_file).dirname.join('site_hook', 'static', 'sass').to_s
@@ -57,160 +37,6 @@ module SiteHook
     end
   end
   # class Webhook (inherits from Sinatra::Base)
-  class Webhook < Sinatra::Base
-    HOOKLOG = SiteHook::HookLogger::HookLog.new(SiteHook.log_levels['hook']).log
-    BUILDLOG = SiteHook::HookLogger::BuildLog.new(SiteHook.log_levels['build']).log
-    APPLOG = SiteHook::HookLogger::AppLog.new(SiteHook.log_levels['app']).log
-    JPHRC = YAML.load_file(Pathname(Dir.home).join('.jph', 'config'))
-    set port: JPHRC.fetch('port', 9090)
-    set bind: '127.0.0.1'
-    set server: %w[thin]
-    set quiet: true
-    set raise_errors: true
-    set views: Pathname(app_file).dirname.join('site_hook', 'views')
-    set :public_folder, Pathname(app_file).dirname.join('site_hook', 'static')
-    use SassHandler
-    use CoffeeHandler
-
-#
-    # @param [String] body JSON String of body
-    # @param [String] sig Signature or token from git service
-    # @param [String] secret User-defined verification token
-    # @param [Boolean] plaintext Whether the verification is plaintext
-    def self.verified?(body, sig, secret, plaintext:, service:)
-      if plaintext
-        sig == secret
-      else
-        case service
-        when 'gogs'
-          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)
-            APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)}"
-            true
-          end
-        when 'github'
-          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)
-            APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)}"
-            true
-          end
-        end
-
-      end
-    end
 
-    get '/' do
-      halt 403, { 'Content-Type' => 'text/html' }, '<h1>See <a href="/webhooks/">here</a> for the active webhooks</h1>'
-    end
-
-    get '/webhooks.json', provides: :json do
-      content_type 'application/json'
-      public_projects = JPHRC['projects'].select do |_project, hsh|
-        (hsh.fetch('private', nil) == false) || hsh.fetch('private', nil).nil?
-      end
-      result = {}
-      public_projects.each do |project, hsh|
-        result[project] = {}
-        hsh.delete('hookpass')
-        result[project].merge!(hsh)
-      end
-      headers 'Content-Type' => 'application/json', 'Accept' => 'application/json'
-      json result, layout: false
-    end
-
-    get '/webhooks/?' do
-      haml :webhooks, locals: { 'projects' => JPHRC['projects'] }
-    end
-
-    get '/webhook/*' do
-      if params[:splat]
-        pass
-      else
-        halt 405, { 'Content-Type' => 'application/json' }, { message: 'GET not allowed' }.to_json
-      end
-    end
-    post '/webhook/:hook_name/?' do
-      service = nil
-      request.body.rewind
-      req_body = request.body.read
-      js = RecursiveOpenStruct.new(JSON.parse(req_body))
-
-      projects = JPHRC['projects']
-      begin
-        project = projects.fetch(params[:hook_name])
-      rescue KeyError => e
-        halt 404, { 'Content-Type' => 'application/json' }, { message: 'no such project', status: 1 }.to_json
-      end
-      plaintext = false
-      signature = nil
-      event = nil
-      github = request.env.fetch('HTTP_X_GITHUB_EVENT', nil)
-      unless github.nil?
-        event = 'push' if github == 'push'
-      end
-      gitlab = request.env.fetch('HTTP_X_GITLAB_EVENT', nil)
-      unless gitlab.nil?
-        event = 'push' if gitlab == 'push'
-      end
-      gogs = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
-      unless gogs.nil?
-        event = 'push' if gogs == 'push'
-      end
-      events = { 'github' => github, 'gitlab' => gitlab, 'gogs' => gogs }
-      events_m_e = events.values.one?
-      case events_m_e
-      when true
-        event = 'push'
-        service = events.select { |_key, value| value }.keys.first
-      when false
-        halt 400, { 'Content-Type': 'application/json' }, { message: 'events are mutually exclusive', status: 'failure' }.to_json
-
-      else
-        halt 400,
-             { 'Content-Type': 'application/json' },
-             'status': 'failure', 'message': 'something weird happened'
-      end
-      if event != 'push'
-        if event.nil?
-          halt 400, { 'Content-Type': 'application/json' }, { message: 'no event header' }.to_json
-        end
-      end
-      case service
-      when 'gitlab'
-        signature = request.env.fetch('HTTP_X_GITLAB_TOKEN', '')
-        plaintext = true
-      when 'github'
-        signature = request.env.fetch('HTTP_X_HUB_SIGNATURE', '').sub!(/^sha1=/, '')
-        plaintext = false
-
-      when 'gogs'
-        signature = request.env.fetch('HTTP_X_GOGS_SIGNATURE', '')
-        plaintext = false
-      end
-      if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext, service: service)
-        BUILDLOG.info 'Building...'
-
-        jekyllbuild = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG)
-        jekyll_status = jekyllbuild.fetch(:status, 1)
-        case jekyll_status
-
-        when 0
-          status 200
-          headers 'Content-Type' => 'application/json'
-          body { { 'status': 'success' }.to_json }
-        when -1, -2, -3
-          status 400
-          headers 'Content-Type' => 'application/json'
-          body do
-            { 'status': 'exception', error: jekyll_status.fetch(:message).to_s }
-          end
-        end
-
-      else
-        halt 403, { 'Content-Type' => 'application/json' }, { message: 'incorrect secret', 'status': 'failure' }.to_json
-      end
-    end
-    post '/webhook/?' do
-      halt 403, { 'Content-Type' => 'application/json' }, { message: 'pick a hook', error: 'root webhook hit', 'status': 'failure' }.to_json
-    end
-  end
   # rubocop:enable Metrics/ClassLength, Metrics/LineLength, MethodLength, BlockLength
 end

data/lib/site_hook/cli.rb

@@ -1,26 +1,7 @@
 require 'thor'
-
 require 'site_hook/config_class'
+require 'site_hook/server_class'
 module SiteHook
-  def self.log_levels
-    default = {
-      'hook' => 'info',
-      'build' => 'info',
-      'git' => 'info',
-      'app' => 'info'
-    }
-    begin
-      log_level = YAML.load_file(Pathname(Dir.home).join('.jph-rc')).fetch('log_levels')
-      if log_level
-        log_level
-      end
-    rescue KeyError
-      default
-    rescue Errno::ENOENT
-      default
-    end
-  end
-
   class CLI < Thor
     map %w[--version -v] => :__print_version
     desc '--version, -v', 'Print the version'
@@ -39,15 +20,11 @@ module SiteHook
       say "Gem Author: #{SiteHook::Gem::Info.author}"
       say "Gem Version: v#{SiteHook::VERSION}"
     end
-
-    method_option(:log_levels, type: :hash, banner: 'LEVELS', default: SiteHook.log_levels)
-    desc 'start', 'Start SiteHook'
-    def start
-
-      SiteHook.mklogdir unless SiteHook::Gem::Paths.logs.exist?
-      SiteHook::Webhook.run!
-    end
     desc 'config SUBCOMMAND [OPTIONS]', 'Configure site_hook options'
     subcommand('config', SiteHook::ConfigClass)
+    desc 'server SUBCOMMAND [OPTIONS]', 'Start the server'
+    subcommand('server', SiteHook::ServerClass)
+
+
   end
 end

data/lib/site_hook/config_class.rb

@@ -33,7 +33,7 @@ module SiteHook
         '    private: true/false        # hidden from the public list',
         ''
       ]
-      jphrc = SiteHook::Gem::Paths.config
+      jphrc = SiteHook::Paths.config
       if jphrc.exist?
         puts "#{jphrc} exists. Will not overwrite."
       else

data/lib/site_hook/gem.rb

@@ -0,0 +1,26 @@
+##########
+# -> File: /home/ken/RubymineProjects/site_hook/lib/site_hook/gem.rb
+# -> Project: site_hook
+# -> Author: Ken Spencer <me@iotaspencer.me>
+# -> Last Modified: 1/10/2018 21:20:45
+# -> Copyright (c) 2018 Ken Spencer
+# -> License: MIT
+##########
+module SiteHook
+  module Gem
+    # class Info
+    class Info
+      def self.name
+        'site_hook'
+      end
+
+      def self.constant_name
+        'SiteHook'
+      end
+
+      def self.author
+        'Ken Spencer <me@iotaspencer.me>'
+      end
+    end
+  end
+end

data/lib/site_hook/log.rb

@@ -0,0 +1,26 @@
+module SiteHook
+  autoload :Paths, 'site_hook/paths'
+  # Logs
+  # Give logs related methods
+  module Logs
+    module_function
+    def self.log_levels
+      default = {
+        'hook' => 'info',
+        'build' => 'info',
+        'git' => 'info',
+        'app' => 'info'
+      }
+      begin
+        log_level = YAML.load_file(SiteHook::Paths.config).fetch('log_levels')
+        if log_level
+          log_level
+        end
+      rescue KeyError
+        default
+      rescue Errno::ENOENT
+        default
+      end
+    end
+  end
+end

data/lib/site_hook/paths.rb

@@ -0,0 +1,21 @@
+##########
+# -> File: /home/ken/RubymineProjects/site_hook/lib/site_hook/paths.rb
+# -> Project: site_hook
+# -> Author: Ken Spencer <me@iotaspencer.me>
+# -> Last Modified: 1/10/2018 21:23:00
+# -> Copyright (c) 2018 Ken Spencer
+# -> License: MIT
+##########
+
+module SiteHook
+  # Paths: Paths to gem resources and things
+  class Paths
+    def self.config
+      Pathname(Dir.home).join('.jph', 'config')
+    end
+
+    def self.logs
+      Pathname(Dir.home).join('.jph', 'logs')
+    end
+  end
+end

data/lib/site_hook/server_class.rb

@@ -0,0 +1,25 @@
+##########
+# -> File: /home/ken/RubymineProjects/site_hook/lib/site_hook/config_class.1.rb
+# -> Project: site_hook
+# -> Author: Ken Spencer <me@iotaspencer.me>
+# -> Last Modified: 1/10/2018 21:45:36
+# -> Copyright (c) 2018 Ken Spencer
+# -> License: MIT
+##########
+require 'thor'
+module SiteHook
+  autoload :Webhook, 'site_hook/webhook'
+
+  # *ServerClass*
+  #
+  # Holds all of the commands for the config subcommand
+  class ServerClass < Thor
+    method_option(:log_levels, type: :hash, banner: 'LEVELS', default: SiteHook::Logs.log_levels)
+    desc 'listen', 'Start SiteHook'
+    def listen
+      SiteHook.mklogdir unless SiteHook::Paths.logs.exist?
+      SiteHook::Webhook.run!
+    end
+  end
+end
+# rubocop:enable Metrics/AbcSize

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/lib/site_hook/webhook.rb

@@ -0,0 +1,169 @@
+##########
+# -> File: /home/ken/RubymineProjects/site_hook/lib/site_hook/webhook.rb
+# -> Project: site_hook
+# -> Author: Ken Spencer <me@iotaspencer.me>
+# -> Last Modified: 1/10/2018 21:35:44
+# -> Copyright (c) 2018 Ken Spencer
+# -> License: MIT
+##########
+
+require 'sinatra'
+
+module SiteHook
+  class Webhook < Sinatra::Base
+    HOOKLOG = SiteHook::HookLogger::HookLog.new(SiteHook::Logs.log_levels['hook']).log
+    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'))
+
+    set port: JPHRC.fetch('port', 9090)
+    set bind: '127.0.0.1'
+    set server: %w[thin]
+    set quiet: true
+    set raise_errors: true
+    set views: Pathname(app_file).dirname.join('site_hook', 'views')
+    set :public_folder, Pathname(app_file).dirname.join('site_hook', 'static')
+    use SassHandler
+    use CoffeeHandler
+
+#
+    # @param [String] body JSON String of body
+    # @param [String] sig Signature or token from git service
+    # @param [String] secret User-defined verification token
+    # @param [Boolean] plaintext Whether the verification is plaintext
+    def self.verified?(body, sig, secret, plaintext:, service:)
+      if plaintext
+        sig == secret
+      else
+        case service
+        when 'gogs'
+          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)
+            APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body)}"
+            true
+          end
+        when 'github'
+          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)
+            APPLOG.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)}"
+            true
+          end
+        end
+
+      end
+    end
+
+    get '/' do
+      halt 403, { 'Content-Type' => 'text/html' }, '<h1>See <a href="/webhooks/">here</a> for the active webhooks</h1>'
+    end
+
+    get '/webhooks.json', provides: :json do
+      content_type 'application/json'
+      public_projects = JPHRC['projects'].select do |_project, hsh|
+        (hsh.fetch('private', nil) == false) || hsh.fetch('private', nil).nil?
+      end
+      result = {}
+      public_projects.each do |project, hsh|
+        result[project] = {}
+        hsh.delete('hookpass')
+        result[project].merge!(hsh)
+      end
+      headers 'Content-Type' => 'application/json', 'Accept' => 'application/json'
+      json result, layout: false
+    end
+
+    get '/webhooks/?' do
+      haml :webhooks, locals: { 'projects' => JPHRC['projects'] }
+    end
+
+    get '/webhook/*' do
+      if params[:splat]
+        pass
+      else
+        halt 405, { 'Content-Type' => 'application/json' }, { message: 'GET not allowed' }.to_json
+      end
+    end
+    post '/webhook/:hook_name/?' do
+      service = nil
+      request.body.rewind
+      req_body = request.body.read
+      js = RecursiveOpenStruct.new(JSON.parse(req_body))
+
+      projects = JPHRC['projects']
+      begin
+        project = projects.fetch(params[:hook_name])
+      rescue KeyError => e
+        halt 404, { 'Content-Type' => 'application/json' }, { message: 'no such project', status: 1 }.to_json
+      end
+      plaintext = false
+      signature = nil
+      event = nil
+      github = request.env.fetch('HTTP_X_GITHUB_EVENT', nil)
+      unless github.nil?
+        event = 'push' if github == 'push'
+      end
+      gitlab = request.env.fetch('HTTP_X_GITLAB_EVENT', nil)
+      unless gitlab.nil?
+        event = 'push' if gitlab == 'push'
+      end
+      gogs = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
+      unless gogs.nil?
+        event = 'push' if gogs == 'push'
+      end
+      events = { 'github' => github, 'gitlab' => gitlab, 'gogs' => gogs }
+      events_m_e = events.values.one?
+      case events_m_e
+      when true
+        event = 'push'
+        service = events.select { |_key, value| value }.keys.first
+      when false
+        halt 400, { 'Content-Type': 'application/json' }, { message: 'events are mutually exclusive', status: 'failure' }.to_json
+
+      else
+        halt 400,
+             { 'Content-Type': 'application/json' },
+             'status': 'failure', 'message': 'something weird happened'
+      end
+      if event != 'push'
+        if event.nil?
+          halt 400, { 'Content-Type': 'application/json' }, { message: 'no event header' }.to_json
+        end
+      end
+      case service
+      when 'gitlab'
+        signature = request.env.fetch('HTTP_X_GITLAB_TOKEN', '')
+        plaintext = true
+      when 'github'
+        signature = request.env.fetch('HTTP_X_HUB_SIGNATURE', '').sub!(/^sha1=/, '')
+        plaintext = false
+
+      when 'gogs'
+        signature = request.env.fetch('HTTP_X_GOGS_SIGNATURE', '')
+        plaintext = false
+      end
+      if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext, service: service)
+        BUILDLOG.info 'Building...'
+
+        jekyllbuild = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG)
+        jekyll_status = jekyllbuild.fetch(:status, 1)
+        case jekyll_status
+
+        when 0
+          status 200
+          headers 'Content-Type' => 'application/json'
+          body { { 'status': 'success' }.to_json }
+        when -1, -2, -3
+          status 400
+          headers 'Content-Type' => 'application/json'
+          body do
+            { 'status': 'exception', error: jekyll_status.fetch(:message).to_s }
+          end
+        end
+
+      else
+        halt 403, { 'Content-Type' => 'application/json' }, { message: 'incorrect secret', 'status': 'failure' }.to_json
+      end
+    end
+    post '/webhook/?' do
+      halt 403, { 'Content-Type' => 'application/json' }, { message: 'pick a hook', error: 'root webhook hit', 'status': 'failure' }.to_json
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Ken Spencer
@@ -290,13 +290,18 @@ files:
 - lib/site_hook.rb
 - lib/site_hook/cli.rb
 - lib/site_hook/config_class.rb
+- lib/site_hook/gem.rb
+- lib/site_hook/log.rb
 - lib/site_hook/logger.rb
+- lib/site_hook/paths.rb
 - lib/site_hook/sender.rb
+- lib/site_hook/server_class.rb
 - lib/site_hook/spinner.rb
 - lib/site_hook/static/sass/styles.scss
 - lib/site_hook/version.rb
 - lib/site_hook/views/layout.haml
 - lib/site_hook/views/webhooks.haml
+- lib/site_hook/webhook.rb
 - site_hook.gemspec
 homepage: https://iotaspencer.me/projects/site_hook/
 licenses: