sigil-cli 1.4.2__tar.gz → 1.5.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (39) hide show
  1. {sigil_cli-1.4.2/src/sigil_cli.egg-info → sigil_cli-1.5.0}/PKG-INFO +1 -1
  2. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/pyproject.toml +1 -1
  3. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/datasource/yml_source.py +3 -3
  4. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/stages/parser.py +45 -0
  5. {sigil_cli-1.4.2 → sigil_cli-1.5.0/src/sigil_cli.egg-info}/PKG-INFO +1 -1
  6. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_integration.py +4 -3
  7. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/LICENSE +0 -0
  8. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/README.md +0 -0
  9. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/setup.cfg +0 -0
  10. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/__init__.py +0 -0
  11. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/__main__.py +0 -0
  12. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/cli_tools/__init__.py +0 -0
  13. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/cli_tools/init.py +0 -0
  14. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/cli_tools/tree.py +0 -0
  15. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/cli_tools/validate.py +0 -0
  16. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/datasource/__init__.py +0 -0
  17. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/datasource/datasource.py +0 -0
  18. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/entrypoint.py +0 -0
  19. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/models/__init__.py +0 -0
  20. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/models/argparser.py +0 -0
  21. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/models/argument.py +0 -0
  22. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/models/command.py +0 -0
  23. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/models/script.py +0 -0
  24. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/stages/__init__.py +0 -0
  25. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/stages/builder.py +0 -0
  26. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/stages/resolver.py +0 -0
  27. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil/stages/script_loader.py +0 -0
  28. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil_cli.egg-info/SOURCES.txt +0 -0
  29. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil_cli.egg-info/dependency_links.txt +0 -0
  30. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil_cli.egg-info/entry_points.txt +0 -0
  31. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil_cli.egg-info/requires.txt +0 -0
  32. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/src/sigil_cli.egg-info/top_level.txt +0 -0
  33. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_builder.py +0 -0
  34. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_cli_init.py +0 -0
  35. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_cli_tree.py +0 -0
  36. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_cli_validate.py +0 -0
  37. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_reader.py +0 -0
  38. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_resolver.py +0 -0
  39. {sigil_cli-1.4.2 → sigil_cli-1.5.0}/tests/test_scriptloader.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: sigil-cli
3
- Version: 1.4.2
3
+ Version: 1.5.0
4
4
  Summary: Configuration driven CLI builder with subcommands and script loading
5
5
  Author-email: Kenzo Staelens <kenzostael@gmail.com>
6
6
  License: MIT
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "sigil-cli"
7
- version = "1.4.2"
7
+ version = "1.5.0"
8
8
  description = "Configuration driven CLI builder with subcommands and script loading"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.10"
@@ -12,15 +12,15 @@ _logger = logging.getLogger(__name__)
12
12
  # though instantiation is not a requirement
13
13
  # if you don't need instance data, classmethods are fine too
14
14
  class YmlSource(DataSource):
15
- def read(self, target):
15
+ def read(self, target) -> dict:
16
16
  try:
17
17
  with open(target) as f:
18
18
  return yaml.load(f.read(), Loader=yaml.SafeLoader)
19
19
  except FileNotFoundError:
20
20
  _logger.error(f"file '{target}' not found")
21
21
  return
22
- except yaml.error.YAMLError:
23
- _logger.error(f"malformed yaml file ({target})")
22
+ except yaml.error.YAMLError as e:
23
+ _logger.error(f"malformed yaml file ({target})\n {e}")
24
24
  return
25
25
 
26
26
 
@@ -1,5 +1,7 @@
1
+ import itertools
1
2
  import logging
2
3
  import sys
4
+ from collections.abc import Iterable
3
5
  from pathlib import Path
4
6
  from typing import Any
5
7
 
@@ -28,6 +30,48 @@ class Parser:
28
30
  for duplicate in duplicates:
