gkeys/base.py: Sort the _option_* functions

1 files changed, 53 insertions, 48 deletions

diff --git a/gkeys/gkeys/base.py b/gkeys/gkeys/base.py
index 2ec4375..c9faf0e 100644
--- a/gkeys/gkeys/base.py
+++ b/gkeys/gkeys/base.py
@@ -46,15 +46,40 @@ class CliBase(object):
 
 
     @staticmethod
+    def _option_status(parser=None):
+        parser.add_argument('-A', '--status', action='store_true',
+            default=False,
+            help='The active status of the member')
+
+    @staticmethod
     def _option_all(parser=None):
         parser.add_argument('-a', '--all', dest='all',
             action='store_true', default=False,
             help='Match all inputs arguments in searches')
 
     @staticmethod
+    def _option_category(parser=None):
+        parser.add_argument('-C', '--category',
+            dest='category', default=None,
+            help='The key or seed directory category to use or update')
+
+    @staticmethod
+    def _option_cleankey(parser=None):
+        parser.add_argument('--clean-key',
+            dest='cleankey', default=False,
+            help='Clean the key from the keyring due to failures')
+
+    @staticmethod
+    def _option_cleanseed(parser=None):
+        parser.add_argument('--clean-seed',
+            dest='cleanseed', default=False,
+            help='Clean the seed from the seedfile due to failures.  '
+                'Used during binary keyring release creation.')
+
+    @staticmethod
     def _option_dest(parser=None):
         parser.add_argument('-d', '--dest', dest='destination', default=None,
-            help='The destination seed file or keydir for move, copy operations')
+            help='The destination for move, copy, create operations')
 
     @staticmethod
     def _option_exact(parser=None):
@@ -63,6 +88,17 @@ class CliBase(object):
             help='Use CASE matching in searches')
 
     @staticmethod
+    def _option_file(parser=None):
+        parser.add_argument('-F', '--file', dest='filename', default=None,
+            nargs='+',
+            help='The path/URL to use for the (signed) file')
+
+    @staticmethod
+    def _option_1file(parser=None):
+        parser.add_argument('-F', '--file', dest='filename', default=None,
+            help='The path/URL to use for the (signed) file')
+
+    @staticmethod
     def _option_fingerprint(parser=None):
         parser.add_argument('-f', '--fingerprint', dest='fingerprint',
             default=None, nargs='+',
@@ -74,12 +110,23 @@ class CliBase(object):
             help='Do a gpg search operations, rather than a gkey search')
 
     @staticmethod
+    def _option_homedir(parser=None):
+        parser.add_argument('-H', '--homedir', dest='homedir', default=None,
+                            help='The destination for the generated key')
+
+    @staticmethod
     def _option_keyid(parser=None):
         parser.add_argument('-i', '--keyid', dest='keyid', default=None,
             nargs='+',
             help='The long keyid of the gpg key to search for')
 
     @staticmethod
+    def _option_justdoit(parser=None):
+        parser.add_argument('--justdoit', dest='justdoit',
+            action='store_true', default=False,
+            help='Just Do It')
+
+    @staticmethod
     def _option_keyring(parser=None):
         parser.add_argument('-k', '--keyring', dest='keyring', default=None,
             help='The name of the keyring to use for verification, etc.')
@@ -91,6 +138,11 @@ class CliBase(object):
             help='The name of the keyring to use for verification, etc.')
 
     @staticmethod
+    def _option_mail(parser=None):
+        parser.add_argument('-m', '--mail', dest='mail', default=None,
+            help='The email address to search for')
+
+    @staticmethod
     def _option_nick(parser=None):
         parser.add_argument('-n', '--nick', dest='nick', default=None,
             help='The nick associated with the the key')
@@ -106,25 +158,6 @@ class CliBase(object):
             default=None, help='The name of the the key')
 
     @staticmethod
-    def _option_category(parser=None):
-        parser.add_argument('-C', '--category',
-            dest='category', default=None,
-            help='The key or seed directory category to use or update')
-
-    @staticmethod
-    def _option_cleankey(parser=None):
-        parser.add_argument('--clean-key',
-            dest='cleankey', default=False,
-            help='Clean the key from the keyring due to failures')
-
-    @staticmethod
-    def _option_cleanseed(parser=None):
-        parser.add_argument('--clean-seed',
-            dest='cleanseed', default=False,
-            help='Clean the seed from the seedfile due to failures.  '
-                'Used during binary keyring release creation.')
-
-    @staticmethod
     def _option_keydir(parser=None):
         parser.add_argument('-r', '--keydir', dest='keydir', default=None,
             help='The keydir to use, update or search for/in')
@@ -135,17 +168,6 @@ class CliBase(object):
             help='The seedfile to use from the gkeys.conf file')
 
     @staticmethod
-    def _option_file(parser=None):
-        parser.add_argument('-F', '--file', dest='filename', default=None,
-            nargs='+',
-            help='The path/URL to use for the (signed) file')
-
-    @staticmethod
-    def _option_1file(parser=None):
-        parser.add_argument('-F', '--file', dest='filename', default=None,
-            help='The path/URL to use for the (signed) file')
-
-    @staticmethod
     def _option_signature(parser=None):
         parser.add_argument('-s','--signature', dest='signature', default=None,
            help='The path/URL to use for the signature')
@@ -157,23 +179,6 @@ class CliBase(object):
             help='Turn on timestamp use')
 
     @staticmethod
-    def _option_mail(parser=None):
-        parser.add_argument('-m', '--mail', dest='mail', default=None,
-            help='The email address to search for')
-
-    @staticmethod
-    def _option_status(parser=None):
-        parser.add_argument('-A', '--status', action='store_true',
-            default=False,
-            help='The active status of the member')
-
-    @staticmethod
-    def _option_justdoit(parser=None):
-        parser.add_argument('--justdoit', dest='justdoit',
-            action='store_true', default=False,
-            help='Just Do It')
-
-    @staticmethod
     def _option_uid(parser=None):
         parser.add_argument('-u', '--uid', dest='uid', nargs='*', default=None,
             help='The user ID, gpg key uid')