arrdem/source
1
0
Fork 0
Code Issues 11 Pull requests Projects Releases Packages Wiki Activity

Fixing list as a global and local fn

Browse source
This commit is contained in:
Reid 'arrdem' McKenzie 2021-11-09 12:31:18 -07:00
parent 028873aa49
commit 0d81f6540d
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
projects/cram/src/python/cram/__main__.py
View file

@ -92,20 +92,27 @@ class PackageV0(NamedTuple):
def load_config(root: Path) -> dict: def load_config(root: Path) -> dict:
"""Load the configured packages.""" """Load the configured packages."""
packages = {str(p.relative_to(root)): PackageV0(p, str(p.relative_to(root))) packages = {
for p in (root / "packages.d").glob("*")} str(p.relative_to(root)): PackageV0(p, str(p.relative_to(root)))
for p in (root / "packages.d").glob("*")
}
# Add profiles, hosts which contain subpackages. # Add profiles, hosts which contain subpackages.
for mp_root in chain((root / "profiles.d").glob("*"), for mp_root in chain((root / "profiles.d").glob("*"), (root / "hosts.d").glob("*")):
(root / "hosts.d").glob("*")):
# First find all subpackages # First find all subpackages
for p in mp_root.glob("*", ): for p in mp_root.glob(
"*",
):
if p.is_dir(): if p.is_dir():
packages[str(p.relative_to(root))] = PackageV0(p, str(p.relative_to(root))) packages[str(p.relative_to(root))] = PackageV0(
p, str(p.relative_to(root))
)
# Register the metapackages themselves # Register the metapackages themselves
packages[str(mp_root.relative_to(root))] = PackageV0(mp_root, str(mp_root.relative_to(root)), True) packages[str(mp_root.relative_to(root))] = PackageV0(
mp_root, str(mp_root.relative_to(root)), True
)
return packages return packages
@ -157,14 +164,14 @@ def load_fs(statefile: Path) -> Vfs:
log.warning("No previous statefile %s", statefile) log.warning("No previous statefile %s", statefile)
return oldfs return oldfs
def simplify(old_fs: Vfs, new_fs: Vfs) -> Vfs: def simplify(old_fs: Vfs, new_fs: Vfs) -> Vfs:
"""Try to reduce a new VFS using diff from the original VFS.""" """Try to reduce a new VFS using diff from the original VFS."""
old_fs = old_fs.copy() old_fs = old_fs.copy()
new_fs = new_fs.copy() new_fs = new_fs.copy()
# Scrub anything in the new log that's in the old log # Scrub anything in the new log that's in the old log
for txn in list(old_fs._log): for txn in list(old_fs._log):
# Except for execs which are stateful # Except for execs which are stateful
@ -188,7 +195,7 @@ def scrub(old_fs: Vfs, new_fs: Vfs) -> Vfs:
if txn[0] == "link" and txn not in new_fs._log: if txn[0] == "link" and txn not in new_fs._log:
new_fs.unlink(txn[2]) new_fs.unlink(txn[2])
elif txn[0] == "mkdir" and txn not in new_fs.log: elif txn[0] == "mkdir" and txn not in new_fs._log:
new_fs.unlink(txn[1]) new_fs.unlink(txn[1])
return new_fs return new_fs
@ -199,13 +206,13 @@ def cli():
pass pass
@cli.command() @cli.command("apply")
@click.option("--execute/--dry-run", default=False) @click.option("--execute/--dry-run", default=False)
@click.option("--optimize/--no-optimize", default=True)
@click.option("--state-file", default=".cram.log", type=Path) @click.option("--state-file", default=".cram.log", type=Path)
@click.option("--optimize/--no-optimize", default=False)
@click.argument("confdir", type=Path) @click.argument("confdir", type=Path)
@click.argument("destdir", type=Path) @click.argument("destdir", type=Path)
def apply(confdir, destdir, state_file, execute, optimize): def cmd_apply(confdir, destdir, state_file, execute, optimize):
"""The entry point of cram.""" """The entry point of cram."""
# Resolve the two input paths to absolutes # Resolve the two input paths to absolutes
@ -232,25 +239,28 @@ def apply(confdir, destdir, state_file, execute, optimize):
else: else:
for e in executable_fs._log: for e in executable_fs._log:
print("-", e) print("-", *e)
@cli.command() @cli.command("show")
@click.option("--state-file", default=".cram.log", type=Path) @click.option("--state-file", default=".cram.log", type=Path)
@click.argument("confdir", type=Path) @click.argument("confdir", type=Path)
def show(confdir, state_file): def cmd_show(confdir, state_file):
"""List out the last `apply` state in the <confdir>/.cram.log or --state-file.""" """List out the last `apply` state in the <confdir>/.cram.log or --state-file."""
root = confdir.resolve() root = confdir.resolve()
if not state_file.is_absolute(): if not state_file.is_absolute():
state_file = root / state_file state_file = root / state_file
fs = load_fs(state_file) fs = load_fs(state_file)
for e in fs._log: for e in fs._log:
print(*e) print(*e)
@cli.command() @cli.command("list")
@click.argument("confdir", type=Path) @click.argument("confdir", type=Path)
def list(confdir): def cmd_list(confdir):
"""List out packages, profiles, hosts and subpackages in the <confdir>.""" """List out packages, profiles, hosts and subpackages in the <confdir>."""
packages = load_config(confdir) packages = load_config(confdir)
for pname in sorted(packages.keys()): for pname in sorted(packages.keys()):