Add path options to fact encrypt, decrypt, and redact

Let users specify the path to write the encrypted, decrypted, or
redacted file to. If not given, default to not overwriting the
original report file.

rho/factdecryptcommand.py

@@ -42,6 +42,11 @@ def __init__(self):
         self.parser.add_option("--facts", dest="facts", metavar="FACTS",
                                action="callback", callback=multi_arg,
                                default=[], help=SUPPRESS_HELP)
+
+        self.parser.add_option("--decrypted-path", dest="decrypted_path",
+                               metavar="DECRYPTEDPATH",
+                               help=_("Location for the decrypted file"))
+
         self.facts_to_decrypt = None
 
     def _validate_options(self):
@@ -111,5 +116,8 @@ def read_and_decrypt(self, path, vault):
     def _do_command(self):
         vault = get_vault(prompt=PROMPT)
         normalized_path = os.path.normpath(self.options.report_path)
+        decrypted_path = (self.options.decrypted_path or
+                          normalized_path + '-decrypted')
+
         keys, data = self.read_and_decrypt(normalized_path, vault)
-        write_csv_data(keys, data, normalized_path)
+        write_csv_data(keys, data, decrypted_path)

rho/factencryptcommand.py

@@ -42,6 +42,12 @@ def __init__(self):
         self.parser.add_option("--facts", dest="facts", metavar="FACTS",
                                action="callback", callback=multi_arg,
                                default=[], help=SUPPRESS_HELP)
+
+        self.parser.add_option("--encrypted-path", dest="encrypted_path",
+                               metavar="ENCRYPTEDPATH",
+                               help=_("Destination for the encrypted file"),
+                               default=None)
+
         self.facts_to_encrypt = None
 
     def _validate_options(self):
@@ -111,5 +117,8 @@ def read_and_encrypt(self, path, vault):
     def _do_command(self):
         vault = get_vault(prompt=PROMPT)
         normalized_path = os.path.normpath(self.options.report_path)
+        encrypted_path = (self.options.encrypted_path or
+                          normalized_path + '-encrypted')
+
         keys, data = self.read_and_encrypt(normalized_path, vault)
-        write_csv_data(keys, data, normalized_path)
+        write_csv_data(keys, data, encrypted_path)

rho/factredactcommand.py

@@ -41,6 +41,11 @@ def __init__(self):
         self.parser.add_option("--facts", dest="facts", metavar="FACTS",
                                action="callback", callback=multi_arg,
                                default=[], help=SUPPRESS_HELP)
+
+        self.parser.add_option("--redacted-path", dest="redacted_path",
+                               metavar="REDACTEDPATH",
+                               help=_("Path to write the redacted report to"))
+
         self.facts_to_redact = None
 
     def _validate_options(self):
@@ -81,6 +86,9 @@ def _do_command(self):
         data = []
         keys = None
         normalized_path = os.path.normpath(self.options.report_path)
+        redacted_path = (self.options.redacted_path or
+                         normalized_path + '-redacted')
+
         with open(normalized_path, 'r') as read_file:
             reader = csv.DictReader(read_file, delimiter=',')
             for row in reader:
@@ -112,4 +120,4 @@ def _do_command(self):
             for row in data:
                 writer.writerow(row)
         data_temp.close()
-        move(data_temp.name, normalized_path)
+        move(data_temp.name, redacted_path)