[maven-release-plugin] prepare release github-api-1.17

This adds the original API back which defaults to the 'github.com' server.

pom.xml

@@ -1,79 +1,47 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.kohsuke</groupId>
+  <parent>
+    <groupId>org.kohsuke</groupId>
+    <artifactId>pom</artifactId>
+    <version>1</version>
+  </parent>
+
   <artifactId>github-api</artifactId>
-  <packaging>jar</packaging>
+  <version>1.17</version>
-  <version>1.3</version>
   <name>GitHub API for Java</name>
-  <url>http://kohsuke.org/github-api/</url>
+  <url>http://github-api.kohsuke.org/</url>
   <description>GitHub API for Java</description>
 
-    <distributionManagement>
+  <scm>
-    <repository>
+    <connection>scm:git:git@github.com/kohsuke/${project.artifactId}.git</connection>
-      <id>java.net-m2-repository</id>
+    <developerConnection>scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git</developerConnection>
-      <url>java-net:/maven2-repository/trunk/repository/</url>
+    <url>http://${project.artifactId}.kohsuke.org/</url>
-    </repository>
+  </scm>
+
+  <distributionManagement>
     <site>
-      <id>kohsuke.org</id>
+      <id>github-pages</id>
-      <url>scp://kohsuke.org/home/kohsuke/kohsuke.org/github-api/</url>
+      <url>gitsite:git@github.com/kohsuke/${project.artifactId}.git</url>
     </site>
   </distributionManagement>
 
   <build>
     <plugins>
       <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
+        <groupId>com.infradna.tool</groupId>
-        <configuration>
+        <artifactId>bridge-method-injector</artifactId>
-          <source>1.5</source>
+        <version>1.2</version>
-          <target>1.5</target>
+        <executions>
-        </configuration>
+          <execution>
-      </plugin>
+            <goals>
-      <plugin>
+              <goal>process</goal>
-        <groupId>org.apache.maven.plugins</groupId>
+            </goals>
-        <artifactId>maven-release-plugin</artifactId>
+          </execution>
-        <version>2.0</version>
+        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.apache.maven.scm</groupId>
-            <artifactId>maven-scm-provider-gitexe</artifactId>
-            <version>1.2</version>
-          </dependency>
-        </dependencies>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-scm-plugin</artifactId>
-        <version>1.3</version>
       </plugin>
     </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.jvnet.wagon-svn</groupId>
-        <artifactId>wagon-svn</artifactId>
-        <version>1.9</version>
-      </extension>
-    </extensions>
   </build>
 
-  <scm>
-    <connection>scm:git:git@github.com:kohsuke/github-api.git</connection>
-  </scm>
-
-  <developers>
-    <developer>
-      <id>kohsuke</id>
-      <name>Kohsuke Kawaguchi</name>
-    </developer>
-  </developers>
-
-  <licenses>
-    <license>
-      <name>MIT License</name>
-      <distribution>repository</distribution>
-      <url>http://www.opensource.org/licenses/mit-license.php</url>
-    </license>
-  </licenses>
-  
   <dependencies>
     <dependency>
       <groupId>org.jvnet.hudson</groupId>
@@ -103,6 +71,18 @@
       <artifactId>commons-io</artifactId>
       <version>1.4</version>
     </dependency>
+    <dependency>
+      <groupId>com.infradna.tool</groupId>
+      <artifactId>bridge-method-annotation</artifactId>
+      <version>1.4</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.kohsuke.stapler</groupId>
+      <artifactId>stapler-jetty</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <reporting>

src/main/java/org/kohsuke/github/ApiVersion.java

@@ -0,0 +1,24 @@
+package org.kohsuke.github;
+
+/**
+ * Different API versions.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+enum ApiVersion {
+	
+    V2("https://?/api/v2/json"),
+    V3("https://api.?");
+
+    final String templateUrl;
+
+    ApiVersion(String templateUrl) {
+        this.templateUrl = templateUrl;
+    }
+    
+    public String getApiVersionBaseUrl(String githubServer) {
+    	
+    	return templateUrl.replaceFirst("\\?", githubServer);
+    		
+    }
+}

src/main/java/org/kohsuke/github/GHCommitPointer.java

@@ -0,0 +1,77 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+/**
+ * Identifies a commit in {@link GHPullRequest}.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class GHCommitPointer {
+    private String ref, sha, label;
+    private GHUser user;
+    private GHRepository repository/*V2*/,repo/*V3*/;
+
+    /**
+     * This points to the user who owns
+     * the {@link #repository}.
+     */
+    public GHUser getUser() {
+        return user;
+    }
+
+    /**
+     * The repository that contains the commit.
+     */
+    public GHRepository getRepository() {
+        return repo!=null ? repo : repository;
+    }
+
+    /**
+     * Named ref to the commit. This appears to be a "short ref" that doesn't include "refs/heads/" portion.
+     */
+    public String getRef() {
+        return ref;
+    }
+
+    /**
+     * SHA1 of the commit.
+     */
+    public String getSha() {
+        return sha;
+    }
+
+    /**
+     * String that looks like "USERNAME:REF".
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    void wrapUp(GitHub root) {
+        if (user!=null) user.root = root;
+        if (repo!=null) repo.wrap(root);
+        if (repository!=null) repository.wrap(root);
+    }
+}

src/main/java/org/kohsuke/github/GHEvent.java

@@ -0,0 +1,28 @@
+package org.kohsuke.github;
+
+/**
+ * Hook event type.
+ *
+ * See http://developer.github.com/v3/events/types/
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public enum GHEvent {
+    COMMIT_COMMENT,
+    CREATE,
+    DELETE,
+    DOWNLOAD,
+    FOLLOW,
+    FORK,
+    FORK_APPLY,
+    GIST,
+    GOLLUM,
+    ISSUE_COMMENT,
+    ISSUES,
+    MEMBER,
+    PUBLIC,
+    PULL_REQUEST,
+    PUSH,
+    TEAM_ADD,
+    WATCH
+}

src/main/java/org/kohsuke/github/GHEventInfo.java

@@ -0,0 +1,82 @@
+package org.kohsuke.github;
+
+import org.codehaus.jackson.node.ObjectNode;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * Represents an event.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class GHEventInfo {
+    private GitHub root;
+
+    // we don't want to expose Jackson dependency to the user. This needs databinding
+    private ObjectNode payload;
+
+    private String created_at;
+    private String type;
+
+    // these are all shallow objects
+    private GHEventRepository repo;
+    private GHUser actor;
+    private GHOrganization org;
+
+    /**
+     * Inside the event JSON model, GitHub uses a slightly different format.
+     */
+    public static class GHEventRepository {
+        private int id;
+        private String url;     // repository API URL
+        private String name;    // owner/repo
+    }
+
+    public GHEvent getType() {
+        String t = type;
+        if (t.endsWith("Event"))    t=t.substring(0,t.length()-5);
+        for (GHEvent e : GHEvent.values()) {
+            if (e.name().replace("_","").equalsIgnoreCase(t))
+                return e;
+        }
+        return null;    // unknown event type
+    }
+
+    /*package*/ GHEventInfo wrapUp(GitHub root) {
+        this.root = root;
+        return this;
+    }
+
+    public Date getCreatedAt() {
+        return GitHub.parseDate(created_at);
+    }
+
+    /**
+     * Repository where the change was made.
+     */
+    public GHRepository getRepository() throws IOException {
+        return root.getRepository(repo.name);
+    }
+    
+    public GHUser getActor() throws IOException {
+        return root.getUser(actor.getLogin());
+    }
+
+    public GHOrganization getOrganization() throws IOException {
+        return (org==null || org.getLogin()==null) ? null : root.getOrganization(org.getLogin());
+    }
+
+    /**
+     * Retrieves the payload.
+     * 
+     * @param type
+     *      Specify one of the {@link GHEventPayload} subtype that defines a type-safe access to the payload.
+     *      This must match the {@linkplain #getType() event type}.
+     */
+    public <T extends GHEventPayload> T getPayload(Class<T> type) throws IOException {
+        T v = GitHub.MAPPER.readValue(payload.traverse(), type);
+        v.wrapUp(root);
+        return v;
+    }
+}

src/main/java/org/kohsuke/github/GHEventPayload.java

@@ -0,0 +1,46 @@
+package org.kohsuke.github;
+
+import java.io.Reader;
+
+/**
+ * Base type for types used in databinding of the event payload.
+ * 
+ * @see GitHub#parseEventPayload(Reader, Class)
+ * @see GHEventInfo#getPayload(Class)
+ */
+public abstract class GHEventPayload {
+    protected GitHub root;
+
+    /*package*/ GHEventPayload() {
+    }
+
+    /*package*/ void wrapUp(GitHub root) {
+        this.root = root;
+    }
+
+    public static class PullRequest extends GHEventPayload {
+        private String action;
+        private int number;
+        GHPullRequest pull_request;
+
+        public String getAction() {
+            return action;
+        }
+
+        public int getNumber() {
+            return number;
+        }
+
+        public GHPullRequest getPullRequest() {
+            pull_request.root = root;
+            return pull_request;
+        }
+
+        @Override
+        void wrapUp(GitHub root) {
+            super.wrapUp(root);
+            pull_request.wrapUp(root);
+        }
+    }
+
+}

src/main/java/org/kohsuke/github/GHException.java

@@ -0,0 +1,14 @@
+package org.kohsuke.github;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public class GHException extends RuntimeException {
+    public GHException(String message) {
+        super(message);
+    }
+
+    public GHException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}

src/main/java/org/kohsuke/github/GHHook.java

