updated

Author: MickMake

.idea/workspace.xml

@@ -27,7 +27,7 @@ endif
 
 
 test:
-	@./bin/deploywp run --chdir --json tests/deploywp.json
+	@./bin/deploywp run --chdir --json tests/deploywp.json prod
 
 
 docker:

Makefile

@@ -48,7 +48,9 @@ func (e *TypeDeployWp) PrintPaths() *ux.State {
 // Usage:
 //		{{ $cmd := OpenSourceRepo }}
 //		{{ $cmd.ExitOnWarning }}
-func (e *TypeDeployWp) OpenSourceRepo() *ux.State {
+func (e *TypeDeployWp) OpenSourceRepo() *helperGit.HelperGit {
+	gitRef := helperGit.NewGit().Reflect()
+
 	for range only.Once {
 		if e.IsNil() {
 			e.State.SetError("deploywp JSON is nil")
@@ -85,7 +87,7 @@ func (e *TypeDeployWp) OpenSourceRepo() *ux.State {
 			break
 		}
 
-		gitRef := helperGit.HelperNewGit()
+		gitRef = helperGit.HelperNewGit()
 		if gitRef.State.IsError() {
 			e.State = gitRef.State
 			break
@@ -128,6 +130,60 @@ func (e *TypeDeployWp) OpenSourceRepo() *ux.State {
 		e.State.Clear()
 	}
 
+	gitRef.State = e.State
+	return gitRef
+}
+
+
+// Usage:
+//		{{ $cmd := CheckoutSourceRepo }}
+//		{{ $cmd.ExitOnWarning }}
+func (e *TypeDeployWp) CheckoutSourceRepo(gitRef *helperGit.HelperGit) *ux.State {
+	for range only.Once {
+		if e.IsNil() {
+			e.State.SetError("deploywp JSON is nil")
+			break
+		}
+
+		if gitRef.IsNotExisting() {
+			e.State.SetError("deploywp JSON is nil")
+			break
+		}
+
+		ux.PrintfBlue("# Checkout branch/tag from repository.\n")
+		refType := e.Source.GetRevisionType()
+		if refType == "" {
+			e.State.SetError(".source.revision.ref_type is nil")
+			break
+		}
+
+		refName := e.Source.GetRevisionName()
+		if refName == "" {
+			e.State.SetError(".source.revision.ref_name is nil")
+			break
+		}
+
+		ux.PrintfBlue("# Source repository checkout.\n")
+		ux.PrintfOk("Type: '%s'\n", refType)
+		ux.PrintfOk("Name: '%s'\n", refName)
+
+		ux.PrintfBlue("# Checking if %s exists.\n", refType)
+		e.State = gitRef.TagExists(refName)
+		if e.State.IsError() {
+			break
+		}
+
+		ux.PrintfBlue("# Checking out %s:%s.\n", refType, refName)
+		e.State = gitRef.TagExists(refName)
+		if e.State.IsError() {
+			break
+		}
+
+		ux.PrintfOk("# Source repository opened OK.\n")
+		e.State.Clear()
+	}
+
+	gitRef.State = e.State
 	return e.State
 }
 

jsonTemplate/helpers/deploywp/helpers_highlevel.go

@@ -121,8 +121,8 @@ func (e *TypeDeployWp) Run() *ux.State {
 		ux.PrintfWhite("#############################\n")
 		ux.PrintfWhite("# Opening source repository #\n")
 		ux.PrintfWhite("#############################\n")
-		e.State = e.OpenSourceRepo()
-		if e.State.IsError() {
+		srcGitRef := e.OpenSourceRepo()
+		if srcGitRef.State.IsError() {
 			break
 		}
 		ux.PrintfWhite("\n\n")
@@ -131,6 +131,13 @@ func (e *TypeDeployWp) Run() *ux.State {
 		ux.PrintfWhite("#############################\n")
 		ux.PrintfWhite("# Opening target repository #\n")
 		ux.PrintfWhite("#############################\n")
+		srcGitRef.State = e.CheckoutSourceRepo(srcGitRef)
+		if e.State.IsError() {
+			break
+		}
+		ux.PrintfWhite("\n\n")
+
+
 	}
 
 	return e.State

jsonTemplate/helpers/deploywp/helpers_workflow.go

@@ -133,7 +133,9 @@ func (g *HelperGit) IsExisting() bool {
 
 	return ok
 }
-
+func (g *HelperGit) IsNotExisting() bool {
+	return !g.IsExisting()
+}
 
 // Usage:
 //		{{- $cmd := $git.Open }}