update dotfiles cli

Author: Ragdata

src/dotware/dotfiles/cli.py

@@ -20,6 +20,7 @@
 from inspect import isfunction
 from typing_extensions import Annotated
 
+from dotware import config
 from dotware.config import *
 from dotware import __pkg_name__, __version__
 from dotware.registry import *
@@ -78,10 +79,16 @@ def showComponents(type: Annotated[str, typer.Argument(help="Component Type")]):
 				compdir = COMPLETIONS
 			case 'functions':
 				compdir = FUNCTIONS
+			case 'packages':
+				compdir = PACKAGES
 			case 'plugins':
 				compdir = PLUGINS
+			case 'scripts':
+				compdir = SCRIPTS
+			case 'stacks':
+				compdir = STACKS
 			case _:
-				logger.error(f"Unknown component type '{type}'. Valid types are: {', '.join(SELECTABLE_TYPES)}")
+				logger.error(f"Unknown component type '{type}'. Valid types are: {', '.join([t[0] for t in COMPONENT_TYPES])}")
 				raise typer.Exit(code=1)
 
 		if not compdir.exists():
@@ -92,7 +99,26 @@ def showComponents(type: Annotated[str, typer.Argument(help="Component Type")]):
 		i = 1
 		files = [f.name for f in compdir.iterdir() if f.is_file()]
 		for file in files:
-			pass
+			try:
+				compfile = compdir / file
+				if not compfile.exists():
+					logger.error(f"Component file '{compfile}' does not exist.")
+					continue
+				if type in SELECTABLE_TYPES:
+					status = Registry._status(compfile)
+					if status == 0:
+						status_symbol = SYMBOL_SUCCESS
+					elif status == 1:
+						status_symbol = " "
+					else:
+						status_symbol = SYMBOL_ERROR
+				else:
+					status_symbol = " "
+				logger.info(f"{i}. {status_symbol} {file}")
+				i += 1
+			except Exception as e:
+				logger.error(f"Error processing file '{file}': {e}")
+				raise
 
 	except Exception as e:
 		logger.error(f"Failed to show components of type '{type}': {e}")
@@ -131,6 +157,7 @@ def installPackage(name: Annotated[str, typer.Argument(help="Package Name")]):
 		preinstall = f"{name}::pre_install"
 		installfnc = f"{name}::install"
 		postinstall = f"{name}::post_install"
+		configfnc = f"{name}::config"
 		if not pkgfile.exists():
 			logger.error(f"Package directory '{pkgfile}' does not exist.")
 			raise typer.Exit(code=1)
@@ -166,6 +193,9 @@ def installPackage(name: Annotated[str, typer.Argument(help="Package Name")]):
 				else:
 					logger.info(f"Post-installation hook executed successfully for package '{name}'.")
 
+			if grepFile(pkgfile, configfnc):
+				logger.info(typer.style(f"Package also includes configuration hook", fg=config.COLOR_WARNING, bold=True))
+
 	except Exception as e:
 		logger.error(f"Failed to install package '{name}': {e}")
 		raise

src/dotware/meta.py

@@ -26,8 +26,8 @@ class Component:
 	desc: str
 	tags: list[str]
 
-	_filepath: Path
-	_status: int = 1
+	filepath: Path
+	status: int = 1
 
 
 
@@ -77,9 +77,9 @@ def searchPath(self, path: Path, clear: bool = False, recursive: bool = True):
 								desc = line.split(':', 1)[1].strip()
 							elif line.startswith('# Tags:'):
 								tags = [tag.strip() for tag in line.split(':', 1)[1].split(',')]
-							elif line.startswith('# FUNCTIONS'):
+							elif line.startswith('###########'):
 								break
-						component = Component(name=name, desc=desc, tags=tags, _filepath=file, _status=Registry._status(file))
+						component = Component(name=name, desc=desc, tags=tags, filepath=file, status=Registry._status(file))
 						self._components.append(component)
 					if found:
 						break

src/dotware/registry.py

@@ -76,19 +76,16 @@ def _checkFile(file: Path):
 	def _status(id: Path | str) -> int:
 		""" Check the status of a component """
 
-		if isinstance(id, Path):
-			if not id.is_file():
-				logger.error(f"Path '{id}' is not a file.")
-				return 20
-			if Registry._checkFile(id) != 0:
-				logger.error(f"File '{id}' is not a valid component file.")
-				return 20
-			name = id.name
-		elif isinstance(id, str):
-			name = id
-		else:
-			logger.error(f"Invalid component ID type: {type(id)}. Must be a Path or str.")
-			return 10
+		if isinstance(id, str):
+			id = Path(id)
+
+		if not id.is_file():
+			logger.error(f"Path '{id}' is not a file.")
+			return 3
+		if Registry._checkFile(id) != 0:
+			logger.error(f"File '{id}' is not a valid component file.")
+			return 2
+		name = id.name
 
 		parts = name.split('.')
 		regfile = REGISTRY / f"{parts[1]}.enabled"

sys/lib/aliases/general.aliases.bash

@@ -24,7 +24,7 @@ fi
 
 # Add an "alert" alias for long running commands.  Use like so:
 #   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+# alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
 # maintain scrollback on clear
 alias clear='clear -x'

sys/lib/pkgs/asdf

@@ -28,11 +28,11 @@ asdf::install()
 
 	sudo ex asdf-*.tar.gz -C /usr/local/bin
 
-	if [ ! -f "$CUSTOM/99-custom.bash" ]; then
-		echo "source <(asdf completion bash)" > "$CUSTOM/99-custom.bash"
-		ln -s "$CUSTOM/99-custom.bash" "$BASHRCD/99-custom.bash"
+	if [ ! -f "$CUSTOM/dots/.bashrc.d/99-custom.bash" ]; then
+		echo "source <(asdf completion bash)" > "$CUSTOM/dots/.bashrc.d/99-custom.bash"
+		ln -s "$CUSTOM/dots/.bashrc.d/99-custom.bash" "$BASHRCD/99-custom.bash"
 	else
-		echo "source <(asdf completion bash)" >> "$CUSTOM/99-custom.bash"
+		echo "source <(asdf completion bash)" >> "$CUSTOM/dots/.bashrc.d/99-custom.bash"
 	fi
 }
 #-------------------------------------------------------------------