site_hook 0.8.2 → 0.9.3

data/lib/site_hook/prelogger.rb

@@ -0,0 +1,88 @@
+# 
+# Copyright 2019 Ken Spencer / IotaSpencer <me@iotaspencer.me>
+# 
+# File: /lib/site_hook/prelogger.rb
+# Created: 3/9/19
+#
+# License is in project root, MIT License is in use.
+
+require 'site_hook/paths'
+module SiteHook
+  class PreLogger
+    def initialize(input, output, errput)
+      self.class.set_base_default
+      @@levels  = {
+          unknown: ::Logger::UNKNOWN,
+          fatal:   ::Logger::FATAL,
+          error:   ::Logger::ERROR,
+          info:    ::Logger::INFO,
+          debug:   ::Logger::DEBUG
+      }
+      @@loggers = {
+          stdout: ::Logger.new(STDOUT, progname: @@base),
+          stderr: ::Logger.new(STDERR, progname: @@base),
+          file:   ::Logger.new(SiteHook::Paths.make_log_name(self.to_s), progname: @@base)
+      }
+      @@loggers.each do |_logger, obj|
+        obj.datetime_format = '%Y-%m-%dT%H:%M:%S%Z'
+        obj.formatter       = proc do |severity, datetime, progname, msg|
+          "#{severity} [#{datetime}] #{progname} —— #{msg}\n"
+        end
+      end
+    end
+    def self.base=(base)
+      @@base = base.to_s
+    end
+    def self.set_base_default
+      @@base = 'Logger'
+    end
+    def self.unknown(obj)
+      @@loggers.each do |_key, value|
+        value.unknown(obj)
+      end
+    end
+
+    def self.error(obj)
+      @@loggers.each do |_key, value|
+        value.error(obj)
+      end
+    end
+
+    def self.info(obj)
+      @@loggers.each do |key, value|
+        next if key == :stderr
+        value.info(obj)
+      end
+    end
+
+    def self.debug(obj)
+      @@loggers.each do |_key, value|
+        value.debug(obj)
+      end
+    end
+    def self.fatal(obj)
+      @@loggers.each do |key, value|
+        next if key == :stderr
+        value.fatal(obj)
+      end
+    end
+
+
+
+    # @param [Symbol] level log level to log at
+    # @param [Object] obj some kind of object or msg to log
+    def self.log(level, obj)
+      @@loggers.each do |logger|
+        logger.add(@levels[level], obj)
+      end
+    end
+
+    def self.<<(msg)
+      @@loggers.each do |logger|
+        logger.<<(msg)
+      end
+
+    end
+
+  end
+end

data/lib/site_hook/prompt.rb

@@ -0,0 +1,14 @@
+module SiteHook
+  class Prompt
+    def self.inherited(base)
+      base.class_eval do
+        Prompt.class_variable_set(:'@@runnable', runnable)
+      end
+    end
+    define_singleton_method :runnable do |mlist|
+      puts mlist
+    end
+    def self.run
+    end
+  end
+end

data/lib/site_hook/prompts/prompt_project.rb

@@ -0,0 +1,48 @@
+##
+#
+# Copyright 2019 Ken Spencer / IotaSpencer
+#
+# 
+# File: prompt_project.rb
+# Created: 2/15/19
+#
+# License is in project root, MIT License is in use.
+##
+
+require 'highline'
+require 'site_hook/prompt'
+module SiteHook
+  module Prompts
+    class Project < ::SiteHook::Prompt
+      runnable [:prompt_name, :prompt_src_path]
+      @@hl = HighLine.new($stdin, $stdout, 0, 0, 0, 0)
+      desc 'Prompts for project details'
+      def prompt_name
+        @@hl.say(<<~STATEMENT)
+          What's the name of the project?
+        STATEMENT
+        @@hl.choose do |menu|
+          menu.confirm   = 'Are you sure? '
+          menu.select_by = :index_or_name
+          menu.index     = '*'
+          menu.prompt    = '> '
+          menu.flow      = :rows
+          menu.default   = Pathname.new(`pwd`).basename.to_s.chomp!
+          menu.choice(Pathname.new(`pwd`).basename.to_s.chomp!) do |answer|
+            @project_name = answer
+          end
+          menu.choice('Custom / Input your own?') do
+            @project_name = @@hl.ask('> ', String) do |q|
+              q.confirm = true
+            end
+          end
+        end
+      end
+      def prompt_src_path
+        @@hl.say(<<~STATEMENT)
+        What's the src path?
+        STATEMENT
+      end
+    end
+  end
+end

