batchfetch 1.3.0__tar.gz → 1.3.2__tar.gz

{batchfetch-1.3.0 → batchfetch-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.3.0
+Version: 1.3.2
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -117,13 +117,13 @@ The parent directory of the "path:" value defines the managed directory, where t
 
 For example, if the "path:" value is `file/my-project`, the managed directory will be `file/`. Any file within `file/` that is not managed by batchfetch will be considered an untracked file.
 
-When *batchfetch* encounters an untracked file, it displays an error message to inform users about paths that are not managed by the system. The message provides clear instructions on how to handle these paths by adding them to the `options.ignore_untracked_paths` list, enabling users to manage untracked files effectively.
+When *batchfetch* encounters an untracked file, it displays an error message to inform users about paths that are not managed by the system. The message provides clear instructions on how to handle these paths by adding them to the `options.ignore_untracked` list, enabling users to manage untracked files effectively.
 
 Here is an example of a *batchfetch.yaml* file that enables *batchfetch* to accept a list of untracked files:
 
 ``` yaml
 options:
-  ignore_untracked_paths:
+  ignore_untracked:
     - ./test
     - /absolute/path
     - ../relative/path
@@ -132,7 +132,7 @@ tasks:
   - git: https://github.com/user/project
 ```
 
-By default, *batchfetch.yaml* is the only untracked file that is ignored. The user does not need to add it to the *ignore_untracked_paths* option.
+By default, *batchfetch.yaml* is the only untracked file that is ignored. The user does not need to add it to the *ignore_untracked* option.
 
 ### How is the Git local paths handled?
 

{batchfetch-1.3.0 → batchfetch-1.3.2}/README.md

@@ -97,13 +97,13 @@ The parent directory of the "path:" value defines the managed directory, where t
 
 For example, if the "path:" value is `file/my-project`, the managed directory will be `file/`. Any file within `file/` that is not managed by batchfetch will be considered an untracked file.
 
-When *batchfetch* encounters an untracked file, it displays an error message to inform users about paths that are not managed by the system. The message provides clear instructions on how to handle these paths by adding them to the `options.ignore_untracked_paths` list, enabling users to manage untracked files effectively.
+When *batchfetch* encounters an untracked file, it displays an error message to inform users about paths that are not managed by the system. The message provides clear instructions on how to handle these paths by adding them to the `options.ignore_untracked` list, enabling users to manage untracked files effectively.
 
 Here is an example of a *batchfetch.yaml* file that enables *batchfetch* to accept a list of untracked files:
 
 ``` yaml
 options:
-  ignore_untracked_paths:
+  ignore_untracked:
     - ./test
     - /absolute/path
     - ../relative/path
@@ -112,7 +112,7 @@ tasks:
   - git: https://github.com/user/project
 ```
 
-By default, *batchfetch.yaml* is the only untracked file that is ignored. The user does not need to add it to the *ignore_untracked_paths* option.
+By default, *batchfetch.yaml* is the only untracked file that is ignored. The user does not need to add it to the *ignore_untracked* option.
 
 ### How is the Git local paths handled?
 

{batchfetch-1.3.0 → batchfetch-1.3.2}/batchfetch/batchfetch_base.py

@@ -21,7 +21,7 @@
 import os
 from copy import deepcopy
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from schema import Optional, Or, Schema
 
@@ -39,13 +39,12 @@ class DataAlreadyInitialized(Exception):
 class TaskBase:
     def __init__(self, data: Dict[str, Any], options: Dict[str, Any]):
         self.global_options_schema: Dict[Any, Any] = {}
-        self.global_options_values: Dict[str, Any] = {}
+        self.global_options_values: Dict[str, Any] = options
 
         self.task_schema: Dict[Any, Any] = {}
         self.task_default_values: Dict[str, Any] = {}
 
         self._item_values = data
-        self._item_options = options
 
         # Variables
         self.values: Dict[str, Any] = {}
@@ -59,13 +58,14 @@ class TaskBase:
         # Options
         self.options = {}
         self.options.update(deepcopy(self.global_options_values))
-        self.options.update(deepcopy(self._item_options))
+
         schema = Schema(self.global_options_schema)
         schema.validate(self.options)
 
         # Data
         self.values = {}
         self.values.update(deepcopy(self.task_default_values))
+        self.values.update(deepcopy(self.options))
         self.values.update(deepcopy(self._item_values))
         schema = Schema(self.task_schema)
         schema.validate(self.values)
@@ -98,6 +98,12 @@ class TaskBatchFetch(TaskBase):
     """Plugin downloader base class."""
 
     def __init__(self, data: Dict[str, Any], options: Dict[str, Any]):
+        new_options = {"exec_before": [],
+                       "exec_after": [],
+                       "ignore_untracked": []}
+        new_options.update(options)
+        options = new_options
+
         super().__init__(data=data, options=options)
         self.indent = 4
         self.indent_spaces = " " * self.indent
@@ -107,7 +113,7 @@ class TaskBatchFetch(TaskBase):
         self.global_options_schema: Dict[Any, Any] = {
             Optional("exec_before"): Or([str], str),
             Optional("exec_after"): Or([str], str),
-            Optional("ignore_untracked_paths"): Or([str], str),
+            Optional("ignore_untracked"): Or([str], str),
         }
 
         self.task_schema: Dict[Any, Any] = {
@@ -116,12 +122,9 @@ class TaskBatchFetch(TaskBase):
 
             Optional("exec_before"): Or([str], str),
             Optional("exec_after"): Or([str], str),
-        }
 
-        self.global_options_values: Dict[str, Any] = {
-            "exec_before": [],
-            "exec_after": [],
-            "ignore_untracked_paths": [],
+            # Global options (unused locally)
+            Optional("ignore_untracked"): Or([str], str),
         }
 
         self.task_default_values: Dict[str, Any] = {
@@ -151,8 +154,8 @@ class TaskBatchFetch(TaskBase):
             return
 
         # Global
-        cmd = self.options["exec_before"] \
-            if "exec_before" in self.options else None
+        cmd = self.global_options_values["exec_before"] \
+            if "exec_before" in self.global_options_values else None
         if cmd:
             self._local_task_exec(cmd, cwd=str(cwd))
 
@@ -167,8 +170,8 @@ class TaskBatchFetch(TaskBase):
             return
 
         # Local
-        cmd = self.options["exec_after"] \
-            if "exec_after" in self.options else None
+        cmd = self.global_options_values["exec_after"] \
+            if "exec_after" in self.global_options_values else None
         if cmd:
             self._local_task_exec(cmd, cwd=str(cwd))
 

{batchfetch-1.3.0 → batchfetch-1.3.2}/batchfetch/batchfetch_cli.py

@@ -47,7 +47,7 @@ class BatchFetchCli:
         self.cfg: dict = {}
         self.check_untracked = check_untracked
         self.tracked_paths: Dict[Path, Set[str]] = {}
-        self.ignore_untracked_paths: Set[Path] = set()
+        self.ignore_untracked: Set[Path] = set()
         self.verbose = verbose
         self.max_workers = max_workers
         self.dirs_relative_to_batchfetch: Set[str] = set()
@@ -100,20 +100,20 @@ class BatchFetchCli:
                           file=sys.stderr)
                     sys.exit(1)
 
-                self.ignore_untracked_paths.add(Path(path).absolute())
-                self.ignore_untracked_paths.add(Path(path).resolve())
+                self.ignore_untracked.add(Path(path).absolute())
+                self.ignore_untracked.add(Path(path).resolve())
                 untracked_paths = None
                 if "options" in yaml_dict and \
-                        "ignore_untracked_paths" in yaml_dict["options"]:
+                        "ignore_untracked" in yaml_dict["options"]:
                     untracked_paths = \
-                        yaml_dict["options"]["ignore_untracked_paths"]
+                        yaml_dict["options"]["ignore_untracked"]
 
                 if isinstance(untracked_paths, str):
                     untracked_paths = [untracked_paths]
 
                 if untracked_paths:
                     for ignore_untracked_path in untracked_paths:
-                        self.ignore_untracked_paths.add(
+                        self.ignore_untracked.add(
                             Path(ignore_untracked_path).absolute()
                         )
 
@@ -277,7 +277,7 @@ class BatchFetchCli:
             actual_filenames = {file.name for file in tracked_dir.iterdir()}
             for filename in actual_filenames - tracked_filenames:
                 full_path = tracked_dir / filename
-                if full_path in self.ignore_untracked_paths:
+                if full_path in self.ignore_untracked:
                     continue
 
                 untracked_paths.add(full_path)
@@ -291,7 +291,7 @@ class BatchFetchCli:
                             "\n")
             err_str += ("The paths above are not managed by batchfetch."
                         " To retain them, add them to the "
-                        "options.ignore_untracked_paths list, using either "
+                        "options.ignore_untracked list, using either "
                         "relative or absolute paths")
             raise BatchFetchError(err_str)
 

{batchfetch-1.3.0 → batchfetch-1.3.2}/batchfetch.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: batchfetch
-Version: 1.3.0
+Version: 1.3.2
 Summary: Efficiently clone and pull multiple Git repositories.
 Home-page: https://github.com/jamescherti/batchfetch
 Author: James Cherti
@@ -117,13 +117,13 @@ The parent directory of the "path:" value defines the managed directory, where t
 
 For example, if the "path:" value is `file/my-project`, the managed directory will be `file/`. Any file within `file/` that is not managed by batchfetch will be considered an untracked file.
 
-When *batchfetch* encounters an untracked file, it displays an error message to inform users about paths that are not managed by the system. The message provides clear instructions on how to handle these paths by adding them to the `options.ignore_untracked_paths` list, enabling users to manage untracked files effectively.
+When *batchfetch* encounters an untracked file, it displays an error message to inform users about paths that are not managed by the system. The message provides clear instructions on how to handle these paths by adding them to the `options.ignore_untracked` list, enabling users to manage untracked files effectively.
 
 Here is an example of a *batchfetch.yaml* file that enables *batchfetch* to accept a list of untracked files:
 
 ``` yaml
 options:
-  ignore_untracked_paths:
+  ignore_untracked:
     - ./test
     - /absolute/path
     - ../relative/path
@@ -132,7 +132,7 @@ tasks:
   - git: https://github.com/user/project
 ```
 
-By default, *batchfetch.yaml* is the only untracked file that is ignored. The user does not need to add it to the *ignore_untracked_paths* option.
+By default, *batchfetch.yaml* is the only untracked file that is ignored. The user does not need to add it to the *ignore_untracked* option.
 
 ### How is the Git local paths handled?
 

{batchfetch-1.3.0 → batchfetch-1.3.2}/setup.py

@@ -22,7 +22,7 @@ from setuptools import find_packages, setup
 
 setup(
     name="batchfetch",
-    version="1.3.0",
+    version="1.3.2",
     packages=find_packages(),
     description="Efficiently clone and pull multiple Git repositories.",
     license="GPLv3",