1 files changed, 11 insertions, 15 deletions

diff --git a/http.go b/http.go
index 77023a0..7665c7f 100644
--- a/http.go
+++ b/http.go
@@ -75,8 +75,8 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 
-		log.Info(me.current.StandardHeader())
-		log.Info(me.current.StandardReleaseHeader())
+		// log.Info(me.current.StandardHeader())
+		log.Info(me.forge.StandardReleaseHeader(me.current, "todoing"))
 	case "/rescanAll":
 		me.repos.View.ScanRepositories()
 	case "/setCurrentRepo":
@@ -85,7 +85,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		log.Info("version: " + version)
 		log.Info("comment: " + comment)
 
-		repo := me.repos.View.FindByName(repoName)
+		repo := me.forge.FindByGoPath(repoName)
 		if repo == nil {
 			log.Info("FindRepoByName() returned nil")
 			return
@@ -95,12 +95,12 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 	case "/IncrementRevisonVersion":
 		log.Info("repo: " + repoName)
 		log.Info("version: " + version)
-		me.current.Status.IncrementRevisionVersion(comment)
+		me.current.IncrementTargetRevision()
 	case "/IncrementMinorVersion":
 		log.Info("repo: " + repoName)
 		log.Info("version: " + version)
 
-		me.current.Status.IncrementMinorVersion("trying minor")
+		me.current.IncrementTargetMinor()
 	case "/setAllBranchesToMaster":
 		log.Info("set all branches to master")
 		me.Disable()
@@ -128,7 +128,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 			log.Info("me.current == nil")
 			return
 		}
-		me.current.Status.SetTargetVersion(version)
+		me.current.SetTargetVersion(version)
 		return
 	case "/setAllTargetVersions":
 		log.Info("version: " + version)
@@ -263,7 +263,10 @@ func showNext() {
 		return
 	}
 
-	if me.current.Status.IsReleased() {
+	if me.current.GetTargetVersion() == "" {
+		log.Info("TargetVersion == blank")
+	}
+	if me.current.GetTargetVersion() == me.current.GetCurrentVersion() {
 		log.Info("IsReleased() == true. do not release this a second time")
 	} else {
 		log.Info("IsReleased() == false")
@@ -298,18 +301,11 @@ func showNext() {
 			log.Info(log.Sprint("IsProtobuf() == err", err))
 		}
 	}
-	if me.current.Status.Whitelist {
-		log.Info("Whitelist == true SHOULD NOT RELEASE THIS")
-	} else {
-		log.Info("Whitelist == false")
-	}
-	log.Info("")
 
 	testNext()
 
 	log.Info(repolist.ReportHeader())
-	log.Info(me.current.StandardHeader())
 	log.Info("")
 	log.Info(repolist.ReleaseReportHeader())
-	log.Info(me.current.StandardReleaseHeader())
+	log.Info(me.forge.StandardReleaseHeader(me.current, "notsure"))
 }