data/lib/site_hook/runner.rb

@@ -0,0 +1,36 @@
+require 'site_hook'
+require 'site_hook/logger'
+module SiteHook
+  class Runner
+    def initialize(argv = ARGV, stdin = STDIN, stdout = STDOUT, stderr = STDERR, kernel = Kernel)
+      @argv, @stdin, @stdout, @stderr, @kernel = argv, stdin, stdout, stderr, kernel
+    end
+    def execute!
+      exit_code = begin
+        $stderr = @stderr
+        $stdin = @stdin
+        $stdout = @stdout
+        SiteHook::PreLogger.new($stdin, $stdout, $stderr)
+        SiteHook::Config.new
+        SiteHook::Log.new($stdin, $stdout, $stderr)
+        SiteHook::CLI.start(@argv)
+        0
+
+      rescue StandardError => e
+        b = e.backtrace
+        STDERR.puts("#{b.shift}: #{e.message} (#{e.class})")
+        STDERR.puts(b.map{|s| "\tfrom #{s}"}.join("\n"))
+        1
+      rescue SystemExit => e
+        STDERR.puts e.status
+        1
+      ensure
+
+        $stderr = STDERR
+        $stdin = STDIN
+        $stdout = STDOUT
+      end
+      @kernel.exit(exit_code)
+    end
+  end
+end

data/lib/site_hook/sender.rb

@@ -2,10 +2,7 @@ require 'open3'
 require 'site_hook/logger'
 require 'git'
 require 'paint'
-require 'site_hook/persist'
 module SiteHook
-  autoload :Logs, 'site_hook/log'
-
   module Senders
     class Jekyll
       attr :jekyll_source, :build_dest
@@ -30,8 +27,8 @@ module SiteHook
         end
 
         def do_pull
-          fakelog = SiteHook::HookLogger::FakeLog.new
-          reallog = SiteHook::HookLogger::GitLog.new(SiteHook::Logs.log_levels['git']).log
+          fakelog = SiteHook::Log.fake
+          reallog = SiteHook::Log.git
           jekyll_source = Jekyll.instance_variable_get(JEKYLL_SOURCE_VAR)
           # build_dest = Jekyll.instance_variable_get('@build_dest')
           g = Git.open(jekyll_source, log: fakelog)
@@ -46,7 +43,7 @@ module SiteHook
           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} --config #{Pathname(jekyll_source).join(@options[:config])}") { |in_io, outerr_io, thr|
-            # pid = thr.pid
+            pid = thr.pid
 
             outerr = outerr_io.read.lines
             outerr.each do |line|
@@ -89,12 +86,10 @@ module SiteHook
         @log = logger
         @options = options
         instance = self::Build.new(options)
-        meths = [instance.do_grab_version, instance.do_pull, instance.do_build]
+        meths = [:do_grab_version, :do_pull, :do_build]
         begin
           meths.each do |m|
-            @log.debug("Running #{m}")
             instance.send(m)
-            @log.debug("Ran #{m}")
           end
           return {message: 'success', status: 0}
         rescue TypeError => e

data/lib/site_hook/string_ext.rb

