new forge init()

3 files changed, 22 insertions, 30 deletions

diff --git a/config.go b/config.go
new file mode 100644
index 0000000..24f047a
--- /dev/null
+++ b/config.go
@@ -0,0 +1,19 @@
+package main
+
+import (
+	"go.wit.com/lib/config"
+	"go.wit.com/lib/protobuf/forgepb"
+	"go.wit.com/log"
+)
+
+// sent via -ldflags
+
+func configInit() *forgepb.ForgeConfigs {
+	configs := new(forgepb.ForgeConfigs)
+	err := config.ConfigLoad(configs, "forge", "forge")
+	if err != nil {
+		log.Info("This tool requires your repos be scanned by forge first")
+		badExit(err)
+	}
+	return configs
+}
diff --git a/forge.go b/forge.go
deleted file mode 100644
index 3ec92a3..0000000
--- a/forge.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"go.wit.com/lib/protobuf/forgepb"
-	"go.wit.com/log"
-)
-
-// if there is no "build" file
-// the attempt to use forgepb to init
-// the GO repo
-func doForge() {
-	me.forge = forgepb.Init()
-	os.Setenv("REPO_WORK_PATH", me.forge.GetGoSrc())
-
-	me.repo = me.forge.Repos.FindByFullPath(argv.Forge)
-	if me.repo == nil {
-		log.Info("repo not found", argv.Forge)
-		me.repo = me.forge.FindByGoPath(argv.Forge)
-	}
-	if me.repo == nil {
-		log.Info("I could not determine which go repo you have", argv.Forge)
-		log.Info("you must create a build & control file", argv.Forge)
-		os.Exit(-1)
-	}
-	log.Info("found repo", me.repo.GetGoPath())
-	// build()
-}
diff --git a/main.go b/main.go
index f6e358c..50a58c0 100644
--- a/main.go
+++ b/main.go
@@ -42,7 +42,9 @@ func main() {
 	os.Setenv("REPO_WORK_PATH", me.goSrc)
 
 	if argv.Forge != "" {
-		me.forge = forgepb.Init()
+		// read in forge info
+		cfg := configInit()
+		me.forge = forgepb.InitFromConfig(cfg)
 
 		me.repo = me.forge.Repos.FindByFullPath(argv.Forge)
 		if me.repo == nil {