sigil-cli 1.5.1__tar.gz → 1.5.2__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 (48) hide show
  1. {sigil_cli-1.5.1/src/sigil_cli.egg-info → sigil_cli-1.5.2}/PKG-INFO +3 -3
  2. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/README.md +2 -2
  3. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/pyproject.toml +1 -1
  4. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/__init__.py +14 -0
  5. sigil_cli-1.5.2/src/sigil/__main__.py +22 -0
  6. sigil_cli-1.5.2/src/sigil/cli_tools/__init__.py +9 -0
  7. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/cli_tools/init.py +8 -1
  8. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/cli_tools/tree.py +7 -0
  9. sigil_cli-1.5.2/src/sigil/cli_tools/util.py +24 -0
  10. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/cli_tools/validate.py +9 -0
  11. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/entrypoint.py +6 -19
  12. sigil_cli-1.5.2/src/sigil/script_sources/__init__.py +7 -0
  13. sigil_cli-1.5.1/src/sigil/stages/script_loader.py → sigil_cli-1.5.2/src/sigil/script_sources/filesystem_script_source.py +7 -53
  14. sigil_cli-1.5.2/src/sigil/script_sources/script_source.py +14 -0
  15. sigil_cli-1.5.2/src/sigil/stages/script_loader.py +84 -0
  16. {sigil_cli-1.5.1 → sigil_cli-1.5.2/src/sigil_cli.egg-info}/PKG-INFO +3 -3
  17. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil_cli.egg-info/SOURCES.txt +5 -0
  18. sigil_cli-1.5.2/tests/test_cli_util.py +27 -0
  19. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_integration.py +4 -1
  20. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_scriptloader.py +10 -7
  21. sigil_cli-1.5.1/src/sigil/__main__.py +0 -40
  22. sigil_cli-1.5.1/src/sigil/cli_tools/__init__.py +0 -0
  23. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/LICENSE +0 -0
  24. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/setup.cfg +0 -0
  25. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/datasource/__init__.py +0 -0
  26. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/datasource/datasource.py +0 -0
  27. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/datasource/helper.py +0 -0
  28. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/datasource/json_source.py +0 -0
  29. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/datasource/yml_source.py +0 -0
  30. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/models/__init__.py +0 -0
  31. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/models/argparser.py +0 -0
  32. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/models/argument.py +0 -0
  33. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/models/command.py +0 -0
  34. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/models/script.py +0 -0
  35. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/stages/__init__.py +0 -0
  36. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/stages/builder.py +0 -0
  37. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/stages/parser.py +0 -0
  38. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil/stages/resolver.py +0 -0
  39. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil_cli.egg-info/dependency_links.txt +0 -0
  40. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil_cli.egg-info/entry_points.txt +0 -0
  41. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil_cli.egg-info/requires.txt +0 -0
  42. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/src/sigil_cli.egg-info/top_level.txt +0 -0
  43. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_builder.py +0 -0
  44. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_cli_init.py +0 -0
  45. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_cli_tree.py +0 -0
  46. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_cli_validate.py +0 -0
  47. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_reader.py +0 -0
  48. {sigil_cli-1.5.1 → sigil_cli-1.5.2}/tests/test_resolver.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: sigil-cli
3
- Version: 1.5.1
3
+ Version: 1.5.2
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
@@ -286,11 +286,11 @@ from sigil import run_from_config
286
286
  # Use JSON instead:
287
287
  class JsonReader:
288
288
  @classmethod
289
- def read_manifest(cls, config_root: Path) -> list | None:
289
+ def read_manifest(cls, config_root: Path, target: str) -> list | None:
290
290
  # read target paths for loading configuration
291
291
  ...
292
292
 
293
- def read_configuration(cls, target: Path) -> dict | None:
293
+ def read_configuration(cls, target: Path, target: str) -> dict | None:
294
294
  # read *.json, parse, convert to dict of raw data
295
295
  ...
296
296
 