@@ -0,0 +1,57 @@
+class String
+  def squish!
+    strip!
+    gsub!(/\s+/, ' ')
+    self
+  end
+  def squish
+    dup.squish!
+  end
+  def underscore!
+    self unless /[A-Z-]|::/.match?(self)
+    self.to_s.gsub!("::".freeze, "/".freeze)
+    self.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'.freeze)
+    self.gsub!(/([a-z\d])([A-Z])/, '\1_\2'.freeze)
+    self.tr!("-".freeze, "_".freeze)
+    self.downcase!
+    self
+  end
+  def underscore
+    dup.underscore!
+  end
+  def camelcase!
+    to_s.scan(/\w+/).collect(&:capitalize).join
+  end
+  def camelcase
+    dup.camelcase!
+  end
+  def camelize!
+    to_s.split(/_|\s+/).collect(&:capitalize).join
+  end
+  def camelize
+    dup.camelize!
+  end
+  def safe_log_name
+    self.split('::').last.underscore
+  end
+end
+module SiteHook
+  module StrExt
+    def StrExt.mkvar(inspection)
+      inspection.to_s.tr('.', '_').tr(' ', '_')
+    end
+    def StrExt.mkatvar(inspection)
+      inspection.dup.to_s.insert(0, '@').to_sym
+    end
+    def StrExt.mkatatvar(inspection)
+      inspection.to_s.insert(0, '@').insert(0, '@').to_sym
+    end
+    def StrExt.rematvar(inspection)
+      inspection.to_s.tr('@', '')
+    end
+
+    def self.mkmvar(inspection)
+      inspection.to_s.tr('@', '').to_sym
+    end
+  end
+end

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.8.2"
-end
+  VERSION = '0.9.3'
+end

data/lib/site_hook/webhook.rb

@@ -1,28 +1,22 @@
 ##########
-# -> File: /home/ken/RubymineProjects/site_hook/lib/site_hook/webhook.rb
+# -> File: /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 'site_hook/persist'
-require 'site_hook/const'
-require 'sinatra'
+require 'rack'
+require 'site_hook/logger'
+require 'json'
+require 'grape'
+require 'grape-route-helpers'
 
 module SiteHook
-  class Webhook < Sinatra::Base
-
-    set server: %w[thin]
-    set quiet: true
-    set raise_errors: true
-    set views: Pathname(SiteHook::Paths.lib_dir).join('site_hook', 'views')
-    set :public_folder, Pathname(SiteHook::Paths.lib_dir).join('site_hook', 'assets')
-    use CoffeeHandler
-    def self.set_options(host, port)
-      self.set bind: host.to_s
-      self.set port: port.to_i
-    end
+  class Server < Grape::API
+    version nil
+    prefix ''
+    format :json
 
     #
     # @param [String] body JSON String of body
@@ -36,142 +30,139 @@ module SiteHook
       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)}"
+          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, secret, body.chomp)
+            SiteHook::Log.app.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)}"
+          if sig == OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body.chomp)
+            SiteHook::Log.app.debug "Secret verified: #{sig} === #{OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA1.new, secret, body)}"
             true
           end
         else
           # This shouldn't happen
         end
-
       end
     end
 
-    CONTENT_TYPE = 'Content-Type'
-    get '/' do
-      halt 403, {CONTENT_TYPE => 'text/html'}, '<h1>See <a href="/webhooks/">here</a> for the active webhooks</h1>'
-    end
-
-    APPLICATION_JSON = 'application/json'
-    get '/webhooks.json', provides: :json do
-      content_type APPLICATION_JSON
-      public_projects = JPHRC['projects'].select do |_project, hsh|
-        !hsh.fetch('private')
+    helpers do
+      def halt(status, message, headers)
+        error!(message, status, headers)
       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']}
+    APPLICATION_JSON = 'application/json'
+    before do
+      remote_addr      = request.env['REMOTE_ADDR']
+      cf_connecting_ip = request.env.fetch('HTTP_CF_CONNECTING_IP', nil)
+      ip               = cf_connecting_ip || remote_addr
+      SiteHook::Log.access.log "#{ip} - #{request.request_method} #{request.path}"
     end
-
-    get '/webhook/*' do
-      if params[:splat]
-        pass
-      else
-        halt 405, {CONTENT_TYPE => APPLICATION_JSON}, {message: 'GET not allowed'}.to_json
-      end
+    after do
+      SiteHook::Log.access.log "#{status}"
     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']