@@ -0,0 +1,60 @@
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+public final class GHHook {
+    /**
+     * Repository that the hook belongs to.
+     */
+    /*package*/ transient GHRepository repository;
+    
+    String created_at, updated_at, name;
+    List<String> events;
+    boolean active;
+    Map<String,String> config;
+    int id;
+    
+    /*package*/ GHHook wrap(GHRepository owner) {
+        this.repository = owner;
+        return this;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public EnumSet<GHEvent> getEvents() {
+        EnumSet<GHEvent> s = EnumSet.noneOf(GHEvent.class);
+        for (String e : events)
+            Enum.valueOf(GHEvent.class,e.toUpperCase(Locale.ENGLISH));
+        return s;
+    }
+
+    public boolean isActive() {
+        return active;
+    }
+
+    public Map<String, String> getConfig() {
+        return Collections.unmodifiableMap(config);
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Deletes this hook.
+     */
+    public void delete() throws IOException {
+        new Poster(repository.root,ApiVersion.V3).withCredential()
+                .to(String.format("/repos/%s/%s/hooks/%d",repository.getOwnerName(),repository.getName(),id),null,"DELETE");
+    }
+}

src/main/java/org/kohsuke/github/GHIssue.java

@@ -0,0 +1,129 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011, Eric Maupin, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.net.URL;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Represents an issue on GitHub.
+ *
+ * @author Eric Maupin
+ * @author Kohsuke Kawaguchi
+ */
+public class GHIssue {
+    GitHub root;
+    GHRepository owner;
+
+    private String gravatar_id,body,title,state,created_at,updated_at,html_url;
+    private List<String> labels;
+    private int number,votes,comments;
+    private int position;
+
+    /**
+     * Repository to which the issue belongs.
+     */
+    public GHRepository getRepository() {
+        return owner;
+    }
+
+    /**
+     * The description of this pull request.
+     */
+    public String getBody() {
+        return body;
+    }
+
+    /**
+     * ID.
+     */
+    public int getNumber() {
+        return number;
+    }
+
+    /**
+     * The HTML page of this issue,
+     * like https://github.com/jenkinsci/jenkins/issues/100
+     */
+    public URL getUrl() {
+        return GitHub.parseURL(html_url);
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public GHIssueState getState() {
+        return Enum.valueOf(GHIssueState.class, state);
+    }
+
+    public Collection<String> getLabels() {
+        return Collections.unmodifiableList(labels);
+    }
+
+    public Date getCreatedAt() {
+        return GitHub.parseDate(created_at);
+    }
+
+    public Date getUpdatedAt() {
+        return GitHub.parseDate(updated_at);
+    }
+
+    /**
+     * Updates the issue by adding a comment.
+     */
+    public void comment(String message) throws IOException {
+        new Poster(root).withCredential().with("comment",message).to(getApiRoute("comment"));
+    }
+
+    /**
+     * Closes this issue.
+     */
+    public void close() throws IOException {
+        new Poster(root).withCredential().to(getApiRoute("close"));
+    }
+
+    /**
+     * Reopens this issue.
+     */
+    public void reopen() throws IOException {
+        new Poster(root).withCredential().to(getApiRoute("reopen"));
+    }
+
+    /**
+     * Obtains all the comments associated with this issue.
+     */
+    public List<GHIssueComment> getComments() throws IOException {
+        return root.retrieve(getApiRoute("comments"), JsonIssueComments.class).wrap(this);
+    }
+
+    private String getApiRoute(String verb) {
+        return "/issues/"+verb+"/"+owner.getOwnerName()+"/"+owner.getName()+"/"+number;
+    }
+}

src/main/java/org/kohsuke/github/GHIssueComment.java

@@ -0,0 +1,79 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.io.IOException;
+import java.util.Date;
+
+/**
+ * Comment to the issue
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class GHIssueComment {
+    GHIssue owner;
+
+    private String body, gravatar_id, user, created_at, updated_at;
+    private int id;
+
+    /**
+     * Gets the issue to which this comment is associated.
+     */
+    public GHIssue getParent() {
+        return owner;
+    }
+
+    /**
+     * The comment itself.
+     */
+    public String getBody() {
+        return body;
+    }
+
+    public Date getCreatedAt() {
+        return GitHub.parseDate(created_at);
+    }
+
+    public Date getUpdatedAt() {
+        return GitHub.parseDate(updated_at);
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    /**
+     * Gets the ID of the user who posted this comment.
+     */
+    public String getUserName() {
+        return user;
+    }
+
+    /**
+     * Gets the user who posted this comment.
+     */
+    public GHUser getUser() throws IOException {
+        return owner.root.getUser(user);
+    }
+}

src/main/java/org/kohsuke/github/GHIssueState.java

@@ -0,0 +1,30 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011, Eric Maupin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+package org.kohsuke.github;
+
+public enum GHIssueState {
+    OPEN,
+    CLOSED
+}

src/main/java/org/kohsuke/github/GHOrganization.java

@@ -1,12 +1,20 @@
 package org.kohsuke.github;
 
 import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
+import static org.kohsuke.github.ApiVersion.*;
+
 /**
  * @author Kohsuke Kawaguchi
  */
@@ -18,29 +26,111 @@ public class GHOrganization extends GHPerson {
      *      Newly created repository.
      */
     public GHRepository createRepository(String name, String description, String homepage, String team, boolean isPublic) throws IOException {
+        return createRepository(name,description,homepage,getTeams().get(team),isPublic);
+    }
+
+    public GHRepository createRepository(String name, String description, String homepage, GHTeam team, boolean isPublic) throws IOException {
         // such API doesn't exist, so fall back to HTML scraping
-        WebClient wc = root.createWebClient();
+        return new Poster(root,V3).withCredential()
-        HtmlPage pg = (HtmlPage)wc.getPage("https://github.com/organizations/"+login+"/repositories/new");
+                .with("name", name).with("description", description).with("homepage", homepage)
-        HtmlForm f = pg.getForms().get(1);
+                .with("public", isPublic).with("team_id",team.getId()).to("/orgs/"+login+"/repos", GHRepository.class).wrap(root);
-        f.getInputByName("repository[name]").setValueAttribute(name);
-        f.getInputByName("repository[description]").setValueAttribute(description);
-        f.getInputByName("repository[homepage]").setValueAttribute(homepage);
-        f.getSelectByName("team_id").getOptionByText(team).setSelected(true);
-        f.submit(f.getButtonByCaption("Create Repository"));
-
-        return root.getUser(login).getRepository(name);
-
-//        GHRepository r = new Poster(root).withCredential()
-//                .with("name", name).with("description", description).with("homepage", homepage)
-//                .with("public", isPublic ? 1 : 0).to(root.getApiURL("/organizations/"+login+"/repos/create"), JsonRepository.class).repository;
-//        r.root = root;
-//        return r;
     }
 
     /**
      * Teams by their names.
      */
     public Map<String,GHTeam> getTeams() throws IOException {
-        return root.retrieveWithAuth(root.getApiURL("/organizations/"+login+"/teams"),JsonTeams.class).toMap(this);
+        return root.retrieveWithAuth("/organizations/"+login+"/teams",JsonTeams.class).toMap(this);
+    }
+
+    @Override
+    public GHRepository getRepository(String name) throws IOException {
+        try {
+            return root.retrieveWithAuth3("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
+        } catch (FileNotFoundException e) {
+            return null;
+        }
+    }
+
+    /**
+     * Publicizes the membership.
+     */
+    public void publicize(GHUser u) throws IOException {
+        root.retrieveWithAuth3("/orgs/" + login + "/public_members/" + u.getLogin(), null, "PUT");
+    }
+
+    /**
+     * All the members of this organization.
+     */
+    public List<GHUser> getMembers() throws IOException {
+        return new AbstractList<GHUser>() {
+            // these are shallow objects with only some limited values filled out
+            // TODO: it's better to allow objects to fill themselves in later when missing values are requested
+            final GHUser[] shallow = root.retrieveWithAuth3("/orgs/" + login + "/members", GHUser[].class);
+
+            @Override
+            public GHUser get(int index) {
+                try {
+                    return root.getUser(shallow[index].getLogin());
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+
+            @Override
+            public int size() {
+                return shallow.length;
+            }
+        };
+    }
+
+    /**
+     * Conceals the membership.
+     */
+    public void conceal(GHUser u) throws IOException {
+        root.retrieveWithAuth3("/orgs/" + login + "/public_members/" + u.getLogin(), null, "DELETE");
+    }
+
+    public enum Permission { ADMIN, PUSH, PULL }
+
+    /**
+     * Creates a new team and assigns the repositories.
+     */
+    public GHTeam createTeam(String name, Permission p, Collection<GHRepository> repositories) throws IOException {
+        Poster post = new Poster(root).withCredential().with("team[name]", name).with("team[permission]", p.name().toLowerCase());
+        for (GHRepository r : repositories) {
+            post.with("team[repo_names][]",r.getOwnerName()+'/'+r.getName());
+        }
+        return post.to("/organizations/"+login+"/teams",JsonTeam.class).wrap(this);
+    }
+
+    public GHTeam createTeam(String name, Permission p, GHRepository... repositories) throws IOException {
+        return createTeam(name,p, Arrays.asList(repositories));
+    }
+
+    /**
+     * List up repositories that has some open pull requests.
+     */
+    public List<GHRepository> getRepositoriesWithOpenPullRequests() throws IOException {
+        WebClient wc = root.createWebClient();
+        HtmlPage pg = (HtmlPage)wc.getPage("https://github.com/organizations/"+login+"/dashboard/pulls");
+        List<GHRepository> r = new ArrayList<GHRepository>();
+        for (HtmlAnchor e : pg.getElementById("js-issue-list").<HtmlAnchor>selectNodes(".//UL[@class='smallnav']/LI[not(@class='zeroed')]/A")) {
+            String a = e.getHrefAttribute();
+            String name = a.substring(a.lastIndexOf('/')+1);
+            r.add(getRepository(name));
+        }
+        return r;
+    }
+
+    /**
+     * Gets all the open pull requests in this organizataion.
+     */
+    public List<GHPullRequest> getPullRequests() throws IOException {
+        List<GHPullRequest> all = new ArrayList<GHPullRequest>();
+        for (GHRepository r : getRepositoriesWithOpenPullRequests()) {
+            all.addAll(r.getPullRequests(GHIssueState.OPEN));
+        }
+        return all;
     }
 }

src/main/java/org/kohsuke/github/GHPerson.java

@@ -1,13 +1,11 @@
 package org.kohsuke.github;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.net.URL;
 import java.util.Collections;
 import java.util.Map;
 import java.util.TreeMap;
 
-import static org.kohsuke.github.GitHub.*;
-
 /**
  * Common part of {@link GHUser} and {@link GHOrganization}.
  * 
@@ -16,33 +14,46 @@ import static org.kohsuke.github.GitHub.*;
 public abstract class GHPerson {
     /*package almost final*/ GitHub root;
 
-    protected String gravatar_id,login;
+    // common
+    protected String login,location,blog,email,name,created_at,company;
+    protected int id;
+    protected String gravatar_id; // appears in V3 as well but presumably subsumed by avatar_url?
 
-    protected int public_gist_count,public_repo_count,following_count,id;
+    // V2
+    protected int public_gist_count,public_repo_count,followers_count,following_count;
 
-    /**
+    // V3
-     * Repositories that this user owns.
+    protected String avatar_url,html_url;
-     */
+    protected int followers,following,public_repos,public_gists;
-    private transient Map<String,GHRepository> repositories;
 
     /**
      * Gets the repositories this user owns.
      */
-    public Map<String,GHRepository> getRepositories() throws IOException {
+    public synchronized Map<String,GHRepository> getRepositories() throws IOException {
-        if (repositories==null) {
+        Map<String,GHRepository> repositories = new TreeMap<String, GHRepository>();
-            repositories = new TreeMap<String, GHRepository>();
+        for (int i=1; ; i++) {
-            URL url = new URL("http://github.com/api/v2/json/repos/show/" + login);
+            GHRepository[] array = root.retrieve3("/users/" + login + "/repos?per_page=100&page=" + i, GHRepository[].class);
-            for (GHRepository r : MAPPER.readValue(url, JsonRepositories.class).repositories) {
+            for (GHRepository r : array) {
                 r.root = root;
                 repositories.put(r.getName(),r);
             }
+            if (array.length==0)  break;
         }
 
         return Collections.unmodifiableMap(repositories);
     }
 
+    /**
+     *
+     * @return
+     *      null if the repository was not found
+     */
     public GHRepository getRepository(String name) throws IOException {
-        return getRepositories().get(name);
+        try {
+            return root.retrieve3("/repos/" + login + '/' + name, GHRepository.class).wrap(root);
+        } catch (FileNotFoundException e) {
+            return null;
+        }
     }
 
     /**
@@ -52,7 +63,73 @@ public abstract class GHPerson {
         return gravatar_id;
     }
 
+    /**
+     * Gets the login ID of this user, like 'kohsuke'
+     */
     public String getLogin() {
         return login;
     }
+
+    /**
+     * Gets the human-readable name of the user, like "Kohsuke Kawaguchi"
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * Gets the company name of this user, like "Sun Microsystems, Inc."
+     */
+    public String getCompany() {
+        return company;
+    }
+
+    /**
+     * Gets the location of this user, like "Santa Clara, California"
+     */
+    public String getLocation() {
+        return location;
+    }
+
+    public String getCreatedAt() {
+        return created_at;
+    }
+
+    /**
+     * Gets the blog URL of this user.
+     */
+    public String getBlog() {
+        return blog;
+    }
+
+    /**
+     * Gets the e-mail address of the user.
+     */
+    public String getEmail() {
+        return email;
+    }
+
+    public int getPublicGistCount() {
+        return Math.max(public_gist_count,public_gists);
+    }
+
+    public int getPublicRepoCount() {
+        return Math.max(public_repo_count,public_repos);
+    }
+
+    public int getFollowingCount() {
+        return Math.max(following_count,following);
+    }
+
+    /**
+     * What appears to be a GitHub internal unique number that identifies this user.
+     */
+    public int getId() {
+        return id;
+    }
+
+    public int getFollowersCount() {
+        return Math.max(followers_count,followers);
+    }
+
 }

src/main/java/org/kohsuke/github/GHPersonSet.java

@@ -0,0 +1,36 @@
+package org.kohsuke.github;
+
+import java.util.Collection;
+import java.util.HashSet;
+
+/**
+ * Set of {@link GHPerson} with helper lookup methods.
+ * 
+ * @author Kohsuke Kawaguchi
+ */
+public final class GHPersonSet<T extends GHPerson> extends HashSet<T> {
+    public GHPersonSet() {
+    }
+
+    public GHPersonSet(Collection<? extends T> c) {
+        super(c);
+    }
+
+    public GHPersonSet(int initialCapacity, float loadFactor) {
+        super(initialCapacity, loadFactor);
+    }
+
+    public GHPersonSet(int initialCapacity) {
+        super(initialCapacity);
+    }
+
+    /**
+     * Finds the item by its login.
+     */
+    public T byLogin(String login) {
+        for (T t : this)
+            if (t.getLogin().equals(login))
+                return t;
+        return null;
+    }    
+}

src/main/java/org/kohsuke/github/GHPullRequest.java

@@ -0,0 +1,110 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.net.URL;
+import java.util.Date;
+
+/**
+ * A pull request.
+ * 
+ * @author Kohsuke Kawaguchi
+ */
+@SuppressWarnings({"UnusedDeclaration"})
+public class GHPullRequest extends GHIssue {
+    private String closed_at, patch_url, issue_updated_at;
+    private GHUser issue_user, user;
+    // labels??
+    private GHCommitPointer base, head;
+    private String mergeable, diff_url;
+
+    /**
+     * The URL of the patch file.
+     * like https://github.com/jenkinsci/jenkins/pull/100.patch
+     */
+    public URL getPatchUrl() {
+        return GitHub.parseURL(patch_url);
+    }
+
+    /**
+     * User who submitted a pull request.
+     */
+    public GHUser getUser() {
+        return user;
+    }
+
+    /**
+     * This points to where the change should be pulled into,
+     * but I'm not really sure what exactly it means.
+     */
+    public GHCommitPointer getBase() {
+        return base;
+    }
+
+    /**
+     * The change that should be pulled. The tip of the commits to merge.
+     */
+    public GHCommitPointer getHead() {
+        return head;
+    }
+
+    public Date getIssueUpdatedAt() {
+        return GitHub.parseDate(issue_updated_at);
+    }
+
+    /**
+     * The HTML page of this pull request,
+     * like https://github.com/jenkinsci/jenkins/pull/100
+     */
+    public URL getUrl() {
+        return super.getUrl();
+    }
+
+    /**
+     * The diff file,
+     * like https://github.com/jenkinsci/jenkins/pull/100.diff
+     */
+    public URL getDiffUrl() {
+        return GitHub.parseURL(diff_url);
+    }
+
+    public Date getClosedAt() {
+        return GitHub.parseDate(closed_at);
+    }
+
+    GHPullRequest wrapUp(GHRepository owner) {
+        this.owner = owner;
+        return wrapUp(owner.root);
+    }
+
+    GHPullRequest wrapUp(GitHub root) {
+        this.root = root;
+        if (owner!=null)    owner.wrap(root);
+        if (issue_user!=null)   issue_user.root=root;
+        if (user!=null)     user.root=root;
+        if (base!=null)     base.wrapUp(root);
+        if (head!=null)     head.wrapUp(root);
+        return this;
+    }
+}

src/main/java/org/kohsuke/github/GHRepository.java

@@ -23,26 +23,51 @@
  */
 package org.kohsuke.github;
 
+import com.gargoylesoftware.htmlunit.ElementNotFoundException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlButton;
+import com.gargoylesoftware.htmlunit.html.HtmlCheckBoxInput;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+
 import java.io.IOException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.net.URL;
+import java.util.AbstractSet;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Date;
 import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 
-import static java.util.Arrays.asList;
+import static java.util.Arrays.*;
+import static org.kohsuke.github.ApiVersion.V3;
 
 /**
  * A repository on GitHub.
  * 
  * @author Kohsuke Kawaguchi
  */
+@SuppressWarnings({"UnusedDeclaration"})
 public class GHRepository {
     /*package almost final*/ GitHub root;
 
-    private String description, homepage, url, name, owner;
+    private String description, homepage, name;
+    private String url; // this is the API url
+    private String html_url;    // this is the UI
+    private GHUser owner;   // not fully populated. beware.
     private boolean has_issues, has_wiki, fork, _private, has_downloads;
-    private int watchers,forks;
+    private int watchers,forks,open_issues;
+    private String created_at, pushed_at;
 
     public String getDescription() {
         return description;
@@ -52,20 +77,46 @@ public class GHRepository {
         return homepage;
     }
 
+    /**
+     * URL of this repository, like 'http://github.com/kohsuke/jenkins'
+     */
     public String getUrl() {
-        return url;
+        return html_url;
     }
 
+    /**
+     * Gets the git:// URL to this repository, such as "git://github.com/kohsuke/jenkins.git"
+     * This URL is read-only.
+     */
+    public String getGitTransportUrl() {
+        return "git://github.com/"+getOwnerName()+"/"+name+".git";
+    }
+
+    /**
+     * Gets the HTTPS URL to this repository, such as "https://github.com/kohsuke/jenkins.git"
+     * This URL is read-only.
+     */
+    public String gitHttpTransportUrl() {
+        return "https://github.com/"+getOwnerName()+"/"+name+".git";
+    }
+
+    /**
+     * Short repository name without the owner. For example 'jenkins' in case of http://github.com/jenkinsci/jenkins
+     */
     public String getName() {
         return name;
     }
 
     public GHUser getOwner() throws IOException {
-        return root.getUser(owner);
+        return root.getUser(owner.login);   // because 'owner' isn't fully populated
+    }
+
+    public List<GHIssue> getIssues(GHIssueState state) throws IOException {
+       return root.retrieve("/issues/list/" + owner.login + "/" + name + "/" + state.toString().toLowerCase(), JsonIssues.class).wrap(this);
     }
 
     protected String getOwnerName() {
-        return owner;
+        return owner.login;
     }
 
     public boolean hasIssues() {
@@ -96,17 +147,48 @@ public class GHRepository {
         return watchers;
     }
 
+    public int getOpenIssueCount() {
+        return open_issues;
+    }
+
+    public Date getPushedAt() {
+        return GitHub.parseDate(pushed_at);
+    }
+
+    public Date getCreatedAt() {
+        return GitHub.parseDate(created_at);
+    }
+
+
     /**
      * Gets the collaborators on this repository.
      * This set always appear to include the owner.
      */
-    public Set<GHUser> getCollaborators() throws IOException {
+    @WithBridgeMethods(Set.class)
-        Set<GHUser> r = new HashSet<GHUser>();
+    public GHPersonSet<GHUser> getCollaborators() throws IOException {
-        for (String u : root.retrieve("/repos/show/"+owner+"/"+name+"/collaborators",JsonCollaborators.class).collaborators)
+        GHPersonSet<GHUser> r = new GHPersonSet<GHUser>();
+        for (String u : root.retrieve("/repos/show/"+owner.login+"/"+name+"/collaborators",JsonCollaborators.class).collaborators)
             r.add(root.getUser(u));
+        return r;
+    }
+
+    /**
+     * Gets the names of the collaborators on this repository.
+     * This method deviates from the principle of this library but it works a lot faster than {@link #getCollaborators()}.
+     */
+    public Set<String> getCollaboratorNames() throws IOException {
+        Set<String> r = new HashSet<String>(root.retrieve("/repos/show/"+owner.login+"/"+name+"/collaborators",JsonCollaborators.class).collaborators);
         return Collections.unmodifiableSet(r);
     }
 
+    /**
+     * If this repository belongs to an organization, return a set of teams.
+     */
+    public Set<GHTeam> getTeams() throws IOException {
+        return Collections.unmodifiableSet(root.retrieveWithAuth("/repos/show/"+owner.login+"/"+name+"/teams",JsonTeams.class).toSet(
+                root.getOrganization(owner.login)));
+    }
+
     public void addCollaborators(GHUser... users) throws IOException {
         addCollaborators(asList(users));
     }
@@ -126,36 +208,273 @@ public class GHRepository {
     private void modifyCollaborators(Collection<GHUser> users, String op) throws IOException {
         verifyMine();
         for (GHUser user : users) {
-            new Poster(root).withCredential().to(root.getApiURL("/repos/collaborators/"+name+ op +user.getLogin()));
+            new Poster(root).withCredential().to("/repos/collaborators/"+name+ op +user.getLogin());
         }
     }
 
+    public void setEmailServiceHook(String address) throws IOException {
+        WebClient wc = root.createWebClient();
+        HtmlPage pg = (HtmlPage)wc.getPage(getUrl()+"/admin");
+        HtmlInput email = (HtmlInput)pg.getElementById("email_address");
+        email.setValueAttribute(address);
+        HtmlCheckBoxInput active = (HtmlCheckBoxInput)pg.getElementById("email[active]");
+        active.setChecked(true);
+
+        final HtmlForm f = email.getEnclosingFormOrDie();
+        f.submit((HtmlButton) f.getElementsByTagName("button").get(0));
+    }
+
+    /**
+     * Enables or disables the issue tracker for this repository.
+     */
+    public void enableIssueTracker(boolean v) throws IOException {
+        new Poster(root).withCredential().with("values[has_issues]",String.valueOf(v))
+                .to("/repos/show/" + owner.login + "/" + name);
+    }
+
+    /**
+     * Enables or disables Wiki for this repository.
+     */
+    public void enableWiki(boolean v) throws IOException {
+        new Poster(root).withCredential().with("values[has_wiki]",String.valueOf(v))
+                .to("/repos/show/" + owner.login + "/" + name);
+    }
+
     /**
      * Deletes this repository.
      */
     public void delete() throws IOException {
-        verifyMine();
         Poster poster = new Poster(root).withCredential();
-        URL url = root.getApiURL("/repos/delete/" + name);
+        String url = "/repos/delete/" + owner.login +"/"+name;
 
         DeleteToken token = poster.to(url, DeleteToken.class);
         poster.with("delete_token",token.delete_token).to(url);
     }
 
     /**
-     * Forks this repository.
+     * Forks this repository as your repository.
+     *
+     * @return
+     *      Newly forked repository that belong to you.
      */
     public GHRepository fork() throws IOException {
-        return new Poster(root).withCredential().to(root.getApiURL("/repos/fork/" + owner + "/" + name), JsonRepository.class).wrap(root);
+        return new Poster(root,V3).withCredential().to("/repos/" + owner.login + "/" + name + "/forks", GHRepository.class, "POST").wrap(root);
     }
 
+    /**
+     * Forks this repository into an organization.
+     *
+     * @return
+     *      Newly forked repository that belong to you.
+     */
+    public GHRepository forkTo(GHOrganization org) throws IOException {
+        new Poster(root, V3).withCredential().to(String.format("/repos/%s/%s/forks?org=%s",owner.login,name,org.getLogin()));
+        return org.getRepository(name);
+    }
+
+    /**
+     * Rename this repository.
+     */
+    public void renameTo(String newName) throws IOException {
+        WebClient wc = root.createWebClient();
+        HtmlPage pg = (HtmlPage)wc.getPage(getUrl()+"/admin");
+        for (HtmlForm f : pg.getForms()) {
+            if (!f.getActionAttribute().endsWith("/rename"))  continue;
+            try {
+                f.getInputByName("name").setValueAttribute(newName);
+                f.submit((HtmlButton)f.getElementsByTagName("button").get(0));
+
+                // overwrite fields
+                final GHRepository r = getOwner().getRepository(newName);
+                for (Field fi : getClass().getDeclaredFields()) {
+                    if (Modifier.isStatic(fi.getModifiers()))   continue;
+                    fi.setAccessible(true);
+                    try {
+                        fi.set(this,fi.get(r));
+                    } catch (IllegalAccessException e) {
+                        throw (IllegalAccessError)new IllegalAccessError().initCause(e);
+                    }
+                }
+
+                return;
+            } catch (ElementNotFoundException e) {
+                // continue
+            }
+        }
+
+        throw new IllegalArgumentException("Either you don't have the privilege to rename "+owner.login+'/'+name+" or there's a bug in HTML scraping");
+    }
+
+    /**
+     * Retrieves a specified pull request.
+     */
+    public GHPullRequest getPullRequest(int i) throws IOException {
+        return root.retrieveWithAuth3("/repos/" + owner.login + '/' + name + "/pulls/" + i, GHPullRequest.class).wrapUp(this);
+    }
+
+    /**
+     * Retrieves all the pull requests of a particular state.
+     */
+    public List<GHPullRequest> getPullRequests(GHIssueState state) throws IOException {
+        GHPullRequest[] r = root.retrieveWithAuth3("/repos/" + owner.login + '/' + name + "/pulls?state=" + state.name().toLowerCase(Locale.ENGLISH), GHPullRequest[].class);
+        for (GHPullRequest p : r)
+            p.wrapUp(this);
+        return new ArrayList<GHPullRequest>(Arrays.asList(r));
+    }
+
+    /**
+     * Retrieves the currently configured hooks.
+     */
+    public List<GHHook> getHooks() throws IOException {
+        List<GHHook> list = new ArrayList<GHHook>(Arrays.asList(
+                root.retrieveWithAuth3(String.format("/repos/%s/%s/hooks",owner.login,name),GHHook[].class)));
+        for (GHHook h : list)
+            h.wrap(this);
+        return list;
+    }
+
+    public GHHook getHook(int id) throws IOException {
+        return root.retrieveWithAuth3(String.format("/repos/%s/%s/hooks/%d",owner.login,name,id),GHHook.class).wrap(this);
+    }
+
+    /**
+     * 
+     * See https://api.github.com/hooks for possible names and their configuration scheme.
+     * TODO: produce type-safe binding
+     * 
+     * @param name
+     *      Type of the hook to be created. See https://api.github.com/hooks for possible names.
+     * @param config
+     *      The configuration hash.
+     * @param events
+     *      Can be null. Types of events to hook into.
+     */
+    public GHHook createHook(String name, Map<String,String> config, Collection<GHEvent> events, boolean active) throws IOException {
+        List<String> ea = null;
+        if (events!=null) {
+            ea = new ArrayList<String>();
+            for (GHEvent e : events)
+                ea.add(e.name().toLowerCase(Locale.ENGLISH));
+        }
+
+        return new Poster(root,ApiVersion.V3)
+                .withCredential()
+                .with("name",name)
+                .with("active", active)
+                ._with("config", config)
+                ._with("events",ea)
+                .to(String.format("/repos/%s/%s/hooks",owner.login,this.name),GHHook.class).wrap(this);
+    }
+    
+    public GHHook createWebHook(URL url, Collection<GHEvent> events) throws IOException {
+        return createHook("web",Collections.singletonMap("url",url.toExternalForm()),events,true);
+    }
+
+    public GHHook createWebHook(URL url) throws IOException {
+        return createWebHook(url,null);
+    }
+
+// this is no different from getPullRequests(OPEN)
+//    /**
+//     * Retrieves all the pull requests.
+//     */
+//    public List<GHPullRequest> getPullRequests() throws IOException {
+//        return root.retrieveWithAuth("/pulls/"+owner+'/'+name,JsonPullRequests.class).wrap(root);
+//    }
+
     private void verifyMine() throws IOException {
-        if (!root.login.equals(owner))
+        if (!root.login.equals(owner.login))
-            throw new IOException("Operation not applicable to a repository owned by someone else: "+owner);
+            throw new IOException("Operation not applicable to a repository owned by someone else: "+owner.login);
+    }
+
+    /**
+     * Returns a set that represents the post-commit hook URLs.
+     * The returned set is live, and changes made to them are reflected to GitHub.
+     * 
+     * @deprecated 
+     *      Use {@link #getHooks()} and {@link #createHook(String, Map, Collection, boolean)}
+     */
+    public Set<URL> getPostCommitHooks() {
+        return postCommitHooks;
+    }
+
+    /**
+     * Live set view of the post-commit hook.
+     */
+    private final Set<URL> postCommitHooks = new AbstractSet<URL>() {
+        private List<URL> getPostCommitHooks() {
+            try {
+                List<URL> r = new ArrayList<URL>();
+                for (GHHook h : getHooks()) {
+                    if (h.getName().equals("web")) {
+                        r.add(new URL(h.getConfig().get("url")));
+                    }
+                }
+                return r;
+            } catch (IOException e) {
+                throw new GHException("Failed to retrieve post-commit hooks",e);
+            }
+        }
+
+        @Override
+        public Iterator<URL> iterator() {
+            return getPostCommitHooks().iterator();
+        }
+
+        @Override
+        public int size() {
+            return getPostCommitHooks().size();
+        }
+
+        @Override
+        public boolean add(URL url) {
+            try {
+                createWebHook(url);
+                return true;
+            } catch (IOException e) {
+                throw new GHException("Failed to update post-commit hooks",e);
+            }
+        }
+
+        @Override
+        public boolean remove(Object url) {
+            try {
+                String _url = ((URL)url).toExternalForm();
+                for (GHHook h : getHooks()) {
+                    if (h.getName().equals("web") && h.getConfig().get("url").equals(_url)) {
+                        h.delete();
+                        return true;
+                    }
+                }
+                return false;
+            } catch (IOException e) {
+                throw new GHException("Failed to update post-commit hooks",e);
+            }
+        }
+    };
+
+    /*package*/ GHRepository wrap(GitHub root) {
+        this.root = root;
+        return this;
     }
 
     @Override
     public String toString() {
-        return "Repository:"+owner+":"+name;
+        return "Repository:"+owner.login+":"+name;
+    }
+
+    @Override
+    public int hashCode() {
+        return toString().hashCode();
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (obj instanceof GHRepository) {
+            GHRepository that = (GHRepository) obj;
+            return this.owner.login.equals(that.owner.login)
+                && this.name.equals(that.name);
+        }
+        return false;
     }
 }

src/main/java/org/kohsuke/github/GHTeam.java

@@ -1,7 +1,7 @@
 package org.kohsuke.github;
 
 import java.io.IOException;
-import java.net.URL;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -31,32 +31,36 @@ public class GHTeam {
      * Retrieves the current members.
      */
     public Set<GHUser> getMembers() throws IOException {
-        return org.root.retrieveWithAuth(getApiURL("/members"),JsonUsersWithDetails.class).toSet(org.root);
+        return org.root.retrieveWithAuth(api("/members"),JsonUsersWithDetails.class).toSet(org.root);
+    }
+
+    public Map<String,GHRepository> getRepositories() throws IOException {
+        return org.root.retrieveWithAuth3(api("/repos"),JsonRepositories.class).wrap(org.root);
     }
 
     /**
      * Adds a member to the team.
      */
     public void add(GHUser u) throws IOException {
-        org.root.retrieveWithAuth(getApiURL("/members?name="+u.getLogin()),null, "POST");
+        org.root.retrieveWithAuth(api("/members?name="+u.getLogin()),null, "POST");
     }
 
     /**
      * Removes a member to the team.
      */
     public void remove(GHUser u) throws IOException {
-        org.root.retrieveWithAuth(getApiURL("/members?name="+u.getLogin()),null, "DELETE");
+        org.root.retrieveWithAuth(api("/members?name="+u.getLogin()),null, "DELETE");
     }
 
     public void add(GHRepository r) throws IOException {
-        org.root.retrieveWithAuth(getApiURL("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "POST");
+        org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "POST");
     }
 
     public void remove(GHRepository r) throws IOException {
-        org.root.retrieveWithAuth(getApiURL("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "DELETE");
+        org.root.retrieveWithAuth(api("/repositories?name="+r.getOwnerName()+'/'+r.getName()),null, "DELETE");
     }
 
-    private URL getApiURL(String tail) throws IOException {
+    private String api(String tail) {
-        return org.root.getApiURL("/organizations/"+org.getLogin()+"/teams/"+id+tail);
+        return "/teams/"+id+tail;
     }
 }

src/main/java/org/kohsuke/github/GHUser.java

@@ -23,7 +23,12 @@
  */
 package org.kohsuke.github;
 
+import com.infradna.tool.bridge_method_injector.BridgeMethodsAdded;
+import com.infradna.tool.bridge_method_injector.WithBridgeMethods;
+
 import java.io.IOException;
+import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -32,106 +37,51 @@ import java.util.Set;
  * @author Kohsuke Kawaguchi
  */
 public class GHUser extends GHPerson {
-    private String name,company,location,created_at,blog,email;
-    private int followers_count;
-
-    /**
-     * Gets the human-readable name of the user, like "Kohsuke Kawaguchi"
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Gets the company name of this user, like "Sun Microsystems, Inc."
-     */
-    public String getCompany() {
-        return company;
-    }
-
-    /**
-     * Gets the location of this user, like "Santa Clara, California"
-     */
-    public String getLocation() {
-        return location;
-    }
-
-    public String getCreatedAt() {
-        return created_at;
-    }
-
-    /**
-     * Gets the blog URL of this user.
-     */
-    public String getBlog() {
-        return blog;
-    }
-
-    /**
-     * Gets the login ID of this user, like 'kohsuke'
-     */
-    public String getLogin() {
-        return login;
-    }
-
-    /**
-     * Gets the e-mail address of the user.
-     */
-    public String getEmail() {
-        return email;
-    }
-
-    public int getPublicGistCount() {
-        return public_gist_count;
-    }
-
-    public int getPublicRepoCount() {
-        return public_repo_count;
-    }
-
-    public int getFollowingCount() {
-        return following_count;
-    }
-
-    /**
-     * What appears to be a GitHub internal unique number that identifies this user.
-     */
-    public int getId() {
-        return id;
-    }
-
-    public int getFollowersCount() {
-        return followers_count;
-    }
 
     /**
      * Follow this user.
      */
     public void follow() throws IOException {
-        new Poster(root).withCredential().to(root.getApiURL("/user/follow/"+login));
+        new Poster(root).withCredential().to("/user/follow/"+login);
     }
 
     /**
      * Unfollow this user.
      */
     public void unfollow() throws IOException {
-        new Poster(root).withCredential().to(root.getApiURL("/user/unfollow/"+login));
+        new Poster(root).withCredential().to("/user/unfollow/"+login);
     }
 
     /**
      * Lists the users that this user is following
      */
-    public Set<GHUser> getFollows() throws IOException {
+    @WithBridgeMethods(Set.class)
+    public GHPersonSet<GHUser> getFollows() throws IOException {
         return root.retrieve("/user/show/"+login+"/following",JsonUsers.class).toSet(root);
     }
 
     /**
      * Lists the users who are following this user.
      */
-    public Set<GHUser> getFollowers() throws IOException {
+    @WithBridgeMethods(Set.class)
+    public GHPersonSet<GHUser> getFollowers() throws IOException {
         return root.retrieve("/user/show/"+login+"/followers",JsonUsers.class).toSet(root);
     }
 
+    /**
+     * Gets the organization that this user belongs to publicly.
+     */
+    @WithBridgeMethods(Set.class)
+    public GHPersonSet<GHOrganization> getOrganizations() throws IOException {
+        GHPersonSet<GHOrganization> orgs = new GHPersonSet<GHOrganization>();
+        Set<String> names = new HashSet<String>();
+        for (GHOrganization o : root.retrieve3("/users/"+login+"/orgs",GHOrganization[].class)) {
+            if (names.add(o.getLogin()))    // I've seen some duplicates in the data
+                orgs.add(root.getOrganization(o.getLogin()));
+        }
+        return orgs;
+    }
+
     @Override
     public String toString() {
         return "User:"+login;

src/main/java/org/kohsuke/github/GitHub.java

@@ -23,29 +23,42 @@
  */
 package org.kohsuke.github;
 
-import com.gargoylesoftware.htmlunit.WebClient;
+import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.ANY;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import static org.kohsuke.github.ApiVersion.V2;
-import org.apache.commons.io.IOUtils;
+import static org.kohsuke.github.ApiVersion.V3;
-import org.codehaus.jackson.map.DeserializationConfig.Feature;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.introspect.VisibilityChecker.Std;
-import sun.misc.BASE64Encoder;
 
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.InterruptedIOException;
+import java.io.Reader;
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
+import java.util.TimeZone;
 
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.ANY;
+import org.apache.commons.io.IOUtils;
-import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
+import org.codehaus.jackson.map.DeserializationConfig.Feature;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.introspect.VisibilityChecker.Std;
+
+import sun.misc.BASE64Encoder;
+
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
 /**
  * Root of the GitHub API.
@@ -54,18 +67,46 @@ import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.NONE;
  */
 public class GitHub {
     /*package*/ final String login;
-    /*package*/ final String token;
+    /*package*/ final String encodedAuthorization;
     /*package*/ final String password;
+    /*package*/ final String apiToken;
 
     private final Map<String,GHUser> users = new HashMap<String, GHUser>();
     private final Map<String,GHOrganization> orgs = new HashMap<String, GHOrganization>();
+	/*package*/ String oauthAccessToken;
+	
+	private final String githubServer;
 
-    private GitHub(String login, String apiToken, String password) {
+	private GitHub(String login, String apiToken, String password) {
-        this.login = login;
+		this ("github.com", login, apiToken, password);
-        this.token = apiToken;
+	}
+	
+    private GitHub(String githubServer, String login, String apiToken, String password) {
+        this.githubServer = githubServer;
+		this.login = login;
+        this.apiToken = apiToken;
         this.password = password;
+
+        BASE64Encoder enc = new sun.misc.BASE64Encoder();
+        if (apiToken!=null || password!=null) {
+            String userpassword = password==null ? (login + "/token" + ":" + apiToken) : (login + ':'+password);
+            encodedAuthorization = enc.encode(userpassword.getBytes());
+        } else
+            encodedAuthorization = null;
     }
 
+    private GitHub (String githubServer, String oauthAccessToken) throws IOException {
+    	
+		this.githubServer = githubServer;
+		this.password = null;
+		this.encodedAuthorization = null;
+		
+		this.oauthAccessToken = oauthAccessToken;
+        this.apiToken = oauthAccessToken;
+		
+		this.login = getMyself().getLogin();
+    }
+    
     /**
      * Obtains the credential from "~/.github"
      */
@@ -85,6 +126,17 @@ public class GitHub {
         return new GitHub(login,apiToken,null);
     }
 
+    public static GitHub connect(String login, String apiToken, String password) throws IOException {
+        return new GitHub(login,apiToken,password);
+    }
+
+    public static GitHub connectUsingOAuth (String accessToken) throws IOException {
+    	return connectUsingOAuth("github.com", accessToken);
+    }
+    
+    public static GitHub connectUsingOAuth (String githubServer, String accessToken) throws IOException {
+    	return new GitHub(githubServer, accessToken);
+    }
     /**
      * Connects to GitHub anonymously.
      *
@@ -95,55 +147,135 @@ public class GitHub {
     }
 
     /*package*/ void requireCredential() {
-        if (login ==null || token ==null)
+        if ((login==null || encodedAuthorization==null) && oauthAccessToken == null)
             throw new IllegalStateException("This operation requires a credential but none is given to the GitHub constructor");
     }
 
-    /*package*/ URL getApiURL(String tail) throws IOException {
+    /*package*/ URL getApiURL(ApiVersion v, String tailApiUrl) throws IOException {
-        return new URL("http://github.com/api/v2/json"+tail);
+    	if (oauthAccessToken != null) {
+    		// append the access token
+    		tailApiUrl = tailApiUrl +  (tailApiUrl.indexOf('?')>=0 ?'&':'?') + "access_token=" + oauthAccessToken;
+    	}
+    	
+        return new URL(v.getApiVersionBaseUrl(githubServer)+tailApiUrl);
     }
 
-    /*package*/ <T> T retrieve(String tail, Class<T> type) throws IOException {
+    /*package*/ <T> T retrieve(String tailApiUrl, Class<T> type) throws IOException {
-        return MAPPER.readValue(getApiURL(tail),type);
+        return _retrieve(tailApiUrl, type, "GET", false, V2);
     }
 
-    /*package*/ <T> T retrieveWithAuth(URL url, Class<T> type) throws IOException {
+    /*package*/ <T> T retrieve3(String tailApiUrl, Class<T> type) throws IOException {
-        return retrieveWithAuth(url,type,"GET");
+        return _retrieve(tailApiUrl, type, "GET", false, V3);
     }
-    /*package*/ <T> T retrieveWithAuth(URL url, Class<T> type, String method) throws IOException {
-        HttpURLConnection uc = (HttpURLConnection) url.openConnection();
 
-        BASE64Encoder enc = new sun.misc.BASE64Encoder();
+    /*package*/ <T> T retrieveWithAuth(String tailApiUrl, Class<T> type) throws IOException {
-        String userpassword = login + "/token" + ":" + token;
+        return retrieveWithAuth(tailApiUrl,type,"GET");
-        String encodedAuthorization = enc.encode(userpassword.getBytes());
+    }
-        uc.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
+
-        uc.setRequestMethod(method);
+    /*package*/ <T> T retrieveWithAuth3(String tailApiUrl, Class<T> type) throws IOException {
-        
+        return _retrieve(tailApiUrl, type, "GET", true, V3);
-        try {
+    }
-            InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
+
-            if (type==null) {
+    /*package*/ <T> T retrieveWithAuth(String tailApiUrl, Class<T> type, String method) throws IOException {
-                String data = IOUtils.toString(r);
+        return _retrieve(tailApiUrl, type, method, true, V2);
-                return null;
+    }
+
+    /*package*/ <T> T retrieveWithAuth3(String tailApiUrl, Class<T> type, String method) throws IOException {
+        return _retrieve(tailApiUrl, type, method, true, V3);
+    }
+
+    private <T> T _retrieve(String tailApiUrl, Class<T> type, String method, boolean withAuth, ApiVersion v) throws IOException {
+        while (true) {// loop while API rate limit is hit
+        	
+            HttpURLConnection uc = (HttpURLConnection) getApiURL(v,tailApiUrl).openConnection();
+
+            if (withAuth && this.oauthAccessToken == null)
+                uc.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
+            
+            uc.setRequestMethod(method);
+            if (method.equals("PUT")) {
+                uc.setDoOutput(true);
+                uc.setRequestProperty("Content-Length","0");
+                uc.getOutputStream().close();
+            }
+
+            try {
+                InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
+                if (type==null) {
+                    String data = IOUtils.toString(r);
+                    return null;
+                }
+                return MAPPER.readValue(r,type);
+            } catch (IOException e) {
+                handleApiError(e,uc);
             }
-            return MAPPER.readValue(r,type);
-        } catch (IOException e) {
-            throw (IOException)new IOException(IOUtils.toString(uc.getErrorStream(),"UTF-8")).initCause(e);
         }
     }
 
     /**
-     * Obtains the object that represents the named user.
+     * If the error is because of the API limit, wait 10 sec and return normally.
+     * Otherwise throw an exception reporting an error.
      */
-    public GHUser getUser(String login) throws IOException {
+    /*package*/ void handleApiError(IOException e, HttpURLConnection uc) throws IOException {
-        GHUser u = users.get(login);
+        if ("0".equals(uc.getHeaderField("X-RateLimit-Remaining"))) {
-        if (u==null) {
+            // API limit reached. wait 10 secs and return normally
-            u = MAPPER.readValue(getApiURL("/user/show/"+login), JsonUser.class).user;
+            try {
-            u.root = this;
+                Thread.sleep(10000);
-            users.put(login,u);
+                return;
+            } catch (InterruptedException _) {
+                throw (InterruptedIOException)new InterruptedIOException().initCause(e);
+            }
         }
-        return u;
+        
+        if (e instanceof FileNotFoundException)
+            throw e;    // pass through 404 Not Found to allow the caller to handle it intelligently
+
+        InputStream es = uc.getErrorStream();
+        if (es!=null)
+            throw (IOException)new IOException(IOUtils.toString(es,"UTF-8")).initCause(e);
+        else
+            throw e;
     }
 
+    /**
+	 * Gets the {@link GHUser} that represents yourself.
+	 */
+	public GHUser getMyself() throws IOException {
+		requireCredential();
+
+		if (oauthAccessToken != null) {
+            GHUser u = retrieveWithAuth("/user/show", JsonUser.class).user;
+			
+			u.root = this;
+			users.put(u.getLogin(), u);
+			
+			return u;
+		} else {
+			return getUser(login);
+		}
+	}
+
+	/**
+	 * Obtains the object that represents the named user.
+	 */
+	public GHUser getUser(String login) throws IOException {
+		GHUser u = users.get(login);
+		if (u == null) {
+
+			if (oauthAccessToken != null) {
+				u = retrieve("/user/show/" + login, JsonUser.class).user;
+				u.root = this;
+				users.put(u.getLogin(), u);
+			} else {
+				u = retrieve("/user/show/" + login, JsonUser.class).user;
+				u.root = this;
+				users.put(login, u);
+			}
+
+		}
+		return u;
+	}
+
     /**
      * Interns the given {@link GHUser}.
      */
@@ -160,7 +292,7 @@ public class GitHub {
     public GHOrganization getOrganization(String name) throws IOException {
         GHOrganization o = orgs.get(name);
         if (o==null) {
-            o = MAPPER.readValue(getApiURL("/organizations/"+name), JsonOrganization.class).organization;
+            o = retrieve("/organizations/"+name,JsonOrganization.class).organization;
             o.root = this;
             orgs.put(name,o);
         }
@@ -168,13 +300,43 @@ public class GitHub {
     }
 
     /**
-     * Gets the {@link GHUser} that represents yourself.
+     * Gets the repository object from 'user/reponame' string that GitHub calls as "repository name"
+     *
+     * @see GHRepository#getName()
      */
-    public GHUser getMyself() throws IOException {
+    public GHRepository getRepository(String name) throws IOException {
-        requireCredential();
+        String[] tokens = name.split("/");
-        return getUser(login);
+        return getUser(tokens[0]).getRepository(tokens[1]);
     }
 
+    public Map<String, GHOrganization> getMyOrganizations() throws IOException {
+    	 return retrieveWithAuth("/organizations",JsonOrganizations.class).wrap(this);
+    }
+
+    /**
+     * Public events visible to you. Equivalent of what's displayed on https://github.com/
+     */
+    public List<GHEventInfo> getEvents() throws IOException {
+        // TODO: pagenation
+        GHEventInfo[] events = retrieve3("/events", GHEventInfo[].class);
+        for (GHEventInfo e : events)
+            e.wrapUp(this);
+        return Arrays.asList(events);
+    }
+
+    /**
+     * Parses the GitHub event object.
+     *
+     * This is primarily intended for receiving a POST HTTP call from a hook.
+     * Unfortunately, hook script payloads aren't self-descriptive, so you need
+     * to know the type of the payload you are expecting.
+     */
+    public <T extends GHEventPayload> T parseEventPayload(Reader r, Class<T> type) throws IOException {
+        T t = MAPPER.readValue(r, type);
+        t.wrapUp(this);
+        return t;
+    }
+    
     /**
      * Creates a new repository.
      *
@@ -182,9 +344,21 @@ public class GitHub {
      *      Newly created repository.
      */
     public GHRepository createRepository(String name, String description, String homepage, boolean isPublic) throws IOException {
-        return new Poster(this).withCredential()
+        return new Poster(this,V3).withCredential()
                 .with("name", name).with("description", description).with("homepage", homepage)
-                .with("public", isPublic ? 1 : 0).to(getApiURL("/repos/create"), JsonRepository.class).wrap(this);
+                .with("public", isPublic ? 1 : 0).to("/user/repos", GHRepository.class,"POST").wrap(this);
+    }
+
+    /**
+     * Ensures that the credential is valid.
+     */
+    public boolean isCredentialValid() throws IOException {
+        try {
+            retrieveWithAuth("/user/show",JsonUser.class);
+            return true;
+        } catch (IOException e) {
+            return false;
+        }
     }
 
     WebClient createWebClient() throws IOException {
@@ -199,9 +373,31 @@ public class GitHub {
         return wc;
     }
 
+    /*package*/ static URL parseURL(String s) {
+        try {
+            return s==null ? null : new URL(s);
+        } catch (MalformedURLException e) {
+            throw new IllegalStateException("Invalid URL: "+s);
+        }
+    }
+
+    /*package*/ static Date parseDate(String timestamp) {
+        for (String f : TIME_FORMATS) {
+            try {
+                SimpleDateFormat df = new SimpleDateFormat(f);
+                df.setTimeZone(TimeZone.getTimeZone("GMT"));
+                return df.parse(timestamp);
+            } catch (ParseException e) {
+                // try next
+            }
+        }
+        throw new IllegalStateException("Unable to parse the timestamp: "+timestamp);
+    }
 
     /*package*/ static final ObjectMapper MAPPER = new ObjectMapper();
 
+    private static final String[] TIME_FORMATS = {"yyyy/MM/dd HH:mm:ss ZZZZ","yyyy-MM-dd'T'HH:mm:ss'Z'"};
+
     static {
         MAPPER.setVisibilityChecker(new Std(NONE, NONE, NONE, NONE, ANY));
         MAPPER.getDeserializationConfig().set(Feature.FAIL_ON_UNKNOWN_PROPERTIES, false);

src/main/java/org/kohsuke/github/JsonIssue.java

@@ -1,7 +1,7 @@
 /*
  * The MIT License
  *
- * Copyright (c) 2010, Kohsuke Kawaguchi
+ * Copyright (c) 2011, Eric Maupin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -21,16 +21,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 package org.kohsuke.github;
 
 /**
- * @author Kohsuke Kawaguchi
+ * @author Eric Maupin
  */
-class JsonRepository {
+class JsonIssue {
-    public GHRepository repository;
+    GHIssue issue;
 
-    public GHRepository wrap(GitHub root) {
+    GHIssue wrap(GHRepository r) {
-        repository.root = root;
+        issue.owner = r;
-        return repository;
+        issue.root = r.root;
+        return issue;
     }
-}
+}

src/main/java/org/kohsuke/github/JsonIssueComments.java

@@ -0,0 +1,16 @@
+package org.kohsuke.github;
+
+import java.util.List;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+class JsonIssueComments {
+    List<GHIssueComment> comments;
+
+    List<GHIssueComment> wrap(GHIssue owner) {
+        for (GHIssueComment c : comments)
+            c.owner = owner;
+        return comments;
+    }
+}

src/main/java/org/kohsuke/github/JsonIssues.java

@@ -0,0 +1,38 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2011, Eric Maupin
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.util.List;
+
+class JsonIssues {
+    List<GHIssue> issues;
+
+    public List<GHIssue> wrap(GHRepository owner) {
+        for (GHIssue issue : issues) {
+            issue.owner = owner;
+            issue.root = owner.root;
+        }
+        return issues;
+    }
+}

src/main/java/org/kohsuke/github/JsonOrganizations.java

@@ -0,0 +1,44 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2010, Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package org.kohsuke.github;
+
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+/**
+ * 
+ */
+class JsonOrganizations {
+    public List<GHOrganization> organizations;
+
+    public Map<String,GHOrganization> wrap(GitHub root) {
+        Map<String,GHOrganization> map = new TreeMap<String, GHOrganization>();
+        for (GHOrganization o : organizations) {
+            o.root = root;
+            map.put(o.getLogin(),o);
+        }
+        return map;
+    }
+}

src/main/java/org/kohsuke/github/JsonRepositories.java

@@ -24,10 +24,21 @@
 package org.kohsuke.github;
 
 import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
 
 /**
  * @author Kohsuke Kawaguchi
  */
 class JsonRepositories {
     public List<GHRepository> repositories;
+
+    public Map<String,GHRepository> wrap(GitHub root) {
+        Map<String,GHRepository> map = new TreeMap<String, GHRepository>();
+        for (GHRepository r : repositories) {
+            r.root = root;
+            map.put(r.getName(),r);
+        }
+        return map;
+    }
 }

src/main/java/org/kohsuke/github/JsonTeam.java

@@ -0,0 +1,13 @@
+package org.kohsuke.github;
+
+/**
+ * @author Kohsuke Kawaguchi
+ */
+class JsonTeam {
+    public GHTeam team;
+
+    GHTeam wrap(GHOrganization org) {
+        team.org = org;
+        return team;
+    }
+}

src/main/java/org/kohsuke/github/JsonTeams.java

@@ -1,7 +1,9 @@
 package org.kohsuke.github;
 
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 /**
@@ -18,4 +20,13 @@ class JsonTeams {
         }
         return r;
     }
+
+    Set<GHTeam> toSet(GHOrganization org) {
+        Set<GHTeam> r = new HashSet<GHTeam>();
+        for (GHTeam t : teams) {
+            t.org = org;
+            r.add(t);
+        }
+        return r;
+    }
 }

src/main/java/org/kohsuke/github/JsonUsers.java

@@ -34,8 +34,8 @@ import java.util.Set;
 class JsonUsers {
     public List<String> users;
 
-    public Set<GHUser> toSet(GitHub root) throws IOException {
+    public GHPersonSet<GHUser> toSet(GitHub root) throws IOException {
-        Set<GHUser> r = new HashSet<GHUser>();
+        GHPersonSet<GHUser> r = new GHPersonSet<GHUser>();
         for (String u : users)
             r.add(root.getUser(u));
         return r;

src/main/java/org/kohsuke/github/Poster.java

@@ -24,19 +24,23 @@
 package org.kohsuke.github;
 
 import org.apache.commons.io.IOUtils;
+import org.codehaus.jackson.JsonNode;
+import org.codehaus.jackson.impl.WriterBasedGenerator;
+import org.codehaus.jackson.node.ObjectNode;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.io.Reader;
+import java.io.UnsupportedEncodingException;
 import java.net.HttpURLConnection;
-import java.net.URL;
 import java.net.URLEncoder;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 
-import static org.kohsuke.github.GitHub.MAPPER;
+import static org.kohsuke.github.GitHub.*;
 
 /**
  * Handles HTTP POST.
@@ -44,29 +48,61 @@ import static org.kohsuke.github.GitHub.MAPPER;
  */
 class Poster {
     private final GitHub root;
-    private final Map<String,String> args = new HashMap<String, String>();
+    private final List<Entry> args = new ArrayList<Entry>();
+    private boolean authenticate;
+
+    private final ApiVersion v;
+
+    private static class Entry {
+        String key;
+        Object value;
+
+        private Entry(String key, Object value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        public String toFormArg() throws UnsupportedEncodingException {
+            return URLEncoder.encode(key,"UTF-8")+'='+URLEncoder.encode(value.toString(),"UTF-8");
+        }
+    }
+
+    Poster(GitHub root, ApiVersion v) {
+        this.root = root;
+        this.v = v;
+    }
 
     Poster(GitHub root) {
-        this.root = root;
+        this(root,ApiVersion.V2);
     }
 
     public Poster withCredential() {
         root.requireCredential();
-        return with("login",root.login).with("token",root.token);
+        authenticate = true;
-    }
-
-    public Poster with(String key, int value) {
-        return with(key,String.valueOf(value));
-    }
-
-    public Poster with(String key, String value) {
-        if (value!=null)
-            this.args.put(key,value);
         return this;
     }
 
-    public void to(URL url) throws IOException {
+    public Poster with(String key, int value) {
-        to(url,null);
+        return _with(key, value);
+    }
+
+    public Poster with(String key, boolean value) {
+        return _with(key, value);
+    }
+
+    public Poster with(String key, String value) {
+        return _with(key, value);
+    }
+
+    public Poster _with(String key, Object value) {
+        if (value!=null) {
+            args.add(new Entry(key,value));
+        }
+        return this;
+    }
+
+    public void to(String tailApiUrl) throws IOException {
+        to(tailApiUrl,null);
     }
 
     /**
@@ -77,40 +113,60 @@ class Poster {
      * @return
      *      {@link Reader} that reads the response.
      */
-    public <T> T to(URL url, Class<T> type) throws IOException {
+    public <T> T to(String tailApiUrl, Class<T> type) throws IOException {
-        return to(url,type,"POST");
+        return to(tailApiUrl,type,"POST");
     }
 
-    public <T> T to(URL url, Class<T> type, String method) throws IOException {
+    public <T> T to(String tailApiUrl, Class<T> type, String method) throws IOException {
-        HttpURLConnection uc = (HttpURLConnection) url.openConnection();
+        while (true) {// loop while API rate limit is hit
+            HttpURLConnection uc = (HttpURLConnection) root.getApiURL(v,tailApiUrl).openConnection();
 
-        uc.setDoOutput(true);
+            uc.setDoOutput(true);
-        uc.setRequestProperty("Content-type","application/x-www-form-urlencoded");
+            uc.setRequestProperty("Content-type","application/x-www-form-urlencoded");
-        uc.setRequestMethod(method);
+            if (authenticate) {
-
+                if (v==ApiVersion.V3) {
-
+                    if (root.oauthAccessToken!=null) {
-        StringBuilder body = new StringBuilder();
+                        uc.setRequestProperty("Authorization", "token " + root.oauthAccessToken);
-        for (Entry<String, String> e : args.entrySet()) {
+                    } else {
-            if (body.length()>0)    body.append('&');
+                        if (root.password==null)
-            body.append(URLEncoder.encode(e.getKey(),"UTF-8"));
+                            throw new IllegalArgumentException("V3 API doesn't support API token");
-            body.append('=');
+                        uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
-            body.append(URLEncoder.encode(e.getValue(),"UTF-8"));
+                    }
-        }
+                } else {
-
+                    uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
-        OutputStreamWriter o = new OutputStreamWriter(uc.getOutputStream(), "UTF-8");
+                }
-        o.write(body.toString());
+            }
-        o.close();
+            uc.setRequestMethod(method);
-
+
-
+
-        try {
+            if (v==ApiVersion.V2) {
-            InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
+                StringBuilder body = new StringBuilder();
-            if (type==null) {
+                for (Entry e : args) {
-                String data = IOUtils.toString(r);
+                    if (body.length()>0)    body.append('&');
-                return null;
+                    body.append(e.toFormArg());
+                }
+
+                OutputStreamWriter o = new OutputStreamWriter(uc.getOutputStream(), "UTF-8");
+                o.write(body.toString());
+                o.close();
+            } else {
+                Map json = new HashMap();
+                for (Entry e : args) {
+                    json.put(e.key, e.value);
+                }
+                MAPPER.writeValue(uc.getOutputStream(),json);
+            }
+
+            try {
+                InputStreamReader r = new InputStreamReader(uc.getInputStream(), "UTF-8");
+                String data = IOUtils.toString(r);
+                if (type==null) {
+                    return null;
+                }
+                return MAPPER.readValue(data,type);
+            } catch (IOException e) {
+                root.handleApiError(e,uc);
             }
-            return MAPPER.readValue(r,type);
-        } catch (IOException e) {
-            throw (IOException)new IOException(IOUtils.toString(uc.getErrorStream(),"UTF-8")).initCause(e);
         }
     }
 }

src/site/site.xml

@@ -2,21 +2,19 @@
 <project name="GitHub API for Java">
   <bannerLeft>
     <name>GitHub API for Java</name>
-    <href>http://kohsuke.org/github-api</href>
+    <href>http://github-api.kohsuke.org/</href>
   </bannerLeft>
   <skin>
     <groupId>org.kohsuke</groupId>
     <artifactId>maven-skin</artifactId>
-    <version>1.1</version>
+    <version>1.2</version>
   </skin>
-  <!--<bannerRight>-->
+  
-    <!--<src>http://maven.apache.org/images/maven-small.gif</src>-->
-  <!--</bannerRight>-->
   <body>
     <menu name="Git Hub API for Java">
-      <item name="Introduction" href="index.html"/>
+      <item name="Introduction"                   href="/index.html"/>
-      <!--item name="User Guide" href="user-guide.html"/-->
+      <item name="Download"               href="http://mvnrepository.com/artifact/${project.groupId}/${project.artifactId}"/>
-      <item name="Download" href="http://maven.dyndns.org/2/org/kohsuke/github-api/"/>
+      <item name="Source code" href="https://github.com/kohsuke/${project.artifactId}"/>
     </menu>
 
     <menu name="References">

src/test/java/org/kohsuke/AppTest.java

@@ -1,25 +1,102 @@
 package org.kohsuke;
 
-import junit.framework.Test;
 import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import org.kohsuke.github.GHEvent;
+import org.kohsuke.github.GHEventInfo;
+import org.kohsuke.github.GHEventPayload;
+import org.kohsuke.github.GHHook;
+import org.kohsuke.github.GHIssueState;
 import org.kohsuke.github.GHOrganization;
+import org.kohsuke.github.GHOrganization.Permission;
 import org.kohsuke.github.GHRepository;
 import org.kohsuke.github.GHTeam;
 import org.kohsuke.github.GitHub;
 
 import java.io.IOException;
+import java.net.URL;
+import java.util.Set;
 
 /**
  * Unit test for simple App.
  */
 public class AppTest extends TestCase {
+    public void testCredentialValid() throws IOException {
+        assertTrue(GitHub.connect().isCredentialValid());
+        assertFalse(GitHub.connect("totally","bogus").isCredentialValid());
+    }
+
+    public void testFetchPullRequest() throws Exception {
+        GitHub gh = GitHub.connect();
+        GHRepository r = gh.getOrganization("jenkinsci").getRepository("jenkins");
+        r.getPullRequest(1);
+        r.getPullRequests(GHIssueState.OPEN);
+    }
+
+    public void tryOrgFork() throws Exception {
+        GitHub gh = GitHub.connect();
+        gh.getUser("kohsuke").getRepository("rubywm").forkTo(gh.getOrganization("jenkinsci"));
+    }
+
+    public void tryGetTeamsForRepo() throws Exception {
+        GitHub gh = GitHub.connect();
+        Set<GHTeam> o = gh.getOrganization("jenkinsci").getRepository("rubywm").getTeams();
+        System.out.println(o);
+    }
+
+    public void testMembership() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        Set<String> members = gitHub.getOrganization("jenkinsci").getRepository("violations-plugin").getCollaboratorNames();
+        System.out.println(members.contains("kohsuke"));
+    }
+    
+    public void testMemberOrgs() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        Set<GHOrganization> o = gitHub.getUser("kohsuke").getOrganizations();
+        System.out.println(o);
+    }
+
+    public void tryHook() throws Exception {
+        GitHub gitHub = GitHub.connect();
+        GHRepository r = gitHub.getMyself().getRepository("test2");
+        GHHook hook = r.createWebHook(new URL("http://www.google.com/"));
+        System.out.println(hook);
+
+        for (GHHook h : r.getHooks())
+            h.delete();
+    }
+
     public void testApp() throws IOException {
         GitHub gitHub = GitHub.connect();
-        GHOrganization labs = gitHub.getOrganization("HudsonLabs");
+        for (GHEventInfo ev : gitHub.getEvents()) {
-        GHTeam t = labs.getTeams().get("Core Developers");
+            System.out.println(ev);
+            if (ev.getType()==GHEvent.PULL_REQUEST) {
+                GHEventPayload.PullRequest pr = ev.getPayload(GHEventPayload.PullRequest.class);
+                System.out.println(pr.getNumber());
+                System.out.println(pr.getPullRequest());
+            }
+        }
 
-        t.add(labs.getRepository("xyz"));
+//        GHRepository r = gitHub.connect().getOrganization("jenkinsci").createRepository("kktest4", "Kohsuke's test", "http://kohsuke.org/", "Everyone", true);
+//        r.fork();
+
+//        tryDisablingIssueTrackers(gitHub);
+
+//        tryDisablingWiki(gitHub);
+
+//        GHPullRequest i = gitHub.getOrganization("jenkinsci").getRepository("sandbox").getPullRequest(1);
+//        for (GHIssueComment c : i.getComments())
+//            System.out.println(c);
+//        System.out.println(i);
+
+//        gitHub.getMyself().getRepository("perforce-plugin").setEmailServiceHook("kk@kohsuke.org");
+
+//        tryRenaming(gitHub);
+//        tryOrgFork(gitHub);
+
+//        testOrganization(gitHub);
+//        testPostCommitHook(gitHub);
+
+//        tryTeamCreation(gitHub);
 
 //        t.add(gitHub.getMyself());
 //        System.out.println(t.getMembers());
@@ -35,4 +112,67 @@ public class AppTest extends TestCase {
 //
 //        System.out.println(hub.getUser("kohsuke").getRepository("hudson").getCollaborators());
     }
+
+    private void tryDisablingIssueTrackers(GitHub gitHub) throws IOException {
+        for (GHRepository r : gitHub.getOrganization("jenkinsci").getRepositories().values()) {
+            if (r.hasIssues()) {
+                if (r.getOpenIssueCount()==0) {
+                    System.out.println("DISABLED  "+r.getName());
+                    r.enableIssueTracker(false);
+                } else {
+                    System.out.println("UNTOUCHED "+r.getName());
+                }
+            }
+        }
+    }
+
+    private void tryDisablingWiki(GitHub gitHub) throws IOException {
+        for (GHRepository r : gitHub.getOrganization("jenkinsci").getRepositories().values()) {
+            if (r.hasWiki()) {
+                System.out.println("DISABLED  "+r.getName());
+                r.enableWiki(false);
+            }
+        }
+    }
+
+    private void tryUpdatingIssueTracker(GitHub gitHub) throws IOException {
+        GHRepository r = gitHub.getOrganization("jenkinsci").getRepository("lib-task-reactor");
+        System.out.println(r.hasIssues());
+        System.out.println(r.getOpenIssueCount());
+        r.enableIssueTracker(false);
+    }
+
+    private void tryRenaming(GitHub gitHub) throws IOException {
+        gitHub.getUser("kohsuke").getRepository("test").renameTo("test2");
+    }
+
+    private void tryOrgFork(GitHub gitHub) throws IOException {
+        GHOrganization o = gitHub.getOrganization("HudsonLabs");
+        System.out.println(gitHub.getUser("rtyler").getRepository("memcache-ada").forkTo(o).getUrl());
+    }
+
+    private void tryTeamCreation(GitHub gitHub) throws IOException {
+        GHOrganization o = gitHub.getOrganization("HudsonLabs");
+        GHTeam t = o.createTeam("auto team", Permission.PUSH);
+        t.add(o.getRepository("auto-test"));
+    }
+
+    private void testPostCommitHook(GitHub gitHub) throws IOException {
+        GHRepository r = gitHub.getMyself().getRepository("foo");
+        Set<URL> hooks = r.getPostCommitHooks();
+        hooks.add(new URL("http://kohsuke.org/test"));
+        System.out.println(hooks);
+        hooks.remove(new URL("http://kohsuke.org/test"));
+        System.out.println(hooks);
+    }
+
+    public void testOrganization() throws IOException {
+        GitHub gitHub = GitHub.connect();
+        GHOrganization j = gitHub.getOrganization("jenkinsci");
+        GHTeam t = j.getTeams().get("Core Developers");
+
+        assertNotNull(j.getRepository("jenkins"));
+
+//        t.add(labs.getRepository("xyz"));
+    }
 }

src/test/java/org/kohsuke/HookApp.java

@@ -0,0 +1,32 @@
+package org.kohsuke;
+
+import org.kohsuke.github.GHEventPayload;
+import org.kohsuke.github.GitHub;
+import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.jetty.JettyRunner;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+/**
+ * App to test the hook script. You need some internet-facing server that can forward the request to you
+ * (typically via SSH reverse port forwarding.)
+ *
+ * @author Kohsuke Kawaguchi
+ */
+public class HookApp {
+    public static void main(String[] args) throws Exception {
+//        GitHub.connect().getMyself().getRepository("sandbox").createWebHook(
+//                new URL("http://173.203.118.45:18080/"), EnumSet.of(GHEvent.PULL_REQUEST));
+        JettyRunner jr = new JettyRunner(new HookApp());
+        jr.addHttpListener(8080);
+        jr.start();
+    }
+
+    public void doIndex(StaplerRequest req) throws IOException {
+        String str = req.getParameter("payload");
+        System.out.println(str);
+        GHEventPayload.PullRequest o = GitHub.connect().parseEventPayload(new StringReader(str),GHEventPayload.PullRequest.class);
+        System.out.println(o);
+    }
+}