Version of BBBPM::GitHub V3 as used on #irssi

MANIFEST

@@ -6,6 +6,7 @@ lib/Bot/BasicBot/Pluggable/Module/GitHub.pm
 lib/Bot/BasicBot/Pluggable/Module/GitHub/Announce.pm
 lib/Bot/BasicBot/Pluggable/Module/GitHub/EasyLinks.pm
 lib/Bot/BasicBot/Pluggable/Module/GitHub/PullRequests.pm
+lib/Bot/BasicBot/Pluggable/Module/GitHub/IssueSearch.pm
 t/00-load.t
 t/01-parse-config.t
 t/manifest.t

Makefile.PL

@@ -14,11 +14,12 @@ WriteMakefile(
     PREREQ_PM => {
         'Test::More'      => 0,
         'Bot::BasicBot::Pluggable::Module' => 0,
-        'Net::GitHub::V2' => 0,
+        'Net::GitHub::V3' => 0,
         'YAML'            => 0,
         'LWP::Simple'     => 0,
         'JSON'            => 0,
         'URI::Title'      => 0,
+        'Mojo::UserAgent' => 0,
     },
     dist                => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
     clean               => { FILES => 'Bot-BasicBot-Pluggable-Module-GitHub-*' },

README

@@ -10,7 +10,7 @@ DESCRIPTION
     interest to you. They're already in use on the Dancer project's IRC
     channel, and internally at my workplace, UK2.
 
-    Most communication with GitHub uses Net::GitHub::V2, and can use
+    Most communication with GitHub uses Net::GitHub::V3, and can use
     authentication with an API key for private repositories.
 
 MODULES

lib/Bot/BasicBot/Pluggable/Module/GitHub.pm

@@ -9,7 +9,8 @@ use base 'Bot::BasicBot::Pluggable::Module';
 # want.
 
 use strict;
-use Net::GitHub::V2;
+use Net::GitHub::V3;
+use Mojo::UserAgent;
 
 our $VERSION = '0.04';
 
@@ -37,26 +38,91 @@ sub ng {
     }
 
     return unless $user && $project;
+    my $id = "$user/$project";
 
     # If we've already got a suitable Net::GitHub::V2 object, use it:
-    if (my $ng = $net_github{"$user/$project"}) {
+    if (my $ng = $net_github{$id}) {
         return $ng;
     }
 
     # Right - assemble the params we need to give to Net::GitHub::V2
     my %ngparams = (
-        owner => $user,
-        repo  => $project,
+#        owner => $user,
+#        repo  => $project,
     );
 
     # If authentication is needed, add that in too:
     if (my $auth = $self->auth_for_project("$user/$project")) {
-        my ($user, $token) = split /:/, $auth, 2;
-        $ngparams{login} = $user;
-        $ngparams{token} = $token;
-        $ngparams{always_Authorization} = 1;
+#        my ($user, $token) = split /:/, $auth, 2;
+#        $ngparams{login} = $user;
+#        $ngparams{token} = $token;
+#        $ngparams{always_Authorization} = 1;
+	$ngparams{access_token} = $auth;
     }
-    return $net_github{"$user/$project"} = Net::GitHub::V2->new(%ngparams);
+    my $endpoint;
+    if ($user =~ /:/) {
+	($endpoint, $user) = split /:/, $user, 2;
+    }
+    if ($endpoint) {
+	$ngparams{api_url} = "https://$endpoint/api/v1";
+    }
+    my $api = Net::GitHub::V3->new(%ngparams);
+    $api->set_default_user_repo($user, $project);
+    return $net_github{$id} = $api;
+}
+
+my $ua;
+
+sub _make_ua {
+    return $ua if $ua;
+    $ua = Mojo::UserAgent->new;
+    $ua->proxy->detect;
+    return $ua;
+}
+
+my %_commit_branch_cache;
+my $_commit_branch_cache_timeout = 60 * 60;
+
+sub _commit_branch {
+    my ($self, $pr, $commit_id) = @_;
+    _make_ua();
+    my $base_url = $pr->{html_url};
+    $base_url =~ s{/(pull|commit)/.*}{};
+    my $url = "$base_url/branch_commits/$commit_id";
+    my $tag;
+    my $time = time;
+    if ($_commit_branch_cache{$url} && ($_commit_branch_cache{$url}{_time} + $_commit_branch_cache_timeout) > $time) {
+	$tag = $_commit_branch_cache{$url}{tag};
+    } else {
+	warn "getting: $url";
+	my $res = $ua->get("$url")->res;
+	return "" unless $res;
+	my @tags = ((grep !m{[-/]}, $res->dom("ul.branches-list li.branch a")->map("text")->each),
+		    (map s/~/-/r, grep !/-/, map s/-(pre\d*|an)/~$1/gr, $res->dom("ul.branches-tag-list li a")->map("text")->each));
+	#my @tags = grep !/-/, $res->dom("ul li a")->map("text")->each;
+	if (@tags) {
+	    $tag = $tags[-1];
+	    $_commit_branch_cache{$url} = { _time => $time, tag => $tag };
+	}
+    }
+    return "T:\cB$tag\cB " if length $tag;
+    return "";
+}
+
+sub _pr_branch {
+    my ($self, $ng, $pr) = @_;
+    my $issue_number = $pr->{number};
+    my $ie = $ng->issue;
+    my $commit_id;
+    #    while (my $event = $ie->next_event($issue_number))
+    for my $event ($ie->events($issue_number)) {
+	if ($event->{event} eq 'merged') {
+	    $commit_id = $event->{commit_id};
+	    last;
+	}
+    }
+    return '' unless length $commit_id;
+    return $self->_commit_branch($pr, $commit_id);
 }
 
 
@@ -98,6 +164,10 @@ sub channels_and_projects {
     return \%project_for_channel;
 }
 
+sub help {
+    "github module; configuration: !listgithubproject, !setgithubproject <channel> <project> [authtok], !delgithubproject <channel> <project>, !delgithubauth <project>"
+}
+
 # Support configuring project details for a channel (potentially with auth
 # details) via a msg.  This is a bit too tricky to just leave the Vars module to
 # handle, I think.  (Note that each of the modules which inherit from us will
@@ -137,7 +207,55 @@ sub said {
         }
         return $message;
 
-    } elsif ($mess->{body} =~ /^!setgithubproject/i) {
+    } elsif ($mess->{body} =~ m{
+        ^!delgithubproject \s+
+        (?<channel> \#\S+ ) \s+
+        (?<project> \S+   )
+    }xi) {
+        my $project_for_channel = 
+            $self->store->get('GitHub','project_for_channel') || {};
+	my $message = 'project not found';
+	if ($project_for_channel->{$+{channel}} eq $+{project}) {
+	    delete $project_for_channel->{$+{channel}};
+	    $message = "OK, project for $+{channel} deleted";
+	}
+        $self->store->set(
+            'GitHub', 'project_for_channel', $project_for_channel
+        );
+        return $message;
+    } elsif ($mess->{body} =~ m{
+        ^!delgithubauth \s+
+        (?<project> \S+ )
+    }xi) {
+        my $auth_for_project =
+            $self->store->get('GitHub', 'auth_for_project') || {};
+	my $message = 'project not found';
+        if ($auth_for_project->{$+{project}}) {
+	    delete $auth_for_project->{$+{project}};
+	    $message = "OK, auth for $+{project} deleted";
+	}
+        $self->store->set(
+            'GitHub', 'auth_for_project', $auth_for_project
+        );
+
+        # Invalidate any cached Net::GitHub object we might have, so the new
+        # settings are used
+        delete $net_github{$+{project}};
+        return $message;
+    } elsif ($mess->{body} =~ m{^!listgithubproject(?:\s+|$)}xi) {
+        my $project_for_channel = 
+            $self->store->get('GitHub','project_for_channel') || {};
+        my $auth_for_project =
+            $self->store->get('GitHub', 'auth_for_project') || {};
+	my $message;
+	for my $c (sort keys %$project_for_channel) {
+	    $message .= "$c: $project_for_channel->{$c}\n";
+	}
+	if (%$auth_for_project) {
+	    $message .= "*: ".(join " ", sort keys %$auth_for_project)."\n";
+	}
+	return $message || "no projects";
+    } elsif ($mess->{body} =~ /^!(set|del|list)github(project|auth)/i) {
         return "Invalid usage.   Try '!help github'";
     }
     return;