Merge pull request #4 from mak-it/file-execution

Replaced Dokku integration with file execution

Author: ebeigarts

README.md

@@ -1,17 +1,15 @@
 # Deployer
 
-Deploy [dokku](http://dokku.viewdocs.io/dokku/) applications using [GitHub Deployments API](https://developer.github.com/v3/repos/deployments/).
+Deploy applications using [GitHub Deployments API](https://developer.github.com/v3/repos/deployments/).
 
 1. Listen/poll new GitHub deployments
 2. Create pending GitHub deployment status and empty Gist
-3. Deploy application to dokku
+3. Execute command file that deploys application
 4. Create success/failure Github deployment status and update Gist
 5. Sleep 30 seconds
 6. Go to step #1
 
-Make sure to run `deployer` as `dokku` user.
-
-To register github deployments you can use [deploy](https://github.com/remind101/deploy),
+To register github deployments you can use curl,
 [slashdeploy](https://github.com/remind101/slashdeploy) or something else.
 
 If you are using Slack, you can enable 'Deploy Events -> Show deployment statuses'
@@ -24,59 +22,34 @@ deployer -h
 ```
 
 ```
-  -app string
-    	Dokku application name (required)
   -env string
-    	Github deployment environment (required)
+      Github deployment environment (required)
+  -file string
+      File to execute when new deployment is available (required)
   -org string
-    	GitHub org (required)
+      GitHub org (required)
   -p string
-    	GitHub password (required)
+      GitHub password (required)
   -repo string
-    	GitHub repo (required)
+      GitHub repo (required)
   -sleep int
-    	Time to sleep between loops (defaults to 30 seconds) (default 30)
+      Time to sleep between loops (defaults to 30 seconds) (default 30)
   -u string
-    	GitHub username (required)
-```
-
-## Installation
-
-Install `deployer` on dokku server:
-
-```bash
-$ su - dokku
-$ curl -L -o deployer https://github.com/mak-it/deployer/releases/download/v0.1.2/deployer-linux-amd64
-$ chmod +x deployer
-```
-
-Start `deployer` on system reboot using `cron` and `screen`:
-
-```bash
-$ su - dokku
-$ echo "@reboot /usr/bin/screen -d -m /home/dokku/deployer -u ghuser -p ghpass -org mak-it -repo myapp -env demo -app myapp-demo -sleep 30" | crontab -
-```
-
-Start `deployer` in `screen`:
-
-```bash
-$ su - dokku
-$ /usr/bin/screen -d -m /home/dokku/deployer -u ghuser -p ghpass -org mak-it -repo myapp -env demo -app myapp-demo -sleep 30
+      GitHub username (required)
 ```
 
 ## Example
 
 Trigger deployment from developer's machine:
 
 ```bash
-$ cd ~/src/myapp
 $ deploy --branch v49.3 --env demo
 ```
 
-On the dokku server:
+On the application server:
 
 ```bash
-$ deployer -u ghuser -p ghpass -org mak-it -repo myapp -env demo -app myapp-demo -sleep 30
+$ deployer -u ghuser -p ghpass -org mak-it -repo myapp -env demo -file bin/deploy-stub -sleep 30
 ```
 
 Output:
@@ -85,19 +58,20 @@ Output:
 Deployer
 ghuser ghpass mak-it myapp demo myapp-demo
 Sleep duration: 30s
-2017/08/24 13:31:43 Cloning repo  
-2017/08/24 13:31:51 Adding repo dokku remote  .myapp-demo myapp-demo
 2017/08/24 13:32:52 Getting deployment  demo
 2017/08/24 13:32:53 Problem in getting deployment Deployment statuses already present
 2017/08/24 13:32:53 Sleeping 30s
 2017/08/24 13:33:23 Getting deployment  demo
 2017/08/24 13:33:23 123 v49.3 demo
-2017/08/24 13:33:23 Fetchin repo  .myapp-demo
 2017/08/24 13:33:24 Gist create ID: 123, Ref: v49.3, Environment: demo
 2017/08/24 13:33:25 Gist https://gist.github.com/...
 2017/08/24 13:33:25 Deployment status create  pending
-2017/08/24 13:33:26 Deploying repo  .myapp-demo
-Everything up-to-date
+2017/08/24 13:33:26 Executing File bin/deploy-stub
+-----> Deploying version: v49.3...
+-----> Adding BUILD_ENV to build environment...
+-----> Compiling Ruby/Rails
+=====> Application deployed:
+       http://ruby-rails-sample.dokku.me
 2017/08/24 13:33:26 Deployment status create  success
 2017/08/24 13:33:26 Gist update
 ```

bin/deploy-stub

@@ -1,6 +1,8 @@
 #!/bin/bash
 
+VERSION=$1
 
+echo $'remote: \e[1G-----> Deploying version: '$VERSION'...'
 echo $'remote: \e[1G-----> Adding BUILD_ENV to build environment...'
 echo $'remote: \e[1G-----> Compiling Ruby/Rails'
 sleep 2

main.go

@@ -16,39 +16,26 @@ import "github.com/google/go-github/github"
 func main() {
 	fmt.Println("Deployer")
 
-	username := flag.String("u",    "",  "GitHub username (required)")
-	password := flag.String("p",    "",  "GitHub password (required)")
-	org      := flag.String("org",  "",  "GitHub org (required)")
-	repo     := flag.String("repo", "",  "GitHub repo (required)")
-	env      := flag.String("env",  "",  "Github deployment environment (required)")
-	app      := flag.String("app",  "",  "Dokku application name (required)")
-	sleepInt := flag.Int(   "sleep", 30, "Time to sleep between loops (defaults to 30 seconds)")
+	username := flag.String("u",    "", "GitHub username (required)")
+	password := flag.String("p",    "", "GitHub password (required)")
+	org      := flag.String("org",  "", "GitHub org (required)")
+	repo     := flag.String("repo", "", "GitHub repo (required)")
+	env      := flag.String("env",  "", "Github deployment environment (required)")
+	file     := flag.String("file", "", "File to execute when new deployment is available (required)")
+	sleepInt := flag.Int(  "sleep", 30, "Time to sleep between loops (defaults to 30 seconds)")
 
 	flag.Parse()
 
-	if *app == "" {
+	if *username == "" || *password == "" || *org == "" || *repo == "" || *env == "" || *file == "" {
 		flag.PrintDefaults()
 		os.Exit(1)
 	}
 
-	fmt.Println(*username, *password, *org, *repo, *env, *app)
+	fmt.Println(*username, *password, *org, *repo, *env, *file)
 
 	sleepDuration := time.Duration(*sleepInt) * time.Second
 	fmt.Printf("Sleep duration: %v\n", sleepDuration)
 
-	repoPath := "." + *app;
-	_, err := os.Stat(repoPath)
-	if err != nil {
-		repoURL := "https://" + *username + ":" + *password + "@github.com/" + *org + "/" + *repo + ".git"
-		err = cloneRepo(repoURL, repoPath)
-		if err != nil {
-			log.Printf("Problem cloning repo %v\n", err)
-			os.Exit(1)
-		}
-	}
-
-	addRepoDokkuRemote(repoPath, *app)
-
 	ctx := context.Background()
 	tp := github.BasicAuthTransport{
 		Username: *username,
@@ -68,13 +55,6 @@ func main() {
 
 		log.Println(*deployment.ID, *deployment.Ref, *deployment.Environment)
 
-		err = fetchRepo(repoPath)
-		if err != nil {
-			log.Printf("Problem in fetching repo %v\n", err)
-			sleep(sleepDuration)
-			continue
-		}
-
 		gist, _, err := createDeploymentGist(ctx, client, deployment)
 
 		if err != nil {
@@ -88,12 +68,12 @@ func main() {
 		createDeploymentStatus(ctx, client, deployment, *org, *repo, "pending", *gist.HTMLURL)
 
 		var output bytes.Buffer
-		cmd := deployToDokku(repoPath, *deployment.Ref)
+		cmd := executeFile(*file, *deployment.Ref)
 		cmd.Stdout = io.MultiWriter(&output, os.Stdout)
 		cmd.Stderr = cmd.Stdout
 		err = cmd.Run()
 		if err != nil {
-			log.Printf("Problem in deploying to dokku %v\n", err)
+			log.Printf("Problem with file execution %v\n", err)
 			createDeploymentStatus(ctx, client, deployment, *org, *repo, "error", *gist.HTMLURL)
 			updateDeploymentGist(ctx, client, gist, output.String())
 			sleep(sleepDuration)
@@ -112,48 +92,10 @@ func sleep(duration time.Duration) {
 	time.Sleep(duration)
 }
 
-func cloneRepo(repoURL string, repoPath string) (error) {
-	log.Println("Cloning repo ", repoURL)
-	cmd := exec.Command("git", "clone", repoURL, repoPath)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	return err
-}
-
-func addRepoDokkuRemote(repoPath string, app string) (error) {
-	log.Println("Adding repo dokku remote ", repoPath, app)
-	cmd := exec.Command("git", "remote", "add", "dokku", "/home/dokku/" + app)
-	cmd.Dir = repoPath
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	return err
-}
-
-func fetchRepo(repoPath string) (error) {
-	log.Println("Fetchin repo ", repoPath)
-	cmd := exec.Command("git", "fetch", "origin", "--force", "--tags")
-	cmd.Dir = repoPath
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		return err
-	}
-	cmd = exec.Command("git", "reset", "--hard", "origin/HEAD")
-	cmd.Dir = repoPath
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err = cmd.Run()
-	return err
-}
-
-func deployToDokku(repoPath string, ref string) (*exec.Cmd) {
-	log.Println("Deploying repo ", repoPath)
-	cmd := exec.Command("git", "push", "-f", "dokku", ref + ":master")
-	cmd.Dir = repoPath
-	// cmd := exec.Command("bin/deploy-stub")
+func executeFile(filePath string, ref string) *exec.Cmd {
+	log.Println("Executing File", filePath)
+	cmd := exec.Command(filePath, ref)
+	// cmd := exec.Command("bin/deploy-stub", ref)
 	return cmd
 }
 
@@ -173,12 +115,12 @@ func getDeployment(ctx context.Context, client *github.Client, org string, repo
 		return nil, resp, err
 	}
 	deployment := deployments[0]
-	
+
 	statuses, resp, err := client.Repositories.ListDeploymentStatuses(ctx, org, repo, *deployment.ID, &github.ListOptions{ PerPage: 1 })
 	if err != nil {
 		return deployment, resp, err
 	}
-	
+
 	if len(statuses) > 0 {
 		err := errors.New("Deployment statuses already present")
 		return deployment, resp, err