Merge pull request #413 from remotemobprogramming/410-status-time

#410: added duration to latest commit for a remote branch to mob status

mob.go

@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	versionNumber     = "4.5.0"
+	versionNumber     = "4.5.1"
 	minimumGitVersion = "2.13.0"
 )
 
@@ -887,16 +887,6 @@ func warnForActiveWipBranches(configuration config.Configuration, currentBaseBra
 	}
 }
 
-func showActiveMobSessions(configuration config.Configuration, currentBaseBranch Branch) {
-	existingWipBranches := getWipBranchesForBaseBranch(currentBaseBranch, configuration)
-	if len(existingWipBranches) > 0 {
-		say.Info("remote wip branches detected:")
-		for _, wipBranch := range existingWipBranches {
-			say.WithPrefix(wipBranch, "  - ")
-		}
-	}
-}
-
 func sayUntrackedFilesInfo() {
 	untrackedFiles := getUntrackedFiles()
 	hasUntrackedFiles := len(untrackedFiles) > 0
@@ -1190,19 +1180,6 @@ func squashOrCommit(configuration config.Configuration) string {
 	}
 }
 
-func status(configuration config.Configuration) {
-	if isMobProgramming(configuration) {
-		currentBaseBranch, currentWipBranch := determineBranches(gitCurrentBranch(), gitBranches(), configuration)
-		say.Info("you are on wip branch " + currentWipBranch.String() + " (base branch " + currentBaseBranch.String() + ")")
-
-		sayLastCommitsList(currentBaseBranch.String(), currentWipBranch.String())
-	} else {
-		currentBaseBranch, _ := determineBranches(gitCurrentBranch(), gitBranches(), configuration)
-		say.Info("you are on base branch '" + currentBaseBranch.String() + "'")
-		showActiveMobSessions(configuration, currentBaseBranch)
-	}
-}
-
 func sayLastCommitsList(currentBaseBranch string, currentWipBranch string) {
 	commitsBaseWipBranch := currentBaseBranch + ".." + currentWipBranch
 	log := silentgit("--no-pager", "log", commitsBaseWipBranch, "--pretty=format:%h %cr <%an>", "--abbrev-commit")

mob_test.go

@@ -177,38 +177,6 @@ func TestDoneNotMobProgramming(t *testing.T) {
 	assertOutputContains(t, output, "to start working together")
 }
 
-func TestStatusMobProgramming(t *testing.T) {
-	output, configuration := setup(t)
-	start(configuration)
-
-	status(configuration)
-
-	assertOutputContains(t, output, "you are on wip branch mob-session")
-}
-
-func TestStatusWithMoreThan5LinesOfLog(t *testing.T) {
-	output, configuration := setup(t)
-	configuration.NextStay = true
-	start(configuration)
-
-	for i := 0; i < 6; i++ {
-		createFile(t, "test"+strconv.Itoa(i)+".txt", "contentIrrelevant")
-		next(configuration)
-	}
-
-	status(configuration)
-	// 6 wip commits + 1 start commit
-	assertOutputContains(t, output, "wip branch 'mob-session' contains 7 commits.")
-}
-
-func TestExecuteKicksOffStatus(t *testing.T) {
-	output, _ := setup(t)
-
-	execute("status", []string{}, config.GetDefaultConfiguration())
-
-	assertOutputContains(t, output, "you are on base branch 'master'")
-}
-
 func TestExecuteInvalidCommandKicksOffHelp(t *testing.T) {
 	output, _ := setup(t)
 

status.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	config "github.com/remotemobprogramming/mob/v4/configuration"
+	"github.com/remotemobprogramming/mob/v4/say"
+)
+
+func status(configuration config.Configuration) {
+	if isMobProgramming(configuration) {
+		currentBaseBranch, currentWipBranch := determineBranches(gitCurrentBranch(), gitBranches(), configuration)
+		say.Info("you are on wip branch " + currentWipBranch.String() + " (base branch " + currentBaseBranch.String() + ")")
+
+		sayLastCommitsList(currentBaseBranch.String(), currentWipBranch.String())
+	} else {
+		currentBaseBranch, _ := determineBranches(gitCurrentBranch(), gitBranches(), configuration)
+		say.Info("you are on base branch '" + currentBaseBranch.String() + "'")
+		showActiveMobSessions(configuration, currentBaseBranch)
+	}
+}
+
+func showActiveMobSessions(configuration config.Configuration, currentBaseBranch Branch) {
+	existingWipBranches := getWipBranchesForBaseBranch(currentBaseBranch, configuration)
+	if len(existingWipBranches) > 0 {
+		say.Info("remote wip branches detected:")
+		for _, wipBranch := range existingWipBranches {
+			time := silentgit("log", "-1", "--pretty=format:(%ar)", wipBranch)
+			say.WithPrefix(wipBranch+" "+time, "  - ")
+		}
+	} else {
+		say.Info("no remote wip branches detected!")
+	}
+}

status_test.go

@@ -0,0 +1,53 @@
+package main
+
+import (
+	config "github.com/remotemobprogramming/mob/v4/configuration"
+	"strconv"
+	"testing"
+)
+
+func TestExecuteKicksOffStatus(t *testing.T) {
+	output, _ := setup(t)
+
+	execute("status", []string{}, config.GetDefaultConfiguration())
+
+	assertOutputContains(t, output, "you are on base branch 'master'")
+}
+
+func TestStatusMobProgramming(t *testing.T) {
+	output, configuration := setup(t)
+	start(configuration)
+
+	status(configuration)
+
+	assertOutputContains(t, output, "you are on wip branch mob-session")
+}
+
+func TestStatusWithMoreThan5LinesOfLog(t *testing.T) {
+	output, configuration := setup(t)
+	configuration.NextStay = true
+	start(configuration)
+
+	for i := 0; i < 6; i++ {
+		createFile(t, "test"+strconv.Itoa(i)+".txt", "contentIrrelevant")
+		next(configuration)
+	}
+
+	status(configuration)
+	// 6 wip commits + 1 start commit
+	assertOutputContains(t, output, "wip branch 'mob-session' contains 7 commits.")
+}
+
+func TestStatusDetectsWipBranches(t *testing.T) {
+	output, configuration := setup(t)
+	start(configuration)
+	createFile(t, "test.txt", "contentIrrelevant")
+	next(configuration)
+	git("checkout", "master")
+
+	status(configuration)
+
+	assertOutputContains(t, output, "remote wip branches detected:\n  - origin/mob-session")
+	assertOutputContains(t, output, " second")
+	assertOutputContains(t, output, " ago)")
+}