Merge lp:~therve/mup/merge-proposal-support into lp:mup

[Thomas Herve]

[Thomas Herve (therve)]

This branch adds support for tracking merge proposals. Here is an example config:

{plugin, new_landscape_merges, mup_mergetracking, [
    {mup_launchpad_name, bugs_for_canonical},
    {targets, [{canonical, "#landscape"}]},
    {interval, 10},
    {project, "landscape"}
]}.

[Gustavo Niemeyer (niemeyer)]

That's been merged. Thank you!

review: Approve

=== modified file 'src/Makefile'
--- src/Makefile	2008-12-08 03:33:35 +0000
+++ src/Makefile	2010-02-04 21:06:19 +0000
@@ -20,6 +20,7 @@
 	mup_plugin_sup.erl \
 	mup_launchpad.erl \
 	mup_bugtracking.erl \
+	mup_mergetracking.erl \
 	mup_directory.erl \
 	mup_publishbot.erl \
 	mup_util.erl \

=== modified file 'src/mup.app.src'
--- src/mup.app.src	2008-10-16 00:34:41 +0000
+++ src/mup.app.src	2010-02-04 21:06:19 +0000
@@ -13,6 +13,7 @@
              mup_plugin_sup,
              mup_launchpad,
              mup_bugtracking,
+             mup_mergetracking,
              mup_directory,
              mup_publishbot,
              mup_util,

=== modified file 'src/mup_launchpad.erl'
--- src/mup_launchpad.erl	2009-03-02 00:32:41 +0000
+++ src/mup_launchpad.erl	2010-02-04 21:06:19 +0000
@@ -17,7 +17,8 @@
 
 -module(mup_launchpad).
 -behaviour(gen_server).
--export([start_link/1, show_bug/4, show_bug/5]).
+-export([start_link/1, show_bug/4, show_bug/5, show_merge_proposal/4,
+         get_merge_proposals/2, get_object_value/2]).
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
          terminate/2, code_change/3]).
 -include("mup.hrl").
@@ -37,11 +38,21 @@
 show_bug(Pid, Prefix, Number, Server, Target) ->
     gen_server:cast(Pid, {show_bug, Prefix, Number, Server, Target}).
 
