| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
| 1da00283d1 |
jw.pkg.cmds.projects.CmdOsCascade: Remove
CmdOsCascade is superseeded by CmdInfo. Use the latter and retire the former. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 11379f4830 |
jw.pkg.cmds.projects.CmdGetAuthInfo: --remote-owner-base
Support --remote-owner-base in the command CmdGetAuthInfo. Make it return what currently --remote-base returned: A URL including the user / organization specific prefix of the Git remote's URL that jw-pkg was pulled from. https://my-company.com/src/theowner/jw-pkg.git would have a --remote-owner-base of https://my-company.com/src/theowner Also, change what --remote-base returns to Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 8dcaa1a6a1 |
jw.pkg.cmds.projects.CmdListRepos: --from-owner
Rename the --from-user option to --from-owner. Forgejo supports users and organizations under the more general term "owner", so that's the better term. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 956235276a |
jw.pkg.cmds.projects.CmdListRepos: Beautify logging
list-repos tries /users/ and /orgs/ to find a working repo URL in a Forgejo instance, logs a failure and doesn't log anything if it finds one that works. In the context, that can be mildly confusing, beautify the output somewhat. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 6c1f0f4c95 |
jw-pkg.py: CmdListRepos: Take base-url argument seriously
base-url is not used as a prefix in its entirety, but massaged in a janware-specific way. Still is, but at least this commit is a step towards being more generic. 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> |
|||
| 595995e084 |
jw.pkg.cmds: Replace split('\n') by splitlines()
splitlines() removes empty lines, so use it and save some lines of code. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| d814052aac |
jw.pkg.cmds.projects.CmdBuild: --source-profile -> --env-reinit
Replace --source-profile by --env-reinit and --env-keep to allow more fine-grained control over environment manipulation. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 230eacac8b |
jw.pkg.cmds.projects.CmdBuild: Add --source-profile
Add --source-profile=[no|add|replace] to the projects build command, doing the obvious thing. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 838b745581 |
jw.pkg.cmds.projects.CmdBuild: Use run_cmd("make")
Use run_cmd() for centralized process handling, instead of hand-rolled Popen(). Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 0cb6a7972c |
jw.pkg.cmds.projects.CmdBuild: Make run_make() async
Make the call chain to Popen(make ...) async, in preparation for the next commit. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| d7f9fc7260 |
CmdAuthInfo: Fix no output
jw-pkg.py projects get-auth-info doesn't print anything, fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 060ff5159b |
jw.pkg.cmds.projects.CmdGetAuthInfo: Fix run_cmd()
CmdGetAuthInfo calls run_cmd() with a list instead of a *-expanded list of arguments. Fix this to match the current run_cmd() prototype. And think again if the current prototype conforms to the priciple of least surprise: Most exec- / run- / whatever- functions do expect ether a string to be run by the shell, or an argv list. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| a55dd8175c |
jw.pkg.cmds.projects.CmdProjectDir: Fix warning typo
Trying to find the directory of a project should log a warning. It throws an exception instead. Fix that. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 6ca4af77d7 |
jw.pkg.App: Code beautification
Major - but not yet sufficient - code beautification starting from jw.pkg.App. - Make more methods private
- Rename methods to be more self-explanatory
- Same for method arguments, notably clean up some inconsistent
uses of "module" vs "project"
- Add more type hints Fix API breakage in the command modules. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 2bbf5bd8e7 |
jw.pkg.cmds.projects.CmdRequiredOsPkg: Support --quote
--quote puts double quotation marks around the listed dependencies, protecting version requirements (>= 1.0) and parenthesis "perl(GD)" from the shell. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 26bfda109c |
cmds.projects.CmdListRepos: Try Forgejo users and orgs
A "username" in jw-pkg terms, as in $(CLONE_FROM_USER), is not sufficient to identify a remote API URL on a Forgejo server, it can denote both an organization and a user, so try organizations first, then users, and stop on the first occasion found. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 53601c8abd |
jw.pkg.cmds.projects.CmdListRepos: Remove test code
Remove --insecure from curl invocation on janware.test. 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> |
|||
| 9c06103a4a |
cmds.project.*: Make _run() async
Cmd._run(), as conceived for working with lib.App, is meant to be an async method. To be conservative about changes, jw-pkg's legacy way of handling _run() was kept when deriving from libApp, and async was not propagated down to the _run() implementations. This commit rectifies that before adding additional subcommands. 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> |
|||
| f6ed191d73 |
jw.pkg.App.get_modules_from_project_txt(): Add Scope
Add the Enum "Scope" to denote the scope argument of jw.pkg.App.get_modules_from_project_txt(), because it explains itself better than an integer. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 917f56a814 |
CmdBuild: Don't use App.res_cache()
App.res_cache should be private. It's needed here to cache the results of a function which is private to CmdBuild anyway, so solve that with lru_cache, to allow App to do it's private thing with caching. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| eafed6434b |
CmdBuild: Don't use App.dep_cache
App.dep_cache is only used by CmdBuild, prepare for removing it from App. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 95fa2f0d06 |
jw.pkg.App: Remove .debug() and friends
Replace the jw.pkg.App.debug(), .warn() and .err() methods by the global log() function. There's no obvious benefit in having App know what's logged. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| aefe983920 |
jw.pkg.App: Support --topdir-format
Add support for --topdir-format. The option supports several different values, affecting the console output of App wherever it knows that the output contains a reference to the projects' toplevel directory. - "unaltered" will have it print the toplevel directory in the same
format as passed to the commandline - "absolute" will try to resolve it to an absolute path before
printing - make:XXX will return the make-varible $(XXX) instead To implement this, the proj_dir() member function is turned into the private member function __proj_dir(), and a new member function find_dir() is supplied, with two additional parameters: search_subdirs and search_absdirs, which will try to find an existing directory relative to the toplevel directory of the given module, or in the search_absdirs list, respectively. Command modules in cmds.projects have been updated to use the new function. Signed-off-by: Jan Lindemann <jan@janware.com> |
|||
| 0b83c863a2 |
jw.build.cmds: Move build.cmds -> cmds.projects
Reorganize the Python module structure. Placing the command classes under jw.cmds.projects instead of jw.build.cmds will allow to add a nested command structure, with the current commands, being mostly related to building software, found below a "projects" toplevel command. Other conceivable commands could be "package" for packaging, or "distro" for commands wrapping the distribution's package manager. Signed-off-by: Jan Lindemann <jan@janware.com> |
