Merge pull request #12 from nschlimm/feature/v2.1.6

Feature/v2.1.6

Author: nschlimm

EasyKey.git/ezk-git-extras.sh

@@ -8,40 +8,51 @@ function changeBlame () {
 	git log --pretty=format:'%Cred%h%Creset | %Cgreen%ad%Creset | %s %C(yellow)%d%Creset %C(bold blue)[%an]%Creset %Cgreen(%cr)%Creset' --graph --date=short
 	echo "Enter baseline commit:"
 	read baseline
+    [ "$baseline" = "" ] && waitonexit && return 
 	echo "Enter until commit (default HEAD):"
 	read untilcommit
+    [ "$untilcommit" = "" ] && waitonexit && return 
 	executeCommand "git guilt $baseline ${untilcommit:-HEAD}"
 }
 
 function removeLatest () {
 	echo "How many commits to remove?"
 	read ccommit
+    [ "$ccommit" = "" ] && waitonexit && return 
 	executeCommand "git back $ccommit"
 }
 
 function findOut () {
 	executeCommand "git authors --list"
 	echo "Enter author to check:"
 	read author
-	echo "Since?"
+    [ "$author" = "" ] && waitonexit && return 
+	echo "Since (in days, e.g. 2)?"
 	read since
-	executeCommand "git standup $author \"$since\""
+    [ "$since" = "" ] && waitonexit && return 
+	executeCommand "git standup -a "$author" -d "$since""
 }
 
 function obliterate () {
 	read -p "This programm completely deletes. Continue (y/n)? " -n 1 -r
 	echo
+    [ "$REPLY" = "" ] && waitonexit && return 
 	if [[ $REPLY =~ [Yy]$ ]]; then
 		selectItem "git ls-files"
-		read -p "Remove $selected (y/n)? " -n 1 -r
+		read -p "Remove $fname (y/n)? " -n 1 -r
+        [ "$REPLY" = "" ] && waitonexit && return 
 		echo
 		if [[ $REPLY =~ [Yy]$ ]]; then
-		   executeCommand "git obliterate $selected"
+		   executeCommand "git obliterate $fname"
 		fi
 	fi
 
 }
 
+monthlySummary() {
+  git log --oneline --format='%C(auto)%ad %h %d' --date=format:'%Y-%m-%d' | awk '{print substr($1, 1, 7)}' | sort | uniq -c | awk '{print $2, $1}'
+}
+
 menuInit "Git extras menu"
 submenuHead "Project information"
 menuItem a "Project summary in commits" "git summary"
@@ -52,6 +63,7 @@ menuItem e "Show information about the repo" "git info"
 menuItem f "Generate changelog" "git changelog -a"
 menuItem g "Show tree" "git show-tree"
 menuItem h "Show activity calendar" "git cal"
+menuItem i "Monthly count of commits" monthlySummary
 submenuHead "Author information"
 menuItem k "List authors" "git authors --list"
 menuItem l "Find out what somebody did since ..." findOut

EasyKey.git/ezk-git-functions.sh

@@ -73,6 +73,8 @@ function addAllUntracked () {
 
 function mergeChanges () {
 
+    importantLog "Checking for merge requirements from remote origin"
+
     # Get the name of the current branch
     current_branch=$(git rev-parse --abbrev-ref HEAD)
 
@@ -81,7 +83,10 @@ function mergeChanges () {
     behind_count=$(git rev-list --count ${current_branch}..${current_branch}@{upstream})
 
     # Check if the current branch is ahead of the remote branch
-    if [ $ahead_count -gt 0 ]; then
+    if [ $ahead_count -eq 0 ]; then
+        echo "Your current branch '$current_branch' is in sync with origin."
+        echo "... nothing to merge ..."
+    elif [ $ahead_count -ge 0 ]; then
         echo "Your current branch '$current_branch' is ahead of its remote counterpart by $ahead_count commit(s)."
         echo "... nothing to merge ..."
     elif [ $behind_count -gt 0 ]; then

EasyKey.kubectl/ezk-kubectl-functions.sh

@@ -234,3 +234,8 @@ kubeContext() {
     deplomentActualStatus
 }
 
+viewSecrets() {
+    selectItem "kubectl get secrets" "awk '{print \$1}'"
+    if [[ $fname == "" ]]; then return 0; fi
+    executeCommand "kubectl edit secret $fname"
+}

EasyKey.kubectl/kubectl.sh

@@ -33,7 +33,7 @@ menuInit "EasyKey.kubectl"
   submenuHead "Other stuff "
     menuItemClm I "List images in contexts" listImagesInUse J "Ingress configuration" "kubectl get ing -o json | jq -r '.items[].spec.rules[].http.paths[]'"
     menuItemClm K "Describe ingress" "kubectl describe ing" "L" "Edit config map" editConfigMap
-    menuItem T "Edit Ingress" "kubectl edit ingress"
+    menuItemClm T "Edit Ingress" "kubectl edit ingress" U "View/Edit secrets" viewSecrets
 startMenu "kubeContext"
 echo "bye, bye, homie!"
 

EasyKey.maven/ezk-maven-functions.sh

@@ -39,6 +39,7 @@ startSpringBoot() {
              "logging.level.sql=TRACE" \
              "spring.jpa.show-sql=true" \
              "logging.level.org.springframework=DEBUG" \
+             "logging.level.org.springframework.jdbc.core=TRACE" \
              "management.endpoints.web.exposure.include=mappings" \
              "logging.group.tomcat=org.apache.catalina,org.apache.coyote,org.apache.tomcat,--logging.level.tomcat=DEBUG" \
              "logging.level.org.hibernate=DEBUG" \

shellmenu.sh

@@ -5,7 +5,7 @@
 #################################
 
 # Release
-release=2.1.5
+release=2.1.6
 
 # Colors
 clrBlack=0