Skip to content
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

Refactoring edge() store the name in a better location #28

Merged
merged 2 commits into from
May 10, 2022
Merged

Refactoring edge() store the name in a better location #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd0461e
Remove dummy commit
pascalandy May 9, 2022
3e2f8b9
Refactoring edge() store the name in a better location
pascalandy May 10, 2022
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
1 change: 0 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,3 @@ In other word, the the **agile release cycle** should be something you master. B
## License

- This git repo is under the **GNU V3** license.
Dummy Commit, 2022-05-09_18H19s40, e8bf97aea9abf41147300d1f4f2eed3ab74c4a703e7d7570eb0288cc772fa73d
64 changes: 37 additions & 27 deletions bashlava.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,10 @@ PR Title: New Feat: 0o0o
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _


# TODO
- New Feat: Add Show_version sv()
- Was probably delete when I refactor show()


TODO edge()
TODO
- Refactoring edge() store the name in a better location
- dynamic edge name creation
- update path to ~/Library/Application Support/FirePress/bashlava
- update path to {HOME}/Library/Application Support/FirePress/bashlava/file


TODO Core_Load_Vars_General
Expand Down Expand Up @@ -144,14 +140,11 @@ function edge { # User_

### Logic to manage and generate unique edge name
### =============================================

### Read _branch_dev_unique
_path_dev_unique_name="${HOME}/Library/.bashlava_${app_name}_dev_branch_name_is"
_branch_dev_unique=$(cat ${_path_dev_unique_name})
_branch_dev_unique=$(cat "${_path_lib}/Application Support/${_path_last_part}")

### Local: delete branch if it exists
_branch_exist=$(git branch --list "${_branch_dev_unique}" | wc -l)
# It does not make sens to Condition_Vars_Must_Be_Not_Empty
# It does not make sens to Condition_Vars_Must_Be_Not_Empty
if [[ ${_branch_exist} -eq 0 ]]; then
echo "local: OK branch ${_branch_dev_unique} do not exist" > /dev/null 2>&1

Expand All @@ -163,8 +156,8 @@ function edge { # User_
fi

### Remote: delete branch if it exists
_branch_exist=$(git ls-remote --heads https://github.com/${github_user}/${app_name}.git "${_branch_dev_unique}" | wc -l)
# It does not make sens to Condition_Vars_Must_Be_Not_Empty
_branch_exist=$(git ls-remote --heads https://github.com/"${github_user}"/"${app_name}".git "${_branch_dev_unique}" | wc -l)
# It does not make sens to Condition_Vars_Must_Be_Not_Empty
if [[ ${_branch_exist} -eq 0 ]]; then
echo "remote: OK branch ${_branch_dev_unique} do not exist" > /dev/null 2>&1
elif [[ ${_branch_exist} -eq 1 ]]; then
Expand All @@ -175,27 +168,26 @@ function edge { # User_
fi

### Reset file where we stored the _branch_dev_unique
if [[ -f "${_path_dev_unique_name}" ]]; then
if [[ -f "${_path_lib}/Application Support/${_path_last_part}" ]]; then
echo "File exist. Lets delete it" > /dev/null 2>&1
rm ${_path_dev_unique_name}
rm "${_path_lib}/Application Support/${_path_last_part}"
fi

### Generate _branch_dev_unique and save the name in a file
if [[ -f "${_path_dev_unique_name}" ]]; then
if [[ -f "${_path_lib}/Application Support/${_path_last_part}" ]]; then
my_message="FATAL: File exist, but it should not!" && Print_Fatal
elif [[ ! -f "${_path_dev_unique_name}" ]]; then
elif [[ ! -f "${_path_lib}/Application Support/${_path_last_part}" ]]; then
echo "OK, file do not exit" > /dev/null 2>&1
_default_edge_prefix="edge" _random_char=$(openssl rand -hex 4 | colrm 4)
# Store to file
echo "${_default_edge_prefix}_${_random_char}" > "${_path_dev_unique_name}"
echo "${_default_edge_prefix}_${_random_char}" > "${_path_lib}/Application Support/${_path_last_part}"
# Get the new generated _branch_dev_unique
_branch_dev_unique=$(cat ${_path_dev_unique_name})
_branch_dev_unique=$(cat "${_path_lib}/Application Support/${_path_last_part}")
else
my_message="FATAL: Core_Load_Dev_Branch_Name | ${_path_dev_unique_name}" && Print_Fatal
my_message="FATAL: edge" && Print_Fatal
fi
### =============================================


git checkout -b "${_branch_dev_unique}"
echo && echo "push ${_branch_dev_unique} to origin"
git push --set-upstream origin "${_branch_dev_unique}" -f
Expand Down Expand Up @@ -362,8 +354,8 @@ function tci { # User_

_short_hash=$(git rev-parse --short HEAD)
_tag_name="ci_${app_version}_${_short_hash}"
_var_name="_short_hash" _is_it_empty="${_short_hash}" && Condition_Vars_Must_Be_Not_Empty
_var_name="_tag_name" _is_it_empty="${_tag_name}" && Condition_Vars_Must_Be_Not_Empty
_var_name="_short_hash" _is_it_empty="${_short_hash}" && Condition_Vars_Must_Be_Not_Empty
_var_name="_tag_name" _is_it_empty="${_tag_name}" && Condition_Vars_Must_Be_Not_Empty

git tag ${_tag_name} && git push --tags && echo
Show_Version
Expand Down Expand Up @@ -755,8 +747,7 @@ function Condition_Branch_Must_Be_Mainbranch {
}

function Condition_Branch_Must_Be_Edge {
_path_dev_unique_name="${HOME}/Library/.bashlava_${app_name}_dev_branch_name_is"
_branch_dev_unique=$(cat ${_path_dev_unique_name})
_branch_dev_unique=$(cat "${_path_lib}/Application Support/${_path_last_part}")

_compare_me=$(git rev-parse --abbrev-ref HEAD)
_compare_you="${_branch_dev_unique}" _fct_is="Condition_Branch_Must_Be_Edge"
Expand Down Expand Up @@ -1000,19 +991,22 @@ function Core_Load_Vars_General {
# to have multiple instance of bashLaVa on your machine
bashlava_executable="bashlava.sh"
_path_user="/usr/local/bin"
_var_name="_path_user" _is_it_empty="${_path_user}" && Condition_Vars_Must_Be_Not_Empty

### Reset if needed
Core_Reset_Bashlava_Path

### Set absolute path for the project root ./
_path_bashlava="$(cat "${_path_user}"/bashlava_path)"
_var_name="_path_bashlava" _is_it_empty="${_path_bashlava}" && Condition_Vars_Must_Be_Not_Empty

### Set absolute path for the ./components directory
_path_components="${_path_bashlava}/components"
_var_name="_path_components" _is_it_empty="${_path_components}" && Condition_Vars_Must_Be_Not_Empty

### Set absolute path for the ./docs directory
_path_docs="${_path_bashlava}/docs"

_var_name="_path_docs" _is_it_empty="${_path_docs}" && Condition_Vars_Must_Be_Not_Empty
# every scripts that are not under the main bashLaVa app, should be threated as an components.
# It makes it easier to maintain the project, it minimises cluter, it minimise break changes, it makes it easy to accept PR, more modular, etc.

Expand Down Expand Up @@ -1075,6 +1069,21 @@ function Core_Load_Vars_Dockerfile {
_var_name="_url_to_check" _is_it_empty="${_url_to_check}" && Condition_Vars_Must_Be_Not_Empty
}

function Core_Load_Vars_Edge {
### edge
# Path where we store the dynamically generated edge name
_path_lib="${HOME}/Library"
_var_name="_path_lib" _is_it_empty="${_path_lib}" && Condition_Vars_Must_Be_Not_Empty

mkdir -p "${_path_lib}/Application Support/FirePress/bashlava"
_path_last_part="FirePress/bashlava/${app_name}_dev_branch_name_is"
_var_name="_path_last_part" _is_it_empty="${_path_last_part}" && Condition_Vars_Must_Be_Not_Empty

# Can't pass the path as a var because of the space (/Application Support)
#_branch_dev_unique=$(cat "${_path_lib}/Application Support/${_path_last_part}")
# It does not make sens to Condition_Vars_Must_Be_Not_Empty
}

### Entrypoint
function main() {
trap script_trap_err ERR
Expand All @@ -1083,6 +1092,7 @@ function main() {

Core_Load_Vars_General
Core_Load_Vars_Dockerfile
Core_Load_Vars_Edge
Core_Check_Which_File_Exist

### Core_Input_Checkpoint
Expand Down