Refactor nulecule base [Fixes #145]

atomicapp/cli/main.py

@@ -17,8 +17,6 @@
  along with Atomic App. If not, see <http://www.gnu.org/licenses/>.
 """
 
-from atomicapp.run import Run
-from atomicapp.install import Install
 import os
 import sys
 
@@ -33,35 +31,46 @@
     ANSWERS_FILE, __ATOMICAPPVERSION__, \
     __NULECULESPECVERSION__, ANSWERS_FILE_SAMPLE_FORMAT, \
     LOCK_FILE
+from atomicapp.nulecule import NuleculeManager
+from atomicapp.nulecule.exceptions import NuleculeException
 from atomicapp.utils import Utils
 
 logger = logging.getLogger(__name__)
 
 
 def cli_install(args):
-    install = Install(**vars(args))
-
-    if install.install() is not None:
+    try:
+        NuleculeManager.do_install(**vars(args))
         sys.exit(True)
-    else:
+    except NuleculeException as e:
+        logger.error(e)
+        sys.exit(False)
+    except Exception as e:
+        logger.error(e, exc_info=True)
         sys.exit(False)
 
 
 def cli_run(args):
-    ae = Run(**vars(args))
-
-    if ae.run() is not None:
+    try:
+        NuleculeManager.do_run(**vars(args))
         sys.exit(True)
-    else:
+    except NuleculeException as e:
+        logger.error(e)
+        sys.exit(False)
+    except Exception as e:
+        logger.error(e, exc_info=True)
         sys.exit(False)
 
 
 def cli_stop(args):
-    stop = Run(stop=True, **vars(args))
-
-    if stop.run() is not None:
+    try:
+        NuleculeManager.do_stop(**vars(args))
         sys.exit(True)
-    else:
+    except NuleculeException as e:
+        logger.error(e)
+        sys.exit(False)
+    except Exception as e:
+        logger.error(e, exc_info=True)
         sys.exit(False)
 
 
@@ -111,24 +120,25 @@ def set_arguments(self):
                 "Don't actually call provider. The commands that should be "
                 "run will be sent to stdout but not run."))
 
-        self.parser.add_argument(
+        subparsers = self.parser.add_subparsers(dest="action")
+
+        parser_run = subparsers.add_parser("run")
+
+        parser_run.add_argument(
             "-a",
             "--answers",
             dest="answers",
             default=os.path.join(os.getcwd(), ANSWERS_FILE),
             help="Path to %s" % ANSWERS_FILE)
 
-        self.parser.add_argument(
+        parser_run.add_argument(
             "--answers-format",
             dest="answers_format",
             default=ANSWERS_FILE_SAMPLE_FORMAT,
             help=(
                 "The format for the answers.conf.sample file.Default is "
                 "'ini', Valid formats are 'ini', 'json', 'xml', 'yaml'."))
 
-        subparsers = self.parser.add_subparsers(dest="action")
-
-        parser_run = subparsers.add_parser("run")
         parser_run.add_argument(
             "--write-answers",
             dest="answers_output",
@@ -154,6 +164,21 @@ def set_arguments(self):
 
         parser_install = subparsers.add_parser("install")
 
+        parser_install.add_argument(
+            "-a",
+            "--answers",
+            dest="answers",
+            default=os.path.join(os.getcwd(), ANSWERS_FILE),
+            help="Path to %s" % ANSWERS_FILE)
+
+        parser_install.add_argument(
+            "--answers-format",
+            dest="answers_format",
+            default=ANSWERS_FILE_SAMPLE_FORMAT,
+            help=(
+                "The format for the answers.conf.sample file.Default is "
+                "'ini', Valid formats are 'ini', 'json', 'xml', 'yaml'."))
+
         parser_install.add_argument(
             "--no-deps",
             dest="nodeps",

atomicapp/constants.py

@@ -29,10 +29,12 @@
 EXTERNAL_APP_DIR = "external"
 GLOBAL_CONF = "general"
 APP_ENT_PATH = "application-entity"
+CACHE_DIR = "/var/lib/atomicapp"
 
 PARAMS_KEY = "params"
 MAIN_FILE = "Nulecule"
 ANSWERS_FILE = "answers.conf"
+ANSWERS_RUNTIME_FILE = "answers.conf.gen"
 ANSWERS_FILE_SAMPLE = "answers.conf.sample"
 ANSWERS_FILE_SAMPLE_FORMAT = 'ini'
 WORKDIR = ".workdir"

atomicapp/nulecule/__init__.py

@@ -0,0 +1,4 @@
+from __future__ import absolute_import
+from .main import NuleculeManager
+
+__all__ = ['NuleculeManager']