Add tags filtering option

Author: glibas

README.md

@@ -35,6 +35,8 @@ usage: assertthat-bdd-standalone-1.6.jar
  -o,--outputFolder <FOLDER PATH>           Features output folder
  -p,--proxyPassword <PASSWORD>             Proxy password
  -q,--jql <JQL>                            JQL filter for features
+ -b,--tags <tags expression                Tags expression for scenarios
+ filtering
  -r,--report                               Upload report
  -s,--secretKey <ASSERTTHAT_SECRET_KEY>    Secret key
  -k,--type <cucumber|karate>               Report type

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.assertthat.plugins</groupId>
     <artifactId>assertthat-bdd-standalone</artifactId>
-    <version>1.7-SNAPSHOT</version>
+    <version>1.7</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

@@ -109,6 +109,12 @@ public static void main(String[] args) throws IOException, JSONException {
         jqlOption.setArgName("JQL");
         options.addOption(jqlOption);
 
+        Option tagsOption = new Option("b", "tags", true, "Tags filter for " +
+                "scenarios");
+        tagsOption.setRequired(false);
+        tagsOption.setArgName("tags");
+        options.addOption(tagsOption);
+
         Option typeOption = new Option("k", "type", true, "Report type");
         typeOption.setRequired(false);
         typeOption.setArgName("cucumber|karate");
@@ -161,14 +167,18 @@ public static void main(String[] args) throws IOException, JSONException {
                 cmd.getOptionValue("proxyPassword"),
                 cmd.getOptionValue("mode"),
                 cmd.getOptionValue("jql"),
+                cmd.getOptionValue("tags"),
                 cmd.getOptionValue("type"),
                 cmd.getOptionValue("jiraServerUrl")
         );
 
         APIUtil apiUtil = new APIUtil(arguments.getProjectId(), arguments.getAccessKey(), arguments.getSecretKey(), arguments.getProxyURI(), arguments.getProxyUsername(), arguments.getProxyPassword(), arguments.getJiraServerUrl());
 
         if (cmd.hasOption("features")) {
-            File inZip = apiUtil.download(new File(arguments.getOutputFolder()), arguments.getMode(), arguments.getJql());
+            File inZip =
+                    apiUtil.download(new File(arguments.getOutputFolder()),
+                            arguments.getMode(), arguments.getJql() ,
+                            arguments.getTags());
             File zip = new FileUtil().unpackArchive(inZip, new File(arguments.getOutputFolder()));
             zip.delete();
         }

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

@@ -92,7 +92,8 @@ public static void copyInputStream(InputStream in, OutputStream out) throws IOEx
         out.close();
     }
 
-    public File download(File targetDir, String mode, String jql) throws IOException {
+    public File download(File targetDir, String mode, String jql,
+                         String tags) throws IOException {
         if (targetDir.exists()) {
             for (File f : targetDir.listFiles()) {
                 if (f.getName().endsWith(".feature")) {
@@ -109,6 +110,9 @@ public File download(File targetDir, String mode, String jql) throws IOException
         if (mode != null) {
             queryParams.add("mode", mode.trim());
         }
+        if (tags != null) {
+            queryParams.add("tags", tags.trim());
+        }
         if (jql != null) {
             queryParams.add("jql", jql.trim());
         }

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

@@ -41,6 +41,7 @@ public class Arguments {
     private String jql;
     private String jiraServerUrl;
     private String type = "cucumber";
+    private String tags;
 
     public Arguments(String accessKey,
                      String secretKey,
@@ -54,6 +55,7 @@ public Arguments(String accessKey,
                      String proxyPassword,
                      String mode,
                      String jql,
+                     String tags,
                      String type,
                      String jiraServerUrl) {
         this.accessKey = System.getenv("ASSERTTHAT_ACCESS_KEY");
@@ -82,6 +84,9 @@ public Arguments(String accessKey,
         if (type != null) {
             this.type = type;
         }
+        if (tags != null) {
+            this.tags = tags;
+        }
 
         if (jsonReportFolder != null && !jsonReportFolder.trim().isEmpty()) {
             this.jsonReportFolder = jsonReportFolder;
@@ -203,4 +208,11 @@ public void setProxyPassword(String proxyPassword) {
         this.proxyPassword = proxyPassword;
     }
 
+    public String getTags() {
+        return this.tags;
+    }
+
+    public void setTags(String tags) {
+        this.tags = tags;
+    }
 }