close #239 correct jira branch name conversion

Author: groenborg

phlow/deliver.go

@@ -44,10 +44,17 @@ func Deliver(conf *setting.ProjectSetting) {
 	}
 
 	//Is branch master or is branch delivered
-	if strings.HasPrefix(branchInfo.Current, "delivered/") || (branchInfo.Current == conf.IntegrationBranch) {
-		fmt.Printf("Could not deliver: %s", branchInfo.Current)
+	if strings.HasPrefix(branchInfo.Current, "delivered/") {
+		fmt.Printf("It is not possible to deliver a branch already delivered: %s \n", branchInfo.Current)
 		return
 	}
+
+	//Delivering master
+	if branchInfo.Current == conf.IntegrationBranch {
+		fmt.Printf("It is not possible to deliver the integration branch: %s \n", branchInfo.Current)
+		return
+	}
+
 	//git push origin name:ready/name
 	_, err = git.Push(conf.Remote, fmt.Sprintf("%s:%s/%s", branchInfo.Current, conf.DeliveryBranchPrefix, branchInfo.Current))
 	if err != nil {

phlow/workon.go

@@ -68,13 +68,13 @@ func WorkOn(keyOrID string, conf *setting.ProjectSetting, update WorkOnUpdate) {
 	branchInfo := githandler.AsList(out)
 
 	//Are we already on the branch we want to work on
-	if plugins.IssueFromBranchName(branchInfo.Current) == keyOrID {
+	if strings.HasPrefix(branchInfo.Current, keyOrID) {
 		fmt.Fprintf(os.Stdout, "You are already on branch %s \n", ui.Format.Branch(branchInfo.Current))
 		return
 	}
 	//Does another workspace already exist with the key or ID
 	for _, branch := range branchInfo.List {
-		if plugins.IssueFromBranchName(branch) == keyOrID {
+		if strings.HasPrefix(branch, keyOrID) {
 
 			if _, err = git.CheckOut(branch); err != nil {
 				fmt.Println(err)
@@ -88,7 +88,6 @@ func WorkOn(keyOrID string, conf *setting.ProjectSetting, update WorkOnUpdate) {
 
 	name, err := update(keyOrID, conf)
 	if err != nil {
-
 		fmt.Println(err)
 		os.Exit(1)
 	}

plugins/plintf.go

@@ -0,0 +1,13 @@
+package plugins
+
+//Authorization ...
+//interface for authorization with external service
+type Authorization func(URL, user, pass string) (token string, err error)
+
+//Authentication ...
+//interface for authentication with external service
+type Authentication func(URL, user, pass string) (authenticated bool, err error)
+
+//DefaultBranch ...
+//interface for getting the default branch of the external service
+type DefaultBranch func(URL, org, repo, token string) (defaultBranch string, err error)

plugins/plugin.go

@@ -6,18 +6,6 @@ import (
 	"strings"
 )
 
-//Authorization ...
-//interface for authorization with external service
-type Authorization func(URL, user, pass string) (token string, err error)
-
-//Authentication ...
-//interface for authentication with external service
-type Authentication func(URL, user, pass string) (authenticated bool, err error)
-
-//DefaultBranch ...
-//interface for getting the default branch of the external service
-type DefaultBranch func(URL, org, repo, token string) (defaultBranch string, err error)
-
 //PhlowLabels ...
 //Map of labels in the phlow
 var PhlowLabels map[string]*PhlowLabel

plugins/plugin_test.go

@@ -1,77 +1,53 @@
-package plugins
+package plugins_test
 
 import (
-	"testing"
+	. "github.com/praqma/git-phlow/plugins"
 
-	. "github.com/smartystreets/goconvey/convey"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
 	"strconv"
 )
 
-type testCase struct {
-	issue      int
-	branchName string
-	expected   string
-	casedesc   string
-}
+var _ = Describe("Plugin", func() {
 
-/* Branch naming conventions
- * - cant begin with '.'
- * - cant have double dot '..'
- * - cant have chars '^', '~', ':'
- * - end with backslash /
- * - end with ".lock"
- * - contain \
- */
-
-func TestBranchNameFromIssue(t *testing.T) {
-	testsToRun := [7]testCase{
-		{issue: 12, branchName: "work on iss", expected: "12-work-on-iss", casedesc: "Test replaces whitespaces with dash '-'"},
-		{issue: 45, branchName: "Case SENsitivity", expected: "45-case-sensitivity", casedesc: "Test converts charecters to lowercase"},
-		{issue: 15, branchName: ".branch name", expected: "15-branch-name", casedesc: "Test removes . prefix"},
-		{issue: 220, branchName: "^^..:~:name", expected: "220-name", casedesc: "removes ASCII control characters"},
-		{issue: 2735, branchName: "name/", expected: "2735-name", casedesc: "test removes end / "},
-		{issue: 234567, branchName: ".NAME.is\"dotted", expected: "234567-name-is-dotted", casedesc: "test removes backslash"},
-		{issue: 672, branchName: "add big data blog /", expected: "672-add-big-data-blog", casedesc: "remove forward slash"},
+	type testCase struct {
+		issue      int
+		branchName string
+		expected   string
+		casedesc   string
 	}
 
-	Convey("Running tests on 'BranchNameFromIssue'", t, func() {
-
-		for _, currentTest := range testsToRun {
-
-			Convey(currentTest.casedesc, func() {
-				actualName := BranchNameFromIssue(strconv.Itoa(currentTest.issue), currentTest.branchName)
-				t.Log(currentTest.branchName)
-				So(actualName, ShouldEqual, currentTest.expected)
-			})
+	/* Branch naming conventions
+	 * - cant begin with '.'
+	 * - cant have double dot '..'
+	 * - cant have chars '^', '~', ':'
+	 * - end with backslash /
+	 * - end with ".lock"
+	 * - contain \
+	 */
+
+	Describe("Branch name from issue", func() {
+		testsToRun := [7]testCase{
+			{issue: 12, branchName: "work on iss", expected: "12-work-on-iss", casedesc: "Test replaces whitespaces with dash '-'"},
+			{issue: 45, branchName: "Case SENsitivity", expected: "45-case-sensitivity", casedesc: "Test converts charecters to lowercase"},
+			{issue: 15, branchName: ".branch name", expected: "15-branch-name", casedesc: "Test removes . prefix"},
+			{issue: 220, branchName: "^^..:~:name", expected: "220-name", casedesc: "removes ASCII control characters"},
+			{issue: 2735, branchName: "name/", expected: "2735-name", casedesc: "test removes end / "},
+			{issue: 234567, branchName: ".NAME.is\"dotted", expected: "234567-name-is-dotted", casedesc: "test removes backslash"},
+			{issue: 672, branchName: "add big data blog /", expected: "672-add-big-data-blog", casedesc: "remove forward slash"},
 		}
-	})
-}
 
-func TestStringConcat(t *testing.T) {
+		Context("Names should follow format rules", func() {
 
-	Convey("Running tests on 'effecientStringConcat' function ", t, func() {
+			for _, currentTest := range testsToRun {
 
-		Convey("Test variable inputs get concatenated correctly", func() {
-			var expectedLong = "created 'something' new"
-			var actualLong = efficientConcatString("created '", "something", "' new")
-			So(actualLong, ShouldEqual, expectedLong)
-		})
+				It(currentTest.casedesc, func() {
+					actualName := BranchNameFromIssue(strconv.Itoa(currentTest.issue), currentTest.branchName)
 
-		Convey("Test funny signs gets concatenated as well", func() {
-			var expectedShort = "j$¢‰¿≈¯¯¯"
-			var actualShort = efficientConcatString("j$¢‰¿≈", "¯¯¯")
-			So(expectedShort, ShouldEqual, actualShort)
+					Ω(actualName).Should(Equal(currentTest.expected))
+				})
+			}
 		})
 	})
-}
 
-func TestGetIssueFromBranch(t *testing.T) {
-	Convey("Running tests on 'GetIssuesFromBranch'", t, func() {
-
-		Convey("GetIssueSFromBranch should return 1", func() {
-
-			i := IssueFromBranchName("39-enable---Add-sign-in-function")
-			So(i, ShouldEqual, "39")
-		})
-	})
-}
+})