v0.10.10

zomp/etc/version.txt

@@ -1 +1 @@
-0.10.9
+0.10.10

zomp/lib/otpr/zx/0.10.10/ebin/zx.app

@@ -1,6 +1,6 @@
 {application,zx,
              [{description,"An Erlang development tool and Zomp user client"},
-              {vsn,"0.10.9"},
+              {vsn,"0.10.10"},
               {applications,[stdlib,kernel]},
               {modules,[zx,zx_auth,zx_conn,zx_conn_sup,zx_daemon,zx_key,
                         zx_lib,zx_local,zx_net,zx_peer,zx_peer_man,

zomp/lib/otpr/zx/0.10.10/src/zx.erl

@@ -24,7 +24,7 @@
 %%% @end
 
 -module(zx).
--vsn("0.10.9").
+-vsn("0.10.10").
 -behavior(application).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.10.10/src/zx_auth.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_auth).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_conn.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_conn).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_conn_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_conn_sup).
--vsn("0.10.9").
+-vsn("0.10.10").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.10.10/src/zx_daemon.erl

@@ -138,7 +138,7 @@
 %%% @end
 
 -module(zx_daemon).
--vsn("0.10.9").
+-vsn("0.10.10").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.10.10/src/zx_key.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_key).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_lib.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_lib).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_local.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_local).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").
@@ -168,7 +168,7 @@ initialize(P = #project{type      = lib,
         "10" -> initialize(P#project{repo_url  = none});
         "11" -> initialize(P#project{ws_url    = none});
         "12" -> initialize(P#project{desc      = none});
-        ""   -> initialize_check(P);
+        ""   -> project_check(P, fun zompify/1, fun initialize/1);
         _    ->
             ok = zx_tty:derp(),
             initialize(P)
@@ -229,14 +229,14 @@ initialize(P = #project{type      = Type,
         "11" -> initialize(P#project{repo_url  = none});
         "12" -> initialize(P#project{ws_url    = none});
         "13" -> initialize(P#project{desc      = none});
-        ""   -> initialize_check(P);
+        ""   -> project_check(P, fun zompify/1, fun initialize/1);
         _    ->
             ok = zx_tty:derp(),
             initialize(P)
     end.
 
 
-initialize_check(P = #project{id = PackageID}) ->
+project_check(P = #project{id = PackageID}, Continue, Retry) ->
     case package_exists(PackageID) of
         false ->
             zompify(P);
@@ -250,8 +250,8 @@ initialize_check(P = #project{id = PackageID}) ->
                        {"Continue anyway.",       2},
                        {"Abort and do it later.", 3}],
             case zx_tty:select(Options) of
-                1 -> initialize(P#project{id = none});
-                2 -> zompify(P);
+                1 -> Retry(P#project{id = none});
+                2 -> Continue(P);
                 3 -> ok
             end;
         maybe ->
@@ -265,8 +265,8 @@ initialize_check(P = #project{id = PackageID}) ->
                        {"Check again.",           2},
                        {"Abort and do it later.", 3}],
             case zx_tty:select(Options) of
-                1 -> zompify(P);
-                2 -> initialize_check(P);
+                1 -> Continue(P);
+                2 -> Retry(P);
                 3 -> ok
             end
     end.
@@ -1284,7 +1284,7 @@ create(P = #project{type      = lib,
         "11" -> create(P#project{repo_url  = none});
         "12" -> create(P#project{ws_url    = none});
         "13" -> create(P#project{desc      = none});
-        ""   -> create_check(P);
+        ""   -> project_check(P, fun create_project/1, fun create/1);
         _    ->
             ok = zx_tty:derp(),
             create(P)
@@ -1339,7 +1339,7 @@ create(P = #project{type      = cli,
         "11" -> create(P#project{repo_url  = none});
         "12" -> create(P#project{ws_url    = none});
         "13" -> create(P#project{desc      = none});
-        ""   -> create_check(P);
+        ""   -> project_check(P, fun create_project/1, fun create/1);
         _    ->
             ok = zx_tty:derp(),
             create(P)
@@ -1433,43 +1433,13 @@ create(P = #project{type      = Type,
         "11" -> create(P#project{repo_url  = none});
         "12" -> create(P#project{ws_url    = none});
         "13" -> create(P#project{desc      = none});
-        ""   -> create_check(P);
+        ""   -> project_check(P, fun create_project/1, fun create/1);
         _    ->
             ok = zx_tty:derp(),
             create(P)
     end.
 
 
-create_check(P = #project{id = PackageID}) ->
-    case package_exists(PackageID) of
-        false ->
-            create_project(P);
-        true ->
-            Message =
-                "~nDHOH!~n"
-                "Sadly this package already exists.~n"
-                "Two packages with the same name cannot exist in a single realm.~n"
-                "Please pick another name.~n",
-            ok = io:format(Message),
-            create(P#project{id = none});
-        maybe ->
-            Message =
-                "~nHmmm...~n"
-                "zx_daemon wasn't able to find out (network problem?) whether this "
-                "package already exists.~n"
-                "What do?~n",
-            ok = io:format(Message),
-            Options = [{"Continue anyway.",       1},
-                       {"Check again.",           2},
-                       {"Abort and do it later.", 3}],
-            case zx_tty:select(Options) of
-                1 -> create_project(P);
-                2 -> create_check(P);
-                3 -> ok
-            end
-    end.
-
-
 create_project(#project{type      = escript,
                         license   = Title,
                         name      = Name,

zomp/lib/otpr/zx/0.10.10/src/zx_net.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_net).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_peer.erl

@@ -8,7 +8,7 @@
 %%% @end
 
 -module(zx_peer).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_peer_man.erl

@@ -9,7 +9,7 @@
 %%% @end
 
 -module(zx_peer_man).
--vsn("0.10.9").
+-vsn("0.10.10").
 -behavior(gen_server).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.10.10/src/zx_peer_sup.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_peer_sup).
--vsn("0.10.9").
+-vsn("0.10.10").
 -behaviour(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.10.10/src/zx_peers.erl

@@ -10,7 +10,7 @@
 %%% @end
 
 -module(zx_peers).
--vsn("0.10.9").
+-vsn("0.10.10").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.10.10/src/zx_proxy.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_proxy).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_sup.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_sup).
--vsn("0.10.9").
+-vsn("0.10.10").
 -behavior(supervisor).
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").

zomp/lib/otpr/zx/0.10.10/src/zx_tty.erl

@@ -6,7 +6,7 @@
 %%% @end
 
 -module(zx_tty).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_userconf.erl

@@ -5,7 +5,7 @@
 %%% @end
 
 -module(zx_userconf).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/src/zx_zsp.erl

@@ -7,7 +7,7 @@
 %%% @end
 
 -module(zx_zsp).
--vsn("0.10.9").
+-vsn("0.10.10").
 -author("Craig Everett <zxq9@zxq9.com>").
 -copyright("Craig Everett <zxq9@zxq9.com>").
 -license("GPL-3.0").

zomp/lib/otpr/zx/0.10.10/zomp.meta

@@ -9,7 +9,7 @@
 {license,"MIT"}.
 {modules,[]}.
 {name,"zx"}.
-{package_id,{"otpr","zx",{0,10,9}}}.
+{package_id,{"otpr","zx",{0,10,10}}}.
 {prefix,"zx_"}.
 {repo_url,"https://gitlab.com/zxq9/zx"}.
 {tags,["tools","package manager","erlang"]}.