refactor for latest Up. Closes #29

tj · tj · commit 9c19b6a8a107 · 2017-09-14T17:09:24.000-07:00
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -2,8 +2,12 @@ build:
   main: cmd/polls/main.go
   binary: polls
   goos:
-    - windows
     - darwin
     - linux
+    - windows
+    - freebsd
+    - netbsd
+    - openbsd
   goarch:
     - amd64
+    - 386
diff --git a/.upignore b/.upignore
@@ -0,0 +1,2 @@
+*
+!static/**
diff --git a/Readme.md b/Readme.md
@@ -2,9 +2,9 @@
 
 User polls for GitHub powered by [Up](https://github.com/apex/up).
 
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20A)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20A/vote)
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20B)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20B/vote)
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20C)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20C/vote)
+[![](https://gh-polls.com/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20A)](https://gh-polls.com/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20A/vote)
+[![](https://gh-polls.com/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20B)](https://gh-polls.com/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20B/vote)
+[![](https://gh-polls.com/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20C)](https://gh-polls.com/poll/01BM2T00TMSDTZWJ1RP6TQF200/Option%20C/vote)
 
 ## About
 
@@ -17,7 +17,7 @@ What do they look like? The poll above is live, click one out and give it a try!
 Via `go get`:
 
 ```
-$ go get github.com/tj/gh-polls/cmd/polls
+$ go get github.com/apex/gh-polls/cmd/polls
 ```
 
 Then create your own poll with `polls new`, the markdown is copied to your clipboard.
@@ -30,19 +30,19 @@ Create a new poll for who is the best ferret.
 $ polls new Tobi Loki Jane
 ```
 
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Tobi)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Tobi/vote)
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Loki)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Loki/vote)
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Jane)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Jane/vote)
+[![](https://gh-polls.com/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Tobi)](https://gh-polls.com/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Tobi/vote)
+[![](https://gh-polls.com/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Loki)](https://gh-polls.com/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Loki/vote)
+[![](https://gh-polls.com/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Jane)](https://gh-polls.com/poll/01BM2ZHFZXYKQV9N3HNFXCBH3N/Jane/vote)
 
 Create a new poll for the best species:
 
 ```
 $ polls new "Cats are cool" "Dogs are better" "Ferrets for the win"
 ```
 
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHPN7BA19X15SQDGX4D88/Cats%20are%20cool)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHPN7BA19X15SQDGX4D88/Cats%20are%20cool/vote)
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHPN7BA19X15SQDGX4D88/Dogs%20are%20better)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHPN7BA19X15SQDGX4D88/Dogs%20are%20better/vote)
-[![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHPN7BA19X15SQDGX4D88/Ferrets%20for%20the%20win)](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/01BM2ZHPN7BA19X15SQDGX4D88/Ferrets%20for%20the%20win/vote)
+[![](https://gh-polls.com/poll/01BM2ZHPN7BA19X15SQDGX4D88/Cats%20are%20cool)](https://gh-polls.com/poll/01BM2ZHPN7BA19X15SQDGX4D88/Cats%20are%20cool/vote)
+[![](https://gh-polls.com/poll/01BM2ZHPN7BA19X15SQDGX4D88/Dogs%20are%20better)](https://gh-polls.com/poll/01BM2ZHPN7BA19X15SQDGX4D88/Dogs%20are%20better/vote)
+[![](https://gh-polls.com/poll/01BM2ZHPN7BA19X15SQDGX4D88/Ferrets%20for%20the%20win)](https://gh-polls.com/poll/01BM2ZHPN7BA19X15SQDGX4D88/Ferrets%20for%20the%20win/vote)
 
 ## Statistics
 
@@ -54,7 +54,7 @@ GitHub poll API statistics powered by [Up](https://github.com/apex/up).
 
 ---
 
-[![GoDoc](https://godoc.org/github.com/tj/gh-polls?status.svg)](https://godoc.org/github.com/tj/gh-polls)
+[![GoDoc](https://godoc.org/github.com/apex/gh-polls?status.svg)](https://godoc.org/github.com/apex/gh-polls)
 ![](https://img.shields.io/badge/license-MIT-blue.svg)
 ![](https://img.shields.io/badge/status-experimental-orange.svg)
 
diff --git a/cmd/polls/main.go b/cmd/polls/main.go
@@ -7,14 +7,14 @@ import (
 
 	"github.com/tj/kingpin"
 
-	"github.com/tj/gh-polls/internal/cli"
-	"github.com/tj/gh-polls/internal/client"
+	"github.com/apex/gh-polls/internal/cli"
+	"github.com/apex/gh-polls/internal/client"
 )
 
 // Config.
 var (
 	version  = "master"
-	endpoint = "https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod"
+	endpoint = "https://gh-polls.com"
 )
 
 func main() {
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
@@ -25,10 +25,10 @@ func CopyToClipboard(id string, options []string) error {
 
 // Link returns a poll option link with image.
 func Link(id, option string) string {
-	return fmt.Sprintf(`[%s](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/%s/%s/vote)`, Image(id, option), id, url.PathEscape(option))
+	return fmt.Sprintf(`[%s](https://gh-polls.com/poll/%s/%s/vote)`, Image(id, option), id, url.PathEscape(option))
 }
 
 // Image returns a poll option image.
 func Image(id, option string) string {
-	return fmt.Sprintf(`![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/%s/%s)`, id, url.PathEscape(option))
+	return fmt.Sprintf(`![](https://gh-polls.com/poll/%s/%s)`, id, url.PathEscape(option))
 }
diff --git a/main.go b/main.go
@@ -11,15 +11,15 @@ import (
 	"github.com/gohttp/response"
 	"github.com/segmentio/go-env"
 
-	"github.com/tj/gh-polls/internal/poll"
+	"github.com/apex/gh-polls/internal/poll"
 )
 
 func main() {
 	app := pat.New()
 	app.Post("/poll", http.HandlerFunc(addPoll))
 	app.Get("/poll/:id/:option", http.HandlerFunc(getPollOption))
 	app.Get("/poll/:id/:option/vote", http.HandlerFunc(getPollOptionVote))
-	addr := env.MustGet("UP_ADDR")
+	addr := ":" + env.MustGet("PORT")
 	if err := http.ListenAndServe(addr, app); err != nil {
 		log.WithError(err).Fatal("binding")
 	}
diff --git a/up.json b/up.json
@@ -1,5 +1,10 @@
 {
-  "name": "polls",
+  "name": "gh-polls",
   "description": "GitHub polls.",
-  "cors": {}
+  "cors": {},
+  "stages": {
+    "production": {
+      "domain": "gh-polls.com"
+    }
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,14 +7,14 @@ import (`
`7`	`7`
`8`	`8`	`"github.com/tj/kingpin"`
`9`	`9`
`10`		`- "github.com/tj/gh-polls/internal/cli"`
`11`		`- "github.com/tj/gh-polls/internal/client"`
	`10`	`+ "github.com/apex/gh-polls/internal/cli"`
	`11`	`+ "github.com/apex/gh-polls/internal/client"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// Config.`
`15`	`15`	`var (`
`16`	`16`	`version = "master"`
`17`		`- endpoint = "https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod"`
	`17`	`+ endpoint = "https://gh-polls.com"`
`18`	`18`	`)`
`19`	`19`
`20`	`20`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -25,10 +25,10 @@ func CopyToClipboard(id string, options []string) error {`
`25`	`25`
`26`	`26`	`// Link returns a poll option link with image.`
`27`	`27`	`func Link(id, option string) string {`
`28`		- return fmt.Sprintf(`[%s](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/%s/%s/vote)`, Image(id, option), id, url.PathEscape(option))
	`28`	+ return fmt.Sprintf(`[%s](https://gh-polls.com/poll/%s/%s/vote)`, Image(id, option), id, url.PathEscape(option))
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Image returns a poll option image.`
`32`	`32`	`func Image(id, option string) string {`
`33`		- return fmt.Sprintf(`![](https://m131jyck4m.execute-api.us-west-2.amazonaws.com/prod/poll/%s/%s)`, id, url.PathEscape(option))
	`33`	+ return fmt.Sprintf(`![](https://gh-polls.com/poll/%s/%s)`, id, url.PathEscape(option))
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,10 @@`
`1`	`1`	`{`
`2`		`- "name": "polls",`
	`2`	`+ "name": "gh-polls",`
`3`	`3`	`"description": "GitHub polls.",`
`4`		`- "cors": {}`
	`4`	`+ "cors": {},`
	`5`	`+ "stages": {`
	`6`	`+ "production": {`
	`7`	`+ "domain": "gh-polls.com"`
	`8`	`+ }`
	`9`	`+ }`
`5`	`10`	`}`