From 822f8624bd13f2b3b09dadb0507bb3a0f18eabc6 Mon Sep 17 00:00:00 2001
From: Dan Ballard <dan@mindstab.net>
Date: Thu, 19 Feb 2015 23:08:32 -0800
Subject: [PATCH] warren run cmd removed, direct commands added

---
 cmd/warren/cmd_run.go     | 50 ----------------------------------
 cmd/warren/cmd_warrend.go | 56 +++++++++++++++++++++++++++++++++++++++
 cmd/warren/main.go        |  3 ++-
 3 files changed, 58 insertions(+), 51 deletions(-)
 delete mode 100644 cmd/warren/cmd_run.go
 create mode 100644 cmd/warren/cmd_warrend.go

diff --git a/cmd/warren/cmd_run.go b/cmd/warren/cmd_run.go
deleted file mode 100644
index 3e702db..0000000
--- a/cmd/warren/cmd_run.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/dballard/warren/lib/warren"
-	"log"
-	"net"
-	"os"
-	"strings"
-	//	"os/exec"
-	//	"time"
-)
-
-var runUsage = `
-warren run - Interfaces with warrend to manage running instances
-`
-
-var runCmd = &warren.Command{
-	Name:    "run",
-	Usage:   runUsage,
-	Summary: "Interface to warrend to manage running instances",
-	Help:    runUsage,
-	Run:     runRun,
-}
-
-func runRun(cmd *warren.Command, args ...string) {
-	if len(args) == 0 || args[0] == "help" {
-		fmt.Print(cmd.Help)
-		return
-	}
-
-	s, err := net.Dial(warren.CmdSockType, warren.CmdSockAddr)
-	if s != nil {
-		defer s.Close()
-	}
-	if err != nil {
-		log.Fatal("Error connecting to warrend:", err)
-	}
-	dir, _ := os.Getwd()
-	// pwd|arg1 arg2 arg3 ....
-	warren.WriteStringz(s, dir+"|"+strings.Join(args, "|"))
-
-	resp, err := warren.ReadStringz(s)
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Println(resp)
-}
diff --git a/cmd/warren/cmd_warrend.go b/cmd/warren/cmd_warrend.go
new file mode 100644
index 0000000..eed1f20
--- /dev/null
+++ b/cmd/warren/cmd_warrend.go
@@ -0,0 +1,56 @@
+package main
+
+import (
+	"fmt"
+	"github.com/dballard/warren/lib/warren"
+	"log"
+	"net"
+	"os"
+	"strings"
+	//	"os/exec"
+	//	"time"
+)
+
+var regUsage = `
+warren reg - Register a deployment directory for running
+`
+var regCmd = &warren.Command{
+	Name:    "reg",
+	Usage:   regUsage,
+	Summary: "Register a deployment directory for running",
+	Help:    regUsage,
+	Run:     warrendRun,
+}
+
+var statusUsage = `
+warren status - Get the status from the warrend server 
+`
+var statusCmd = &warren.Command{
+	Name:    "status",
+	Usage:   statusUsage,
+	Summary: "Get the status from the warrend server",
+	Help:    statusUsage,
+	Run:     warrendRun,
+}
+
+func warrendRun(cmd *warren.Command, args ...string) {
+
+	s, err := net.Dial(warren.CmdSockType, warren.CmdSockAddr)
+	if s != nil {
+		defer s.Close()
+	}
+	if err != nil {
+		log.Fatal("Error connecting to warrend:", err)
+	}
+	dir, _ := os.Getwd()
+	// pwd|arg1 arg2 arg3 ....
+	warren.WriteStringz(s, dir+"|"+cmd.Name+"|"+strings.Join(args, "|"))
+
+	resp, err := warren.ReadStringz(s)
+
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	fmt.Println(resp)
+}
diff --git a/cmd/warren/main.go b/cmd/warren/main.go
index 11d13c8..e9123d9 100644
--- a/cmd/warren/main.go
+++ b/cmd/warren/main.go
@@ -25,7 +25,8 @@ func usage() {
 func main() {
 	warren.RegisterCommand(buildCmd)
 	warren.RegisterCommand(deployCmd)
-	warren.RegisterCommand(runCmd)
+	warren.RegisterCommand(statusCmd)
+	warren.RegisterCommand(regCmd)
 	warren.RegisterCommand(versionCmd)
 	args := os.Args[1:]
 	if len(args) == 0 || args[0] == "-h" {