fix: Assembly behaviour correction and devops fixes.

* Implemented trestle assemble with some UT

* Modified docs

* Code format

* Code lint

* Extending UT

* Full UT

* assemble bug fix

* fix 'make docs-serve' on linux (Red Hat 7.9)

Signed-off-by: Lou Degenaro <degenaro@us.ibm.com>

* Updated to deal with inherently plural model names.

Signed-off-by: Chris Butler <chris@thebutlers.me>

Co-authored-by: Nebula Alam <anebula@au1.ibm.com>
Co-authored-by: degenaro <degenaro@us.ibm.com>

scripts/website_automation.py

@@ -84,5 +84,5 @@ def md_txt(original: pathlib.Path, md_ed_license: pathlib.Path):
     structer = create_module_markdowns(pathlib.Path('trestle'), 'trestle', pathlib.Path('docs/api_reference'))
     update_mkdocs_meta(pathlib.Path('mkdocs.yml'), structer)
     # Ensure single source of truth for license file
-    md_txt(pathlib.Path('license'), pathlib.Path('docs/license.md'))
+    md_txt(pathlib.Path('LICENSE'), pathlib.Path('docs/license.md'))
     md_txt(pathlib.Path('DCO1.1.txt'), pathlib.Path('docs/contributing/DCO.md'))

tests/trestle/core/commands/assemble_test.py

@@ -65,7 +65,7 @@ def test_assemble_catalog(testdata_dir: pathlib.Path, tmp_trestle_dir: pathlib.P
         assert rc == 0
 
     # Read assembled model
-    actual_model = Catalog.oscal_read(pathlib.Path('dist/catalog.json'))
+    actual_model = Catalog.oscal_read(pathlib.Path('dist/catalogs/mycatalog.json'))
     _, _, expected_model = load_distributed(mycatalog_dir / 'catalog.json')
 
     assert actual_model == expected_model

trestle/core/commands/assemble.py

@@ -181,7 +181,10 @@ def assemble_model(cls, model_alias: str, object_type: Type[TLO], args: argparse
 
         # distributed load
         _, _, assembled_model = load_distributed(root_model_filepath)
-        assembled_model_filepath = trestle_root / const.TRESTLE_DIST_DIR / f'{model_alias}.{args.extension}'
+        plural_alias = model_alias if model_alias[-1] == 's' else model_alias + 's'
+        assembled_model_dir = trestle_root / const.TRESTLE_DIST_DIR / plural_alias
+
+        assembled_model_filepath = assembled_model_dir / f'{args.name}.{args.extension}'
 
         plan = Plan()
         plan.add_action(CreatePathAction(assembled_model_filepath, True))