added symmetric encryption. changed options in to groups

Bakefile

@@ -19,25 +19,30 @@ install_useve() {
     py-format .
     useve qgpg
     pip install ./
+    qgpg --help
 }
 
 test_encrypt() {
+    # Prepare
     cd ~/tmp/
     . useve-runner
     useve qgpg
-    rm -fr key2* datadir sha1sum.txt
-    GPGPASS=secret @ qgpg --key key2 k
+    rm -fr key2* datadir datadir.encrypted sha1sum.txt
     @ mkdir -p datadir/folder{1,2}
     @ dd if=/dev/random of=datadir/testfile bs=3024 count=102400
     for i in {1..10}; do
         dd if=/dev/random of=datadir/folder1/${i}testfile bs=1024 count=10240 &> /dev/null
         dd if=/dev/random of=datadir/folder2/${i}testfile bs=1024 count=10240 &> /dev/null
     done
-    @ qgpg --key key2.pub e datadir/folder1/1testfile
-    @ qgpg --key key2.pub e datadir/folder1/1testfile datadir/1testfile.encrypted.gpg
-    @ qgpg --key key2.pub -r e datadir
-    @ qgpg --key key2.pub -r e datadir
-    @ qgpg --key key2.pub -r e $(pwd)/datadir/ datadir.encrypted/
+    # Run encryption code
+    set -e
+    GPGPASS=secret @ qgpg -k --key key2
+    @ qgpg -e --key key2.pub datadir/folder1/1testfile
+    @ qgpg -e --key key2.pub datadir/folder1/1testfile datadir/1testfile.encrypted.gpg
+    @ qgpg -e --key key2.pub -r datadir
+    @ qgpg -e --key key2.pub -r datadir
+    @ qgpg -e --key key2.pub -r $(pwd)/datadir/ datadir.encrypted/
+    GPGPASS=symmetric_password @ qgpg -e datadir/folder1/1testfile datadir/1testfile.encrypted.symmetric.gpg
     @ hash-update -t sha1 -f sha1sum.txt -r datadir
 }
 
@@ -45,8 +50,10 @@ test_decrypt() {
     cd ~/tmp/
     . useve-runner
     useve qgpg
+    set -e
     @ find datadir -type f -name '*testfile' | xargs -II rm -v I
-    GPGPASS=secret @ qgpg --key key2 -r d datadir
+    GPGPASS=secret @ qgpg -d --key key2 -r datadir
+    GPGPASS=symmetric_password @ qgpg -d --force datadir/1testfile.encrypted.symmetric.gpg datadir/folder1/1testfile
     @ hash-update -t sha1 -f sha1sum.txt -c
 }