From 9b7bf95b9422ef0e2f371daf37a72ff763b27b40 Mon Sep 17 00:00:00 2001
From: a-sansara <dev@pluie.org>
Date: Mon, 18 Jun 2018 16:15:13 +0200
Subject: [PATCH] manage update : load bes dependencies recursively

---
 dist/bes-build | 195 +++++++++++++++++++++++++++++++------------------
 src/update.sh  | 195 +++++++++++++++++++++++++++++++------------------
 2 files changed, 246 insertions(+), 144 deletions(-)

diff --git a/dist/bes-build b/dist/bes-build
index 05f4aa8..b6c50c4 100755
--- a/dist/bes-build
+++ b/dist/bes-build
@@ -529,8 +529,8 @@ function bes.build ()
     fi
 }
 
-BES_LIB="echo install ini"
-
+BES_LIB="echo install ini dep1 dep2"
+BES_LOADED_LIB=
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function bes.inlist ()
 {
@@ -541,6 +541,115 @@ function bes.inlist ()
     return $rs
 }
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.addLoadedLib ()
+{
+    local sep=" "
+    if [ -z "$BES_LOADED_LIB" ]; then
+        sep=""
+    fi
+    BES_LOADED_LIB=$BES_LOADED_LIB$sep$1
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.loadExtDep ()
+{
+    local name=$1
+    local prefix=$2
+    local key=${name:${#prefix}+1}
+    local project=${key#*_}
+    local vendor=${key%_*}
+    local version=${!name}
+    if [ ! "$vendor" = "bes" ]; then
+        bes.echo.title "Loading" "${key//_/.}${Cusa} ${!name}${Coff}"
+        if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
+            bes.echo.action "creating vendor directory ${Cusa}$vendor"
+            mkdir -p "$APP_DIR/vendor/$vendor"
+            bes.echo.state $?
+        fi
+        if [ "${version:0:4}" = "http" ]; then
+            local req=${!name}
+            local path=${req#*:}
+            local  tag=${req##*:}
+            local repo=${req%:*}
+            echo "$APP_DIR/vendor/$vendor/$project"
+            echo $(pwd)
+            if [ ! -d "$APP_DIR/vendor/$vendor/$project" ]; then
+                mkdir "$APP_DIR/vendor/$vendor"
+                cd $_
+                git clone $repo $project
+            fi
+            cd "$APP_DIR/vendor/$vendor/$project"
+            git checkout $tag
+            for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
+                bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
+                # tail -n +2 "$entry" >> "$APP_BIN"
+            done
+            bes.echo.state $?
+        fi
+    fi
+    bes.echo.rs
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.loadDep ()
+{
+    local name=$1
+    local prefix=$2
+    local key=${name:${#prefix}+1}
+    local project=${key#*_}
+    local vendor=${key%_*}
+    local version=${!name}
+    if [ "$vendor" = "bes" ]; then
+        bes.echo.title "Loading" "${key//_/.}${Cusa} ${!name}${Coff}"
+        if bes.inlist "$project" "$BES_LIB"; then
+            if bes.inlist "$project" "$BES_LOADED_LIB"; then
+                bes.echo.action "dependencies already loaded for ${Cusa}$project"
+                bes.echo
+            else
+                if [ "$bescheck" = "1" ]; then
+                    if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
+                        bes.echo.action "creating vendor directory ${Cusa}$vendor"
+                        mkdir -p "$APP_DIR/vendor/$vendor"
+                    else
+                        bes.echo.action "checking vendor directory ${Cusa}$vendor"
+                    fi
+                    bes.echo.state $?
+                    bescheck=0
+                    echo "[bes_vendor]" > $APP_DIR/vendor/.bes
+                fi
+                echo "$project = $version" >> $APP_DIR/vendor/.bes
+                cd "$APP_DIR/vendor/$vendor"
+                bes.echo.action "updating repository $Cusa$vendor.$project ${Coff}:$Cusa $version"
+                if [ ! -d "$project" ]; then
+                    git clone -q "https://git.pluie.org/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
+                    #~ bes.echo.state $?
+                    cd $project
+                else
+                    cd $project
+                    git fetch --all -q 2>&1 >/dev/null
+                    #~ bes.echo.state $?
+                fi
+                #~ bes.echo.action "checkout to version $Cusa$version"
+                local branch=$(git branch --no-color | grep \* | cut -d ' ' -f2-)
+                # branch=${branch:5: -3}
+                if [ "$branch" != "$version" ]; then
+                    git checkout -q $version 2>&1 >/dev/null
+                fi
+                bes.echo.state $?
+                for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
+                    bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
+                    # tail -n +2 "$entry" >> "$APP_BIN"
+                done
+                bes.echo.state $?
+                bes.addLoadedLib $project
+                bes.ini "$APP_DIR/vendor/$vendor/$project/bes.ini" require -p bes$project -b 1
+                local suballvarname=bes${project}_ALL_VARS
+                for subname in ${!suballvarname}; do
+                    bes.loadDep "$subname" "bes${project}_require"
+                done
+            fi
+        fi
+    fi
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function bes.update ()
 {
     bes.echo.title "Reading Project" $APP_NAME
@@ -558,6 +667,16 @@ function bes.update ()
             fi
         done
 
+        if [ -f "$APP_DIR/vendor/.bes" ]; then
+            bes.ini "$APP_DIR/vendor/.bes" bes_vendor -p bessed -b 1
+            local prefix="bes_vendor"
+            for name in ${bessed_ALL_VARS}; do
+                local key=${name:${#prefix}+1}
+                local project=${key#*_}
+                bes.addLoadedLib "$project"
+            done
+        fi
+
         bes.ini "$APP_DIR/bes.ini" require -p bes -b 1
         local prefix="bes_require"
         local key=""
@@ -570,76 +689,8 @@ function bes.update ()
             done
             echo
             for name in ${bes_ALL_VARS}; do
-                key=${name:${#prefix}+1}
-                bes.echo.title "Loading" "${key//_/.}${Cusa} ${!name}${Coff}"
-                local project=${key#*_}
-                local vendor=${key%_*}
-                local version=${!name}
-                bes.inlist "$project" "$BES_LIB"
-                if [ "$vendor" = "bes" ]; then
-                    if bes.inlist "$project" "$BES_LIB"; then
-                        if [ "$bescheck" = "1" ]; then
-                            if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
-                                bes.echo.action "creating vendor directory ${Cusa}$vendor"
-                                mkdir -p "$APP_DIR/vendor/$vendor"
-                            else
-                                bes.echo.action "checking vendor directory ${Cusa}$vendor"
-                            fi
-                            bes.echo.state $?
-                            bescheck=0
-                        fi
-                        cd "$APP_DIR/vendor/$vendor"
-                        bes.echo.action "updating repository $Cusa$vendor.$project ${Coff}:$Cusa $version"
-                        if [ ! -d "$project" ]; then
-                            git clone -q "https://git.pluie.org/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
-                            #~ bes.echo.state $?
-                            cd $project
-                        else
-                            cd $project
-                            git fetch --all -q 2>&1 >/dev/null
-                            #~ bes.echo.state $?
-                        fi
-                        #~ bes.echo.action "checkout to version $Cusa$version"
-                        local branch=$(git branch --no-color | grep \* | cut -d ' ' -f2-)
-                        # branch=${branch:5: -3}
-                        if [ "$branch" != "$version" ]; then
-                            git checkout -q $version 2>&1 >/dev/null
-                        fi
-                        bes.echo.state $?
-                        for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
-                            bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
-                            # tail -n +2 "$entry" >> "$APP_BIN"
-                        done
-                        bes.echo.state $?
-                    fi
-                else
-                    if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
-                        bes.echo.action "creating vendor directory ${Cusa}$vendor"
-                        mkdir -p "$APP_DIR/vendor/$vendor"
-                        bes.echo.state $?
-                    fi
-                    if [ "${version:0:4}" = "http" ]; then
-                        local req=${!name}
-                        local path=${req#*:} 
-                        local  tag=${req##*:} 
-                        local repo=${req%:*}
-                        echo "$APP_DIR/vendor/$vendor/$project"
-                        echo $(pwd)
-                        if [ ! -d "$APP_DIR/vendor/$vendor/$project" ]; then
-                            mkdir "$APP_DIR/vendor/$vendor"
-                            cd $_
-                            git clone $repo $project
-                        fi
-                        cd "$APP_DIR/vendor/$vendor/$project"
-                        git checkout $tag
-                        for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
-                            bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
-                            # tail -n +2 "$entry" >> "$APP_BIN"
-                        done
-                        bes.echo.state $?
-                    fi
-                fi
-                bes.echo.rs
+                bes.loadDep "$name" "$prefix"
+                bes.loadExtDep "$name" "$prefix"
             done
         fi
     else
diff --git a/src/update.sh b/src/update.sh
index 76728f3..736d0f4 100644
--- a/src/update.sh
+++ b/src/update.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-BES_LIB="echo install ini"
-
+BES_LIB="echo install ini dep1 dep2"
+BES_LOADED_LIB=
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function bes.inlist ()
 {
@@ -12,6 +12,115 @@ function bes.inlist ()
     return $rs
 }
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.addLoadedLib ()
+{
+    local sep=" "
+    if [ -z "$BES_LOADED_LIB" ]; then
+        sep=""
+    fi
+    BES_LOADED_LIB=$BES_LOADED_LIB$sep$1
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.loadExtDep ()
+{
+    local name=$1
+    local prefix=$2
+    local key=${name:${#prefix}+1}
+    local project=${key#*_}
+    local vendor=${key%_*}
+    local version=${!name}
+    if [ ! "$vendor" = "bes" ]; then
+        bes.echo.title "Loading" "${key//_/.}${Cusa} ${!name}${Coff}"
+        if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
+            bes.echo.action "creating vendor directory ${Cusa}$vendor"
+            mkdir -p "$APP_DIR/vendor/$vendor"
+            bes.echo.state $?
+        fi
+        if [ "${version:0:4}" = "http" ]; then
+            local req=${!name}
+            local path=${req#*:}
+            local  tag=${req##*:}
+            local repo=${req%:*}
+            echo "$APP_DIR/vendor/$vendor/$project"
+            echo $(pwd)
+            if [ ! -d "$APP_DIR/vendor/$vendor/$project" ]; then
+                mkdir "$APP_DIR/vendor/$vendor"
+                cd $_
+                git clone $repo $project
+            fi
+            cd "$APP_DIR/vendor/$vendor/$project"
+            git checkout $tag
+            for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
+                bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
+                # tail -n +2 "$entry" >> "$APP_BIN"
+            done
+            bes.echo.state $?
+        fi
+    fi
+    bes.echo.rs
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+function bes.loadDep ()
+{
+    local name=$1
+    local prefix=$2
+    local key=${name:${#prefix}+1}
+    local project=${key#*_}
+    local vendor=${key%_*}
+    local version=${!name}
+    if [ "$vendor" = "bes" ]; then
+        bes.echo.title "Loading" "${key//_/.}${Cusa} ${!name}${Coff}"
+        if bes.inlist "$project" "$BES_LIB"; then
+            if bes.inlist "$project" "$BES_LOADED_LIB"; then
+                bes.echo.action "dependencies already loaded for ${Cusa}$project"
+                bes.echo
+            else
+                if [ "$bescheck" = "1" ]; then
+                    if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
+                        bes.echo.action "creating vendor directory ${Cusa}$vendor"
+                        mkdir -p "$APP_DIR/vendor/$vendor"
+                    else
+                        bes.echo.action "checking vendor directory ${Cusa}$vendor"
+                    fi
+                    bes.echo.state $?
+                    bescheck=0
+                    echo "[bes_vendor]" > $APP_DIR/vendor/.bes
+                fi
+                echo "$project = $version" >> $APP_DIR/vendor/.bes
+                cd "$APP_DIR/vendor/$vendor"
+                bes.echo.action "updating repository $Cusa$vendor.$project ${Coff}:$Cusa $version"
+                if [ ! -d "$project" ]; then
+                    git clone -q "https://git.pluie.org/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
+                    #~ bes.echo.state $?
+                    cd $project
+                else
+                    cd $project
+                    git fetch --all -q 2>&1 >/dev/null
+                    #~ bes.echo.state $?
+                fi
+                #~ bes.echo.action "checkout to version $Cusa$version"
+                local branch=$(git branch --no-color | grep \* | cut -d ' ' -f2-)
+                # branch=${branch:5: -3}
+                if [ "$branch" != "$version" ]; then
+                    git checkout -q $version 2>&1 >/dev/null
+                fi
+                bes.echo.state $?
+                for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
+                    bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
+                    # tail -n +2 "$entry" >> "$APP_BIN"
+                done
+                bes.echo.state $?
+                bes.addLoadedLib $project
+                bes.ini "$APP_DIR/vendor/$vendor/$project/bes.ini" require -p bes$project -b 1
+                local suballvarname=bes${project}_ALL_VARS
+                for subname in ${!suballvarname}; do
+                    bes.loadDep "$subname" "bes${project}_require"
+                done
+            fi
+        fi
+    fi
+}
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 function bes.update ()
 {
     bes.echo.title "Reading Project" $APP_NAME
@@ -29,6 +138,16 @@ function bes.update ()
             fi
         done
 
+        if [ -f "$APP_DIR/vendor/.bes" ]; then
+            bes.ini "$APP_DIR/vendor/.bes" bes_vendor -p bessed -b 1
+            local prefix="bes_vendor"
+            for name in ${bessed_ALL_VARS}; do
+                local key=${name:${#prefix}+1}
+                local project=${key#*_}
+                bes.addLoadedLib "$project"
+            done
+        fi
+
         bes.ini "$APP_DIR/bes.ini" require -p bes -b 1
         local prefix="bes_require"
         local key=""
@@ -41,76 +160,8 @@ function bes.update ()
             done
             echo
             for name in ${bes_ALL_VARS}; do
-                key=${name:${#prefix}+1}
-                bes.echo.title "Loading" "${key//_/.}${Cusa} ${!name}${Coff}"
-                local project=${key#*_}
-                local vendor=${key%_*}
-                local version=${!name}
-                bes.inlist "$project" "$BES_LIB"
-                if [ "$vendor" = "bes" ]; then
-                    if bes.inlist "$project" "$BES_LIB"; then
-                        if [ "$bescheck" = "1" ]; then
-                            if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
-                                bes.echo.action "creating vendor directory ${Cusa}$vendor"
-                                mkdir -p "$APP_DIR/vendor/$vendor"
-                            else
-                                bes.echo.action "checking vendor directory ${Cusa}$vendor"
-                            fi
-                            bes.echo.state $?
-                            bescheck=0
-                        fi
-                        cd "$APP_DIR/vendor/$vendor"
-                        bes.echo.action "updating repository $Cusa$vendor.$project ${Coff}:$Cusa $version"
-                        if [ ! -d "$project" ]; then
-                            git clone -q "https://git.pluie.org/meta-tech/$vendor-$project" "$project" 2>&1 >/dev/null
-                            #~ bes.echo.state $?
-                            cd $project
-                        else
-                            cd $project
-                            git fetch --all -q 2>&1 >/dev/null
-                            #~ bes.echo.state $?
-                        fi
-                        #~ bes.echo.action "checkout to version $Cusa$version"
-                        local branch=$(git branch --no-color | grep \* | cut -d ' ' -f2-)
-                        # branch=${branch:5: -3}
-                        if [ "$branch" != "$version" ]; then
-                            git checkout -q $version 2>&1 >/dev/null
-                        fi
-                        bes.echo.state $?
-                        for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
-                            bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
-                            # tail -n +2 "$entry" >> "$APP_BIN"
-                        done
-                        bes.echo.state $?
-                    fi
-                else
-                    if [ ! -d "$APP_DIR/vendor/$vendor" ]; then
-                        bes.echo.action "creating vendor directory ${Cusa}$vendor"
-                        mkdir -p "$APP_DIR/vendor/$vendor"
-                        bes.echo.state $?
-                    fi
-                    if [ "${version:0:4}" = "http" ]; then
-                        local req=${!name}
-                        local path=${req#*:} 
-                        local  tag=${req##*:} 
-                        local repo=${req%:*}
-                        echo "$APP_DIR/vendor/$vendor/$project"
-                        echo $(pwd)
-                        if [ ! -d "$APP_DIR/vendor/$vendor/$project" ]; then
-                            mkdir "$APP_DIR/vendor/$vendor"
-                            cd $_
-                            git clone $repo $project
-                        fi
-                        cd "$APP_DIR/vendor/$vendor/$project"
-                        git checkout $tag
-                        for entry in "$APP_DIR/vendor/$vendor/$project/src"/*.sh; do
-                            bes.echo "      ${Cspe}- ${Cok}set for autoloading ${Coff}src/$(basename $entry)"
-                            # tail -n +2 "$entry" >> "$APP_BIN"
-                        done
-                        bes.echo.state $?
-                    fi
-                fi
-                bes.echo.rs
+                bes.loadDep "$name" "$prefix"
+                bes.loadExtDep "$name" "$prefix"
             done
         fi
     else