Merge pull request #1271 from rfbgo/implicitname

Allow ramble to assume application name is the class name

Author: douglasjacobsen

lib/ramble/ramble/test/modifier_language.py

@@ -473,8 +473,7 @@ def add_modifier_variable(mod_inst, mod_var_num=1):
 def test_modifier_variable_directive(mod_class):
     test_defs = []
 
-    mod_inst = mod_class("/not/a/path")
-    mod_inst.name = "mock-test-mod"
+    mod_inst = mod_class("/invalid/mock-test-mod/path.py")
     test_defs.append(add_modifier_variable(mod_inst))
 
     for test_def in test_defs:
@@ -504,8 +503,7 @@ def test_modifier_class_attributes(mod_class):
 
 @pytest.mark.parametrize("mod_class", mod_types)
 def test_require_condition_creates_when_list(mod_class):
-    mod_inst = mod_class("/not/a/path")
-    mod_inst.name = "test-mod"
+    mod_inst = mod_class("/invalid/test-mod/path.py")
     for i in range(4):
         mod_inst.mode(f"mode_{i}", description="mode")
 

var/ramble/repos/builtin/base_classes/application-base/base_class.py

@@ -127,7 +127,6 @@ def _get_phase_func_wrapper(workspace, phase_func, phase_name):
 
 
 class ApplicationBase(ObjectMixin, metaclass=ApplicationMeta):
-    name = None
     origin_type = "application"
     _builtin_name = NS_SEPARATOR.join(("builtin", "{name}"))
     _builtin_required_key = "required"
@@ -201,6 +200,8 @@ def __init__(self, file_path):
         self._fom_map = {}
 
         # Ensure we always have the application name, and this is never empty
+        self._file_path = file_path
+
         self.license_names = self.license_names + [self.name]
 
         self.hash_inventory = {
@@ -215,8 +216,6 @@ def __init__(self, file_path):
         }
         self.experiment_hash = None
 
-        self._file_path = file_path
-
         self.application_class = "ApplicationBase"
 
         self._verbosity = "short"

var/ramble/repos/builtin/base_classes/modifier-base/base_class.py

@@ -34,7 +34,6 @@
 
 
 class ModifierBase(ObjectMixin, metaclass=ModifierMeta):
-    name = None
     origin_type = "modifier"
     _builtin_name = NS_SEPARATOR.join(
         ("modifier_builtin", "{obj_name}", "{name}")

var/ramble/repos/builtin/base_classes/object_mixin/base_class.py

@@ -5,18 +5,31 @@
 # <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
+import os
 from html import escape
 
 from ramble.repository import ObjectTypes
 from ramble.util import format
+from ramble.util.logger import logger
 
 
 class ObjectMixin:
     """A mixin class for Ramble objects"""
 
+    _name = None
+
     def __str__(self):
         return self.name
 
+    @property
+    def name(self):
+        if not self._name:
+            logger.warn(
+                f"Application {self.__class__.__name__} is missing explicit name."
+            )
+            self._name = os.path.basename(os.path.dirname(self._file_path))
+        return self._name
+
     @property
     def scoped_name(self):
         return f"{self.origin_type}::{self.name}"

var/ramble/repos/builtin/base_classes/package-manager-base/base_class.py

@@ -25,7 +25,6 @@
 
 
 class PackageManagerBase(ObjectMixin, metaclass=PackageManagerMeta):
-    name = None
     origin_type = "package_manager"
     _builtin_name = NS_SEPARATOR.join(
         ("package_manager_builtin", "{obj_name}", "{name}")

var/ramble/repos/builtin/base_classes/workflow-manager-base/base_class.py

@@ -25,7 +25,6 @@
 
 
 class WorkflowManagerBase(ObjectMixin, metaclass=WorkflowManagerMeta):
-    name = None
     origin_type = "workflow_manager"
     _builtin_name = NS_SEPARATOR.join(
         ("workflow_manager_builtin", "{obj_name}", "{name}")