site_hook 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 527916652c303be70f17556e05d2976ccf4147cc
-  data.tar.gz: f425282a8157e32ac302dadedd5bf2c4289b2091
+  metadata.gz: b91ef665dece23dcb7dbc74835e8615686fca06f
+  data.tar.gz: cac8dd89fd31b748136a4ea995b1477cd90a7cdb
 SHA512:
-  metadata.gz: aa270b66f0bab2f97a1b91783ae016648e456ad4c52869db1a58f5778455d956e6342bc3a8b561d3c3b9032d5b9ec8ea7e2e2d72506c323084ecaec32db151c4
-  data.tar.gz: ab7a6e2c6765c95c9f900697139e94daf29332a4b726f8f5177208b74714f20912e3e5f188ccc39a59fde72d9bb4c0829fd8ef609ebbfbfcab8a55f71735aa51
+  metadata.gz: b8ba7d33d2b7a819f1d3ac2a3fc91640ed548165659372631deece7b23c956beeb3d7592415c84901012578e78b3052bbf8f66a52201c6f607e864a04f4c0d66
+  data.tar.gz: eb7cde1074571eebb5c96dd673f079cdadf1cc4161fb00c165c90df9a02a4aff20462ce108ee6b49388a0f8aa9dc844eebafbac690f44f1cd5e73c59d19c41d5

data/.gitignore

@@ -6,7 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
-.idea/
+/.idea/
 .vscode/
 /vendor
 # rspec failure tracking

data/lib/site_hook.rb

@@ -4,10 +4,40 @@ require 'site_hook/logger'
 require 'recursive-open-struct'
 require 'site_hook/cli'
 require 'sinatra'
+require 'haml'
+require 'sass'
 require 'json'
+require 'sinatra/json'
 require 'yaml'
 
 module SiteHook
+  module Gem
+    class Info
+      def self.name
+        'site_hook'
+      end
+      def self.constant_name
+        'SiteHook'
+      end
+      def self.author
+        %q(Ken Spencer <me@iotaspencer.me>)
+      end
+    end
+  end
+  class SassHandler < Sinatra::Base
+    set :views, Pathname(app_file).dirname.join('site_hook', 'static', 'sass').to_s
+    get '/css/*.css' do
+      filename = params[:splat].first
+      scss filename.to_sym, cache: false
+    end
+  end
+  class CoffeeHandler < Sinatra::Base
+    set :views, Pathname(app_file).dirname.join('site_hook', 'static', 'coffee').to_s
+    get '/js/*.js' do
+      filename = params[:splat].first
+      coffee filename.to_sym
+    end
+  end
   class Webhook < Sinatra::Base
     HOOKLOG  = SiteHook::HookLogger::HookLog.new(SiteHook.log_levels['hook']).log
     BUILDLOG = SiteHook::HookLogger::BuildLog.new(SiteHook.log_levels['build']).log
@@ -18,7 +48,9 @@ module SiteHook
     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
     # @param [String] body JSON String of body
     # @param [String] sig Signature or token from git service
     # @param [String] secret User-defined verification token
@@ -39,12 +71,38 @@ module SiteHook
     end
 
     get '/' do
-      halt 403, {'Content-Type' => 'application/json'}, {message: 'no permission'}.to_json
+      halt 403, {'Content-Type' => 'text/html'}, "<h1>See <a href=\"/webhooks/\">here</a> for the active webhooks</h1>"
     end
-    get '/webhook/?' do
-      halt 405, {'Content-Type' => 'application/json'}, {message: 'GET not allowed'}.to_json
+
+    get '/webhooks.json', provides: :json do
+      content_type 'application/json'
+      public_projects = JPHRC['projects'].select do |project, hsh|
+        hsh.fetch('private', nil) == false or 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
+    post '/webhook/:hook_name/?' do
       request.body.rewind
       req_body = request.body.read
       js       = RecursiveOpenStruct.new(JSON.parse(req_body))
@@ -58,7 +116,6 @@ module SiteHook
       plaintext = false
       signature = nil
       event     = request.env.fetch('HTTP_X_GITLAB_EVENT', nil) || request.env.fetch('HTTP_X_GITHUB_EVENT', nil)
-      APPLOG.info event.inspect
       if event != 'push'
         if event.nil?
           halt 400, {'Content-Type' => 'application/json'}, {message: 'no event header'}.to_json

data/lib/site_hook/cli.rb

@@ -28,7 +28,16 @@ module SiteHook
     # Prints version string
     # @return [NilClass] nil
     def __print_version
-      puts SiteHook::VERSION
+      puts "Version: v#{SiteHook::VERSION}"
+    end
+
+    map %w(--gem-info --info --about) => :__gem_info
+    desc '--gem-info, --info, --about', 'Print info on the gem.'
+    def __gem_info
+      say "Gem Name: #{SiteHook::Gem::Info.name}"
+      say "Gem Constant: #{SiteHook::Gem::Info.constant_name}"
+      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)

data/lib/site_hook/config_class.rb

@@ -2,6 +2,8 @@ require 'thor'
 require 'yaml'
 require 'recursive-open-struct'
 module SiteHook
