webhookd 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 117c81bc0145b051d53dd51e0c85b54c99cc546a
-  data.tar.gz: d1874340cf8f379b5f2e7d9d2f76d7da699dab54
+  metadata.gz: be015c3eefbb47481f8dfc39b40dfa7d9f1a88f1
+  data.tar.gz: 68d5c088ba11143893aedccf9f8b735704658d69
 SHA512:
-  metadata.gz: 59510634125b6e8de310ba419c9b05867dfa6fab2892a472475c888a0bb1d04dc62cf85e6ba0fb58f2eb826ae125e86fd4eff67092d708c3771a9029894ec146
-  data.tar.gz: b2ad48474b9d31a74e171abf5d9b57d1d084821b22142689ff7f6e2e40a86489c1bb68a689556f012be7f8d4fdb61a081885ea400b8a56e7eb943b591cb48d71
+  metadata.gz: c5afc2914a4114983cb50b9c7a6909e671719143cd8c9a1ed67f49a2bd24bf633850c15f5eaa3ffa86d5372b906eaac8bab6cc8ea8e53493ad5e4a63ee6bcf38
+  data.tar.gz: 9cc1d79f8301ff6cdb0d8d52143093486a444c35ffd89a9c8e324c7ba6d3674dedbaa068eac4ab0d76d63955479c6f2dc934d0e2ac6bcadf7dcf8887eebe87ee

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.0.8 ( (February 04, 2015)
+
+* Improved logging
+* New payload type: "debug"
+
 # v0.0.7 (January 31, 2015)
 
 * Renaming of the project

data/README.md

@@ -1,4 +1,4 @@
-# Webhookd
+# WebhookD
 
 **Flexible, configurable universal webhook receiver**
 
@@ -129,6 +129,16 @@ vcs:
       command: 'echo this is the repo <%= repo_name.upcase %>'
 ```
 
+### Webhook usage
+
+The use a webhook, add the URL to your project.
+
+**Available webhook payload types**
+
+* *Bitbucket*: http(s)://USERNAME:PASSWORD@YOURIP:YOURPORT/payload/bitbucket
+* *Gitlab*: http(s)://USERNAME:PASSWORD@YOURIP:YOURPORT/payload/gitlab
+* *Debug*: http(s)://USERNAME:PASSWORD@YOURIP:YOURPORT/payload/debug
+
 ### Testing
 
 There are some tests in place using `minitest`. Run `rake test` to run all available test.
@@ -152,6 +162,7 @@ For an example have a look at `lib/webhookd/payloadtype/bitbucket.rb`.
 Adding a new type would involve the following steps:
 1. Write a payload parser in `lib/webhookd/payloadtype/`
 1. Add business logic for the payload type in `lib/webhookd/app.rb` under `case parsed_data[:type]`
+1. Update README.md
 
 ### Payload parser
 
@@ -170,7 +181,69 @@ data[:branch_name]
 data[:author_name]
 ```
 
-## TODO / Ideas
+**debug**
+
+The `debug` payload type has the following hash signature:
+
+```ruby
+data[:type]
+```
+
+It can be used to develop a new payload type or payload parser.
+When using this payload type, it just outputs the request body
+in the logfile under the loglevel `debug`.
+
+## Packaging
+
+### Debian
+
+Some very basic Debian packaging effort can be found under [tobru/webhookd-debian-packaging](https://github.com/tobru/webhookd-debian-packaging).
+This is how the initial package creation was done:
+
+```
+export DEBFULLNAME="My Name"
+export DEBEMAIL="email@address.com"
+gem fetch webhookd
+gem2deb -p webhookd webhookd*.gem
+cd webhookd-<VERSION>
+git init
+git-import-orig ../webhookd_*.orig.tar.gz --pristine-tar
+cd ..
+mv webhookd-<VERSION> webhookd
+cd webhookd
+
+# EDIT .gitignore
+vi .gitignore
+
+# add following lines
+/debian/webhookd.postinst.debhelper
+/debian/webhookd.postrm.debhelper
+/debian/webhookd.prerm.debhelper
+/debian/webhookd.substvars
+/debian/webhookd
+/debian/files
+/.pc
+Gemfile.lock
+
+:wq
+# END EDIT
+
+git add .
+git commit -a
+git-buildpackage -us -uc
+```
+
+After changes to the packaging process (`/debian` folder):
+```
+dch -v <upstreamver>-<incrementpkgrel>
+git commit -a
+rm Gemfile.lock
+git-buildpackage -us -uc
+```
+
+If there is a new upstream version:
+```
+gem fetch webhookd && gem2deb webhookd*.gem ; git-import-orig
+dch -v <upstreamver>-<incrementpkgrel>
+```
 
-* Regex match for repository and branch names
-* Notification mechanism (jabber, irc)

data/etc/example.yml

@@ -16,4 +16,5 @@ vcs:
   encdata:
     master:
       command: 'git pull'
+debug:
 

data/lib/webhookd/app.rb

@@ -129,6 +129,8 @@ module Webhookd
               command_runner.run
             end
           # we don't know the type of this known payload
+          when 'debug'
+            logger.info "payload type was debug, see debug loglevel"
           else
             error_msg = "webhook payload type #{parsed_data[:type]} unknown"
             logger.fatal error_msg
@@ -137,7 +139,7 @@ module Webhookd
       # this type of payload is not configured
       else
         error_msg = "webhook payload of type #{parsed_data[:type]} not configured"
-        logger.info error_msg
+        logger.error error_msg
         halt 500, "#{error_msg}\n"
       end
 

data/lib/webhookd/command_runner.rb

@@ -15,10 +15,10 @@ module Webhookd
         logger.info "Running command: #{@command}"
         Open3::popen2e(@command) { |stdin, stdout_err, wait_thr|
           while line = stdout_err.gets
-            logger.debug("Command output: #{line.strip}")
+            logger.info("STDOUTERR: #{line.strip}")
           end
           if wait_thr.value.success?
-            logger.info "command successful"
+            logger.info "command successfully finished"
             return true
           else
             logger.error "command failed"
@@ -26,7 +26,7 @@ module Webhookd
           end
         }
       rescue Exception => e
-        logger.fatal "Completely failed: #{e.message}"
+        logger.fatal "command running completely failed: #{e.message}"
       end
     end
   end

data/lib/webhookd/payloadtype/bitbucket.rb

@@ -34,7 +34,7 @@ module Webhookd
       data[:branch_name] = branch_name
       data[:author_name] = author_name
 
-      logger.debug "parsed from the bitbucket data: #{data}"
+      logger.info "parsed from the bitbucket data: #{data}"
 
       # return the hash
       data

data/lib/webhookd/payloadtype/debug.rb

@@ -0,0 +1,21 @@
+require 'webhookd/logging'
+module Webhookd
+  class ParsePayload
+
+    include Logging
+
+    def initialize(payload)
+      @payload = payload
+    end
+
+    def parse
+      logger.debug 'parsing payload type debug'
+      logger.debug "raw received data: #{@payload}"
+
+      data = Hash.new
+      data[:type] = 'debug'
+
+      data
+    end
+  end
+end

data/lib/webhookd/payloadtype/gitlab.rb

@@ -22,7 +22,7 @@ module Webhookd
       data[:branch_name] = json_parsed['ref'].split("/")[2]
       data[:author_name] = json_parsed['user_name']
 
-      logger.debug "parsed from the gitlab data: #{data}"
+      logger.info "parsed from the gitlab data: #{data}"
 
       # return the hash
       data

data/lib/webhookd/version.rb

@@ -1,3 +1,3 @@
 module Webhookd
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/scripts/webhookd.init

@@ -5,7 +5,7 @@
 # Required-Start:  $network $syslog
 # Required-Stop:
 # Default-Start:   2 3 4 5
-# Default-Stop:
+# Default-Stop:    0 1 6
 # Short-Description: Starts up the webhookd server
 ### END INIT INFO
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webhookd
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Tobias Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,7 @@ files:
 - lib/webhookd/configuration.rb
 - lib/webhookd/logging.rb
 - lib/webhookd/payloadtype/bitbucket.rb
+- lib/webhookd/payloadtype/debug.rb
 - lib/webhookd/payloadtype/gitlab.rb
 - lib/webhookd/version.rb
 - scripts/test/curl-bitbucket-explicit-repo-and-branch.sh