close #188 wrapup for jira

Author: groenborg

ci/CHANGELOG.md

@@ -1,10 +1,26 @@
 ## Changelog
-An apology to the users who was affected by the recent major release, that was not cool. We have fixed a few things that should make life easier.
-We also cleaned up the code a bit and made it look nicer.
 
-#### Improvements
-- bootstrap .phlow if it does not exist #203 @groenborg
-git phlow will now create a .phlow file if none exists. It will also see if it can find the default branch like it did before.
 
-- workon should not do a pull rebase #200 @groenborg
-workon will not do a pull rebase, when setting up a workspace.
+#### Features
+
+- deliver is updated to support target configuration, and Jira #230 @groenborg
+you can now deliver work, with settings from the target configuration.. Hurray
+
+- wrapup is now support on windows as well #188 @groenborg
+wrapup will now format messages based on GitHub and Jira branches
+
+- workon is now updated to support target configuration, and Jira #224 @groenborg
+you can now work on issues located on GitHub and Jira, with settings from the target configuration
+
+
+#### Bug Fixes
+- fix configuration for windows #236 @groenborg
+Turns out the config before did not work on windows, however, it does now.
+
+- auth errors are handled when commands using service API are called #240 @groenborg
+a successful bug-hunt resulted in one less error, where the tool basically would explode with errors if commands were executed without authorization
+
+
+#### improvements
+- We removed the beautiful spinner when running `workon` and `deliver` #241 @groenborg
+it might return in future versions, when it no longer messes with the formatting. Never mess with the formatting!

main.go

@@ -1,11 +1,7 @@
 package main
 
-import (
-	"github.com/praqma/git-phlow/cmd"
-)
+import "github.com/praqma/git-phlow/cmd"
 
 func main() {
-
 	cmd.Execute()
-
 }

phlow/wrapup.go

@@ -9,6 +9,8 @@ import (
 	"github.com/praqma/git-phlow/githandler"
 	"github.com/praqma/git-phlow/options"
 	"github.com/praqma/git-phlow/executor"
+	"strconv"
+	"errors"
 )
 
 //WrapUp ...
@@ -30,13 +32,25 @@ func WrapUp() {
 
 	//Retrieve branch info - current branch
 	info := githandler.AsList(out)
-
 	var commitMessage string
 
-	if options.GlobalFlagForceMessage != "" {
-		commitMessage = "close #" + strings.Split(info.Current, "-")[0] + " " + options.GlobalFlagForceMessage
+	issue, err := GetJIRAIssue(info.Current)
+	if err != nil {
+		
+		if options.GlobalFlagForceMessage != "" {
+			commitMessage = "close #" + strings.Split(info.Current, "-")[0] + " " + options.GlobalFlagForceMessage
+		} else {
+			commitMessage = "close #" + strings.Replace(info.Current, "-", " ", -1)
+		}
 	} else {
-		commitMessage = "close #" + strings.Replace(info.Current, "-", " ", -1)
+		msg := strings.TrimPrefix(info.Current, issue)
+
+		if options.GlobalFlagForceMessage != "" {
+			commitMessage = "close #" + issue + " " + options.GlobalFlagForceMessage
+		} else {
+			commitMessage = "close #" + issue + strings.Replace(msg, "-", " ", -1)
+		}
+
 	}
 
 	_, err = git.Commit("-m", commitMessage)
@@ -47,3 +61,12 @@ func WrapUp() {
 
 	fmt.Fprintln(os.Stdout, commitMessage)
 }
+
+func GetJIRAIssue(branch string) (string, error) {
+
+	parts := strings.Split(branch, "-")
+	if _, err := strconv.Atoi(parts[0]); err != nil && len(parts) > 1 {
+		return parts[0] + "-" + parts[1], nil
+	}
+	return "", errors.New("not a jira branch")
+}

phlow/wrapup_test.go

@@ -0,0 +1,50 @@
+package phlow_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	"github.com/praqma/git-phlow/phlow"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Wrapup", func() {
+
+	Describe("Testing getting name and issue", func() {
+
+		Context("for github branches", func() {
+
+			It("for github should return error", func() {
+				_, err := phlow.GetJIRAIssue("1-hello-issue")
+				Ω(err).ShouldNot(BeNil())
+			})
+
+			It("for master should return error", func() {
+				_, err := phlow.GetJIRAIssue("master")
+				Ω(err).ShouldNot(BeNil())
+			})
+
+		})
+
+		Context("for jira branches", func() {
+
+			It("should return TIS-46", func() {
+				issue, err := phlow.GetJIRAIssue("TIS-46-update-localtransportcontroller-to-handle-multiple-travel-providers-in-one-reservation")
+				Ω(err).Should(BeNil())
+				Ω(issue).Should(Equal("TIS-46"))
+			})
+
+			It("should return TIS-45", func() {
+				issue, err := phlow.GetJIRAIssue("TIS-45-email-non-registered-users-to-sign-up-with-teams-in-space")
+				Ω(err).Should(BeNil())
+				Ω(issue).Should(Equal("TIS-45"))
+			})
+
+			It("should return ADO-70", func() {
+				issue, err := phlow.GetJIRAIssue("ADO-70-booking-button-randomly-dissapears")
+				Ω(err).Should(BeNil())
+				Ω(issue).Should(Equal("ADO-70"))
+			})
+
+		})
+
+	})
+})