added 'sanitize_passphrase' for DRY, added a passphrase with spaces t…

…o tests and added nja files to gitignore

.gitignore

@@ -1 +1,2 @@
 *.pyc
+*.nja

test.py

@@ -14,7 +14,8 @@ def setUpClass(self):
         self.keyfile = '.'.join([self.pid, 'key'])
         self.keyfile2 = '.'.join([self.pid, '2ndkey'])
         self.mountpath = './tmptomb'
-        self.passphrase = str(randrange(2 ** 64))
+        # generate a passphrase with spaces
+        self.passphrase = str(randrange(2 ** 64)).replace("", " ")[1:-1]
         self.passphrase2 = str(randrange(2 ** 64))
         self.imagefile = '.'.join([self.pid, 'jpg'])
         self.createImage(self.imagefile)

tomber.py

@@ -28,40 +28,50 @@ def execute(cmd):
         return False, get_message(stderr, 'error')
 
 
+def sanitize_passphrase(passphrase):
+    """
+    Used to avoid errors with passphrase which includes spaces
+    """
+    return ''.join(['"', passphrase, '"'])
+
+
 def tdig(tombfile, size):
+    """
+    Usage: tdig <tombfilename> <size> - dig a tomb of given size
+    """
+
     cmd = ' '.join(['tomb', 'dig', tombfile, '-s', str(size), '--no-color'])
     return execute(cmd)
 
 
 def tforge(keyfile, passphrase):
-    # avoid errors with spaces in passphrase
-    passphrase = ''.join(['"', passphrase, '"'])
+    """
+    Usage: tforge <keyfile> <passphrase> - forge a key with given passphrase
+    """
     cmd = ' '.join(['tomb',
         'forge',
         keyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        passphrase,
+        sanitize_passphrase(passphrase),
         '--no-color'])
     return execute(cmd)
 
 
 def tlock(tombfile, keyfile, passphrase):
-    passphrase = ''.join(['"', passphrase, '"'])
     cmd = ' '.join(['tomb',
         'lock',
         tombfile,
         '-k',
         keyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        passphrase,
+        sanitize_passphrase(passphrase),
         '--no-color'])
     return execute(cmd)
 
 
 def topen(tombfile, keyfile, passphrase, mountpath=False):
-    passphrase = ''.join(['"', passphrase, '"'])
     if not mountpath:
         mountpath = ''
     cmd = ' '.join(['tomb',
@@ -71,7 +81,7 @@ def topen(tombfile, keyfile, passphrase, mountpath=False):
         keyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        passphrase,
+        sanitize_passphrase(passphrase),
         '--no-color',
         mountpath])
     return execute(cmd)
@@ -83,77 +93,70 @@ def tclose(tombfile):
 
 
 def tresize(tombfile, keyfile, passphrase, newsize):
-    passphrase = ''.join(['"', passphrase, '"'])
     cmd = ' '.join(['tomb',
         'resize',
         tombfile,
         '-k',
         keyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        passphrase,
+        sanitize_passphrase(passphrase),
         '-s',
         str(newsize),
         '--no-color'])
     return execute(cmd)
 
 
 def tbury(keyfile, passphrase, imagefile):
-    passphrase = ''.join(['"', passphrase, '"'])
     cmd = ' '.join(['tomb',
         'bury',
         '-k',
         keyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        passphrase,
+        sanitize_passphrase(passphrase),
         imagefile,
         '--no-color'])
     return execute(cmd)
 
 
 def texhume(keyfile, passphrase, imagefile):
-    passphrase = ''.join(['"', passphrase, '"'])
     cmd = ' '.join(['tomb',
         'exhume',
         '-k',
         keyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        passphrase,
+        sanitize_passphrase(passphrase),
         imagefile,
         '--no-color'])
     return execute(cmd)
 
 
 def tpasswd(keyfile, newpassphrase, oldpassphrase):
-    newpassphrase = ''.join(['"', newpassphrase, '"'])
-    oldpassphrase = ''.join(['"', oldpassphrase, '"'])
     cmd = ' '.join(['tomb',
         'passwd',
         '-k',
         keyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        newpassphrase,
+        sanitize_passphrase(newpassphrase),
         '--tomb-old-pwd',
-        oldpassphrase,
+        sanitize_passphrase(oldpassphrase),
         '--no-color'])
     return execute(cmd)
 
 
 def tsetkey(oldkeyfile, tombfile, newkeyfile, newpassphrase, oldpassphrase):
-    newpassphrase = ''.join(['"', newpassphrase, '"'])
-    oldpassphrase = ''.join(['"', oldpassphrase, '"'])
     cmd = ' '.join(['tomb',
         'setkey',
         oldkeyfile,
         '-k',
         newkeyfile,
         '--unsecure-dev-mode',
         '--tomb-pwd',
-        newpassphrase,
+        sanitize_passphrase(newpassphrase),
         '--tomb-old-pwd',
-        oldpassphrase,
+        sanitize_passphrase(oldpassphrase),
         '--no-color'])
     return execute(cmd)