Merge pull request #72 from beatsbears/v2.0.2

2.0.2 bump

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## 2.0.2
+- Use temp-dir for cache files
+- Fix HTML report generation on Windows
+- Fix `exclude_dir` configu bug
+
 ## 2.0.1
 - Fixed issue where policies not being specified within the .ochrona.yml caused a TypeError
 

README.md

@@ -114,7 +114,7 @@ There is an empty `.ochrona.yml` file included in the repo.
 | Key | Description | Type | Example |
 |-|-|-|-|
 | `dir` | Directory to recursively search for dependencies files to scan [.] | path | /User/me/my_project |
-| `exclude_dir` | Directory names that should be excluded from recursive search. | list | build |
+| `exclude_dir` | Directory names that should be excluded from recursive search. | array | build |
 | `file` | Single dependency file to scan | file | /User/me/my_project/requirements.txt |
 | `debug` | Enable debug logging [false] | bool | true |
 | `silent` | Silent mode [false] | bool | true |

ochrona/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 __author__ = "Andrew Scott"
 __email__ = "[email protected]"
-__version__ = "2.0.1"
+__version__ = "2.0.2"
 __license__ = "MIT"

ochrona/file/file_handler.py

@@ -34,24 +34,32 @@
 def rfind_all_dependencies_files(
     logger: OchronaLogger,
     directory: Optional[str] = None,
-    excluded_directories: Optional[str] = None,
+    excluded_directories: Optional[Union[List[str], str]] = None,
     file_obj: Optional[Union[IO, str]] = None,
 ) -> List[str]:
     """
     Recursively searches for dependency files to analyze
 
     :param logger: A configured `OchronaFormatter` instance
     :param directory: str - starting directory (optional)
+    :param excluded_directories: list - directories to exclude
     :param file_obj: A specified file to use
     :return: list - list of paths for files to analyze
     """
     if not directory:
         directory = os.getcwd()
 
     files = []
-    directories_to_exclude = (
-        excluded_directories.split(",") if isinstance(excluded_directories, str) else []
-    )
+
+    # if this is somehow still a string, let's fix that
+    if excluded_directories:
+        directories_to_exclude = (
+            excluded_directories.split(",")
+            if isinstance(excluded_directories, str)
+            else excluded_directories
+        )
+    else:
+        directories_to_exclude = []
 
     if file_obj:
         if isinstance(file_obj, str):