Merge branch 'feature/merge-request-labels'

accepting mr labels with --label

Author: ulisseslima

README.md

@@ -32,7 +32,7 @@ gclit-sync
 
 * Make more changes...
 
-* Deliver the fature (commits pending changes, creates merge request if project url is from gitlab, syncs with target branch [e.g.: master], pushes changes, merges changes back to target branch if project url is from github, delivers runrun task):
+* Deliver the feature (commits pending changes, creates merge request if project url is from gitlab, syncs with target branch [e.g.: master], pushes changes, merges changes back to target branch if project url is from github, delivers runrun task):
 ```
 gclit-deliver
 ```

db.sh

@@ -27,6 +27,10 @@ function db() {
     fi
 }
 
+function db_dump() {
+    cat $LOCAL_DB
+}
+
 if [[ -n "$1" && $(MYNAME) == $CALLER ]]; then
     if [[ "$1" == -r ]]; then
         less $LOCAL_DB

deliver.sh

@@ -29,20 +29,25 @@ if [[ ! -n "$name" ]]; then
     exit 1
 fi
 
+if [[ "$PWD" != $(db CURR_FEATURE_DIR) ]]; then
+    err "feature '$name' was started on another repo:"
+    db CURR_FEATURE_DIR
+    exit 1
+fi
+
 git checkout $name
 
-info "${name}'s conclusion message:"
-if [[ -n "$message" ]]; then
-    echo "$message"
-else
+while [[ ! -n "$message" ]]; do
+    info "${name}'s conclusion message:"
     read message
-fi
+done
+debug "delivery message: '$message'"
 
 echo "$(date)" > v
 
 $MYDIR/commit.sh "$message"
 if [[ $mr == true && $(project_url) == *gitlab* ]]; then
-    $MYDIR/merge-request.sh "$message" false
+    $MYDIR/merge-request.sh "$@"
 fi
 $MYDIR/sync.sh
 $MYDIR/push.sh "$message"

feature.sh

@@ -20,10 +20,12 @@ if [[ ! -n "$(curr_branch)" ]]; then
 fi
 
 if [[ "$1" != '-'* ]]; then
+    # name was passed directlty as first arg with no prefix
     name="$1"; shift
 fi
 
 project_id="$(db CURR_PROJECT_ID)"
+label=gclit
 
 while test $# -gt 0
 do
@@ -38,6 +40,10 @@ do
 
         project_id=$(prompt_project_id "$name_or_id")
     ;;
+    --label)
+        shift
+        label="$1"
+    ;;
     -*)
         echo "bad option '$1'"
         exit 1
@@ -61,7 +67,9 @@ if [[ ! -n "$project_name" ]]; then
     exit 1
 fi
 
-info "will start '$name' on project '$project_name', proceed?"
+info "will start '$name' on project '$project_name'"
+info "project URL: $(project_url)"
+echo "<enter> to proceed, CTRL+C to abort"
 read anyKey
 
 if [[ "$(curr_branch)" != "$name" ]]; then

jprop.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
-
-cat /dev/stdin | python -c "import sys, json; print json.load(sys.stdin)$1"
+export PYTHONIOENCODING=utf-8
+cat /dev/stdin | python -c "import sys, json; print json.load(sys.stdin)$1"

log.sh

@@ -47,7 +47,7 @@ function log() {
 	fi
 
     if [[ $level == DEBUG && $(debugging) == on || $level != DEBUG ]]; then
-        echo "$indicator $(now.sh -dt) - ${FUNCNAME[2]}@${BASH_LINENO[1]}/$level: $@"
+        echo "$indicator $(now.sh -t) - ${FUNCNAME[2]}@${BASH_LINENO[1]}/$level: $@"
     fi
     echo "$MYSELF - $indicator $(now.sh -dt) - ${FUNCNAME[2]}@${BASH_LINENO[1]}/$level: $@" >> $logf
 }

merge-request.sh

@@ -9,9 +9,39 @@ source $MYDIR/env
 source $MYDIR/log.sh
 source $MYDIR/db.sh
 
-message="$1"
-wip="${2:-true}"
-detail="${3:-auto generated by gclit}"
+wip=false
+description="auto generated by gclit"
+
+if [[ "$1" != '-'* ]]; then
+    # message was passed directlty as first arg with no prefix
+    message="$1"; shift
+fi
+
+while test $# -gt 0
+do
+    case "$1" in
+    --message|-m)
+        shift
+        message="$1"
+    ;;
+    --wip)
+        wip=true
+    ;;
+    --label)
+        shift
+        label="$1"
+    ;;
+    --description|-d)
+        shift
+        description="$1"
+    ;;
+    -*)
+        echo "bad option '$1'"
+        exit 1
+    ;;
+    esac
+    shift
+done
 
 if [[ ! -n "$(curr_branch)" ]]; then
     err "you have to be inside the repository directory"
