pytest-dsl 0.12.0__tar.gz → 0.13.0__tar.gz

{pytest_dsl-0.12.0/pytest_dsl.egg-info → pytest_dsl-0.13.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pytest-dsl
-Version: 0.12.0
+Version: 0.13.0
 Summary: A DSL testing framework based on pytest
 Author: Chen Shuanglin
 License: MIT

{pytest_dsl-0.12.0 → pytest_dsl-0.13.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pytest-dsl"
-version = "0.12.0"
+version = "0.13.0"
 description = "A DSL testing framework based on pytest"
 readme = "README.md"
 requires-python = ">=3.9"

{pytest_dsl-0.12.0 → pytest_dsl-0.13.0}/pytest_dsl/cli.py

@@ -78,7 +78,7 @@ def parse_args():
         list_parser.add_argument(
             '--category',
             choices=[
-                'builtin', 'plugin', 'custom', 
+                'builtin', 'plugin', 'custom',
                 'project_custom', 'remote', 'all'
             ],
             default='all',
@@ -108,7 +108,7 @@ def parse_args():
             parser.add_argument(
                 '--category',
                 choices=[
-                    'builtin', 'plugin', 'custom', 
+                    'builtin', 'plugin', 'custom',
                     'project_custom', 'remote', 'all'
                 ],
                 default='all'
@@ -157,6 +157,29 @@ def load_all_keywords(include_remote=False):
     # 扫描本地关键字
     scan_local_keywords()
 
+    # 自动导入项目中的resources目录
+    try:
+        from pytest_dsl.core.custom_keyword_manager import (
+            custom_keyword_manager)
+
+        # 尝试从多个可能的项目根目录位置导入resources
+        possible_roots = [
+            os.getcwd(),  # 当前工作目录
+            os.path.dirname(os.getcwd()),  # 上级目录
+        ]
+
+        # 尝试每个可能的根目录
+        for project_root in possible_roots:
+            if project_root and os.path.exists(project_root):
+                resources_dir = os.path.join(project_root, "resources")
+                if (os.path.exists(resources_dir) and
+                        os.path.isdir(resources_dir)):
+                    custom_keyword_manager.auto_import_resources_directory(
+                        project_root)
+                    break
+    except Exception as e:
+        print(f"自动导入resources目录时出现警告: {str(e)}")
+
     # 扫描项目中的自定义关键字（.resource文件中定义的）
     project_custom_keywords = scan_project_custom_keywords()
     if project_custom_keywords:

{pytest_dsl-0.12.0 → pytest_dsl-0.13.0}/pytest_dsl/core/custom_keyword_manager.py

@@ -15,6 +15,7 @@ class CustomKeywordManager:
         """初始化自定义关键字管理器"""
         self.resource_cache = {}  # 缓存已加载的资源文件
         self.resource_paths = []  # 资源文件搜索路径
+        self.auto_imported_resources = set()  # 记录已自动导入的资源文件
 
     def add_resource_path(self, path: str) -> None:
         """添加资源文件搜索路径
@@ -25,6 +26,141 @@ class CustomKeywordManager:
         if path not in self.resource_paths:
             self.resource_paths.append(path)
 
+    def auto_import_resources_directory(
+            self, project_root: str = None) -> None:
+        """自动导入项目中的resources目录
+
+        Args:
+            project_root: 项目根目录，默认为当前工作目录
+        """
+        if project_root is None:
+            project_root = os.getcwd()
+
+        # 查找resources目录
+        resources_dir = os.path.join(project_root, "resources")
+
+        if (not os.path.exists(resources_dir) or
+                not os.path.isdir(resources_dir)):
+            # 如果没有resources目录，静默返回
+            return
+
+        print(f"发现resources目录: {resources_dir}")
+
+        # 递归查找所有.resource文件
+        resource_files = []
+        for root, dirs, files in os.walk(resources_dir):
+            for file in files:
+                if file.endswith('.resource'):
+                    resource_files.append(os.path.join(root, file))
+
+        if not resource_files:
+            print("resources目录中没有找到.resource文件")
+            return
+
+        print(f"在resources目录中发现 {len(resource_files)} 个资源文件")
+
+        # 按照依赖关系排序并加载资源文件
+        sorted_files = self._sort_resources_by_dependencies(resource_files)
+
+        for resource_file in sorted_files:
+            try:
+                # 检查是否已经自动导入过
+                absolute_path = os.path.abspath(resource_file)
+                if absolute_path not in self.auto_imported_resources:
+                    self.load_resource_file(resource_file)
+                    self.auto_imported_resources.add(absolute_path)
+                    print(f"自动导入资源文件: {resource_file}")
+            except Exception as e:
+                print(f"自动导入资源文件失败 {resource_file}: {e}")
+
+    def _sort_resources_by_dependencies(self, resource_files):
+        """根据依赖关系对资源文件进行排序
+
+        Args:
+            resource_files: 资源文件列表
+
+        Returns:
+            list: 按依赖关系排序后的资源文件列表
+        """
+        # 简单的拓扑排序实现
+        dependencies = {}
+        all_files = set()
+
+        # 分析每个文件的依赖关系
+        for file_path in resource_files:
+            all_files.add(file_path)
+            dependencies[file_path] = self._extract_dependencies(file_path)
+
+        # 拓扑排序
+        sorted_files = []
+        visited = set()
+        temp_visited = set()
+
+        def visit(file_path):
+            if file_path in temp_visited:
+                # 检测到循环依赖，跳过
+                return
+            if file_path in visited:
+                return
+
+            temp_visited.add(file_path)
+
+            # 访问依赖的文件
+            for dep in dependencies.get(file_path, []):
+                if dep in all_files:  # 只处理在当前文件列表中的依赖
+                    visit(dep)
+
+            temp_visited.remove(file_path)
+            visited.add(file_path)
+            sorted_files.append(file_path)
+
+        # 访问所有文件
+        for file_path in resource_files:
+            if file_path not in visited:
+                visit(file_path)
+
+        return sorted_files
+
+    def _extract_dependencies(self, file_path):
+        """提取资源文件的依赖关系
+
+        Args:
+            file_path: 资源文件路径
+
+        Returns:
+            list: 依赖的文件路径列表
+        """
+        dependencies = []
+
+        try:
+            with open(file_path, 'r', encoding='utf-8') as f:
+                content = f.read()
+
+            # 解析文件获取导入信息
+            lexer = get_lexer()
+            parser = get_parser()
+            ast = parser.parse(content, lexer=lexer)
+
+            if ast.type == 'Start' and ast.children:
+                metadata_node = ast.children[0]
+                if metadata_node.type == 'Metadata':
+                    for item in metadata_node.children:
+                        if item.type == '@import':
+                            imported_file = item.value
+                            # 处理相对路径
+                            if not os.path.isabs(imported_file):
+                                imported_file = os.path.join(
+                                    os.path.dirname(file_path), imported_file)
+                            # 规范化路径
+                            imported_file = os.path.normpath(imported_file)
+                            dependencies.append(imported_file)
+
+        except Exception as e:
+            # 如果解析失败，返回空依赖列表
+            print(f"解析资源文件依赖失败 {file_path}: {e}")
+
+        return dependencies
+
     def load_resource_file(self, file_path: str) -> None:
         """加载资源文件
 

{pytest_dsl-0.12.0 → pytest_dsl-0.13.0}/pytest_dsl/core/dsl_executor.py

@@ -300,6 +300,9 @@ class DSLExecutor:
             metadata = {}
             teardown_node = None
 
+            # 自动导入项目中的resources目录
+            self._auto_import_resources()
+
             # 先处理元数据和找到teardown节点
             for child in node.children:
                 if child.type == 'Metadata':
@@ -334,6 +337,40 @@ class DSLExecutor:
             # 测试用例执行完成后清空上下文
             self.test_context.clear()
 
+    def _auto_import_resources(self):
+        """自动导入项目中的resources目录"""
+        try:
+            from pytest_dsl.core.custom_keyword_manager import custom_keyword_manager
+
+            # 尝试从多个可能的项目根目录位置导入resources
+            possible_roots = [
+                os.getcwd(),  # 当前工作目录
+                os.path.dirname(os.getcwd()),  # 上级目录
+            ]
+
+            # 如果在pytest环境中，尝试获取pytest的根目录
+            try:
+                import pytest
+                if hasattr(pytest, 'config') and pytest.config:
+                    pytest_root = pytest.config.rootdir
+                    if pytest_root:
+                        possible_roots.insert(0, str(pytest_root))
+            except:
+                pass
+
+            # 尝试每个可能的根目录
+            for project_root in possible_roots:
+                if project_root and os.path.exists(project_root):
+                    resources_dir = os.path.join(project_root, "resources")
+                    if os.path.exists(resources_dir) and os.path.isdir(resources_dir):
+                        custom_keyword_manager.auto_import_resources_directory(
+                            project_root)
+                        break
+
+        except Exception as e:
+            # 自动导入失败不应该影响测试执行，只记录警告
+            print(f"自动导入resources目录时出现警告: {str(e)}")
+
     def _handle_import(self, file_path):
         """处理导入指令