+show_merge_proposal(Pid, Merge, Server, Target) ->
+    gen_server:cast(Pid, {show_merge_proposal, Merge, Server, Target}).
+
+get_merge_proposals(Pid, Project) ->
+    gen_server:call(Pid, {get_merge_proposals_internal, Project}).
+
 
 init(Name) ->
     {ok, Plugin} = mup_config:get_plugin(Name),
     {ok, #state{plugin=Plugin}}.
 
+handle_call({get_merge_proposals_internal, Project}, _From, State) ->
+    Merges = get_merge_proposals_internal(Project, State),
+    {reply, {ok, Merges}, State};
+
 handle_call(_Request, _From, State) ->
     {reply, ok, State}.
 
@@ -53,6 +64,10 @@
     spawn(fun () -> send_bug(Prefix, Number, Server, Target, State) end),
     {noreply, State};
 
+handle_cast({show_merge_proposal, Merge, Server, Target}, State) ->
+    spawn(fun () -> send_merge_proposal(Merge, Server, Target, State) end),
+    {noreply, State};
+
 handle_cast({handle_message, #message{command='PRIVMSG'}=Message}, State) ->
     case mup_message:match_channels(Message, get_option(channels, State)) of
         true ->
@@ -178,6 +193,22 @@
             ok
     end.
 
+send_merge_proposal(Merge, Server, Target, State) ->
+    AllowPrivate = get_option(private, false, State),
+    IsPrivate = get_object_value("private", Merge),
+    if
+        AllowPrivate or not IsPrivate ->
+            SourceBranchUrl = get_object_value("source_branch_link", Merge),
+            [_, SourceBranchName] = string:tokens(binary_to_list(SourceBranchUrl), "~"),
+            Status = binary_to_list(get_object_value("queue_status", Merge)),
+            {ok, Pid} = mup_server_sup:find_server(Server),
+            Command = io_lib:fwrite("PRIVMSG ~s Branch lp:~~~s: ~s",
+                                    [Target, SourceBranchName, string:to_lower(Status)]),
+            mup_server:send(Pid, Command);
+        true ->
+            ok
+    end.
+
 
 get_bug_task_notes([Entry|Rest]) ->
     [erlang:binary_to_list(get_object_value("bug_target_display_name", Entry))
@@ -206,6 +237,11 @@
     end.
 
 
+get_merge_proposals_internal(Project, State) ->
+    Collection = perform_launchpad_request([Project, "?ws.op=getMergeProposals"], State),
+    get_object_value("entries", Collection).
+
+
 perform_launchpad_request(UrlSuffix, State) ->
     Plugin = State#state.plugin,
     {MegaSecs, Secs, MicroSecs} = erlang:now(),

=== added file 'src/mup_mergetracking.erl'
--- src/mup_mergetracking.erl	1970-01-01 00:00:00 +0000
+++ src/mup_mergetracking.erl	2010-02-04 21:06:19 +0000
@@ -0,0 +1,136 @@
+% Mup IRC Bot
+%
+% Copyright (C) 2008  Gustavo Niemeyer
+%
+% This program is free software: you can redistribute it and/or modify
+% it under the terms of the GNU Affero General Public License as
+% published by the Free Software Foundation, either version 3 of the
+% License, or (at your option) any later version.
+%
+% This program is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU Affero General Public License for more details.
+%
+% You should have received a copy of the GNU Affero General Public License
+% along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+-module(mup_mergetracking).
+-behaviour(gen_server).
+-export([start_link/1]).
+-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+         terminate/2, code_change/3]).
+-include("mup.hrl").
+-include_lib("eunit/include/eunit.hrl").
+
+
+-record(state,
+        {plugin,
+         merges,
+         update_timer}).
+
+start_link(Name) ->
+    gen_server:start_link(?MODULE, Name, []).
+
+init(Name) ->
+    {ok, Plugin} = mup_config:get_plugin(Name),
+    {ok, schedule_update(#state{plugin=Plugin})}.
+
+handle_call(_Request, _From, State) ->
+    {reply, {error, bad_request}, State}.
+
+handle_cast({handle_message, _Message}, State) ->
+    {noreply, State};
+
+handle_cast(reconfig, State) ->
+    case mup_config:get_plugin((State#state.plugin)#plugin.name) of
+        {ok, Plugin} ->
+            {noreply, State#state{plugin=Plugin}};
+        undefined ->
+            {stop, normal, State}
+    end.
+
+merge_objects_to_dict(Merges) ->
+    merge_objects_to_dict(Merges, dict:new()).
+
+merge_objects_to_dict([], Dict) ->
+    Dict;
+
+merge_objects_to_dict([Merge | Tail], Dict) ->
+    MergeUrl = mup_launchpad:get_object_value("self_link", Merge),
+    Status = mup_launchpad:get_object_value("queue_status", Merge),
+    merge_objects_to_dict(Tail, dict:store(MergeUrl, Status, Dict)).
+
+handle_info(update, State) ->
+    LaunchpadPid = get_mup_launchpad_pid(State),
+    Project = get_option(project, "", State),
+    {ok, NewMerges} = mup_launchpad:get_merge_proposals(LaunchpadPid, Project),
+    NewMergesAsDict = merge_objects_to_dict(NewMerges),
+    case State#state.merges of
+        undefined ->
+            ok;
+        OldMerges ->
+            Channels = get_option(targets, [], State),
+            show_merges(NewMerges, OldMerges, Channels, LaunchpadPid)
+    end,
+    {noreply, schedule_update(State#state{merges=NewMergesAsDict})};
+
+handle_info(_Info, State) ->
+    {noreply, State}.
+
+terminate(_Reason, _State) ->
+    ok.
+
+code_change(_OldVsn, State, _Extra) ->
+    {ok, State}.
+
+
+get_option(Key, State) ->
+    mup_util:option(Key, (State#state.plugin)#plugin.options).
+
+get_option(Key, Default, State) ->
+    mup_util:option(Key, (State#state.plugin)#plugin.options, Default).
+
+get_mup_launchpad_pid(State) ->
+    case get_option(mup_launchpad_name, State) of
+        undefined ->
+            throw({missing_option, mup_launchpad_name});
+        Name ->
+            {ok, LaunchpadPid} = mup_plugin_sup:find_plugin(Name),
+            LaunchpadPid
+    end.
+
+
+schedule_update(State) ->
+    case State#state.update_timer of
+        undefined ->
+            ok;
+        Timer ->
+            erlang:cancel_timer(Timer)
+    end,
+    Interval = get_option(interval, 300, State) * 1000,
+    State#state{update_timer=erlang:send_after(Interval, self(), update)}.
+
+
+show_merges([Merge|Rest], OldMerges, Channels, LaunchpadPid) ->
+    MergeUrl = mup_launchpad:get_object_value("self_link", Merge),
+    NewStatus = mup_launchpad:get_object_value("queue_status", Merge),
+    case dict:find(MergeUrl, OldMerges) of
+        {ok, NewStatus} ->
+            ok;
+        error ->
+            show_merge(Merge, Channels, LaunchpadPid);
+        {ok, OldStatus} ->
+            show_merge(Merge, Channels, LaunchpadPid)
+    end,
+    show_merges(Rest, OldMerges, Channels, LaunchpadPid);
+
+show_merges([], _OldMerges, _Channels, _LaunchpadPid) ->
+    ok.
+
+show_merge(Merge, [{Server, Channel}|Rest], LaunchpadPid) ->
+    mup_launchpad:show_merge_proposal(LaunchpadPid, Merge, Server, Channel),
+    show_merge(Merge, Rest, LaunchpadPid);
+
+show_merge(_Merge, [], _LaunchpadPid) ->
+    ok.