Skip to content

Implementation of tree feature #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Implementation of tree feature #6

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64f3483
Change tree action to an option of inspect
Mar 13, 2020
c8707ac
change the display of the tree
Mar 13, 2020
85fd225
fix error message
Apr 20, 2020
47fbe0d
now inspect --tree actions follows the order in which the dependencie…
Apr 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 93 additions & 72 deletions qompoter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ INQLUDE_FILENAME=
VENDOR_DIR=vendor
REPO_PATH=${QOMP_REPO_PATH}
test "${REPO_PATH}" == "" && REPO_PATH=https://github.com
IS_TREE=0
IS_ALL=0
IS_BYPASS=0
IS_FORCE=0
Expand Down Expand Up @@ -289,12 +290,15 @@ usage()
Usage: $C_PROGNAME [action] [ --repo <repo> | other options ]

action Select an action:
export, init, inspect, install, require, tree
export, init, inspect, install, require

Other actions are useful for digging into Qompoter:
inqlude, jsonh, md5sum

Options:
--tree Make a tree with all dependencies and sub-dependecies
of the project.
Supported action is: inspect

--all List or apply actions to all elements depending of
the action
Expand Down Expand Up @@ -387,7 +391,10 @@ usage()

List downloaded dependencies for this project:
$C_PROGNAME inspect --all


Make a tree with all downloaded dependencies and sub-dependencies for this project:
$C_PROGNAME inspect --tree

Export vendor directory:
$C_PROGNAME export

Expand Down Expand Up @@ -2024,86 +2031,97 @@ inspectAction()
local vendorDir=$2
local globalRes=0
qompoterLockFile=$(echo "${qompoterFile}" | cut -d'.' -f1).lock

# Check
checkQompoterFile "${qompoterLockFile}" || return 100
if [ ! -d "${vendorDir}" ]; then
echo "Nothing to do: no '${VENDOR_DIR}' dir"
return 0
echo "Nothing to do: no '${VENDOR_DIR}' dir"
return 0
fi

if [[ "${IS_TREE}" == "1" ]]; then
treeAction "${vendorDir}"
else
# Loop over lock file
local changes=0
local requires
requires=$(getProjectRequiresFromLock "${qompoterLockFile}")
for packageInfo in ${requires}; do
local vendorName
vendorName=$(echo "${packageInfo}" | cut -d'/' -f1)
local projectName
projectName=$(echo "${packageInfo}" | cut -d'/' -f2)
local projectFullName="${vendorName}/${projectName}"
local version
version=$(echo "${packageInfo}" | cut -d'/' -f3)
local expectedMd5Sum
expectedMd5Sum=$(getProjectMd5FromLock "${qompoterLockFile}" "${projectFullName}" | cut -d'/' -f3)
local actualMd5Sum
actualMd5Sum=$(getProjectMd5 "${vendorDir}/${projectName}")
local differs=
test "${actualMd5Sum}" != "${expectedMd5Sum}" && let changes=${changes}+1 && differs="${C_INFO} *${C_END}"
if [[ "${IS_ALL}" == "1" ]] || [[ ! -z "${differs}" ]]; then
echo -e "* ${projectFullName} (${version}${differs})"
if [ -d "${vendorDir}/${projectName}/.git" ]; then
cd "${vendorDir}/${projectName}" || ( echo " Error: cannot go to !$" ; echo -e "${C_FAIL}FAILURE${C_END}" ; exit -1)
git status -sb
if [[ ! -z $"${differs}" ]] && ( [ "$IS_VERBOSE" == "1" ] || [ "$IS_VERBOSE" == "2" ] || [ "$IS_VERBOSE" == "3" ] ); then
git diff
fi
cd ../../ || ( echo " Error: cannot go to !$" ; echo -e "${C_FAIL}FAILURE${C_END}" ; exit -1)
fi
echo
fi
done

# Loop over lock file
local changes=0
local requires
requires=$(getProjectRequiresFromLock "${qompoterLockFile}")
for packageInfo in ${requires}; do
local vendorName
vendorName=$(echo "${packageInfo}" | cut -d'/' -f1)
local projectName
projectName=$(echo "${packageInfo}" | cut -d'/' -f2)
local projectFullName="${vendorName}/${projectName}"
local version
version=$(echo "${packageInfo}" | cut -d'/' -f3)
local expectedMd5Sum
expectedMd5Sum=$(getProjectMd5FromLock "${qompoterLockFile}" "${projectFullName}" | cut -d'/' -f3)
local actualMd5Sum
actualMd5Sum=$(getProjectMd5 "${vendorDir}/${projectName}")
local differs=
test "${actualMd5Sum}" != "${expectedMd5Sum}" && let changes=${changes}+1 && differs="${C_INFO} *${C_END}"
if [[ "${IS_ALL}" == "1" ]] || [[ ! -z "${differs}" ]]; then
echo -e "* ${projectFullName} (${version}${differs})"
if [ -d "${vendorDir}/${projectName}/.git" ]; then
cd "${vendorDir}/${projectName}" || ( echo " Error: cannot go to !$" ; echo -e "${C_FAIL}FAILURE${C_END}" ; exit -1)
git status -sb
if [[ ! -z $"${differs}" ]] && ( [ "$IS_VERBOSE" == "1" ] || [ "$IS_VERBOSE" == "2" ] || [ "$IS_VERBOSE" == "3" ] ); then
git diff
if [ "${changes}" == "0" ]; then
echo -e "${C_OK}Great! There is no manual change${C_END}"
elif [ "${changes}" == "1" ]; then
echo -e "Take care, there is ${C_INFO}1${C_END} manual change"
else
echo -e "Take care, there are ${C_INFO}${changes}${C_END} manual changes"
fi
cd ../../ || ( echo " Error: cannot go to !$" ; echo -e "${C_FAIL}FAILURE${C_END}" ; exit -1)
fi
echo
echo
fi
done

