From ad98577c4254fc1323749f44788c670047861844 Mon Sep 17 00:00:00 2001
From: Tyler Akins <fidian@rumkin.com>
Date: Mon, 13 Nov 2017 10:13:03 -0600
Subject: [PATCH] Changing how functions are called

Old way:

    functionName CONTENT argument1 argument2

New way:

    echo -n "$CONTENT" | functionName argument1 argument2

This follow the Unix style more closely.
---
 demo/function-for-advanced-looping |  5 ++++-
 demo/important-file                | 10 +++++++---
 mo                                 | 11 ++++++-----
 tests/function-args.env            |  8 ++------
 tests/function-args.expected       |  6 +++---
 tests/function.env                 |  4 ++--
 tests/function.expected            |  3 +--
 7 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/demo/function-for-advanced-looping b/demo/function-for-advanced-looping
index c097f15..b734246 100755
--- a/demo/function-for-advanced-looping
+++ b/demo/function-for-advanced-looping
@@ -3,6 +3,9 @@
 cd "$(dirname "$0")" # Go to the script's directory
 
 EVERY_REPO() {
+    # The block contents come in through standard input. Capture it here.
+    content=$(cat)
+
     echo "# Starting EVERY_REPO"
 
     # Get list of repos
@@ -14,7 +17,7 @@ EVERY_REPO() {
         # It rewrites {{__REPO__.name}} into {{resque.name}}, for instance.
         # You can prefix your environment variables and do other things as well.
         
-        echo -n "$1" | sed "s/__REPO__/${REPO}/"
+        echo "$content" | sed "s/__REPO__/${REPO}/"
 
         echo "## Looped one time for repo: $REPO"
     done
diff --git a/demo/important-file b/demo/important-file
index 662697c..cd39322 100755
--- a/demo/important-file
+++ b/demo/important-file
@@ -2,13 +2,17 @@
 
 cd "$(dirname "$0")"/..
 
-date-string() { date; }
-wrapper() { echo -n "*** $1 ***"; }
+date-string() {
+    date
+}
+wrapper() {
+    echo -n "*** $(cat) ***"
+}
 
 export IP=127.0.0.1
 export ALLOWED_HOSTS=( 192.168.0.1 192.168.0.2 192.168.0.3 )
 
-. mo  # Keep in mind this script is executing in the parent directory
+. ./mo  # Keep in mind this script is executing in the parent directory
 cat <<EOF | mo
 # {{#wrapper}}OH SO IMPORTANT{{/wrapper}}
 # This file automatically generated at {{date-string}}
diff --git a/mo b/mo
index cfbf56f..2d0f59e 100755
--- a/mo
+++ b/mo
@@ -141,15 +141,16 @@ mo() (
 #
 # Returns nothing.
 moCallFunction() {
-    local moCommand
+    local moArgs
+
+    moArgs=()
 
     # shellcheck disable=SC2031
     if [[ -n "$MO_ALLOW_FUNCTION_ARGUMENTS" ]]; then
-        printf -v moCommand "%q %q %s" "$1" "$2" "$3"
-        eval "$moCommand"
-    else
-        "$1" "$2"
+        moArgs=$3
     fi
+
+    echo -n "$2" | eval "$1" "$moArgs"
 }
 
 
diff --git a/tests/function-args.env b/tests/function-args.env
index 22a760c..83865f6 100644
--- a/tests/function-args.env
+++ b/tests/function-args.env
@@ -2,16 +2,12 @@ name=Willy
 MO_ALLOW_FUNCTION_ARGUMENTS=true
 
 pipeTo() {
-    echo -n "$1" | "$2"
+    cat | "$1"
 }
 
 testArgs() {
     printf "%d" "$#"
 
-    # Remove content. Note that when zero arguments are passed, this
-    # line does nothing and $1 will still be the content.
-    shift
-
     # Display all arguments
-    printf " %q" "$@"
+    printf " %q" ${@+"$@"}
 }
diff --git a/tests/function-args.expected b/tests/function-args.expected
index 30eed40..170457d 100644
--- a/tests/function-args.expected
+++ b/tests/function-args.expected
@@ -1,4 +1,4 @@
-No args: 1 '' - done
-One arg: 2 one - done
-Getting name in a string: 2 The\ name\ is\ Willy - done
+No args: 0 '' - done
+One arg: 1 one - done
+Getting name in a string: 1 The\ name\ is\ Willy - done
 Reverse this: edcba
diff --git a/tests/function.env b/tests/function.env
index d96edf9..b8ccfaf 100644
--- a/tests/function.env
+++ b/tests/function.env
@@ -1,5 +1,5 @@
 name=Willy
 wrapped() {
-    # The final newline is eaten by mo
-    echo "<b>$1</b>"
+    # This eats the newline in the content
+    echo "<b>$(cat)</b>"
 }
diff --git a/tests/function.expected b/tests/function.expected
index 1f1a461..d9120c0 100644
--- a/tests/function.expected
+++ b/tests/function.expected
@@ -1,2 +1 @@
-<b>  Willy is awesome.
-</b>... this is the last line.
+<b>  Willy is awesome.</b>... this is the last line.