From a62eec74b783e8284c0969f6d5565a66881784ad Mon Sep 17 00:00:00 2001 From: Craig Everett Date: Thu, 19 Sep 2019 23:56:50 +0900 Subject: [PATCH] Rectify cli user help with implemented commands --- zomp/lib/otpr/zx/0.2.0/src/zx.erl | 77 ++++++++++++++++++------------- 1 file changed, 45 insertions(+), 32 deletions(-) diff --git a/zomp/lib/otpr/zx/0.2.0/src/zx.erl b/zomp/lib/otpr/zx/0.2.0/src/zx.erl index 982576d..fa0ce08 100644 --- a/zomp/lib/otpr/zx/0.2.0/src/zx.erl +++ b/zomp/lib/otpr/zx/0.2.0/src/zx.erl @@ -128,6 +128,9 @@ do(["list", "versions", PackageName]) -> do(["latest", PackageString]) -> ok = zx_daemon:connect(), done(zx_local:latest(PackageString)); +do(["upgrade"]) -> + ok = zx_daemon:connect(), + done(upgrade()); do(["import", "realm", RealmFile]) -> done(zx_local:import_realm(RealmFile)); do(["drop", "realm", Realm]) -> @@ -141,11 +144,16 @@ do(["set", "timeout", String]) -> done(zx_local:set_timeout(String)); do(["add", "mirror"]) -> done(zx_local:add_mirror()); +do(["add", "mirror", Address]) -> + done(zx_local:add_mirror(Address)); +do(["add", "mirror", Address, Port]) -> + done(zx_local:add_mirror(Address, Port)); do(["drop", "mirror"]) -> done(zx_local:drop_mirror()); -do(["upgrade"]) -> - ok = zx_daemon:connect(), - done(upgrade()); +do(["drop", "mirror", Address]) -> + done(zx_local:drop_mirror(Address)); +do(["drop", "mirror", Address, Port]) -> + done(zx_local:drop_mirror(Address, Port)); do(["create", "project"]) -> ok = zx_daemon:connect(), done(zx_local:create_project()); @@ -168,15 +176,15 @@ do(["set", "dep", PackageString]) -> done(zx_local:set_dep(PackageString)); do(["drop", "dep", PackageString]) -> done(zx_local:drop_dep(PackageString)); -do(["provides", Module]) -> - ok = zx_daemon:connect(), - done(zx_local:provides(Module)); do(["verup", Level]) -> ok = compatibility_check([unix]), done(zx_local:verup(Level)); do(["set", "version", VersionString]) -> ok = compatibility_check([unix]), done(zx_local:set_version(VersionString)); +do(["provides", Module]) -> + ok = zx_daemon:connect(), + done(zx_local:provides(Module)); do(["update", ".app"]) -> done(zx_local:update_app_file()); do(["package"]) -> @@ -191,8 +199,6 @@ do(["submit", PackageFile]) -> done(zx_auth:submit(PackageFile)); do(["list", "pending", PackageName]) -> done(zx_auth:list_pending(PackageName)); -do(["list", "approved", Realm]) -> - done(zx_auth:list_approved(Realm)); do(["review", PackageString]) -> done(zx_auth:review(PackageString)); do(["approve", PackageString]) -> @@ -228,6 +234,8 @@ do(["install", PackageFile]) -> true -> done(zx_daemon:install(PackageFile)); false -> done({error, ".zsp file does not exist", 22}) end; +do(["list", "approved", Realm]) -> + done(zx_auth:list_approved(Realm)); do(["accept", PackageString]) -> done(zx_auth:accept(PackageString)); do(["add", "package", PackageName]) -> @@ -687,7 +695,7 @@ include_env(PackageID = {_, Name, _}) -> -spec upgrade() -> zx:outcome(). %% @private -%% Upgrade ZX itself to the latest version.. +%% Upgrade ZX itself to the latest version. upgrade() -> ZxDir = os:getenv("ZX_DIR"), @@ -814,13 +822,13 @@ usage_user() -> " zx list packages Realm~n" " zx list versions PackageID~n" " zx latest PackageID~n" + " zx upgrade~n" " zx import realm RealmFile~n" " zx drop realm Realm~n" " zx logpath [Package [1-10]]~n" - " zx status~n" " zx set timeout Value~n" - " zx add mirror Realm Host:Port~n" - " zx drop mirror Realm Host:Port~n~n". + " zx add mirror [Address [Port]]~n" + " zx drop mirror [Address [Port]]~n~n". usage_dev() -> "Developer/Packager/Maintainer Actions:~n" @@ -831,22 +839,22 @@ usage_dev() -> " zx list deps [PackageID]~n" " zx set dep PackageID~n" " zx drop dep PackageID~n" - " zx provides Module~n" " zx verup Level~n" " zx set version Version~n" + " zx provides Module~n" " zx update .app~n" - " zx package Path~n" + " zx package [Path]~n" " zx submit ZSP~n" " zx list pending PackageName~n" " zx review PackageID~n" " zx approve PackageID~n" " zx reject PackageID~n" - " zx add key~n" + " zx sync keys~n" " zx create user~n" " zx create userfile~n" " zx create keypair~n" " zx export user~n" - " zx import user [ZPUF | ZDUF]~n" + " zx import user ZDUF~n" " zx list users Realm~n" " zx list packagers PackageName~n" " zx list maintainers PackageName~n" @@ -860,25 +868,30 @@ usage_sysop() -> " zx accept PackageID~n" " zx add package PackageName~n" " zx add user ZPUF~n" - " zx add packager PackageName UserID~n" - " zx add maintainer PackageName UserID~n" - " zx add sysop UserID~n" + " zx rem user Realm UserName~n" + " zx add packager PackageName UserName~n" + " zx rem packager PackageName UserName~n" + " zx add maintainer PackageName UserName~n" + " zx rem maintainer PackageName UserName~n" + " zx add sysop Realm UserName~n" " zx create realm~n" " zx takeover Realm~n" " zx abdicate Realm~n~n". usage_spec() -> "Where~n" - " PackageID :: A string of the form Realm-Name[-Version]~n" - " Args :: Arguments to pass to the application~n" - " Type :: The project type: a standalone \"app\" or a \"lib\"~n" - " Version :: Version string X, X.Y, or X.Y.Z: \"1\", \"1.2\", \"1.2.3\"~n" - " RealmFile :: Path to a valid .zrf realm file~n" - " Realm :: The name of a realm as a string [:a-z:]~n" - " Module :: Name of a code module.~n" - " KeyName :: The prefix of a keypair to drop~n" - " Level :: The version level, one of \"major\", \"minor\", or \"patch\"~n" - " Path :: Path or filename.~n" - " ZSP :: Path to a .zsp file (Zomp Source Package).~n" - " ZPUF :: Path to a .zpuf file (Zomp Public User File).~n" - " ZDUF :: Path to a .zduf file (Zomp DANGEROUS User File).~n". + " PackageID :: A string of the form [Realm-]Name[-Version]~n" + " PackageName :: A string that matches [^[a-z]a-z0-9_]~n" + " UserName :: A string that matches [^[a-z]a-z0-9_]~n" + " Args :: Arguments to pass to the application~n" + " Type :: The project type: a standalone \"app\" or a \"lib\"~n" + " Version :: Version string X, X.Y, or X.Y.Z: \"1\", \"1.2\", \"1.2.3\"~n" + " RealmFile :: Path to a valid .zrf realm file~n" + " Realm :: The name of a realm as a string [:a-z:]~n" + " Module :: Name of a code module.~n" + " KeyName :: The prefix of a keypair~n" + " Level :: The version level, one of \"major\", \"minor\", or \"patch\"~n" + " Path :: Path or filename.~n" + " ZSP :: Path to a .zsp file (Zomp Source Package).~n" + " ZPUF :: Path to a .zpuf file (Zomp Public User File).~n" + " ZDUF :: Path to a .zduf file (Zomp DANGEROUS User File).~n".