Draft tickets list command

diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
index 212e729285cdc56b6ca07b4d206a945ea96e3879..4495e518c78ee6c08473218db1fe36cbc328547d 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
@@ -25,7 +25,6 @@ import org.parboiled.common.StringUtils;
 
 import com.gitblit.manager.IGitblit;
 import com.gitblit.models.ProjectModel;
-import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.transport.ssh.commands.CommandMetaData;
 import com.gitblit.transport.ssh.commands.DispatchCommand;

diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/TicketsDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/TicketsDispatcher.java
index f921798a9fa0709830ac64046a9cc55a43535ddf..de8d3baf22a59db1f5a557b5e44acfe924d5c8ab 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/TicketsDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/TicketsDispatcher.java
@@ -15,9 +15,26 @@
  */
 package com.gitblit.transport.ssh.gitblit;
 
+import java.text.SimpleDateFormat;
+import java.util.List;
+
+import org.kohsuke.args4j.Argument;
+import org.kohsuke.args4j.Option;
+import org.parboiled.common.StringUtils;
+
+import com.gitblit.manager.IGitblit;
+import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.TicketModel.Status;
 import com.gitblit.models.UserModel;
+import com.gitblit.tickets.ITicketService;
+import com.gitblit.tickets.QueryBuilder;
+import com.gitblit.tickets.QueryResult;
+import com.gitblit.tickets.TicketIndexer.Lucene;
 import com.gitblit.transport.ssh.commands.CommandMetaData;
 import com.gitblit.transport.ssh.commands.DispatchCommand;
+import com.gitblit.transport.ssh.commands.SshCommand;
+import com.gitblit.utils.FlipTable;
+import com.gitblit.utils.FlipTable.Borders;
 
 @CommandMetaData(name = "tickets", description = "Ticket commands", hidden = true)
 public class TicketsDispatcher extends DispatchCommand {
@@ -25,5 +42,110 @@ public class TicketsDispatcher extends DispatchCommand {
        @Override
        protected void setup(UserModel user) {
                register(user, ReviewCommand.class);
+               register(user, ListTickets.class);
+       }
+       
+       /* List tickets */
+       @CommandMetaData(name = "list", aliases= { "ls" }, description = "List tickets")
+       public static class ListTickets extends SshCommand {
+
+               @Option(name = "--verbose", aliases = { "-v" }, usage = "verbose")
+               private boolean verbose;
+
+               @Option(name = "--tabbed", aliases = { "-t" }, usage = "as tabbed output")
+               private boolean tabbed;
+
+               @Argument(index = 0, metaVar = "REPOSITORY", usage = "repository")
+               protected String repository;
+
+               @Override
+               public void run() throws UnloggedFailure {
+                       IGitblit gitblit = getContext().getGitblit();
+                       ITicketService tickets = gitblit.getTicketService();
+
+                       QueryBuilder sb = new QueryBuilder();
+                       sb.and(Lucene.status.matches(Status.New.toString())).or(Lucene.status.matches(Status.Open.toString()));
+
+                       QueryBuilder qb;
+                       if (StringUtils.isEmpty(repository)) {
+                               qb = sb;
+                       } else {
+                               qb = new QueryBuilder();
+                               RepositoryModel r = gitblit.getRepositoryModel(repository);
+                               if (r == null) {
+                                       throw new UnloggedFailure(1,  String.format("%s not found!", repository));
+                               }
+                               qb.and(Lucene.rid.matches(r.getRID()));
+                               qb.and(sb.toSubquery().toString());
+                       }
+                       
+                       String query = qb.build();
+                       List<QueryResult> list = tickets.queryFor(query, 0, 0, null, true);
+
+                       if (tabbed) {
+                               asTabbed(list);
+                       } else {
+                               asTable(list);
+                       }
+               }
+
+               protected void asTable(List<QueryResult> list) {
+                       boolean forRepo = !StringUtils.isEmpty(repository);
+                       String[] headers;
+                       if (verbose) {
+                               if (forRepo) {
+                                       String[] h = { "ID", "Title", "Status", "Last Modified" };
+                                       headers = h;
+                               } else {
+                                       String[] h = { "Repository", "ID", "Title", "Status", "Last Modified" };
+                                       headers = h;
+                               }
+                       } else {
+                               if (forRepo) {
+                                       String[] h = { "ID", "Title", "Status", "Last Modifed" };
+                                       headers = h;
+                               } else {
+                                       String[] h = { "Repository", "ID", "Title", "Status", "Last Modified" };
+                                       headers = h;
+                               }
+                       }
+
+                       SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+                       String[][] data = new String[list.size()][];
+                       for (int i = 0; i < list.size(); i++) {
+                               QueryResult q = list.get(i);
+
+                               if (verbose) {
+                                       if (forRepo) {
+                                               data[i] = new String[] { "" + q.number, q.title, q.status.toString(), df.format(q.getDate()) };
+                                       } else {
+                                               data[i] = new String[] { q.repository, "" + q.number, q.title, q.status.toString(), df.format(q.getDate()) };
+                                       }
+                               } else {
+                                       if (forRepo) {
+                                               data[i] = new String[] { "" + q.number, q.title, q.status.toString(), df.format(q.getDate()) };
+                                       } else {
+                                               data[i] = new String[] { q.repository, "" + q.number, q.title, q.status.toString(), df.format(q.getDate()) };
+                                       }
+                               }
+                       }
+                       stdout.println(FlipTable.of(headers, data, Borders.BODY_HCOLS));
+               }
+
+               protected void asTabbed(List<QueryResult> list) {
+                       String pattern;
+                       if (verbose) {
+                               pattern = "%s\t%s\t%s";
+                       } else {
+                               pattern = "%s";
+                       }
+
+                       SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+                       for (QueryResult q : list) {
+                               stdout.println(String.format(pattern,
+                                               q.repository, q.number, q.title, q.status.toString(),
+                                               df.format(q.getDate())));
+                       }
+               }
        }
 }

diff --git a/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java b/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
index ebe0a0a231796dc22597f8a4389bfb56128c1a02..a078138a7bc54c4073bc41834d2579b3e7c3222e 100644 (file)
--- a/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
+++ b/src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
@@ -24,7 +24,6 @@ import org.parboiled.common.StringUtils;
 
 import com.gitblit.manager.IGitblit;
 import com.gitblit.models.RegistrantAccessPermission;
-import com.gitblit.models.RepositoryModel;
 import com.gitblit.models.TeamModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.transport.ssh.commands.CommandMetaData;