Merge pull request #31 from mboersma/25-refresh-units-fix

fix(cmd): allow `-p` to specify where to save unit files

Author: mboersma

Makefile

@@ -9,7 +9,7 @@ installer:
 	@if [ ! -d makeself ]; then git clone -b deisctl-hack https://github.com/deis/makeself.git; fi
 	PATH=./makeself:$$PATH makeself.sh --bzip2 --nox11 --target /usr/local/bin dist \
 		dist/deisctl-`cat deis-version`-`go env GOOS`-`go env GOARCH`.run \
-		"Deis Control Utility" "/usr/local/bin/deisctl refresh-units"
+		"Deis Control Utility" "deisctl refresh-units"
 
 install:
 	godep go install -v ./...

client/unit.go

@@ -14,7 +14,7 @@ import (
 )
 
 // path hierarchy for finding systemd service templates
-var rootPaths = []string{"/var/lib/deis/units", "~/.deisctl/units"}
+var rootPaths = []string{"~/.deisctl/units", "/var/lib/deis/units"}
 
 // Units returns a list of units filtered by target
 func (c *FleetClient) Units(target string) (units []string, err error) {
@@ -119,7 +119,7 @@ func readTemplate(component string) (out []byte, err error) {
 	} else {
 		// otherwise look in rootPaths hierarchy
 		for _, rootPath := range rootPaths {
-			rootPath, _ := expandUser(rootPath)
+			rootPath, _ := ExpandUser(rootPath)
 			filename := path.Join(rootPath, templateName)
 			if _, err := os.Stat(filename); err == nil {
 				templateFile = filename
@@ -138,11 +138,11 @@ func readTemplate(component string) (out []byte, err error) {
 	return
 }
 
-// expandUser replaces "~" in a string with the current user's home directory.
-func expandUser(path string) (string, error) {
+// ExpandUser replaces "~" in a string with the current user's home directory.
+func ExpandUser(path string) (string, error) {
 	user, err := user.Current()
 	if err != nil {
 		return path, err
 	}
-	return strings.Replace(path, "~/", user.HomeDir, 1), nil
+	return strings.Replace(path, "~/", user.HomeDir+"/", 1), nil
 }

cmd/cmd.go

@@ -5,7 +5,6 @@ import (
 	"io/ioutil"
 	"net/http"
 	"os"
-	"os/user"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -15,6 +14,7 @@ import (
 	"github.com/deis/deisctl/constant"
 	"github.com/deis/deisctl/update"
 	"github.com/deis/deisctl/utils"
+	"github.com/docopt/docopt-go"
 )
 
 func ListUnits(c client.Client) error {
@@ -257,17 +257,26 @@ func Update() error {
 }
 
 func RefreshUnits() error {
-	// create the $HOME/.deisctl directory if necessary
-	user, err := user.Current()
+	usage := `Refreshes local unit files from the master repository.
+
+Usage:
+  deisctl refresh-units [-p <target>]
+
+Options:
+  -p --path=<target>   where to save unit files [default: /var/lib/deis/units]
+`
+	// parse command-line arguments
+	args, err := docopt.Parse(usage, nil, true, "", false)
 	if err != nil {
-		return err
+		fmt.Printf("Error: %v\n", err)
+		os.Exit(2)
 	}
-	dir := filepath.Join(user.HomeDir, ".deisctl")
-	if err = os.MkdirAll(dir, 0700); err != nil {
+	dir, _ := client.ExpandUser(args["--path"].(string))
+	// create the target dir if necessary
+	if err := os.MkdirAll(dir, 0700); err != nil {
 		return err
 	}
-
-	// download and save the unit files to $HOME/.deisctl
+	// download and save the unit files to the specified path
 	rootURL := "https://raw.githubusercontent.com/deis/deisctl/"
 	branch := "master"
 	units := []string{

utils/utils.go

@@ -46,16 +46,6 @@ func GetKey(dir, key, perm string) string {
 	return result.Node.Value
 }
 
-// func GetNewClient() (
-// 	cli *client.DockerCli, stdout *io.PipeReader, stdoutPipe *io.PipeWriter) {
-// 	testDaemonAddr := "/var/run/docker.sock"
-// 	testDaemonProto := "unix"
-// 	stdout, stdoutPipe = io.Pipe()
-// 	cli = client.NewDockerCli(
-// 		nil, stdoutPipe, nil, testDaemonProto, testDaemonAddr, nil)
-// 	return
-// }
-
 func PullImage(args string) error {
 	cmdl := exec.Command("docker", "pull", args)
 	if _, _, err := RunCommandWithStdoutStderr(cmdl); err != nil {
@@ -196,7 +186,6 @@ func getExitCode(err error) (int, error) {
 }
 
 // RunCommandWithStdoutStderr execs a command and returns its output.
-
 func RunCommandWithStdoutStderr(cmd *exec.Cmd) (bytes.Buffer, bytes.Buffer, error) {
 	var stdout, stderr bytes.Buffer
 	stderrPipe, err := cmd.StderrPipe()
@@ -267,5 +256,3 @@ func stripTrailingCharacters(target string) string {
 func nLines(s string) int {
 	return strings.Count(s, "\n")
 }
-
-//func deis(bash string , arg string ,  cmd string )