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

Add JsonOrganizations to support getting a list of my organizations.

Because Github.login is needed we fetch it during the Github.connectUsingOAuth() method.

pom.xml

@@ -1,110 +1,30 @@
 <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.8</version>
+  <version>1.12</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>
 
+  <scm>
+    <connection>scm:git:git@github.com/kohsuke/${project.artifactId}.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/kohsuke/${project.artifactId}.git</developerConnection>
+    <url>http://${project.artifactId}.kohsuke.org/</url>
+  </scm>
+
   <distributionManagement>
-    <repository> 
-      <id>maven.jenkins-ci.org</id> 
-      <url>http://maven.jenkins-ci.org:8081/content/repositories/releases/</url> 
-    </repository> 
     <site>
-      <id>kohsuke.org</id>
-      <url>scp://kohsuke.org/home/kohsuke/kohsuke.org/github-api/</url>
+      <id>github-pages</id>
+      <url>gitsite:git@github.com/kohsuke/${project.artifactId}.git</url>
     </site>
   </distributionManagement>
 
-  <repositories>
-    <repository>
-      <id>m.g.o-public</id>
-      <url>http://maven.glassfish.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
-  </repositories>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>m.g.o-public</id>
-      <url>http://maven.glassfish.org/content/groups/public/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>1.5</source>
-          <target>1.5</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.0</version>
-        <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>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-ssh</artifactId>
-        <version>1.0-beta-7</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>

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

@@ -0,0 +1,17 @@
+package org.kohsuke.github;
+
+/**
+ * Different API versions.
+ *
+ * @author Kohsuke Kawaguchi
+ */
+enum ApiVersion {
+    V2("https://github.com/api/v2/json"),
+    V3("https://api.github.com");
+
+    final String url;
+
+    ApiVersion(String url) {
+        this.url = url;
+    }
+}

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

