commit 63c27bab9a440b176f9578d4a2745d8d2bdce730
author Scott Baker <smbaker@gmail.com> Fri Mar 01 16:06:15 2019 -0800
committer Scott Baker <smbaker@gmail.com> Fri Mar 01 16:07:57 2019 -0800
tree c1f488d22996e9746f9ced33f96673fbe55e65df
parent 75e9d567482ca4c9d1dcbb49d760979004267546

SEBA-509 Allow xos-migrate to use relative path

Change-Id: I3251a03b6f29efef92ceb8ab80e3e0414e941646

lib/xos-genx/xosgenx/generator.py

diff --git a/lib/xos-genx/xosgenx/generator.py b/lib/xos-genx/xosgenx/generator.py
index 3e650be..af99a23 100644
--- a/lib/xos-genx/xosgenx/generator.py
+++ b/lib/xos-genx/xosgenx/generator.py
@@ -243,9 +243,9 @@
             )
 
         if args.output is not None and not os.path.isabs(args.output):
-            raise Exception("[XosGenX] The output dir must be an absolute path!")
+            raise Exception("[XosGenX] The output dir (%s) must be an absolute path!" % args.output)
         if args.output is not None and not os.path.isdir(args.output):
-            raise Exception("[XosGenX] The output dir must be a directory!")
+            raise Exception("[XosGenX] The output dir (%s) must be a directory!" % args.output)
 
         if hasattr(args, "files"):
             inputs = XOSProcessor._read_input_from_files(args.files)

lib/xos-migrate/xosmigrate/main.py

diff --git a/lib/xos-migrate/xosmigrate/main.py b/lib/xos-migrate/xosmigrate/main.py
index 3bea379..3fcbe89 100644
--- a/lib/xos-migrate/xosmigrate/main.py
+++ b/lib/xos-migrate/xosmigrate/main.py
@@ -32,13 +32,20 @@
 from xosconfig import Config
 from multistructlog import create_logger
 
-
 def get_abs_path(dir_):
+    """ Convert a path specified by the user, which might be relative or based on
+        home directory location, into an absolute path.
+    """
     if os.path.isabs(dir_):
         return os.path.realpath(dir_)
     if dir_[0] == "~" and not os.path.exists(dir_):
         dir_ = os.path.expanduser(dir_)
         return os.path.abspath(dir_)
+    return os.path.abspath(os.path.join(os.getcwd(), dir_))
+
+
+def get_migration_library_path(dir_):
+    """ Return a directory relative to the location of the migration library """
     return os.path.dirname(os.path.realpath(__file__)) + "/" + dir_
 
 
@@ -265,9 +272,9 @@
 
 
 # SETTING ENV
-os.environ["LOG_FILE"] = get_abs_path("django.log")
-os.environ["XOS_CONFIG_SCHEMA"] = get_abs_path("migration_cfg_schema.yaml")
-os.environ["XOS_CONFIG_FILE"] = get_abs_path("migration_cfg.yaml")
+os.environ["LOG_FILE"] = get_migration_library_path("django.log")
+os.environ["XOS_CONFIG_SCHEMA"] = get_migration_library_path("migration_cfg_schema.yaml")
+os.environ["XOS_CONFIG_FILE"] = get_migration_library_path("migration_cfg.yaml")
 os.environ["MIGRATIONS"] = "true"
 # this is populated in case we generate migrations for services and it's used in settings.py
 os.environ["INSTALLED_APPS"] = ""