Add numbered option

Author: glibas

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.assertthat.plugins</groupId>
     <artifactId>assertthat-bdd-standalone</artifactId>
-    <version>1.9</version>
+    <version>1.9.1</version>
     <name>assertthat-bdd-standalone</name>
     <description>AssertThat BDD Jira plugin client standalone</description>
     <url>http://www.assertthat.com</url>

src/main/java/com/assertthat/plugins/api/Main.java

@@ -123,6 +123,10 @@ public static void main(String[] args) throws IOException, JSONException {
         Option featuresOption = new Option("f", "features", false, "Download features");
         featuresOption.setRequired(false);
 
+        Option numberedOption = new Option("d", "numbered", false, "Prepend ordinal to feature name");
+        numberedOption.setRequired(false);
+        options.addOption(numberedOption);
+
         Option reportOption = new Option("r", "report", false, "Upload report");
         reportOption.setRequired(false);
 
@@ -169,7 +173,8 @@ public static void main(String[] args) throws IOException, JSONException {
                 cmd.getOptionValue("jql"),
                 cmd.getOptionValue("tags"),
                 cmd.getOptionValue("type"),
-                cmd.getOptionValue("jiraServerUrl")
+                cmd.getOptionValue("jiraServerUrl"),
+                cmd.hasOption("numbered")
         );
 
         APIUtil apiUtil = new APIUtil(arguments.getProjectId(), arguments.getAccessKey(), arguments.getSecretKey(), arguments.getProxyURI(), arguments.getProxyUsername(), arguments.getProxyPassword(), arguments.getJiraServerUrl());
@@ -178,7 +183,7 @@ public static void main(String[] args) throws IOException, JSONException {
             File inZip =
                     apiUtil.download(new File(arguments.getOutputFolder()),
                             arguments.getMode(), arguments.getJql() ,
-                            arguments.getTags());
+                            arguments.getTags(), arguments.isNumbered());
             File zip = new FileUtil().unpackArchive(inZip, new File(arguments.getOutputFolder()));
             zip.delete();
         }

src/main/java/com/assertthat/plugins/internal/APIUtil.java

@@ -96,7 +96,7 @@ public static void copyInputStream(InputStream in, OutputStream out) throws IOEx
     }
 
     public File download(File targetDir, String mode, String jql,
-                         String tags) throws IOException {
+                         String tags, boolean isNumbered) throws IOException {
         if (targetDir.exists()) {
             for (File f : targetDir.listFiles()) {
                 if (f.getName().endsWith(".feature")) {
@@ -119,6 +119,7 @@ public File download(File targetDir, String mode, String jql,
         if (jql != null) {
             queryParams.add("jql", jql.trim());
         }
+        queryParams.add("numbered", isNumbered);
         client.addFilter(new ClientFilter() {
             @Override
             public ClientResponse handle(ClientRequest

src/main/java/com/assertthat/plugins/internal/Arguments.java

@@ -43,6 +43,7 @@ public class Arguments {
     private String jiraServerUrl;
     private String type = "cucumber";
     private String tags;
+    private boolean numbered;
 
     public Arguments(String accessKey,
                      String secretKey,
@@ -58,7 +59,8 @@ public Arguments(String accessKey,
                      String jql,
                      String tags,
                      String type,
-                     String jiraServerUrl) {
+                     String jiraServerUrl,
+                     boolean numbered) {
         this.accessKey = System.getenv("ASSERTTHAT_ACCESS_KEY");
         this.secretKey = System.getenv("ASSERTTHAT_SECRET_KEY");
         if (accessKey != null && !accessKey.trim().isEmpty()) {
@@ -76,6 +78,7 @@ public Arguments(String accessKey,
         this.proxyPassword = proxyPassword;
         this.proxyUsername = proxyUsername;
         this.jiraServerUrl = jiraServerUrl;
+        this.numbered = numbered;
 
         if (runName != null) {
             this.runName = runName;
@@ -112,8 +115,9 @@ public Arguments(String accessKey,
                      String tags,
                      String type,
                      String jiraServerUrl,
-                     String metadata) {
-        this(accessKey,secretKey ,projectId,runName,outputFolder,jsonReportFolder,jsonReportIncludePattern,proxyURI,proxyUsername,proxyPassword,mode,jql,tags,type,jiraServerUrl);
+                     String metadata,
+                     boolean numbered) {
+        this(accessKey,secretKey ,projectId,runName,outputFolder,jsonReportFolder,jsonReportIncludePattern,proxyURI,proxyUsername,proxyPassword,mode,jql,tags,type,jiraServerUrl, numbered);
         this.metadata = metadata;
 
 
@@ -245,4 +249,8 @@ public String getTags() {
     public void setTags(String tags) {
         this.tags = tags;
     }
+
+    public boolean isNumbered() {
+        return numbered;
+    }
 }