Merge pull request #413 from Titas-Ghosh/fix-mkconcore-path-handling

Fix mkconcore path handling for nested output directories

Author: pradeeban

mkconcore.py

@@ -142,7 +142,8 @@ def _resolve_concore_path():
     print(" type must be posix (macos or ubuntu), windows, or docker")
     sys.exit(1)
 
-GRAPHML_FILE = sys.argv[1]
+ORIGINAL_CWD = os.getcwd()
+GRAPHML_FILE = os.path.abspath(sys.argv[1])
 TRIMMED_LOGS = True
 CONCOREPATH = _resolve_concore_path()
 CPPWIN    = os.environ.get("CONCORE_CPPWIN", "g++")          #Windows C++  6/22/21
@@ -196,21 +197,22 @@ def _resolve_concore_path():
     OCTAVEEXE = _tools.get("OCTAVEEXE", OCTAVEEXE)
     OCTAVEWIN = _tools.get("OCTAVEWIN", OCTAVEWIN)
 
-prefixedgenode = ""
-sourcedir = sys.argv[2]
-outdir = sys.argv[3]
-
+prefixedgenode = ""
+sourcedir = os.path.abspath(sys.argv[2])
+outdir = os.path.abspath(sys.argv[3])
+
 # Validate outdir argument (allow full paths)
 safe_name(outdir, "Output directory argument", allow_path=True)
 
 if not os.path.isdir(sourcedir):
     logging.error(f"{sourcedir} does not exist")
     quit()
 
-if len(sys.argv) == 4:
-    prefixedgenode = outdir+"_" #nodes and edges prefixed with outdir_ only in case no type specified 3/24/21
-    concoretype = "docker"
-else:
+if len(sys.argv) == 4:
+    # Use only the output directory name in generated prefixes.
+    prefixedgenode = os.path.basename(os.path.normpath(outdir)) + "_"
+    concoretype = "docker"
+else:
     concoretype = sys.argv[4]
     if not (concoretype in ["posix","windows","docker","macos","ubuntu"]):
         logging.error(" type must be posix (macos or ubuntu), windows, or docker")
@@ -227,8 +229,8 @@ def _resolve_concore_path():
     logging.error(f"if intended, Remove/Rename {outdir} first")
     quit()
 
-os.mkdir(outdir)
-os.chdir(outdir)
+os.makedirs(outdir)
+os.chdir(outdir)
 if concoretype == "windows":
     fbuild = open("build.bat","w")
     frun = open("run.bat", "w")
@@ -255,8 +257,8 @@ def cleanup_script_files():
             fh.close()
 atexit.register(cleanup_script_files)
 
-os.mkdir("src")
-os.chdir("..")
+os.mkdir("src")
+os.chdir(ORIGINAL_CWD)
 
 logging.info(f"mkconcore {MKCONCORE_VER}")
 logging.info(f"Concore path: {CONCOREPATH}")

tests/test_cli.py

@@ -114,6 +114,21 @@ def test_run_command_default_type(self):
             else:
                 self.assertTrue(Path('out/build').exists())
 
+    def test_run_command_nested_output_path(self):
+        with self.runner.isolated_filesystem(temp_dir=self.temp_dir):
+            result = self.runner.invoke(cli, ['init', 'test-project'])
+            self.assertEqual(result.exit_code, 0)
+
+            result = self.runner.invoke(cli, [
+                'run',
+                'test-project/workflow.graphml',
+                '--source', 'test-project/src',
+                '--output', 'build/out',
+                '--type', 'posix'
+            ])
+            self.assertEqual(result.exit_code, 0)
+            self.assertTrue(Path('build/out/src/concore.py').exists())
+
     def test_run_command_subdir_source(self):
         with self.runner.isolated_filesystem(temp_dir=self.temp_dir):
             result = self.runner.invoke(cli, ['init', 'test-project'])