6 files changed, 71 insertions, 7 deletions
diff --git a/priv/shell-completion/bash/rebar b/priv/shell-completion/bash/rebar
index d4a42dc..7dc3b5e 100644
--- a/priv/shell-completion/bash/rebar
+++ b/priv/shell-completion/bash/rebar
@@ -21,6 +21,7 @@ _rebar()
         compile \
         create \
         create-app \
+        create-lib \
         create-node \
         ct \
         doc \
diff --git a/priv/shell-completion/zsh/_rebar b/priv/shell-completion/zsh/_rebar
index 3d04ba1..384fead 100644
--- a/priv/shell-completion/zsh/_rebar
+++ b/priv/shell-completion/zsh/_rebar
@@ -7,10 +7,10 @@ _rebar_global_opts=(
   '(--help -h)'{--help,-h}'[Show the program options]'
   '(--commands -c)'{--commands,-c}'[Show available commands]'
   '(--version -V)'{--version,-V}'[Show version information]'
-  '(-vvv -vv -v)'--verbose+'[Verbosity level. Default: 0]:verbosity level:(0 1 2 3)'
-  '(-vvv)-v[Slightly more verbose output]'
-  '(-vvv)-vv[More verbose output]'
-  '(-v -vv)-vvv[Most verbose output]'
+  '(-vv -v)'--verbose'[Enforce verbosity level]'
+  '(-vv)-v[Slightly more verbose output]'
+  '(-v)-vv[More verbose output]'
+  '(-vv -v --verbose)'{--quiet,-q}'[Quiet, only print error messages]'
   '(--force -f)'{--force,-f}'[Force]'
   '-D+[Define compiler macro]'
   '(--jobs -j)'{--jobs+,-j+}'[Number of concurrent workers a command may use. Default: 3]:workers:(1 2 3 4 5 6 7 8 9)'
@@ -31,6 +31,7 @@ _rebar () {
         'compile[Compile sources]' \
         'create[Create skel based on template and vars]' \
         'create-app[Create simple app skel]' \
+        'create-lib[Create simple lib skel]' \
         'create-node[Create simple node skel]' \
         'list-template[List avaiavle templates]' \
         'doc[Generate Erlang program documentation]' \
diff --git a/priv/templates/simplelib.app.src b/priv/templates/simplelib.app.src
new file mode 100644
index 0000000..752665a
--- /dev/null
+++ b/priv/templates/simplelib.app.src
@@ -0,0 +1,14 @@
+{application, {{libid}},
+ [
+  {description, "An Erlang {{libid}} library"},
+  {vsn, "1"},
+  {modules, [
+             {{libid}}
+            ]},
+  {registered, []},
+  {applications, [
+                  kernel,
+                  stdlib
+                 ]},
+  {env, []}
+ ]}.
diff --git a/priv/templates/simplelib.erl b/priv/templates/simplelib.erl
new file mode 100644
index 0000000..2c4451f
--- /dev/null
+++ b/priv/templates/simplelib.erl
@@ -0,0 +1,18 @@
+-module({{libid}}).
+
+%% {{libid}}: {{libid}} library's entry point.
+
+-export([my_func/0]).
+
+
+%% API
+
+my_func() ->
+    ok().
+
+%% Internals
+
+ok() ->
+    ok.
+
+%% End of Module.
diff --git a/priv/templates/simplelib.template b/priv/templates/simplelib.template
new file mode 100644
index 0000000..59d20fa
--- /dev/null
+++ b/priv/templates/simplelib.template
@@ -0,0 +1,3 @@
+{variables, [{libid, "mylib"}]}.
+{template, "simplelib.app.src", "src/{{libid}}.app.src"}.
+{template, "simplelib.erl", "src/{{libid}}.erl"}.
diff --git a/priv/templates/simplenode.runner b/priv/templates/simplenode.runner
index c2ef258..032eb28 100755
--- a/priv/templates/simplenode.runner
+++ b/priv/templates/simplenode.runner
@@ -16,6 +16,7 @@ fi
 unset POSIX_SHELL
 
 RUNNER_SCRIPT_DIR=$(cd ${0%/*} && pwd -P)
+RUNNER_SCRIPT=${0##*/}
 
 CALLER_DIR=$PWD
 
@@ -85,10 +86,36 @@ fi
 REMSH_TYPE=`echo $NAME_ARG | awk '{print $1}'`
 REMSH_NAME=`echo $NAME_ARG | awk '{print $2}'`
 
+# Test if REMSH_NAME contains a @ and set REMSH_HOSTNAME_PART 
+# and REMSH_NAME_PART according REMSH_TYPE
+MAYBE_FQDN_HOSTNAME=`hostname`
+HOSTNAME=`echo $MAYBE_FQDN_HOSTNAME | awk -F. '{print $1}'`
+
+REMSH_HOSTNAME_PART="$MAYBE_FQDN_HOSTNAME"
+case "$REMSH_NAME" in
+    *@*)
+        REMSH_HOSTNAME_PART=`echo $REMSH_NAME | awk -F@ '{print $2}'`
+        REMSH_NAME_PART=`echo $REMSH_NAME | awk -F@ '{print $1}'`
+        ;;
+    *)
+        REMSH_NAME_PART="$REMSH_NAME"
+        if [ "$REMSH_TYPE" = "-sname" ]; then
+            REMSH_HOSTNAME_PART= "$HOSTNAME"
+        else
+            # -name type, check if `hostname` is fqdn
+            if [ "$MAYBE_FQDN_HOSTNAME" = "$HOSTNAME" ]; then
+                echo "Hostname must be a fqdn domain name when node is configured with long names"
+                echo "and the full node name isn't configured in vm.args"
+                exit 1
+            fi
+        fi
+        ;;
+esac
+
 # Note the `date +%s`, used to allow multiple remsh to the same node
 # transparently
-REMSH_NAME_ARG="$REMSH_TYPE remsh`date +%s`@`echo $REMSH_NAME | awk -F@ '{print $2}'`"
-REMSH_REMSH_ARG="-remsh $REMSH_NAME"
+REMSH_NAME_ARG="$REMSH_TYPE remsh`date +%s`@$REMSH_HOSTNAME_PART"
+REMSH_REMSH_ARG="-remsh $REMSH_NAME_PART@$REMSH_HOSTNAME_PART"
 
 # Extract the target cookie
 COOKIE_ARG=`grep '^\-setcookie' $VMARGS_PATH`
@@ -110,7 +137,7 @@ ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
 NODETOOL="$ERTS_PATH/escript $ERTS_PATH/nodetool $NAME_ARG $COOKIE_ARG"
 
 # Setup remote shell command to control node
-REMSH="$ERTS_PATH/erl $REMSH_NAME_ARG $REMSH_REMSH_ARG $COOKIE_ARG"
+REMSH="$ERTS_PATH/erl -hidden $REMSH_NAME_ARG $REMSH_REMSH_ARG $COOKIE_ARG"
 
 # Common functions