+  class FileExistsError < Exception
+  end
   class ConfigClass < Thor
     YML = open(Pathname(Dir.home).join('.jph-rc'), 'r')
 
@@ -10,11 +12,9 @@ module SiteHook
     def list
       puts YML.read
     end
-    method_option '-f', type: :boolean, banner: 'FILE', default: false
+    method_option :file, type: :boolean, banner: 'FILE', default: false, aliases: %w(-f)
     desc 'gen [options]', "Generate a example config file if one doesn't exist"
     def gen
-      #return if Pathname(Dir.home).join('.jph-rc').exist?
-
       yaml = [
           "# fatal, error, warn, info, debug",
           "log_levels:",
@@ -25,13 +25,36 @@ module SiteHook
           "projects:",
           "  PROJECT.NAME:  # Use the name you put as your webhook url",
           "  # https://jekyllhook.example.com/webhook/PROJECT.NAME",
-          "    src: /path/to/jekyll/site/source  # Directory you 'git pull' into",
-          "    dst: /path/to/build/destination/  # The web root will be this folder",
-          "    hookpass: SOMERANDOMSTRING  # set your Gitlab-Token or GitHub secret to this",
+          "    src: /path/2/site/source   # Directory you 'git pull' into",
+          "    dst: /path/2/destination/  # The web root will be this folder",
+          "    host: git*.com             # The git service you're using for vcs",
+          "    repo: USER/REPO            # The repo path on the git service",
+          "    hookpass: SOMERANDOMSTRING # Gitlab-Token or GitHub secret, etc.",
+          "    private: true/false        # hidden from the public list",
           "",
       ]
+      if options[:file]
+        jphrc = Pathname(Dir.home).join('.jph-rc')
+        begin
+          if jphrc.exist?
+            raise SiteHook::FileExistsError "#{jphrc} exists. Will not overwrite."
+          else
+            open(jphrc, 'w') do |f|
+              yaml.each do |line|
+                f.puts line
+              end
+            end
+            say "Created #{jphrc}"
+            say "You can now edit #{jphrc} and add your projects."
+          end
+        rescue SiteHook::FileExistsError => e
+          puts e
+        end
+
+      else
+        puts yaml
+      end
 
-      puts yaml
     end
   end
 end

data/lib/site_hook/static/sass/styles.scss

@@ -0,0 +1,9 @@
+body {
+    background-color: #bbbbff;
+}
+.list-group-item {
+  background-color: #036A07;
+  &:hover {
+    background-color: #021300
+  }
+}

data/lib/site_hook/version.rb

@@ -1,3 +1,3 @@
 module SiteHook
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/lib/site_hook/views/layout.haml

@@ -0,0 +1,24 @@
+!!!
+%html
+  %head
+    %meta{charset: "utf-8"}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1, shrink-to-fit=yes"}
+    %link{rel: "stylesheet", href: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css", integrity: "sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm", crossorigin: "anonymous"}
+    %link{rel: "stylesheet", href: "/css/styles.css"}
+
+    %title Hello, world!
+  %body.bg-dark
+    %header.d-flex
+      %h1.text.light.d-flex.mx-auto Webhooks
+
+    #content.wrapper.card.bg-dark
+      =yield
+    %footer.container-fluid
+      %p.d-flex.justify-content-end.text-light
+        Powered by
+        %a{href: "https://iotaspencer.me/projects/site_hook"} #{" SiteHook "}
+        v#{SiteHook::VERSION}
+
+    %script{src: "https://code.jquery.com/jquery-3.2.1.slim.min.js", integrity: "sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN", crossorigin: "anonymous"}
+    %script{src: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js", integrity: "sha384-ApNbgh9B+Y1QKtv3Rn7W3mgPxhU9K/ScQsAP7hUibX39j7fakFPskvXusvfa0b4Q", crossorigin: "anonymous"}
+    %script{src: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js", integrity: "sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl", crossorigin: "anonymous"}

data/lib/site_hook/views/webhooks.haml

@@ -0,0 +1,6 @@
+#webhook-list.list-group
+  - projects.each do |name, hsh|
+    - if hsh.fetch('private', nil).nil? or hsh.fetch('private', nil)
+      %a{id: "#{hsh['repo'].sub(/\./, '-').sub(/\//, '-')}", class: "list-group-item",href: "https://#{hsh['host']}/#{hsh['repo']}"}
+        #{name}
+        %span{class: "badge badge-pill badge-dark"} https://#{hsh['host']}/#{hsh['repo']}

data/site_hook.gemspec

@@ -35,6 +35,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'thin', '~> 1.7'
   spec.add_runtime_dependency 'activesupport', '~> 5.1'
   spec.add_runtime_dependency 'recursive-open-struct', '~> 1.1'
+  spec.add_runtime_dependency 'haml', '~> 5.0'
+  spec.add_runtime_dependency 'sass', '~> 3.5'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: site_hook
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ken Spencer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-18 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -150,6 +150,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -218,7 +246,10 @@ files:
 - lib/site_hook/logger.rb
 - lib/site_hook/sender.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
 - site_hook.gemspec
 homepage: https://iotaspencer.me/projects/site_hook/
 licenses: