Migrate all pkgs to using a complete Action_Map dictionary

This dictionary holds all information for generating cli options, help, running the actions and generating man pages.

2 files changed, 14 insertions, 11 deletions

diff --git a/gkeys-gen/gkeygen/actions.py b/gkeys-gen/gkeygen/actions.py
index 62aaf05..e118289 100644
--- a/gkeys-gen/gkeygen/actions.py
+++ b/gkeys-gen/gkeygen/actions.py
@@ -15,6 +15,8 @@ import re
 import shutil
 import sys
 
+from collections import OrderedDict
+
 if sys.version_info[0] >= 3:
     from urllib.request import urlopen
     py_input = input
@@ -27,15 +29,17 @@ else:
 from gkeys.fileops import ensure_dirs
 
 
-Available_Actions = ["gen-key"]
-
-Action_Options = {
-    'gen-key': ['dest', 'spec'],
-}
+Action_Map = OrderedDict({
+    'gen-key':  {
+        'func': 'genkey',
+        'options': ['spec', 'dest'],
+        'desc': '''Generate a gpg key using a spec file''',
+        'long_desc': '''Generate a gpg key using a spec file''',
+        'example': '''''',
+        },
+})
 
-Action_Map = {
-    'gen-key': 'genkey',
-}
+Available_Actions = list(Action_Map)
 
 
 LARRY = """
@@ -65,7 +69,7 @@ class Actions(object):
 
 
     def genkey(self, args):
-        '''Key generation action'''
+        '''Generate a gpg key using a spec file'''
         messages = []
         if not args.destination:
             gpghome = self.config.get_key('gkeys-gen', 'gpg-home')
diff --git a/gkeys-gen/gkeygen/cli.py b/gkeys-gen/gkeygen/cli.py
index 818dbbd..3c55b38 100644
--- a/gkeys-gen/gkeygen/cli.py
+++ b/gkeys-gen/gkeygen/cli.py
@@ -11,7 +11,7 @@ import sys
 from gkeys.config import GKeysConfig
 from gkeys.log import log_levels, set_logger
 from gkeys.base import CliBase
-from gkeygen.actions import Actions, Available_Actions, Action_Options, Action_Map
+from gkeygen.actions import Actions, Available_Actions, Action_Map
 
 
 class Main(CliBase):
@@ -32,7 +32,6 @@ class Main(CliBase):
         self.cli_config = {
             'Actions': Actions,
             'Available_Actions': Available_Actions,
-            'Action_Options': Action_Options,
             'Action_Map': Action_Map,
             'prog': 'gkeys-gen',
             'description': 'Gentoo Keys GPG key generator program',