Add cleanupFeatures option

Author: glibas

README.md

@@ -30,6 +30,8 @@ usage: assertthat-bdd-standalone-1.9.6.jar
  -h,--help                             Display help
  -ignoreCertErrors <arg>               Ignore ssl certificate eerors
                                        (default is false)
+ -cleanupFeatures <arg>                Delete features in outputFolder before download
+                                       (default is true)                                       
  -jiraServerUrl <arg>                  Jira server URL
  -jql <JQL>                            JQL filter for features and Jira
                                        ticket to be updated with report

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

@@ -71,8 +71,8 @@ public APIUtil(String projectId, String accessKey, String secretKey, String prox
     }
 
     public File download(File targetDir, String mode, String jql,
-                         String tags, boolean isNumbered) throws IOException {
-        if (targetDir.exists()) {
+                         String tags, boolean isNumbered, boolean cleanupFeatures) throws IOException {
+        if (cleanupFeatures && targetDir.exists()) {
             for (File f : targetDir.listFiles()) {
                 if (f.getName().endsWith(".feature")) {
                     f.delete();

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

@@ -46,6 +46,8 @@ public class Arguments {
     private boolean numbered;
     private boolean ignoreCertErrors;
 
+    private boolean cleanupFeatures = true;
+
     Arguments(String accessKey,
               String secretKey,
               String projectId,
@@ -63,7 +65,8 @@ public class Arguments {
               String jiraServerUrl,
               String metadata,
               boolean numbered,
-              boolean ignoreCertErrors) {
+              boolean ignoreCertErrors,
+              boolean cleanupFeatures) {
         this.accessKey = System.getenv("ASSERTTHAT_ACCESS_KEY");
         this.secretKey = System.getenv("ASSERTTHAT_SECRET_KEY");
         if (accessKey != null && !accessKey.trim().isEmpty()) {
@@ -108,6 +111,7 @@ public class Arguments {
         this.mode = mode;
         this.jql = jql;
         this.ignoreCertErrors = ignoreCertErrors;
+        this.cleanupFeatures = cleanupFeatures;
     }
 
     public boolean isIgnoreCertErrors() {
@@ -253,4 +257,12 @@ public boolean isNumbered() {
     public void setNumbered(boolean numbered) {
         this.numbered = numbered;
     }
+
+    public boolean isCleanupFeatures() {
+        return cleanupFeatures;
+    }
+
+    public void setCleanupFeatures(boolean cleanupFeatures) {
+        this.cleanupFeatures = cleanupFeatures;
+    }
 }

src/main/java/com/assertthat/plugins/standalone/ArgumentsFeatures.java

@@ -14,7 +14,8 @@ public ArgumentsFeatures(String accessKey,
                      String tags,
                      String jiraServerUrl,
                      boolean numbered,
-                     boolean ignoreCertErrors) {
+                     boolean ignoreCertErrors,
+                     boolean cleanupFeatures) {
         super(accessKey,
                 secretKey,
                 projectId,
@@ -32,6 +33,7 @@ public ArgumentsFeatures(String accessKey,
                 jiraServerUrl,
                 null,
                 numbered,
-                ignoreCertErrors);
+                ignoreCertErrors,
+                cleanupFeatures);
     }
 }

src/main/java/com/assertthat/plugins/standalone/ArgumentsReport.java

@@ -34,7 +34,8 @@ public ArgumentsReport(String accessKey,
                 jiraServerUrl,
                 metadata,
                 false,
-                ignoreCertErrors);
+                ignoreCertErrors,
+                false);
 
     }
 }

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

@@ -131,10 +131,15 @@ public static void main(String[] args) throws IOException, JSONException {
         options.addOption(numberedOption);
 
         Option ignoreCertErrors = new Option("ignoreCertErrors",  true, "Ignore ssl certificate eerors (default is false)");
-        numberedOption.setRequired(false);
-        numberedOption.setArgName("true|false");
+        ignoreCertErrors.setRequired(false);
+        ignoreCertErrors.setArgName("true|false");
         options.addOption(ignoreCertErrors);
 
+        Option cleanupFeatures = new Option("cleanupFeatures",  true, "Delete features in outputFolder directory before downloading");
+        cleanupFeatures.setRequired(false);
+        cleanupFeatures.setArgName("true|false");
+        options.addOption(cleanupFeatures);
+
         Option reportOption = new Option("report", false, "Upload report");
         reportOption.setRequired(false);
 
@@ -174,6 +179,10 @@ public static void main(String[] args) throws IOException, JSONException {
         if (cmd.hasOption("ignoreCertErrors") && cmd.getOptionValue("ignoreCertErrors") != null && cmd.getOptionValue("ignoreCertErrors").equals("true")) {
             ignoreCertErrorsVal = true;
         }
+        boolean cleanupFeaturesVal = false;
+        if (cmd.hasOption("cleanupFeatures") && cmd.getOptionValue("cleanupFeatures") != null && cmd.getOptionValue("cleanupFeatures").equals("true")) {
+            cleanupFeaturesVal = true;
+        }
         Arguments arguments = new Arguments(
                 cmd.getOptionValue("accessKey"),
                 cmd.getOptionValue("secretKey"),
@@ -192,7 +201,8 @@ public static void main(String[] args) throws IOException, JSONException {
                 cmd.getOptionValue("jiraServerUrl"),
                 cmd.getOptionValue("metadata"),
                 ignoreCertErrorsVal,
-                isNumbered
+                isNumbered,
+                cleanupFeaturesVal
         );
 
         APIUtil apiUtil = new APIUtil(arguments.getProjectId(), arguments.getAccessKey(), arguments.getSecretKey(), arguments.getProxyURI(), arguments.getProxyUsername(), arguments.getProxyPassword(), arguments.getJiraServerUrl(), ignoreCertErrorsVal);
@@ -201,7 +211,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.isNumbered());
+                            arguments.getTags(), arguments.isNumbered(), arguments.isCleanupFeatures());
             File zip = new FileUtil().unpackArchive(inZip, new File(arguments.getOutputFolder()));
             zip.delete();
         }