-      project = projects.fetch(params[:hook_name], nil)
-      if project.nil?
-        halt 404, {CONTENT_TYPE => APPLICATION_JSON}, {message: 'no such project', status: 1}.to_json
-      end
-      plaintext = false
-      signature = nil
-      event     = nil
-      gogs      = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
-      unless gogs.nil?
-        event = 'push' if gogs == 'push'
-      end
-      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
-
-      events = {'github' => github, 'gitlab' => gitlab, 'gogs' => gogs}
-      if events['github'] && events['gogs']
-        events['github'] = nil
-      end
-      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' && event.nil?
-        halt 400, {CONTENT_TYPE: APPLICATION_JSON}, {message: 'no event header'}.to_json
-      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
+    resource :webhook do
+      route_param :hook_name do
+        get do
+          STDOUT.puts params[:hook_name]
+          project = SiteHook::Config.projects.find_project(StrExt.mkvar(params[:hook_name]))
+          if project.nil?
+            {message: 'project not found or private', status: 1, project: {}}
+          else
+            project_obj = {}
+            %i[src dst repo host].each do |option|
+              project_obj[option] = project.instance_variable_get(StrExt.mkvar(option))
+            end
+            {project: project_obj}
+          end
+        end
+        post do
+          service = nil
+          request.body.rewind
+          req_body = request.body.read
+          project  = SiteHook::Config.projects.get(StrExt.mkvar(params[:hook_name]))
+          CONTENT_TYPE   = 'Content-Type'
+          if project == :not_found
+            halt 404, {message: 'no such project', status: 1}.to_json, {CONTENT_TYPE => APPLICATION_JSON}
+          elsif project == :no_projects
+            halt 500, {message: 'no projects defined', status: 2}.to_json, {CONTENT_TYPE => APPLICATION_JSON}
+          end
+          plaintext = false
+          signature = nil
+          event     = nil
+          gogs      = request.env.fetch('HTTP_X_GOGS_EVENT', nil)
+          unless gogs.nil?
+            event = 'push' if gogs == 'push'
+          end
+          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
 
-      when 'gogs'
-        signature = request.env.fetch('HTTP_X_GOGS_SIGNATURE', '')
-        plaintext = false
-      else
-        # This shouldn't happen
-      end
-      if Webhook.verified?(req_body.to_s, signature, project['hookpass'], plaintext: plaintext, service: service)
-        BUILDLOG.info 'Building...'
-        begin
-          jekyll_status = SiteHook::Senders::Jekyll.build(project['src'], project['dst'], BUILDLOG, options: {config: project['config']})
-          case jekyll_status
+          events = {'github' => github, 'gitlab' => gitlab, 'gogs' => gogs}
+          if events['github'] && events['gogs']
+            events['github'] = nil
+          end
+          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, {message: 'events are mutually exclusive', status: 'failure'}.to_json, {CONTENT_TYPE => APPLICATION_JSON}
 
-          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}
+          else
+            halt 400, {'status': 'failure', 'message': 'something weird happened'}, {CONTENT_TYPE => APPLICATION_JSON}
+          end
+          if event != 'push' && event.nil?
+            halt 400, {message: 'no event header', status: 'failure'}.to_json, {CONTENT_TYPE => APPLICATION_JSON}
+          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
           else
             # This shouldn't happen
           end
-
-        rescue => e
-          halt 500, {CONTENT_TYPE => APPLICATION_JSON}, {'status': 'exception', error: e.to_s}
-
+          if Server.verified?(req_body.to_s, signature, project.hookpass, plaintext: plaintext, service: service)
+            SiteHook::Log.build.info 'Building...'
+            begin
+              jekyll_status = SiteHook::Senders::Jekyll.build(project.src, project.dst, SiteHook::Log.build, options: {config: project.config})
+              case jekyll_status[:status]
+
+              when 0
+                status 200
+                {status: 'success'}
+              when -1, -2, -3
+                halt 400, {'status': 'exception', error: jekyll_status.fetch(:message).to_s}, {CONTENT_TYPE => APPLICATION_JSON}
+              else
+                # This shouldn't happen
+              end
+            rescue => e
+              halt 500, {'status': 'exception', error: e.to_s}, {CONTENT_TYPE => APPLICATION_JSON}
+            end
+          else
+            halt 403, {message: 'incorrect secret', 'status': 'failure'}.to_json, {CONTENT_TYPE => APPLICATION_JSON}
+          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
+
+    resource :webhooks do
+      get do
+        SiteHook::Config.projects.to_h
+      end
+
     end
   end
 end