@@ -256,11 +256,11 @@ from sigil import run_from_config
256
256
  # Use JSON instead:
257
257
  class JsonReader:
258
258
  @classmethod
259
- def read_manifest(cls, config_root: Path) -> list | None:
259
+ def read_manifest(cls, config_root: Path, target: str) -> list | None:
260
260
  # read target paths for loading configuration
261
261
  ...
262
262
 
263
- def read_configuration(cls, target: Path) -> dict | None:
263
+ def read_configuration(cls, target: Path, target: str) -> dict | None:
264
264
  # read *.json, parse, convert to dict of raw data
265
265
  ...
266
266
 
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "sigil-cli"
7
- version = "1.5.1"
7
+ version = "1.5.2"
8
8
  description = "Configuration driven CLI builder with subcommands and script loading"
9
9
  readme = "README.md"
10
10
  requires-python = ">=3.10"
@@ -2,6 +2,11 @@ from importlib.metadata import version
2
2
 
3
3
  __version__ = version('sigil-cli')
4
4
 
5
+ from .datasource import (
6
+ DataSource,
7
+ JSONSource,
8
+ YmlSource,
9
+ )
5
10
  from .entrypoint import run_from_config
6
11
  from .models import (
7
12
  Argument,
@@ -10,6 +15,10 @@ from .models import (
10
15
  ParserConfig,
11
16
  SubcommandModule,
12
17
  )
18
+ from .script_sources import (
19
+ FilesystemScriptSource,
20
+ ScriptSource,
21
+ )
13
22
  from .stages import (
14
23
  Builder,
15
24
  Parser,
@@ -28,4 +37,9 @@ __all__ = (
28
37
  'Resolver',
29
38
  'Builder',
30
39
  'ScriptLoader',
40
+ 'DataSource',
41
+ 'JSONSource',
42
+ 'YmlSource',
43
+ 'FilesystemScriptSource',
44
+ 'ScriptSource',
31
45
  )
@@ -0,0 +1,22 @@
1
+ import argparse
2
+
3
+ from sigil import __version__
4
+ from sigil.cli_tools.util import COMMAND_REGISTRY, REGISTER_CALLABLES
5
+
6
+
7
+ def main():
8
+ parser = argparse.ArgumentParser(prog='sigil')
9
+ parser.add_argument('--version', action='version', version=f'Sigil {__version__}')
10
+ sub = parser.add_subparsers(title="subcommands", dest='command')
11
+ for fn in REGISTER_CALLABLES:
12
+ fn(sub)
13
+
14
+ args = parser.parse_args()
15
+ if args.command not in COMMAND_REGISTRY:
16
+ parser.parse_args(['-h'])
17
+ return
18
+ COMMAND_REGISTRY[args.command](args)
19
+
20
+
21
+ if __name__ == "__main__":
22
+ main()
@@ -0,0 +1,9 @@
1
+ # lives here to trigger registration logic without manual imports
2
+ from . import init, tree, util, validate
3
+
4
+ __all__ = [
5
+ 'init',
6
+ 'tree',
7
+ 'util',
8
+ 'validate'
9
+ ]
@@ -1,8 +1,10 @@
1
1
  # for everyone's sanity: not to be confused with __init__
2
-
2
+ import argparse
3
3
  import sys
4
4
  from pathlib import Path
5
5
 
6
+ from .util import registers
7
+
6
8
  # initial file contents
7
9
  MANIFEST="""- yml/root.yml
8
10
  """
@@ -75,3 +77,8 @@ def create_project(project_name: str, target_dir: str = "."):
75
77
  print(f" cd {project_name}")
76
78
  print(" python main.py hello --help")
77
79
  print(" create an alias")
80
+
81
+ @registers('init', 'generate a minimal sigil')
82
+ def add_sigil_init(command: argparse.ArgumentParser):
83
+ command.add_argument('name', help="project name to create")
84
+ return lambda args: create_project(args.name)
@@ -3,6 +3,8 @@ import argparse
3
3
  from sigil import Builder, Parser, Resolver
4
4
  from sigil.datasource import YmlSource
5
5
 
6
+ from .util import registers
7
+
6
8
 
7
9
  # adapted from https://stackoverflow.com/questions/78166654/how-can-i-print-the-tree-structure-of-subparsers-of-an-argparse-parser-in-python/78246362#78246362
8
10
  def parser_tree(
@@ -39,3 +41,8 @@ def display_project(projectroot):
39
41
  parser = Builder.build(resolved)
40
42
  print(parser_tree(parser))
41
43
 
44
+
45
+ @registers('tree', 'display the command structure of a sigil.')
46
+ def add_sigil_tree(command: argparse.ArgumentParser):
47
+ command.add_argument('path', help="project to validate")
48
+ return lambda args: display_project(args.path)
@@ -0,0 +1,24 @@
1
+ import argparse
2
+ import functools
3
+ from collections.abc import Callable
4
+
5
+ COMMAND_REGISTRY: 'dict[str, Callable[[argparse.Namespace]]]' = {}
6
+ REGISTER_CALLABLES = []
7
+
8
+ def registers(name: str, cmd_help: str):
9
+ def decorator_fn(f: 'Callable[[argparse.ArgumentParser], Callable[[argparse.Namespace]]]'): # noqa: E501
10
+ @functools.wraps(f)
11
+ def wrapper(parser: argparse._SubParsersAction):
12
+ if name in COMMAND_REGISTRY:
13
+ raise RuntimeError(f'{name} already registered')
14
+ subparser: argparse.ArgumentParser = parser.add_parser(
15
+ name=name,
16
+ help=cmd_help
17
+ )
18
+ callable = f(subparser)
19
+ COMMAND_REGISTRY[name] = callable
20
+ return subparser
21
+ # note: requires import in cli_tools.__init__ to auto trigger registration
22
+ REGISTER_CALLABLES.append(wrapper)
23
+ return wrapper
24
+ return decorator_fn
@@ -1,3 +1,4 @@
1
+ import argparse
1
2
  import contextlib
2
3
  import logging
3
4
  import sys
@@ -6,6 +7,8 @@ from pathlib import Path
6
7
  from sigil import Builder, Parser, Resolver
7
8
  from sigil.datasource import YmlSource
8
9
 
10
+ from .util import registers
11
+
9
12
 
10
13
  # small helper to capture logs from in the guts of sigil
11
14
  class WarningCollector(logging.Handler):
@@ -115,3 +118,9 @@ def validate_project(projectroot):
115
118
  sys.exit(1)
116
119
  else:
117
120
  print("Validation passed successfully.", file=sys.stderr)
121
+
122
+
123
+ @registers('validate', 'validate structure of a sigil')
124
+ def add_sigil_validate(command: argparse.ArgumentParser):
125
+ command.add_argument('path', help="project to validate")
126
+ return lambda args: validate_project(args.path)
@@ -1,18 +1,17 @@
1
- import logging
2
- import sys
3
1
  from pathlib import Path
4
2
  from typing import Any
5
3
 
6
4
  from .datasource import DataSource, YmlSource
5
+ from .script_sources import FilesystemScriptSource, ScriptSource
7
6
  from .stages import Builder, Parser, Resolver, ScriptLoader
8
7
 
9
- _logger = logging.getLogger(__name__)
10
8
 
11
9
  # default to yamlloader, use whatever datastore you feel like
12
10
  def run_from_config(
13
11
  config_root: str | Path,
14
12
  datasource: DataSource | type[DataSource] = YmlSource,
15
13
  manifest_target='manifest.yml',
14
+ script_source: ScriptSource=FilesystemScriptSource # also default to FS scripts
16
15
  ) -> None:
17
16
  raw_data = Parser(datasource).load(config_root, manifest_target)
18
17
  resolved = Resolver.resolve_inheritance(raw_data)
@@ -27,19 +26,7 @@ def run_from_config(
27
26
  else:
28
27
  args = parser.parse_args()
29
28
 
30
- scripts = ScriptLoader.get_scripts(args, 'root', parser, {'root': resolved})
31
- for script in scripts:
32
- try:
33
- module = ScriptLoader.import_module(
34
- config_root,
35
- resolved.script_dir,
36
- script
37
- )
38
- if not module:
39
- continue
40
- except FileNotFoundError as e:
41
- # prevent your subcommand from turning your environment
42
- # into undefined soup by not continuing execution
43
- _logger.critical(f'failed to load script "{script}"\n {e}')
44
- sys.exit(2)
45
- module.run(args, execution_context)
29
+
30
+ scriptloader = ScriptLoader(config_root, resolved.script_dir, script_source)
31
+ scripts = scriptloader.get_scripts(args, 'root', parser, {'root': resolved})
32
+ scriptloader.run_scripts(scripts, args, execution_context)
@@ -0,0 +1,7 @@
1
+ from .filesystem_script_source import FilesystemScriptSource
2
+ from .script_source import ScriptSource
3
+
4
+ __all__ = [
5
+ 'FilesystemScriptSource',
6
+ 'ScriptSource'
7
+ ]
@@ -1,16 +1,18 @@
1
- import importlib.util
1
+ import importlib
2
2
  import logging
3
3
  import sys
4
- from argparse import Namespace
5
4
  from importlib.abc import Loader
6
5
  from pathlib import Path
7
6
  from typing import cast
8
7
 
9
- from sigil.models import LibArgParser, ParserConfig, SubcommandModule
8
+ from sigil.models import SubcommandModule
9
+
10
+ from .script_source import ScriptSource
10
11
 
11
12
  _logger = logging.getLogger(__name__)
12
13
 
13
- class ScriptLoader:
14
+
15
+ class FilesystemScriptSource(ScriptSource):
14
16
  @classmethod
15
17
  def _construct_package_name(
16
18
  cls,
@@ -40,11 +42,10 @@ class ScriptLoader:
40
42
  )
41
43
  return fully_qualified_name
42
44
 
43
-
44
45
  @classmethod
45
46
  def import_module(
46
47
  cls,
47
- config_root,
48
+ config_root: Path,
48
49
  path:str | None,
49
50
  module_name: str
50
51
  ) -> SubcommandModule | None:
@@ -69,50 +70,3 @@ class ScriptLoader:
69
70
  module = importlib.util.module_from_spec(spec)
70
71
  cast(Loader, spec.loader).exec_module(module)
71
72
  return cast(SubcommandModule, module) # or at least assumed to be by contract
72
-
73
- @classmethod
74
- def _get_next_parser_name(cls, args: Namespace, target: str, parser: ParserConfig):
75
- # get the name of the next subcommand
76
- if target != 'root':
77
- # normal case a subcommand just points to the next arg
78
- next_value = getattr(args, target)
79
- else:
80
- # root is a special case because the top level parser
81
- # is required to be called root (id, not name parameter)
82
- # therefore root needs to grab the next part by name instead
83
- next_value = getattr(args, parser.name)
84
- return next_value
85
-
86
- @classmethod
87
- def get_scripts(
88
- cls,
89
- args: Namespace,
90
- target: str,
91
- root_parser: LibArgParser,
92
- data: dict[str, ParserConfig]
93
- ) -> list[str]:
94
- found_scripts = []
95
-
96
- target_parser: ParserConfig = data[target]
97
- subparsers = target_parser.subparsers
98
- script = target_parser.script
99
-
100
- if script:
101
- found_scripts.append(script)
102
- if not subparsers:
103
- # nothing to keep exploring anymore -> early exit
104
- return found_scripts
105
-
106
- next_value = cls._get_next_parser_name(args, target, target_parser)
107
-
108
- if next_value is None:
109
- # if subcommands exist but no subcommand is used print help instead
110
- root_parser.parse_args(sys.argv[1:] + ['--help'])
111
- sys.exit(2) # nothing to do here
112
-
113
- return found_scripts + cls.get_scripts(
114
- args,
115
- next_value,
116
- root_parser,
117
- subparsers,
118
- )
@@ -0,0 +1,14 @@
1
+ from abc import ABC, abstractmethod
2
+ from pathlib import Path
3
+
4
+ from sigil.models import SubcommandModule
5
+
6
+
7
+ class ScriptSource(ABC):
8
+ @abstractmethod
9
+ def import_module(
10
+ cls,
11
+ config_root: Path, # config root
12
+ script_dir: str | None, # script dir according to root config
13
+ module_name: str # data in config file
14
+ ) -> SubcommandModule | None: ...
@@ -0,0 +1,84 @@
1
+ import logging
2
+ import sys
3
+ from argparse import Namespace
4
+ from pathlib import Path
5
+
6
+ from sigil.models import LibArgParser, ParserConfig
7
+ from sigil.script_sources import ScriptSource
8
+
9
+ _logger = logging.getLogger(__name__)
10
+
11
+ class ScriptLoader:
12
+ def __init__(
13
+ self,
14
+ config_root: Path,
15
+ script_dir: str | None,
16
+ script_source: ScriptSource | type[ScriptSource]
17
+ ):
18
+ self.config_root = config_root
19
+ self.script_dir = script_dir
20
+ if isinstance(script_source, type):
21
+ script_source = script_source()
22
+ self.script_source = script_source
23
+
24
+ def _get_next_parser_name(cls, args: Namespace, target: str, parser: ParserConfig):
25
+ # get the name of the next subcommand
26
+ if target != 'root':
27
+ # normal case a subcommand just points to the next arg
28
+ next_value = getattr(args, target)
29
+ else:
30
+ # root is a special case because the top level parser
31
+ # is required to be called root (id, not name parameter)
32
+ # therefore root needs to grab the next part by name instead
33
+ next_value = getattr(args, parser.name)
34
+ return next_value
35
+
36
+ def get_scripts(
37
+ cls,
38
+ args: Namespace,
39
+ target: str,
40
+ root_parser: LibArgParser,
41
+ data: dict[str, ParserConfig]
42
+ ) -> list[str]:
43
+ found_scripts = []
44
+
45
+ target_parser: ParserConfig = data[target]
46
+ subparsers = target_parser.subparsers
47
+ script = target_parser.script
48
+
49
+ if script:
50
+ found_scripts.append(script)
51
+ if not subparsers:
52
+ # nothing to keep exploring anymore -> early exit
53
+ return found_scripts
54
+
55
+ next_value = cls._get_next_parser_name(args, target, target_parser)
56
+
57
+ if next_value is None:
58
+ # if subcommands exist but no subcommand is used print help instead
59
+ root_parser.parse_args(sys.argv[1:] + ['--help'])
60
+ sys.exit(2) # nothing to do here
61
+
62
+ return found_scripts + cls.get_scripts(
63
+ args,
64
+ next_value,
65
+ root_parser,
66
+ subparsers,
67
+ )
68
+
69
+ def run_scripts(self, script_targets, namespace, context):
70
+ for script in script_targets:
71
+ try:
72
+ module = self.script_source.import_module(
73
+ self.config_root,
74
+ self.script_dir,
75
+ script
76
+ )
77
+ if not module:
78
+ continue
79
+ except Exception as e:
80
+ # prevent your subcommand from turning your environment
81
+ # into undefined soup by not continuing execution
82
+ _logger.critical(f'failed to load script "{script}"\n {e}')
83
+ sys.exit(2)
84
+ module.run(namespace, context)
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: sigil-cli
3
- Version: 1.5.1
3
+ Version: 1.5.2
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
@@ -286,11 +286,11 @@ from sigil import run_from_config
286
286
  # Use JSON instead:
287
287
  class JsonReader:
288
288
  @classmethod
289
- def read_manifest(cls, config_root: Path) -> list | None:
289
+ def read_manifest(cls, config_root: Path, target: str) -> list | None:
290
290
  # read target paths for loading configuration
291
291
  ...
292
292
 
293
- def read_configuration(cls, target: Path) -> dict | None:
293
+ def read_configuration(cls, target: Path, target: str) -> dict | None:
294
294
  # read *.json, parse, convert to dict of raw data
295
295
  ...
296
296
 
@@ -7,6 +7,7 @@ src/sigil/entrypoint.py
7
7
  src/sigil/cli_tools/__init__.py
8
8
  src/sigil/cli_tools/init.py
9
9
  src/sigil/cli_tools/tree.py
10
+ src/sigil/cli_tools/util.py
10
11
  src/sigil/cli_tools/validate.py
11
12
  src/sigil/datasource/__init__.py
12
13
  src/sigil/datasource/datasource.py
@@ -18,6 +19,9 @@ src/sigil/models/argparser.py
18
19
  src/sigil/models/argument.py
19
20
  src/sigil/models/command.py
20
21
  src/sigil/models/script.py
22
+ src/sigil/script_sources/__init__.py
23
+ src/sigil/script_sources/filesystem_script_source.py
24
+ src/sigil/script_sources/script_source.py
21
25
  src/sigil/stages/__init__.py
22
26
  src/sigil/stages/builder.py
23
27
  src/sigil/stages/parser.py
@@ -32,6 +36,7 @@ src/sigil_cli.egg-info/top_level.txt
32
36
  tests/test_builder.py
33
37
  tests/test_cli_init.py
34
38
  tests/test_cli_tree.py
39
+ tests/test_cli_util.py
35
40
  tests/test_cli_validate.py
36
41
  tests/test_integration.py
37
42
  tests/test_reader.py
@@ -0,0 +1,27 @@
1
+ import argparse
2
+
3
+ import pytest
4
+
5
+ from sigil.cli_tools.util import COMMAND_REGISTRY, REGISTER_CALLABLES
6
+
7
+
8
+ def test_cli_util(
9
+ capsys: pytest.CaptureFixture
10
+ ) -> None:
11
+ parser = argparse.ArgumentParser(prog='sigil')
12
+ parser.add_argument('--version', action='version', version='Sigil x.x.x')
13
+ sub = parser.add_subparsers(title="subcommands", dest='command')
14
+
15
+ assert len(REGISTER_CALLABLES) == 3
16
+ for fn in REGISTER_CALLABLES:
17
+ fn(sub)
18
+
19
+ with pytest.raises(SystemExit):
20
+ # argparse raises on -h :/
21
+ parser.parse_args(['-h'])
22
+
23
+ # # Act & Assert: should not raise or exit
24
+ captured = capsys.readouterr().out.strip()
25
+ print('xxx',captured)
26
+ for k in COMMAND_REGISTRY.keys():
27
+ assert k in captured
@@ -7,6 +7,7 @@ import yaml
7
7
  from sigil import (
8
8
  Argument,
9
9
  Builder,
10
+ FilesystemScriptSource,
10
11
  LibArgParser,
11
12
  ParserConfig,
12
13
  ScriptLoader,
@@ -119,6 +120,8 @@ def test_script_loader_no_subcommand(capsys):
119
120
  args = parser.parse_args([]) # no subcommand
120
121
  # get_scripts will print help and sys.exit
121
122
  with pytest.raises(SystemExit):
122
- ScriptLoader.get_scripts(args, "root", parser, data)
123
+ ScriptLoader(
124
+ None, None, FilesystemScriptSource
125
+ ).get_scripts(args, "root", parser, data)
123
126
  captured = capsys.readouterr()
124
127
  assert "usage:" in captured.out or "usage:" in captured.err
@@ -1,6 +1,6 @@
1
1
  from unittest.mock import MagicMock, patch
2
2
 
3
- from sigil import Builder, ScriptLoader
3
+ from sigil import Builder, FilesystemScriptSource, ScriptLoader
4
4
 
5
5
 
6
6
  def test_script_loader_get_scripts(resolved_config):
@@ -13,7 +13,10 @@ def test_script_loader_get_scripts(resolved_config):
13
13
  # data structure: we have root as ParserConfig;
14
14
  # we need to pass as dict for recursive lookup
15
15
  data = {"root": resolved_config}
16
- scripts = ScriptLoader.get_scripts(args, "root", parser, data)
16
+ scripts = ScriptLoader(
17
+ None, None, FilesystemScriptSource
18
+ ).get_scripts(args, "root", parser, data)
19
+ # scripts = ScriptLoader.get_scripts(args, "root", parser, data)
17
20
 
18
21
  # The leaf script should be found
19
22
  assert "leaf_script" in scripts
@@ -32,24 +35,24 @@ def test_script_loader_import_module(tmp_path):
32
35
  " print('Hello')\n"
33
36
  )
34
37
 
35
- loader = ScriptLoader()
36
- module = loader.import_module(str(tmp_path), "scripts", "my_script")
38
+ loader = ScriptLoader(None, None, FilesystemScriptSource)
39
+ module = loader.script_source.import_module(tmp_path, "scripts", "my_script")
37
40
  assert hasattr(module, "run")
38
41
  assert module is not None
39
42
  assert callable(module.run)
40
43
 
41
- @patch("sigil.stages.script_loader.importlib.util")
44
+ @patch("sigil.script_sources.filesystem_script_source.importlib.util")
42
45
  def test_script_loader_import_module_mock(mock_importlib, tmp_path):
43
46
  """Test import_module with mocked importlib to avoid actual file I/O."""
44
47
  # We'll just verify it builds the correct path and calls spec_from_file_location
45
- loader = ScriptLoader()
48
+ loader = ScriptLoader(None, None, FilesystemScriptSource)
46
49
  # We need to mock the spec and loader
47
50
  mock_spec = MagicMock()
48
51
  mock_importlib.spec_from_file_location.return_value = mock_spec
49
52
  mock_module = MagicMock()
50
53
  mock_importlib.module_from_spec.return_value = mock_module
51
54
 
52
- loader.import_module(str(tmp_path), "scripts", "my_script")
55
+ loader.script_source.import_module(tmp_path, "scripts", "my_script")
53
56
 
54
57
  mock_importlib.spec_from_file_location.assert_called_once_with(
55
58
  "scripts.my_script", str(tmp_path / "scripts" / "my_script.py")
@@ -1,40 +0,0 @@
1
- import argparse
2
-
3
- from sigil import __version__
4
- from sigil.cli_tools.init import create_project
5
- from sigil.cli_tools.tree import display_project
6
- from sigil.cli_tools.validate import validate_project
7
-
8
-
9
- def main():
10
- # let's not start self hosting here
11
- parser = argparse.ArgumentParser(prog='sigil')
12
- parser.add_argument('--version', action='version', version=f'Sigil {__version__}')
13
- sub = parser.add_subparsers(title="subcommands", dest='command')
14
-
15
- init = sub.add_parser(name="init", help="generate a minimal sigil")
16
- init.add_argument('name', help="project name to create")
17
-
18
- validate = sub.add_parser(name="validate", help="validate structure of a sigil")
19
- validate.add_argument('path', help="project to validate")
20
-
21
- validate = sub.add_parser(
22
- name="tree",
23
- help="display the command structure of a sigil."
24
- )
25
- validate.add_argument('path', help="project to validate")
26
-
27
- args = parser.parse_args()
28
-
29
- if args.command == 'init':
30
- create_project(args.name)
31
- return
32
- if args.command == 'validate':
33
- validate_project(args.path)
34
- return
35
- if args.command == 'tree':
36
- display_project(args.path)
37
- return
38
-
39
- if __name__ == "__main__":
40
- main()
File without changes
File without changes
File without changes