29
31
  _logger.warning(f"{entry}[{duplicate}] already defined, ignoring")
30
32
 
33
+ def _expandpath(self, config_root: Path, path_pattern: Path) -> Iterable[Path]:
34
+ _has_glob = lambda part: any(ch in part for ch in "*?[") # noqa: E731
35
+ p: Path = (config_root/path_pattern).resolve()
36
+ str_p = str(p)
37
+
38
+ # Quick check: does this path contain any glob pattern at all?
39
+ if not _has_glob(str_p):
40
+ yield p.resolve()
41
+ return # is this cursed? yes, does it work somehow? also yes
42
+ parts = p.parts
43
+
44
+ # Find the first part that contains a wildcard
45
+ first_glob_idx = 0
46
+ for i, part in enumerate(parts):
47
+ if _has_glob(part):
48
+ first_glob_idx = i
49
+ break
50
+
51
+ # Build the literal base directory and the relative glob pattern
52
+ if first_glob_idx == 0:
53
+ base = Path('.')
54
+ if parts[0] == '/': # pesky absolute paths
55
+ base = Path('/')
56
+ parts = parts[1:]
57
+ else:
58
+ base = Path(*parts[:first_glob_idx])
59
+
60
+ pattern = "/".join(parts[first_glob_idx:])
61
+ # Expand the pattern relative to the base, and resolve each match
62
+ for match in base.glob(pattern):
63
+ yield match.resolve()
64
+
65
+ def _resolve_manifest(self, config_root, manifest: list) -> Iterable[Path]:
66
+ # because iterable unpacking is not supported in list comprehension
67
+ res_manifest = []
68
+ for line in manifest:
69
+ res_manifest = itertools.chain(
70
+ res_manifest,
71
+ self._expandpath(config_root, Path(line))
72
+ )
73
+ return res_manifest
74
+
31
75
  def load(
32
76
  self,
33
77
  config_root: str | Path,
@@ -40,6 +84,7 @@ class Parser:
40
84
  _logger.critical("could not load manifest, aborting")
41
85
  sys.exit(1)
42
86
  loaded_config = {}
87
+ manifest = self._resolve_manifest(config_root, manifest)
43
88
 
44
89
  for entry in manifest:
45
90
  loaded_entry = self.datasource.read_configuration(config_root_path/entry)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: sigil-cli
3
- Version: 1.4.2
3
+ Version: 1.5.0
4
4
  Summary: Configuration driven CLI builder with subcommands and script loading
5
5
  Author-email: Kenzo Staelens <kenzostael@gmail.com>
6
6
  License: MIT
@@ -18,10 +18,11 @@ def test_integration_run_from_config_with_capsys(tmp_path, capsys):
18
18
  """Test run_from_config and capture output."""
19
19
  # Same setup as above
20
20
  manifest = tmp_path / "manifest.yml"
21
- manifest.write_text("- root.yml\n- hello.yml\n")
21
+ (tmp_path/'yml').mkdir()
22
+ manifest.write_text("- yml/*.yml\n")
22
23
 
23
24
  root_data = {"root": {"name": "hello", "script_dir": "scripts"}}
24
- (tmp_path / "root.yml").write_text(yaml.dump(root_data))
25
+ (tmp_path / "yml/root.yml").write_text(yaml.dump(root_data))
25
26
 
26
27
  hello_data = {
27
28
  "hello_cmd": {
@@ -31,7 +32,7 @@ def test_integration_run_from_config_with_capsys(tmp_path, capsys):
31
32
  "args": [{"name": "--name", "default": "world"}],
32
33
  }
33
34
  }
34
- (tmp_path / "hello.yml").write_text(yaml.dump(hello_data))
35
+ (tmp_path / "yml/hello.yml").write_text(yaml.dump(hello_data))
35
36
 
36
37
  script_dir = tmp_path / "scripts"
37
38
  script_dir.mkdir()
File without changes
File without changes
File without changes