Merge pull request #413 from tsloughter/neotoma_hidden

Update neotoma and have remote shell nodes be hidden

4 files changed, 10 insertions, 13 deletions

diff --git a/priv/templates/extended_bin b/priv/templates/extended_bin
index 0046502..eaeb54a 100755
--- a/priv/templates/extended_bin
+++ b/priv/templates/extended_bin
@@ -59,7 +59,7 @@ relx_rem_sh() {
     # Setup remote shell command to control node
     exec "$BINDIR/erl" "$NAME_TYPE" "$id" -remsh "$NAME" -boot start_clean \
          -boot_var ERTS_LIB_DIR "$ERTS_LIB_DIR" \
-         -setcookie "$COOKIE" -kernel net_ticktime $TICKTIME
+         -setcookie "$COOKIE" -hidden -kernel net_ticktime $TICKTIME
 }
 
 # Generate a random id
diff --git a/rebar.config b/rebar.config
index 647efa8..747f415 100644
--- a/rebar.config
+++ b/rebar.config
@@ -24,10 +24,7 @@
 
 %% Profiles ====================================================================
 
-{profiles, [{dev, [{deps, [{neotoma, ".*",
-                            {git, "https://github.com/seancribbs/neotoma.git", {branch, "master"}}}
-                          ]}
-                  ]},
+{profiles, [{dev, [{plugins, [rebar3_neotoma_plugin]}]},
 
             {test, [{erl_opts, [debug_info]}]}
            ]}.
diff --git a/src/rlx_goal.erl b/src/rlx_goal.erl
index e588a0e..354aa48 100644
--- a/src/rlx_goal.erl
+++ b/src/rlx_goal.erl
@@ -16,9 +16,9 @@
 file(Filename) -> case file:read_file(Filename) of {ok,Bin} -> parse(Bin); Err -> Err end.
 
 -spec parse(binary() | list()) -> any().
-parse(List) when is_list(List) -> parse(list_to_binary(List));
+parse(List) when is_list(List) -> parse(unicode:characters_to_binary(List));
 parse(Input) when is_binary(Input) ->
-  setup_memo(),
+  _ = setup_memo(),
   Result = case 'constraint'(Input,{{line,1},{column,1}}) of
              {AST, <<>>, _Index} -> AST;
              Any -> Any
@@ -115,7 +115,7 @@ setup_memo() ->
 release_memo() ->
   ets:delete(memo_table_name()).
 
--spec memoize(index(), atom(), term()) -> true.
+-spec memoize(index(), atom(), parse_result()) -> true.
 memoize(Index, Name, Result) ->
   Memo = case ets:lookup(memo_table_name(), Index) of
               [] -> [];
@@ -252,8 +252,8 @@ p_label(Tag, P) ->
 -endif.
 
 -ifdef(p_scan).
--spec p_scan(parse_fun(), input(), index(), [term()]) -> parse_result().
-p_scan(_, [], Index, Accum) -> {lists:reverse( Accum ), [], Index};
+-spec p_scan(parse_fun(), input(), index(), [term()]) -> {[term()], input(), index()}.
+p_scan(_, <<>>, Index, Accum) -> {lists:reverse(Accum), <<>>, Index};
 p_scan(P, Inp, Index, Accum) ->
   case P(Inp, Index) of
     {fail,_} -> {lists:reverse(Accum), Inp, Index};
diff --git a/src/rlx_prv_relup.erl b/src/rlx_prv_relup.erl
index 0dbe8f9..9ac2135 100644
--- a/src/rlx_prv_relup.erl
+++ b/src/rlx_prv_relup.erl
@@ -133,16 +133,16 @@ make_upfrom_script(State, Release, UpFrom) ->
                              systools:make_relup(CurrentRel, [UpFromRel], [UpFromRel], CorrectOptions)
                      end) of
         ok ->
-            ec_cmd_log:error(rlx_state:log(State),
+            ec_cmd_log:info(rlx_state:log(State),
                           "relup from ~s to ~s successfully created!",
                           [UpFromRel, CurrentRel]),
             {ok, State};
         error ->
             ?RLX_ERROR({relup_script_generation_error, CurrentRel, UpFromRel});
         {ok, RelUp, _, []} ->
-            ec_cmd_log:error(rlx_state:log(State),
-                          "relup successfully created!"),
             write_relup_file(State, Release, RelUp),
+            ec_cmd_log:info(rlx_state:log(State),
+                            "relup successfully created!"),
             {ok, State};
         {ok,_, Module,Warnings} ->
             ?RLX_ERROR({relup_script_generation_warn, Module, Warnings});