@@ -30,15 +60,19 @@ if [[ ! -n "$name" ]]; then
     exit 1
 fi
 
-info "creating request to merge back to $target ..."
+while [[ ! -n "$label" ]]; do
+    info "choose a label:"
+    read label
+done
+
+info "#$label - creating request to merge back to $target ..."
 git checkout $name
 
-info "${name}'s merge request message:"
-if [[ -n "$message" ]]; then
-    echo "$message"
-else
+while [[ ! -n "$message" ]]; do
+    info "${name}'s MR message:"
     read message
-fi
+done
+debug "MR message: '$message'"
 
 if [[ $wip == true ]]; then
     message="[WIP] $message"
@@ -51,6 +85,7 @@ git push \
     -o merge_request.target=$target \
     -o merge_request.remove_source_branch \
     -o merge_request.title="$message" \
-    -o merge_request.description="$detail"
+    -o merge_request.description="$description" \
+    -o merge_request.label="$label"
 
-$MYDIR/rr-comment.sh "opened merge request to $target"
+$MYDIR/rr-comment.sh "opened MR to $target"

rr-curr-project.sh

@@ -11,18 +11,17 @@ source $MYDIR/db.sh
 
 json=$($MYDIR/runrun.sh GET "tasks?user_id=$(rr_user_id)&is_working_on=true")
 if [[ -n "$json" && "$json" != '[]' ]]; then
-    p_name=$(echo "$json" | $MYDIR/jprop.sh "[0]['project_name']")
+    # TODO abstrair pra não ter que duplicar e chamar no pause
     p_id=$(echo "$json" | $MYDIR/jprop.sh "[0]['project_id']")
-    
-    t_name=$(echo "$json" | $MYDIR/jprop.sh "[0]['title']")
-    t_id=$(echo "$json" | $MYDIR/jprop.sh "[0]['id']")
-    t_type=$(echo "$json" | $MYDIR/jprop.sh "[0]['type_id']")
-
     db CURR_PROJECT_ID "${p_id}"
+    p_name=$(echo "$json" | $MYDIR/jprop.sh "[0]['project_name']")
     db CURR_PROJECT_NAME "${p_name}"
 
+    t_id=$(echo "$json" | $MYDIR/jprop.sh "[0]['id']")
     db CURR_TASK_ID "${t_id}"
+    t_name=$(echo "$json" | $MYDIR/jprop.sh "[0]['title']")
     db CURR_TASK_NAME "${t_name}"
+    t_type=$(echo "$json" | $MYDIR/jprop.sh "[0]['type_id']")
     db CURR_TASK_TYPE "${t_type}"
 
     t_team=$(echo "$json" | $MYDIR/jprop.sh "[0]['team_id']")

rr-pause.sh

@@ -9,15 +9,22 @@ source $MYDIR/env
 source $MYDIR/log.sh
 source $MYDIR/db.sh
 
-id="$(db CURR_TASK_ID)"
+id="$1"
+if [[ ! -n "$id" ]]; then
+    id="$(db CURR_TASK_ID)"
+fi
 name="$(db CURR_TASK_NAME)"
 
+if [[ $(nan "$id") == true ]]; then
+    err "arg 1 must be the task id"
+fi
+
 if [[ $(nan "$id") == true ]]; then
     info "no tasks were running"
     exit 0
 fi
 
-info "pausing '$name' ..."
+info "pausing task #$id ..."
 
 json=$($MYDIR/runrun.sh POST "tasks/$id/pause")
 if [[ "$json" == *'already paused'* ]]; then

rr-play.sh

@@ -15,9 +15,13 @@ if [[ ! -n "$id" ]]; then
 fi
 
 if [[ $(nan "$id") == true ]]; then
-    err "arg 1 must be the task id, showing results for '$id'..."
-    $MYDIR/rr-find-task.sh "$id"
-    info "choose one an try again"
+    err "arg 1 must be the task id"
+    if [[ -n "$id" ]]; then
+        info "showing results for '$id'..."
+        $MYDIR/rr-find-task.sh "$id"
+    fi
+    
+    info "choose one and try again"
     exit 1
 fi