| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
| 565946643b |
jw.pkg.*.run_xxx(): Return exit status
Most run_xxx() return stdout and stderr. There's no way, really, for the caller to get hold of the exit code of the spawned executable. It can pass throw=true, catch, and assume a non-zero exit status. But that's not semantically clean, since the spawned function can well be a test function which is expected to return a non-zero status code, and the caller might be interested in what code that was, exactly. The clearest way to solve this is to return the exit code as well. This commit does that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| afc77ab61d |
jw.pkg.lib.util.run_curl(): Beautify logging
Make some incomprensible parser error messages if run_curl() returns nothing slightly less incomprehensible. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| b81406e11a |
run_cmd() and friends: Make args a list[str]
This is a code maintenance commit: some run_xxx() helper functions take a string, some a list, and some just digest all arguments and pass them on as a list to exec() to be executed. That's highly inconsistent. This commit changes that to list-only. Except for the run_cmd() method of SSHClient, which is still run as a shell method, because, erm, it's a shell. Might be changed in the future for consistency reasons. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 2906c697de |
jw.pkg.lib.util.run_cmd(): Add stderr to exception
If an error happens, append stderr to the exception thrown. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| c8036ad216 |
jw-pkg.sh: Print help for missing subcommands
Print a help message if no subcommand is specified for one of the comamnds "distro" and "projects". Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| e5e0cf9930 |
jw.pkg.lib.Cmd._run(): Call parent._run()
jw.pkg.lib.Cmd._run() is abstract, but it's nice to give it a default implementation which calls self.parent._run() in case parent is also a command class. That allows for some default processing in _run() for each node up the parent chain. The children / derived classes just need to make sure all classes in the hierarchy do: async def _run(self, args):
return await super()._run(args)
... add main command logic here .. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 6916d7edc8 |
jw.pkg.lib.util.run_sudo(): Add parameter verbose
Add parameter verbose to run_sudo() and pass it on to run_cmd(). Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| b3fd624a3f |
jw.pkg.lib.util.get_profile_env(): add -> keep
Replace the boolean parameter "add" with the richer "keep": - False -> Don't keep anything - True -> Keep what's in the current environment - List of strings -> Keep those variables Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 2d1beeebb0 |
jw.pkg.lib.util.get_profile_env(): Add function
Add a function get_profile_env(), a function returning environment variables from /etc/profile. Pass add=True to add its contents to the existing environment dictionary, overwriting old entries, or pass False to get the pristine content. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| e104fa2e46 |
jw.pkg.lib.util.run_cmd(): Add output_encoding
Add a parameter "output_encoding" to run_cmd(). The parameter allows the caller to specify if the output encoding should be detected as is by passing None (the default), if the output should be returned as undecoded bytes by passing the special string "bytes", or if the output should be treated as the encoding with the specified name and decoded to strings. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 82c6a44ad6 |
jw.pkg.lib.util.run_cmd(): Fix mode:auto
In cmd_input == "mode:auto", the interactive variable is currently not set due to a typo. Fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| f8dc8ee6d1 |
jw.pkg.lib.util.run_cmd(): Honour env in PTY mode
The evironment passed to run_cmd() via env is currently not honoured with mode:interactive. Fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 75faf02232 |
jw.pkg.lib.util.run_cmd(): Add title parameter
Allow the caller to choose which title should be used for the command's logging output box. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 7eb15f2477 |
jw.pkg.lib: Don't log {e}
Don't log an Exception as {e} but as str(e) producing nicer output. Or as repr(e) if a backtrace is requested, because to people who can read backtraces, type info might be of interest. Also, remove pointless time stamps, those belong into the logging framework. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| b1d4e20295 |
jw.pkg.util: Add sudo()
Move the body of BackendCmd.sudo() into a function. The rationale behind that is that its functionality is independent of the calling object for the most part, so having it in a function instead of a method is the more modular pattern. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| d50a33d9ab |
jw.pkg.cmds.lib.Cmd: Define run()
Define run(), which calls _run() in the abstract base class Cmd, not in lib.Cmd. Otherwise lib.Cmd is not abstract, which will predictably confuse including code outside of jw-pkg. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 53ba9e6fbe |
lib.App: Stay functional without autocomplete
If Python's autocomplete is not installed, jw-pkg.py fails to run commands. Fix that in order stay compatible with minimal excecution environments. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 4274a71c62 |
lib.util.run_cmd(): Rewrite it to be async
run_cmd() is synchronous. Now that all commands are asynchronous, we can await it, so rewrite it to be asynchronous, too. Other changes: - Make it return stderr as well in case its needed - Drop into a pseuto-tty if
- cmd_input == "mode:interactive" or
- cmd_input == "mode:auto" and stdin is a TTY - Add argument env, defaulting to None. If it's a dict, it will be
the environment the command is run in This entails making all functions using run_cmd() async, too, including run_curl(), get_username() and get_password(). Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| f175f9d5c9 |
lib.Cmd: Add argument "parent" to __init__()
During __init__(), commands have no idea of their parent. This is not a problem as of now, but is easy to fix, and it's architecturally desirable to be prepared just in case, so add the parent argument to the ctor before more commands are added. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 0be02c7154 |
lib.App, .Cmd: Add modules
Add App and Cmd as generic base classes for multi-command applications. The code is taken from jw-python: The exising jw.pkg.App is very similar to the more capable jwutils.Cmds class, so, to avoid code duplication, add it here to allow for jwutils.Cmds and jw.pkg.App to derive from it at some point in the future. Both had to be slightly modified to work within jw-pkg's less equipped context, and will need futher code cleanup. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 18467a6500 |
lib.Types: Add module
Types is a container for types, notably classes, which are dynamically loaded from other modules. Which modules are loaded is based on the following criteria passed to its constructor: - mod_names: A list of modules to load and investigate - type_name_filter: A regular filter expression or None (default).
If it's None, all types pass this filter. - type_filter: A list of types the returned types must match.
Defaults to [], in which case all types pass this filter Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| f7cc364be2 |
lib.log: Add module
A dedicated logging module is currently provided by jw-python, but since it's often needed also in jw-pkg, and it's relatively small and maintainable, it seems justified to move it into jw-pkg. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 2e69639362 |
jw.pkg.build.lib: Move to jw.pkg.lib
In preparation of reorganizing the tree below cmds, move the lib subdirectory a level up. Signed-off-by: Jan Lindemann <jan@janware.com> |