if [ "${changes}" == "0" ]; then
echo -e "${C_OK}Great! There is no manual change${C_END}"
elif [ "${changes}" == "1" ]; then
echo -e "Take care, there is ${C_INFO}1${C_END} manual change"
else
echo -e "Take care, there are ${C_INFO}${changes}${C_END} manual changes"
fi
echo
}

listRequirement()
{
local match=$(grep -w -o $1 qompoter.json)
if [ "$match" = "$1" ];then
echo -e "\t\e[37m$match: {"
local data=$(echo $(<qompoter.json) |sed "s/$1/%/" | cut -d'%' -f2 | sed "s/://" | sed "s/{//" | cut -d'}' -f1| sed "s/,/\r\n\t\t/g")
data=$(tr -d ' ' <<<"$data")
echo -e "\t\t\e[39m$data\r\n\t}"
else
echo -e "\t\e[93m$1 not found."
local data=$(echo $(<qompoter.json) |sed "s/$1/%/" | cut -d'%' -f2 | sed "s/://" | sed "s/{//" | cut -d'}' -f1| sed "s/,/\r\n|\t|----/g")
data=$(tr -d ' ' <<<"$data")
if [[ ! -z "$data" ]]; then
echo -e "\e[37m|\t|----$data"
fi
fi
}

treeAction(){
local vendorDir=$2
cd $vendorDir
for dir in $(find [0-9a-zA-Z]* -maxdepth 0 -type d); do
cd $dir
echo -e "\e[34m$dir/"
if [ -f qompoter.json ]; then
local qompoterFile=$(<qompoter.json)
listRequirement ""\"require\"""
listRequirement ""\"require-dev\"""
listRequirement ""\"require-global\"""
echo -e "\r\n"
else
echo -e "\t\e[93mqompoter.json not found.\r\n"
fi
cd ..
done
echo -e "Project : \e[35m${PWD##*/}"
local requires
requires=$(getProjectRequiresFromLock "${qompoterLockFile}")
for packageInfo in ${requires}; do
local vendorName
vendorName=$(echo "${packageInfo}" | cut -d'/' -f1)
local projectName
projectName=$(echo "${packageInfo}" | cut -d'/' -f2)
cd $1/$projectName
echo -e "\e[37m|\r\n|----\e[34m$projectName"
echo -e "\e[37m|\t|"
if [ -f qompoter.json ]; then
if [ -z "$(grep -w -o ""\"require\""" qompoter.json)" ] && [ -z "$(grep -w -o ""\"require-dev\""" qompoter.json)" ] && [ -z "$(grep -w -o ""\"require-global\""" qompoter.json)" ]; then
echo -e "\e[37m|\t|---- There is no dependencies in the qompoter.json of this project"
else
listRequirement ""\"require\"""
listRequirement ""\"require-dev\"""
listRequirement ""\"require-global\"""
fi
else
echo -e "\e[37m|\t|---- There is no qompoter.json in this project"
fi
cd ../..
done
}

recursiveInstallFromQompoterFile()
Expand Down Expand Up @@ -2521,14 +2539,22 @@ cmdline()
fi
while [ "$1" != "" ]; do
case $1 in
--all )
--tree )
if [ "${ACTION}" == "inspect" ]; then
IS_TREE=1
else
echo "Ignore flag --tree for action '${ACTION}'"
fi
shift
;;
--all )
if [ "${ACTION}" == "inspect" ]; then
IS_ALL=1
else
echo "Ignore flag --all for action '${ACTION}'"
fi
shift
;;
;;
--by-pass )
IS_BYPASS=1
shift
Expand Down Expand Up @@ -2746,11 +2772,6 @@ main()
echo
inspectAction "${QOMPOTER_FILENAME}" "${VENDOR_DIR}"
;;
"tree")
echo "======== ${ACTION}"
echo
treeAction "${QOMPOTER_FILENAME}" "${VENDOR_DIR}"
;;
"install")
echo "======== ${ACTION}"
echo
Expand Down