From 2cb552ce1f5f74cd141c84d4f163c6f7d923145a Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Mar 2014 03:22:39 +0100 Subject: git/gitolite-hooks/irc-announce: initial commit --- git/gitolite-hooks/irc-announce | 91 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100755 git/gitolite-hooks/irc-announce (limited to 'git/gitolite-hooks/irc-announce') diff --git a/git/gitolite-hooks/irc-announce b/git/gitolite-hooks/irc-announce new file mode 100755 index 00000000..3230a2b0 --- /dev/null +++ b/git/gitolite-hooks/irc-announce @@ -0,0 +1,91 @@ +#! /bin/sh +set -euf + +# CAVEAT we hope that IRC_NICK is unique +IRC_NICK="gl$GL_TID" +IRC_CHANNEL='#testing' +IRC_SERVER='ire.retiolum' +IRC_PORT=6667 + +# for privmsg_cat below +export IRC_CHANNEL + +# collect users that are mentioned in the gitolite configuration +interested_users="$(perl -e ' + do "gl-conf"; + print join(" ", keys%{ $one_repo{$ENV{"GL_REPO"}} }); +')" + +# CAVEAT beware of real TABs in grep pattern! +# CAVEAT there will never be more than 42 relevant log entries! +log="$(tail -n 42 "$GL_LOGFILE" | grep "^[^ ]* $GL_TID ")" +update_log="$(echo "$log" | grep "^[^ ]* $GL_TID update")" + +# (debug output) +env | sed 's/^/env: /' +echo "$log" | sed 's/^/log: /' + +# see http://gitolite.com/gitolite/dev-notes.html#lff +reponame=$(echo "$update_log" | cut -f 4) +username=$(echo "$update_log" | cut -f 5) +ref_name=$(echo "$update_log" | cut -f 7 | sed 's|^refs/heads/||') +old_sha=$(echo "$update_log" | cut -f 8) +new_sha=$(echo "$update_log" | cut -f 9) + +# check if new branch is created +if test $old_sha = 0000000000000000000000000000000000000000; then + # TODO what should we really show? + old_sha=$new_sha^ +fi + +# +git_log="$(git log $old_sha..$new_sha --pretty=oneline --abbrev-commit)" +commit_count=$(echo "$git_log" | wc -l) + +# echo2 and cat2 are used output to both, stdout and stderr +# This is used to see what we send to the irc server. (debug output) +echo2() { echo "$*"; echo "$*" >&2; } +cat2() { tee /dev/stderr; } + +# privmsg_cat transforms stdin to a privmsg +privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } + +# +# +# +{ + echo2 "USER $LOGNAME 0 * :$LOGNAME@$(hostname)" + echo2 "NICK $IRC_NICK" + + # wait for MODE message + # CAVEAT 1 second was enough while testing...^_^ + sleep 1 + + echo2 "JOIN $IRC_CHANNEL" + + echo "$interested_users" \ + | tr ' ' '\n' \ + | sed 's/$/: poke/' \ + | privmsg_cat \ + | cat2 + + printf '[13%s] %s pushed %s new commit%s to 6%s %s\n' \ + "$reponame" \ + "$username" \ + "$commit_count" \ + "$(test $commit_count == 1 || echo s)" \ + "$(hostname)" \ + "$ref_name" \ + | privmsg_cat \ + | cat2 + + echo "$git_log" \ + | sed 's/^/14/;s/ / /' \ + | privmsg_cat \ + | cat2 + + echo2 'QUIT :Gone to have lunch' + + printf  +} \ + | nc -c "$IRC_SERVER" "$IRC_PORT" -- cgit v1.2.3 From 86198e2578aa76a1d0f269ba7802eb2e46bbe0a1 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Mar 2014 03:44:33 +0100 Subject: irc-announce: talk about LOCAL_CODE --- git/gitolite-hooks/irc-announce | 2 ++ 1 file changed, 2 insertions(+) (limited to 'git/gitolite-hooks/irc-announce') diff --git a/git/gitolite-hooks/irc-announce b/git/gitolite-hooks/irc-announce index 3230a2b0..31f4444c 100755 --- a/git/gitolite-hooks/irc-announce +++ b/git/gitolite-hooks/irc-announce @@ -1,6 +1,8 @@ #! /bin/sh set -euf +# XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update +# any relevant gitolite LOCAL_CODE! # CAVEAT we hope that IRC_NICK is unique IRC_NICK="gl$GL_TID" IRC_CHANNEL='#testing' -- cgit v1.2.3 From b19c958016f2fe26a49449954d64f0f337ec2302 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Mar 2014 03:44:47 +0100 Subject: irc-announce: use correct channel --- git/gitolite-hooks/irc-announce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/gitolite-hooks/irc-announce') diff --git a/git/gitolite-hooks/irc-announce b/git/gitolite-hooks/irc-announce index 31f4444c..ca8b0059 100755 --- a/git/gitolite-hooks/irc-announce +++ b/git/gitolite-hooks/irc-announce @@ -5,7 +5,7 @@ set -euf # any relevant gitolite LOCAL_CODE! # CAVEAT we hope that IRC_NICK is unique IRC_NICK="gl$GL_TID" -IRC_CHANNEL='#testing' +IRC_CHANNEL='#retiolum' IRC_SERVER='ire.retiolum' IRC_PORT=6667 -- cgit v1.2.3 From d5d9073f5317290b7aa679d930c2718cd1cdec20 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Mar 2014 04:33:13 +0100 Subject: irc-announce: fix conflict resolution fail --- git/gitolite-hooks/irc-announce | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'git/gitolite-hooks/irc-announce') diff --git a/git/gitolite-hooks/irc-announce b/git/gitolite-hooks/irc-announce index ca8b0059..aa9f91f3 100755 --- a/git/gitolite-hooks/irc-announce +++ b/git/gitolite-hooks/irc-announce @@ -1,13 +1,18 @@ #! /bin/sh set -euf +config_file="$HOME/.local/krebs/irc-announce" +if test -f "$config_file"; then + . "$config_file" +fi + # XXX when changing IRC_CHANNEL or IRC_SERVER/_PORT, don't forget to update # any relevant gitolite LOCAL_CODE! # CAVEAT we hope that IRC_NICK is unique -IRC_NICK="gl$GL_TID" -IRC_CHANNEL='#retiolum' -IRC_SERVER='ire.retiolum' -IRC_PORT=6667 +IRC_NICK="${IRC_NICK-gl$GL_TID}" +IRC_CHANNEL="${IRC_CHANNEL-#retiolum}" +IRC_SERVER="${IRC_SERVER-ire.retiolum}" +IRC_PORT="${IRC_PORT-6667}" # for privmsg_cat below export IRC_CHANNEL @@ -86,6 +91,11 @@ privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } | privmsg_cat \ | cat2 + echo2 "PART $IRC_CHANNEL" + + # TESTME does this sleep help to send all messages? + sleep 5 + echo2 'QUIT :Gone to have lunch' printf  -- cgit v1.2.3 From 080c871894d43139037ea27fc40ef342fcc1e2c9 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Mar 2014 04:43:37 +0100 Subject: irc-announce: read from $GL_ADMIN_BASE/conf/ --- git/gitolite-hooks/irc-announce | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/gitolite-hooks/irc-announce') diff --git a/git/gitolite-hooks/irc-announce b/git/gitolite-hooks/irc-announce index aa9f91f3..99ea3d9d 100755 --- a/git/gitolite-hooks/irc-announce +++ b/git/gitolite-hooks/irc-announce @@ -1,7 +1,7 @@ #! /bin/sh set -euf -config_file="$HOME/.local/krebs/irc-announce" +config_file="$GL_ADMIN_BASE/conf/irc-announce.conf" if test -f "$config_file"; then . "$config_file" fi -- cgit v1.2.3 From ecea0f9dadf6995f2cdebfa270482852d244a2c5 Mon Sep 17 00:00:00 2001 From: tv Date: Fri, 14 Mar 2014 04:48:41 +0100 Subject: irc-announce: don't poke committer --- git/gitolite-hooks/irc-announce | 1 + 1 file changed, 1 insertion(+) (limited to 'git/gitolite-hooks/irc-announce') diff --git a/git/gitolite-hooks/irc-announce b/git/gitolite-hooks/irc-announce index 99ea3d9d..32ae8f26 100755 --- a/git/gitolite-hooks/irc-announce +++ b/git/gitolite-hooks/irc-announce @@ -72,6 +72,7 @@ privmsg_cat() { awk '{ print "PRIVMSG "ENVIRON["IRC_CHANNEL"]" :"$0 }'; } echo "$interested_users" \ | tr ' ' '\n' \ + | grep -v "^$GL_USER" \ | sed 's/$/: poke/' \ | privmsg_cat \ | cat2 -- cgit v1.2.3