@@ -4,7 +4,6 @@ import com.gargoylesoftware.htmlunit.WebClient;
 import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
 import com.gargoylesoftware.htmlunit.html.HtmlForm;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import org.kohsuke.github.GHPullRequest.State;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -34,7 +33,7 @@ public class GHOrganization extends GHPerson {
         f.getSelectByName("team_id").getOptionByText(team).setSelected(true);
         f.submit(f.getButtonByCaption("Create Repository"));
 
-        return refreshRepository(name);
+        return getRepository(name);
 
 //        GHRepository r = new Poster(root).withCredential()
 //                .with("name", name).with("description", description).with("homepage", homepage)
@@ -88,7 +87,7 @@ public class GHOrganization extends GHPerson {
     public List<GHPullRequest> getPullRequests() throws IOException {
         List<GHPullRequest> all = new ArrayList<GHPullRequest>();
         for (GHRepository r : getRepositoriesWithOpenPullRequests()) {
-            all.addAll(r.getPullRequests(State.OPEN));
+            all.addAll(r.getPullRequests(GHIssueState.OPEN));
         }
         return all;
     }

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

@@ -17,43 +17,22 @@ public abstract class GHPerson {
 
     protected int public_gist_count,public_repo_count,following_count,id;
 
-    /**
-     * Repositories that this user owns.
-     */
-    private transient Map<String,GHRepository> repositories;
-
     /**
      * Gets the repositories this user owns.
      */
     public synchronized Map<String,GHRepository> getRepositories() throws IOException {
-        if (repositories==null) {
-            repositories = Collections.synchronizedMap(new TreeMap<String, GHRepository>());
-            for (int i=1; ; i++) {
-                Map<String, GHRepository> map = root.retrieve("/repos/show/" + login + "?page=" + i, JsonRepositories.class).wrap(root);
-                repositories.putAll(map);
-                if (map.isEmpty())  break;
-            }
+        Map<String,GHRepository> repositories = new TreeMap<String, GHRepository>();
+        for (int i=1; ; i++) {
+            Map<String, GHRepository> map = root.retrieve("/repos/show/" + login + "?page=" + i, JsonRepositories.class).wrap(root);
+            repositories.putAll(map);
+            if (map.isEmpty())  break;
         }
 
         return Collections.unmodifiableMap(repositories);
     }
 
-    /**
-     * Fetches the repository of the given name from GitHub, and return it.
-     */
-    protected GHRepository refreshRepository(String name) throws IOException {
-        if (repositories==null) getRepositories(); // fetch the base first
-        GHRepository r = fetchRepository(name);
-        repositories.put(name,r);
-        return r;
-    }
-
-    protected GHRepository fetchRepository(String name) throws IOException {
-        return root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root);
-    }
-
     public GHRepository getRepository(String name) throws IOException {
-        return getRepositories().get(name);
+        return root.retrieve("/repos/show/" + login + '/' + name, JsonRepository.class).wrap(root);
     }
 
     /**

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

@@ -33,26 +33,12 @@ import java.util.Locale;
  * @author Kohsuke Kawaguchi
  */
 @SuppressWarnings({"UnusedDeclaration"})
-public class GHPullRequest {
-    /*package almost final*/ GitHub root;
-
-    private String gravatar_id, closed_at, state, body, created_at, patch_url, issue_updated_at;
-    private int number, position, comments, votes;
+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, updated_at, html_url, title, diff_url;
-
-    public enum State {
-        OPEN, CLOSED
-    }
-
-    /**
-     * The description of this pull request.
-     */
-    public String getBody() {
-        return body;
-    }
+    private String mergeable, diff_url;
 
     /**
      * The URL of the patch file.
@@ -62,13 +48,6 @@ public class GHPullRequest {
         return GitHub.parseURL(patch_url);
     }
 
-    /**
-     * ID.
-     */
-    public int getNumber() {
-        return number;
-    }
-
     /**
      * User who submitted a pull request.
      */
@@ -76,13 +55,6 @@ public class GHPullRequest {
         return user;
     }
 
-    /**
-     * Repository to which the pull request was sent.
-     */
-    public GHRepository getRepository() {
-        return getBase().getRepository();
-    }
-
     /**
      * This points to where the change should be pulled into,
      * but I'm not really sure what exactly it means.
@@ -103,11 +75,7 @@ public class GHPullRequest {
      * like https://github.com/jenkinsci/jenkins/pull/100
      */
     public URL getUrl() {
-        return GitHub.parseURL(html_url);
-    }
-
-    public String getTitle() {
-        return title;
+        return super.getUrl();
     }
 
     /**
@@ -121,16 +89,4 @@ public class GHPullRequest {
     public Date getClosedAt() {
         return GitHub.parseDate(closed_at);
     }
-
-    public Date getCreatedAt() {
-        return GitHub.parseDate(created_at);
-    }
-
-    public Date getUpdatedAt() {
-        return GitHub.parseDate(updated_at);
-    }
-
-    public State getState() {
-        return State.valueOf(state.toUpperCase(Locale.ENGLISH));
-    }
 }

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

@@ -32,6 +32,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlInput;
 import com.gargoylesoftware.htmlunit.html.HtmlPage;
 
 import java.io.IOException;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.net.URL;
@@ -47,6 +48,7 @@ import java.util.Locale;
 import java.util.Set;
 
 import static java.util.Arrays.*;
+import static org.kohsuke.github.ApiVersion.V3;
 
 /**
  * A repository on GitHub.
@@ -59,7 +61,7 @@ public class GHRepository {
 
     private String description, homepage, url, name, owner;
     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() {
@@ -85,6 +87,10 @@ public class GHRepository {
         return root.getUser(owner);
     }
 
+    public List<GHIssue> getIssues(GHIssueState state) throws IOException {
+       return root.retrieve("/issues/list/" + owner + "/" + name + "/" + state.toString().toLowerCase(), JsonIssues.class).wrap(this);
+    }
+
     protected String getOwnerName() {
         return owner;
     }
@@ -117,6 +123,10 @@ public class GHRepository {
         return watchers;
     }
 
+    public int getOpenIssueCount() {
+        return open_issues;
+    }
+
     public Date getPushedAt() {
         return GitHub.parseDate(pushed_at);
     }
@@ -137,6 +147,23 @@ public class GHRepository {
         return Collections.unmodifiableSet(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+"/"+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+"/"+name+"/teams",JsonTeams.class).toSet(
+                root.getOrganization(owner)));
+    }
+
     public void addCollaborators(GHUser... users) throws IOException {
         addCollaborators(asList(users));
     }
@@ -172,6 +199,22 @@ public class GHRepository {
         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 + "/" + 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 + "/" + name);
+    }
+
     /**
      * Deletes this repository.
      */
@@ -200,22 +243,8 @@ public class GHRepository {
      *      Newly forked repository that belong to you.
      */
     public GHRepository forkTo(GHOrganization org) throws IOException {
-        WebClient wc = root.createWebClient();
-        HtmlPage pg = (HtmlPage)wc.getPage(getUrl());
-        for (HtmlForm f : pg.getForms()) {
-            if (!f.getActionAttribute().endsWith("/fork"))  continue;
-            try {
-                if (org.getLogin().equals(f.getInputByName("organization").getValueAttribute())) {
-                    // found it
-                    f.submit((HtmlButton)f.getElementsByTagName("button").get(0));
-                    return org.refreshRepository(name);
-                }
-            } catch (ElementNotFoundException e) {
-                // continue
-            }
-        }
-
-        throw new IllegalArgumentException("Either you don't have the privilege to fork into "+org.getLogin()+" or there's a bug in HTML scraping");
+        new Poster(root, V3).withCredential().to(String.format("/repos/%s/%s/forks?org=%s",owner,name,org.getLogin()));
+        return org.getRepository(name);
     }
 
     /**
@@ -231,7 +260,7 @@ public class GHRepository {
                 f.submit((HtmlButton)f.getElementsByTagName("button").get(0));
 
                 // overwrite fields
-                final GHRepository r = getOwner().fetchRepository(newName);
+                final GHRepository r = getOwner().getRepository(newName);
                 for (Field fi : getClass().getDeclaredFields()) {
                     if (Modifier.isStatic(fi.getModifiers()))   continue;
                     fi.setAccessible(true);
@@ -255,14 +284,14 @@ public class GHRepository {
      * Retrieves a specified pull request.
      */
     public GHPullRequest getPullRequest(int i) throws IOException {
-        return root.retrieveWithAuth("/pulls/" + owner + '/' + name + "/" + i, JsonPullRequest.class).wrap(root);
+        return root.retrieveWithAuth("/pulls/" + owner + '/' + name + "/" + i, JsonPullRequest.class).wrap(this);
     }
 
     /**
      * Retrieves all the pull requests of a particular state.
      */
-    public List<GHPullRequest> getPullRequests(GHPullRequest.State state) throws IOException {
-        return root.retrieveWithAuth("/pulls/"+owner+'/'+name+"/"+state.name().toLowerCase(Locale.ENGLISH),JsonPullRequests.class).wrap(root);
+    public List<GHPullRequest> getPullRequests(GHIssueState state) throws IOException {
+        return root.retrieveWithAuth("/pulls/"+owner+'/'+name+"/"+state.name().toLowerCase(Locale.ENGLISH),JsonPullRequests.class).wrap(this);
     }
 
 // this is no different from getPullRequests(OPEN)

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

@@ -42,10 +42,13 @@ import java.net.MalformedURLException;
 import java.net.URL;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 
 import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.*;
 
@@ -57,23 +60,37 @@ import static org.codehaus.jackson.annotate.JsonAutoDetect.Visibility.*;
 public class GitHub {
     /*package*/ final String login;
     /*package*/ final String encodedAuthorization;
-    final String password;
+    /*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>();
+	private String oauthAccessToken;
 
     private GitHub(String login, String apiToken, String password) {
         this.login = login;
+        this.apiToken = apiToken;
         this.password = password;
 
         BASE64Encoder enc = new sun.misc.BASE64Encoder();
         if (apiToken!=null || password!=null) {
-            String userpassword = apiToken!=null ? (login + "/token" + ":" + apiToken) : (login + ':'+password);
+            String userpassword = password==null ? (login + "/token" + ":" + apiToken) : (login + ':'+password);
             encodedAuthorization = enc.encode(userpassword.getBytes());
         } else
             encodedAuthorization = null;
     }
 
+    private GitHub (String oauthAccessToken) throws IOException {
+    	
+		this.password = null;
+		this.encodedAuthorization = null;
+		
+		this.oauthAccessToken = oauthAccessToken;
+        this.apiToken = oauthAccessToken;
+		
+		this.login = getMyself().getLogin();
+    }
+    
     /**
      * Obtains the credential from "~/.github"
      */
@@ -97,6 +114,9 @@ public class GitHub {
         return new GitHub(login,apiToken,password);
     }
 
+    public static GitHub connectUsingOAuth (String accessToken) throws IOException {
+    	return new GitHub(accessToken);
+    }
     /**
      * Connects to GitHub anonymously.
      *
@@ -107,12 +127,17 @@ public class GitHub {
     }
 
     /*package*/ void requireCredential() {
-        if (login==null || encodedAuthorization==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 tailApiUrl) throws IOException {
-        return new URL("http://github.com/api/v2/json"+tailApiUrl);
+    /*package*/ URL getApiURL(ApiVersion v, String tailApiUrl) throws IOException {
+    	if (oauthAccessToken != null) {
+    		// append the access token
+    		tailApiUrl = tailApiUrl + "?access_token=" + oauthAccessToken;
+    	}
+    	
+        return new URL(v.url+tailApiUrl);
     }
 
     /*package*/ <T> T retrieve(String tailApiUrl, Class<T> type) throws IOException {
@@ -129,10 +154,13 @@ public class GitHub {
 
     private <T> T _retrieve(String tailApiUrl, Class<T> type, String method, boolean withAuth) throws IOException {
         while (true) {// loop while API rate limit is hit
-            HttpURLConnection uc = (HttpURLConnection) getApiURL(tailApiUrl).openConnection();
+        	
+        	
+            HttpURLConnection uc = (HttpURLConnection) getApiURL(ApiVersion.V2,tailApiUrl).openConnection();
 
-            if (withAuth)
+            if (withAuth && this.oauthAccessToken == null)
                 uc.setRequestProperty("Authorization", "Basic " + encodedAuthorization);
+            
             uc.setRequestMethod(method);
 
             try {
@@ -172,9 +200,18 @@ public class GitHub {
     public GHUser getUser(String login) throws IOException {
         GHUser u = users.get(login);
         if (u==null) {
+        	
+        	if (oauthAccessToken != null) {
+        		u = retrieve("/user/show",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;
     }
@@ -202,6 +239,10 @@ public class GitHub {
         return o;
     }
 
+    public Map<String, GHOrganization> getMyOrganizations() throws IOException {
+    	 return retrieveWithAuth("/organizations",JsonOrganizations.class).wrap(this);
+        
+    }
     /**
      * Gets the {@link GHUser} that represents yourself.
      */

src/main/java/org/kohsuke/github/JsonIssue.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;
+
+/**
+ * @author Eric Maupin
+ */
+class JsonIssue {
+    GHIssue issue;
+
+    GHIssue wrap(GHRepository r) {
+        issue.owner = r;
+        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/JsonPullRequest.java

@@ -29,8 +29,9 @@ package org.kohsuke.github;
 class JsonPullRequest {
     public GHPullRequest pull;
 
-    public GHPullRequest wrap(GitHub root) {
-        pull.root = root;
+    public GHPullRequest wrap(GHRepository owner) {
+        pull.owner = owner;
+        pull.root = owner.root;
         return pull;
     }
 }

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

@@ -31,9 +31,11 @@ import java.util.List;
 class JsonPullRequests {
     public List<GHPullRequest> pulls;
 
-    public List<GHPullRequest> wrap(GitHub root) {
-        for (GHPullRequest pull : pulls)
-            pull.root = root;
+    public List<GHPullRequest> wrap(GHRepository owner) {
+        for (GHPullRequest pull : pulls) {
+            pull.owner = owner;
+            pull.root = owner.root;
+        }
         return pulls;
     }
 }

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

@@ -3,7 +3,7 @@ package org.kohsuke.github;
 /**
  * @author Kohsuke Kawaguchi
  */
-public class JsonTeam {
+class JsonTeam {
     public GHTeam team;
 
     GHTeam wrap(GHOrganization org) {

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/Poster.java

@@ -46,8 +46,15 @@ class Poster {
     private final List<String> args = new ArrayList<String>();
     private boolean authenticate;
 
-    Poster(GitHub root) {
+    private final ApiVersion v;
+
+    Poster(GitHub root, ApiVersion v) {
         this.root = root;
+        this.v = v;
+    }
+
+    Poster(GitHub root) {
+        this(root,ApiVersion.V2);
     }
 
     public Poster withCredential() {
@@ -89,12 +96,19 @@ class Poster {
 
     public <T> T to(String tailApiUrl, Class<T> type, String method) throws IOException {
         while (true) {// loop while API rate limit is hit
-            HttpURLConnection uc = (HttpURLConnection) root.getApiURL(tailApiUrl).openConnection();
+            HttpURLConnection uc = (HttpURLConnection) root.getApiURL(v,tailApiUrl).openConnection();
 
             uc.setDoOutput(true);
             uc.setRequestProperty("Content-type","application/x-www-form-urlencoded");
-            if (authenticate)
-                uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
+            if (authenticate) {
+                if (v==ApiVersion.V3) {
+                    if (root.password==null)
+                        throw new IllegalArgumentException("V3 API doesn't support API token");
+                    uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
+                } else {
+                    uc.setRequestProperty("Authorization", "Basic " + root.encodedAuthorization);
+                }
+            }
             uc.setRequestMethod(method);
 
 

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="User Guide" href="user-guide.html"/-->
-      <item name="Download" href="http://maven.dyndns.org/2/org/kohsuke/github-api/"/>
+      <item name="Introduction"                   href="/index.html"/>
+      <item name="Download"               href="http://mvnrepository.com/artifact/${project.groupId}/${project.artifactId}"/>
+      <item name="Source code" href="https://github.com/kohsuke/${project.artifactId}"/>
     </menu>
 
     <menu name="References">

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

@@ -4,19 +4,14 @@ import junit.framework.TestCase;
 import org.kohsuke.github.GHOrganization;
 import org.kohsuke.github.GHOrganization.Permission;
 import org.kohsuke.github.GHPullRequest;
-import org.kohsuke.github.GHPullRequest.State;
 import org.kohsuke.github.GHRepository;
 import org.kohsuke.github.GHTeam;
+import org.kohsuke.github.GHUser;
 import org.kohsuke.github.GitHub;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Unit test for simple App.
@@ -27,9 +22,35 @@ public class AppTest extends TestCase {
         assertFalse(GitHub.connect("totally","bogus").isCredentialValid());
     }
 
+    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 testApp() throws IOException {
         GitHub gitHub = GitHub.connect();
 
+//        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);
@@ -55,6 +76,35 @@ 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");
     }