James Moger
2014-03-22 eb55cdc3109577ac0fc299c8561dd8a03d6947b6
Draft tickets list command
3 files modified
124 ■■■■■ changed files
src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java 1 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/transport/ssh/gitblit/TicketsDispatcher.java 122 ●●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java 1 ●●●● patch | view | raw | blame | history
src/main/java/com/gitblit/transport/ssh/gitblit/ProjectsDispatcher.java
@@ -25,7 +25,6 @@
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;
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 @@
    @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())));
            }
        }
    }
}
src/main/java/com/gitblit/transport/ssh/gitblit/UsersDispatcher.java
@@ -24,7 +24,6 @@
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;