diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 912752ae..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,456 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - digest = "1:573fa46f8d413d4bc3f7cc5e86b2c43cb21559f4fb0a19d9874d228e28fdc07c" - name = "github.com/PuerkitoBio/goquery" - packages = ["."] - pruneopts = "UT" - revision = "2d2796f41742ece03e8086188fa4db16a3a0b458" - version = "v1.5.0" - -[[projects]] - digest = "1:66b3310cf22cdc96c35ef84ede4f7b9b370971c4025f394c89a2638729653b11" - name = "github.com/andybalholm/cascadia" - packages = ["."] - pruneopts = "UT" - revision = "901648c87902174f774fac311d7f176f8647bdaa" - version = "v1.0.0" - -[[projects]] - digest = "1:4d82bda206a7724a5ed11e442471dc4595dfd4a641d9feb9b741a74afe8c8890" - name = "github.com/aymerick/douceur" - packages = [ - "css", - "inliner", - "parser", - ] - pruneopts = "UT" - revision = "c5c95ec357c8235fbd7f34e8c843d36783f3fad9" - version = "v0.2.0" - -[[projects]] - digest = "1:cd0089a5b5d872ac1b772087c7ee0ff2e71de50aa3a51826be64a63963a85287" - name = "github.com/dnote/actions" - packages = ["."] - pruneopts = "UT" - revision = "60e81aff027d39f4494c5ee5c1db9c3efc015ccf" - version = "v0.2.0" - -[[projects]] - digest = "1:865079840386857c809b72ce300be7580cb50d3d3129ce11bf9aa6ca2bc1934a" - name = "github.com/dnote/color" - packages = ["."] - pruneopts = "UT" - revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" - version = "v1.7.0" - -[[projects]] - digest = "1:d29ee5ef14a7e0253facd0bcebe6a69a7a4e02a67eb24d2aacd8ccb4a7cea6fc" - name = "github.com/gobuffalo/envy" - packages = ["."] - pruneopts = "UT" - revision = "043cb4b8af871b49563291e32c66bb84378a60ac" - version = "v1.7.0" - -[[projects]] - digest = "1:6c9088827dcc7a807c97592a55f190e35e0fdaf237c5a074256c260925c59428" - name = "github.com/gobuffalo/logger" - packages = ["."] - pruneopts = "UT" - revision = "7c291b53e05b81d77bd43109b4a3c6f84e45c8e1" - version = "v1.0.1" - -[[projects]] - digest = "1:40849e8495ef81a84ff335ef65e23d33671b61e60e9db464fbab55f19f43f120" - name = "github.com/gobuffalo/packd" - packages = [ - ".", - "internal/takeon/github.com/markbates/errx", - ] - pruneopts = "UT" - revision = "54ea459691466cfb630ccc276723fe3963f3e9d5" - version = "v0.3.0" - -[[projects]] - digest = "1:d5be00af71142774ee6738480e580ae975e8e97158f9334b13af41a77f2f6b0c" - name = "github.com/gobuffalo/packr" - packages = [ - "v2", - "v2/file", - "v2/file/resolver", - "v2/file/resolver/encoding/hex", - "v2/internal/takeon/github.com/markbates/errx", - "v2/internal/takeon/github.com/markbates/oncer", - "v2/internal/takeon/github.com/markbates/safe", - "v2/jam/parser", - "v2/plog", - ] - pruneopts = "UT" - revision = "9eb7a3d310e89e471c2cdf1ea3ec8d7fc1ab969c" - version = "v2.5.2" - -[[projects]] - digest = "1:1d1cbf539d9ac35eb3148129f96be5537f1a1330cadcc7e3a83b4e72a59672a3" - name = "github.com/google/go-cmp" - packages = [ - "cmp", - "cmp/internal/diff", - "cmp/internal/flags", - "cmp/internal/function", - "cmp/internal/value", - ] - pruneopts = "UT" - revision = "2d0692c2e9617365a95b295612ac0d4415ba4627" - version = "v0.3.1" - -[[projects]] - digest = "1:bfb6d8aee23cd9b2db8fa3760ca11d7a934d9a05993d5233406f1e6042e4c110" - name = "github.com/google/go-github" - packages = ["github"] - pruneopts = "UT" - revision = "ababee01b03f69965d0ec370e65b61ec7967be34" - version = "v26.0.9" - -[[projects]] - digest = "1:a63cff6b5d8b95638bfe300385d93b2a6d9d687734b863da8e09dc834510a690" - name = "github.com/google/go-querystring" - packages = ["query"] - pruneopts = "UT" - revision = "44c6ddd0a2342c386950e880b658017258da92fc" - version = "v1.0.0" - -[[projects]] - digest = "1:582b704bebaa06b48c29b0cec224a6058a09c86883aaddabde889cd1a5f73e1b" - name = "github.com/google/uuid" - packages = ["."] - pruneopts = "UT" - revision = "0cd6bf5da1e1c83f8b45653022c74f71af0538a4" - version = "v1.1.1" - -[[projects]] - digest = "1:fc51ecee8f31d03436c1a0167eb1e383ad0a241d02272541853f3995374a08f1" - name = "github.com/gorilla/css" - packages = ["scanner"] - pruneopts = "UT" - revision = "398b0b046082ecb3694c01bec6b336a06a4e530a" - version = "v1.0.0" - -[[projects]] - digest = "1:3af6be4fee7c08f81f13d36f04ffb63ad4b6b5aaba12cce96095c7c2863d4912" - name = "github.com/gorilla/mux" - packages = ["."] - pruneopts = "UT" - revision = "ed099d42384823742bba0bf9a72b53b55c9e2e38" - version = "v1.7.2" - -[[projects]] - digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" - name = "github.com/inconshreveable/mousetrap" - packages = ["."] - pruneopts = "UT" - revision = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75" - version = "v1.0" - -[[projects]] - digest = "1:777a682d72e7ff9dc6f139e6eb8edfaf3b8cbbd0f47023fdef174aede101e6bd" - name = "github.com/jinzhu/gorm" - packages = ["."] - pruneopts = "UT" - revision = "01b66011427614f01e84a473b0303c917179f2a0" - version = "v1.9.9" - -[[projects]] - digest = "1:01ed62f8f4f574d8aff1d88caee113700a2b44c42351943fa73cc1808f736a50" - name = "github.com/jinzhu/inflection" - packages = ["."] - pruneopts = "UT" - revision = "f5c5f50e6090ae76a29240b61ae2a90dd810112e" - version = "v1.0.0" - -[[projects]] - digest = "1:ecd9aa82687cf31d1585d4ac61d0ba180e42e8a6182b85bd785fcca8dfeefc1b" - name = "github.com/joho/godotenv" - packages = ["."] - pruneopts = "UT" - revision = "23d116af351c84513e1946b527c88823e476be13" - version = "v1.3.0" - -[[projects]] - branch = "master" - digest = "1:77fa3714d5009a706a77970c39b690c951473ab05560baab801f14055218c9ed" - name = "github.com/justincampbell/timeago" - packages = ["."] - pruneopts = "UT" - revision = "027f40306f1dbe89d24087611680ef95543bf876" - -[[projects]] - digest = "1:77857b3205f936bdc6928ef347b682ab549cf99454d6c0ca04a49f8df9e418f3" - name = "github.com/karrick/godirwalk" - packages = ["."] - pruneopts = "UT" - revision = "73c17a9b9528eb3ce857b782a2816c0cda581e62" - version = "v1.10.12" - -[[projects]] - digest = "1:31e761d97c76151dde79e9d28964a812c46efc5baee4085b86f68f0c654450de" - name = "github.com/konsorten/go-windows-terminal-sequences" - packages = ["."] - pruneopts = "UT" - revision = "f55edac94c9bbba5d6182a4be46d86a2c9b5b50e" - version = "v1.0.2" - -[[projects]] - digest = "1:bdd53b87de8185da386bae179c84d4848854c6870bacacf6a154fe63e2e750f7" - name = "github.com/lib/pq" - packages = [ - ".", - "oid", - "scram", - ] - pruneopts = "UT" - revision = "bc6a3c0594130b1e34005880bc600b6d3f49fa7f" - version = "v1.1.1" - -[[projects]] - digest = "1:c658e84ad3916da105a761660dcaeb01e63416c8ec7bc62256a9b411a05fcd67" - name = "github.com/mattn/go-colorable" - packages = ["."] - pruneopts = "UT" - revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" - version = "v0.0.9" - -[[projects]] - digest = "1:9b90c7639a41697f3d4ad12d7d67dfacc9a7a4a6e0bbfae4fc72d0da57c28871" - name = "github.com/mattn/go-isatty" - packages = ["."] - pruneopts = "UT" - revision = "1311e847b0cb909da63b5fecfb5370aa66236465" - version = "v0.0.8" - -[[projects]] - digest = "1:4a49346ca45376a2bba679ca0e83bec949d780d4e927931317904bad482943ec" - name = "github.com/mattn/go-sqlite3" - packages = ["."] - pruneopts = "UT" - revision = "c7c4067b79cc51e6dfdcef5c702e74b1e0fa7c75" - version = "v1.10.0" - -[[projects]] - digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b" - name = "github.com/pkg/errors" - packages = ["."] - pruneopts = "UT" - revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4" - version = "v0.8.1" - -[[projects]] - digest = "1:a278d57d6315d6f405dbaebdece8eb0a17e243e5f96456b00bfc0dbfb3fe3286" - name = "github.com/radovskyb/watcher" - packages = ["."] - pruneopts = "UT" - revision = "f5989f8deca223d590d5a130c77ea375fe9fde30" - version = "v1.0.7" - -[[projects]] - digest = "1:ed615c5430ecabbb0fb7629a182da65ecee6523900ac1ac932520860878ffcad" - name = "github.com/robfig/cron" - packages = ["."] - pruneopts = "UT" - revision = "b41be1df696709bb6395fe435af20370037c0b4c" - version = "v1.2.0" - -[[projects]] - digest = "1:e09ada96a5a41deda4748b1659cc8953961799e798aea557257b56baee4ecaf3" - name = "github.com/rogpeppe/go-internal" - packages = [ - "modfile", - "module", - "semver", - ] - pruneopts = "UT" - revision = "438578804ca6f31be148c27683afc419ce47c06e" - version = "v1.3.0" - -[[projects]] - digest = "1:83eb06141fc25c7fd89f8b39717962ac930a7480796aab3d46c7e88507a69173" - name = "github.com/rubenv/sql-migrate" - packages = [ - ".", - "sqlparse", - ] - pruneopts = "UT" - revision = "f4d34eae5a5cf210693e81c604e6bac5f6727927" - -[[projects]] - digest = "1:d917313f309bda80d27274d53985bc65651f81a5b66b820749ac7f8ef061fd04" - name = "github.com/sergi/go-diff" - packages = ["diffmatchpatch"] - pruneopts = "UT" - revision = "1744e2970ca51c86172c8190fadad617561ed6e7" - version = "v1.0.0" - -[[projects]] - digest = "1:04457f9f6f3ffc5fea48e71d62f2ca256637dee0a04d710288e27e05c8b41976" - name = "github.com/sirupsen/logrus" - packages = ["."] - pruneopts = "UT" - revision = "839c75faf7f98a33d445d181f3018b5c3409a45e" - version = "v1.4.2" - -[[projects]] - digest = "1:e096613fb7cf34743d49af87d197663cfccd61876e2219853005a57baedfa562" - name = "github.com/spf13/cobra" - packages = ["."] - pruneopts = "UT" - revision = "f2b07da1e2c38d5f12845a4f607e2e1018cbb1f5" - version = "v0.0.5" - -[[projects]] - digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2" - name = "github.com/spf13/pflag" - packages = ["."] - pruneopts = "UT" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" - -[[projects]] - digest = "1:e81d8049c2a13612668f4cc1db572f6d8040ed3019f0c1bb440c8fb0629681b9" - name = "github.com/stripe/stripe-go" - packages = [ - ".", - "card", - "customer", - "form", - "paymentsource", - "source", - "sub", - "webhook", - ] - pruneopts = "UT" - revision = "13d29913e9d85a422195fa6571a8b51cffe069f7" - version = "v61.7.1" - -[[projects]] - branch = "master" - digest = "1:49a1047b3a0a713e01facecccf5a533c0dcad5724c29eba438857086a27d5769" - name = "golang.org/x/crypto" - packages = [ - "bcrypt", - "blowfish", - "cast5", - "hkdf", - "openpgp", - "openpgp/armor", - "openpgp/elgamal", - "openpgp/errors", - "openpgp/packet", - "openpgp/s2k", - "pbkdf2", - "ssh/terminal", - ] - pruneopts = "UT" - revision = "cc06ce4a13d484c0101a9e92913248488a75786d" - -[[projects]] - branch = "master" - digest = "1:d7b978a787736537d0ad2f84c0e8b75b05c2febef0537198e28edf1cf2768afd" - name = "golang.org/x/net" - packages = [ - "html", - "html/atom", - ] - pruneopts = "UT" - revision = "3b0461eec859c4b73bb64fdc8285971fd33e3938" - -[[projects]] - branch = "master" - digest = "1:fe40fbf915905f8a2397b321b3f10190edbdf5d293f087d01d7eb3a6d1a4adca" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows", - ] - pruneopts = "UT" - revision = "c5567b49c5d04a5f83870795b8c0e2df43a8ce32" - -[[projects]] - branch = "master" - digest = "1:9fdc2b55e8e0fafe4b41884091e51e77344f7dc511c5acedcfd98200003bff90" - name = "golang.org/x/time" - packages = ["rate"] - pruneopts = "UT" - revision = "9d24e82272b4f38b78bc8cff74fa936d31ccd8ef" - -[[projects]] - branch = "v3" - digest = "1:7388652e2215a3f45d341d58766ed58317971030eb1cbd75f005f96ace8e9196" - name = "gopkg.in/alexcesaro/quotedprintable.v3" - packages = ["."] - pruneopts = "UT" - revision = "2caba252f4dc53eaf6b553000885530023f54623" - -[[projects]] - digest = "1:eebd52aee67d9f1e0af1859a584e14b1817581dd5f90d4585418c27b6a93c966" - name = "gopkg.in/gomail.v2" - packages = ["."] - pruneopts = "UT" - revision = "41f3572897373c5538c50a2402db15db079fa4fd" - version = "2.0.0" - -[[projects]] - digest = "1:1b36b0cb56126316f637ad55cfd5ed84c945fe45bd90e944666b4107a80a1da9" - name = "gopkg.in/gorp.v1" - packages = ["."] - pruneopts = "UT" - revision = "6a667da9c028871f98598d85413e3fc4c6daa52e" - version = "v1.7.2" - -[[projects]] - digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96" - name = "gopkg.in/yaml.v2" - packages = ["."] - pruneopts = "UT" - revision = "51d6538a90f86fe93ac480b35f37b2be17fef232" - version = "v2.2.2" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - input-imports = [ - "github.com/aymerick/douceur/inliner", - "github.com/dnote/actions", - "github.com/dnote/color", - "github.com/gobuffalo/packr/v2", - "github.com/google/go-cmp/cmp", - "github.com/google/go-github/github", - "github.com/google/uuid", - "github.com/gorilla/mux", - "github.com/jinzhu/gorm", - "github.com/joho/godotenv", - "github.com/justincampbell/timeago", - "github.com/lib/pq", - "github.com/mattn/go-sqlite3", - "github.com/pkg/errors", - "github.com/radovskyb/watcher", - "github.com/robfig/cron", - "github.com/rubenv/sql-migrate", - "github.com/sergi/go-diff/diffmatchpatch", - "github.com/spf13/cobra", - "github.com/stripe/stripe-go", - "github.com/stripe/stripe-go/card", - "github.com/stripe/stripe-go/customer", - "github.com/stripe/stripe-go/paymentsource", - "github.com/stripe/stripe-go/source", - "github.com/stripe/stripe-go/sub", - "github.com/stripe/stripe-go/webhook", - "golang.org/x/crypto/bcrypt", - "golang.org/x/crypto/hkdf", - "golang.org/x/crypto/pbkdf2", - "golang.org/x/crypto/ssh/terminal", - "golang.org/x/time/rate", - "gopkg.in/gomail.v2", - "gopkg.in/yaml.v2", - ] - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 4bac9652..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,114 +0,0 @@ -# Gopkg.toml example -# -# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html -# for detailed Gopkg.toml documentation. -# -# required = ["github.com/user/thing/cmd/thing"] -# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] -# -# [[constraint]] -# name = "github.com/user/project" -# version = "1.0.0" -# -# [[constraint]] -# name = "github.com/user/project2" -# branch = "dev" -# source = "github.com/myfork/project2" -# -# [[override]] -# name = "github.com/x/y" -# version = "2.4.0" -# -# [prune] -# non-go = false -# go-tests = true -# unused-packages = true - - -[[constraint]] - name = "github.com/aymerick/douceur" - version = "0.2.0" - -[[constraint]] - name = "github.com/dnote/actions" - version = "0.2.0" - -[[constraint]] - name = "github.com/dnote/color" - version = "1.7.0" - -[[constraint]] - name = "github.com/google/go-github" - version = "26.0.9" - -[[constraint]] - name = "github.com/gorilla/mux" - version = "1.7.2" - -[[constraint]] - name = "github.com/jinzhu/gorm" - version = "1.9.9" - -[[constraint]] - name = "github.com/joho/godotenv" - version = "1.3.0" - -[[constraint]] - name = "github.com/lib/pq" - version = "1.1.1" - -[[constraint]] - name = "github.com/mattn/go-sqlite3" - version = "1.10.0" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.8.1" - -[[constraint]] - name = "github.com/robfig/cron" - version = "1.2.0" - -[[constraint]] - name = "github.com/sergi/go-diff" - version = "1.0.0" - -[[constraint]] - name = "github.com/spf13/cobra" - version = "0.0.5" - -[[constraint]] - name = "github.com/stripe/stripe-go" - version = "61.7.1" - -[[constraint]] - branch = "master" - name = "golang.org/x/crypto" - -[[constraint]] - branch = "master" - name = "golang.org/x/time" - -[[constraint]] - name = "gopkg.in/gomail.v2" - version = "2.0.0" - -[[constraint]] - name = "gopkg.in/yaml.v2" - version = "2.2.2" - -[prune] - go-tests = true - unused-packages = true - -[[constraint]] - revision = "f4d34eae5a5cf210693e81c604e6bac5f6727927" - name = "github.com/rubenv/sql-migrate" - -[[constraint]] - name = "github.com/gobuffalo/packr" - version = "2.5.2" - -[[constraint]] - name = "github.com/radovskyb/watcher" - version = "1.0.7" diff --git a/Makefile b/Makefile index 6adc4eb6..6efc8a98 100644 --- a/Makefile +++ b/Makefile @@ -1,35 +1,24 @@ -DEP := $(shell command -v dep 2> /dev/null) PACKR2 := $(shell command -v packr2 2> /dev/null) NPM := $(shell command -v npm 2> /dev/null) HUB := $(shell command -v hub 2> /dev/null) -COMPILEDAEMON := $(shell command -v CompileDaemon 2> /dev/null) -serverOutputDir = ${GOPATH}/src/github.com/dnote/dnote/build/server -cliOutputDir = ${GOPATH}/src/github.com/dnote/dnote/build/cli -cliHomebrewDir = ${GOPATH}/src/github.com/dnote/homebrew-dnote +currentDir = $(shell pwd) +serverOutputDir = ${currentDir}/build/server +cliOutputDir = ${currentDir}/build/cli +cliHomebrewDir = ${currentDir}/../homebrew-dnote ## installation install: install-go install-js .PHONY: install install-go: -ifndef DEP - @echo "==> installing dep" - @curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh -endif - ifndef PACKR2 @echo "==> installing packr2" @go get -u github.com/gobuffalo/packr/v2/packr2 endif -ifndef COMPILEDAEMON - @echo "==> installing CompileDaemon" - @go get -u github.com/githubnemo/CompileDaemon -endif - @echo "==> installing go dependencies" - @dep ensure -v + @go mod download .PHONY: install-go install-js: @@ -40,13 +29,13 @@ endif @echo "==> installing js dependencies" ifeq ($(CI), true) - @(cd ${GOPATH}/src/github.com/dnote/dnote/web && npm install --unsafe-perm=true) - @(cd ${GOPATH}/src/github.com/dnote/dnote/browser && npm install --unsafe-perm=true) - @(cd ${GOPATH}/src/github.com/dnote/dnote/jslib && npm install --unsafe-perm=true) + @(cd ${currentDir}/web && npm install --unsafe-perm=true) + @(cd ${currentDir}/browser && npm install --unsafe-perm=true) + @(cd ${currentDir}/jslib && npm install --unsafe-perm=true) else - @(cd ${GOPATH}/src/github.com/dnote/dnote/web && npm install) - @(cd ${GOPATH}/src/github.com/dnote/dnote/browser && npm install) - @(cd ${GOPATH}/src/github.com/dnote/dnote/jslib && npm install) + @(cd ${currentDir}/web && npm install) + @(cd ${currentDir}/browser && npm install) + @(cd ${currentDir}/jslib && npm install) endif .PHONY: install-js @@ -56,21 +45,21 @@ test: test-cli test-api test-web test-jslib test-cli: @echo "==> running CLI test" - @${GOPATH}/src/github.com/dnote/dnote/pkg/cli/scripts/test.sh + @(${currentDir}/scripts/cli/test.sh) .PHONY: test-cli test-api: @echo "==> running API test" - @${GOPATH}/src/github.com/dnote/dnote/pkg/server/scripts/test-local.sh + @(${currentDir}/scripts/server/test-local.sh) .PHONY: test-api test-web: @echo "==> running web test" ifeq ($(WATCH), true) - @(cd ${GOPATH}/src/github.com/dnote/dnote/web && npm run test:watch) + @(cd ${currentDir}/web && npm run test:watch) else - @(cd ${GOPATH}/src/github.com/dnote/dnote/web && npm run test) + @(cd ${currentDir}/web && npm run test) endif .PHONY: test-web @@ -78,16 +67,16 @@ test-jslib: @echo "==> running jslib test" ifeq ($(WATCH), true) - @(cd ${GOPATH}/src/github.com/dnote/dnote/jslib && npm run test:watch) + @(cd ${currentDir}/jslib && npm run test:watch) else - @(cd ${GOPATH}/src/github.com/dnote/dnote/jslib && npm run test) + @(cd ${currentDir}/jslib && npm run test) endif .PHONY: test-jslib # development dev-server: @echo "==> running dev environment" - @(cd ${GOPATH}/src/github.com/dnote/dnote/web && VERSION=master ./scripts/dev.sh) + @VERSION=master ${currentDir}/scripts/web/dev.sh .PHONY: dev-server ## build @@ -96,7 +85,7 @@ ifndef version $(error version is required. Usage: make version=0.1.0 build-web) endif @echo "==> building web" - @(cd ${GOPATH}/src/github.com/dnote/dnote/web && VERSION=$(version) ./scripts/build-prod.sh) + @VERSION=${version} ${currentDir}/scripts/web/build-prod.sh .PHONY: build-web build-server: build-web @@ -105,13 +94,13 @@ ifndef version endif @echo "==> building server" - @(cd ${GOPATH}/src/github.com/dnote/dnote/pkg/server && ./scripts/build.sh $(version)) + @${currentDir}/scripts/server/build.sh $(version) .PHONY: build-server build-cli: ifeq ($(debug), true) @echo "==> building cli in dev mode" - @${GOPATH}/src/github.com/dnote/dnote/pkg/cli/scripts/dev.sh + @${currentDir}/scripts/cli/dev.sh else ifndef version @@ -119,7 +108,7 @@ ifndef version endif @echo "==> building cli" - @${GOPATH}/src/github.com/dnote/dnote/pkg/cli/scripts/build.sh $(version) + @${currentDir}/scripts/cli/build.sh $(version) endif .PHONY: build-cli @@ -138,7 +127,7 @@ endif fi @echo "==> releasing cli" - @${GOPATH}/src/github.com/dnote/dnote/scripts/release.sh cli $(version) ${cliOutputDir} + @${currentDir}/scripts/release.sh cli $(version) ${cliOutputDir} @echo "===> releading on Homebrew" @(cd "${cliHomebrewDir}" && \ @@ -157,7 +146,7 @@ ifndef HUB endif @echo "==> releasing server" - @${GOPATH}/src/github.com/dnote/dnote/scripts/release.sh server $(version) ${serverOutputDir} + @${currentDir}/scripts/release.sh server $(version) ${serverOutputDir} .PHONY: release-server # migrations @@ -166,7 +155,7 @@ ifndef filename $(error filename is required. Usage: make filename=your-filename create-migration) endif - @(cd ${GOPATH}/src/github.com/dnote/dnote/pkg/server/database && ./scripts/create-migration.sh $(filename)) + @(cd ${currentDir}/pkg/server/database && ./scripts/create-migration.sh $(filename)) .PHONY: create-migration clean: @@ -176,7 +165,7 @@ clean: .PHONY: clean clean-dep: - @rm -rf ./web/node_modules - @rm -rf ./jslib/node_modules - @rm -rf ./browser/node_modules + @rm -rf ${currentDir}/web/node_modules + @rm -rf ${currentDir}/jslib/node_modules + @rm -rf ${currentDir}/browser/node_modules .PHONY: clean-dep diff --git a/go.mod b/go.mod new file mode 100644 index 00000000..eaf66c32 --- /dev/null +++ b/go.mod @@ -0,0 +1,41 @@ +module github.com/dnote/dnote + +go 1.13 + +require ( + github.com/PuerkitoBio/goquery v1.5.0 // indirect + github.com/aymerick/douceur v0.2.0 + github.com/dnote/actions v0.2.0 + github.com/dnote/color v1.7.0 + github.com/gobuffalo/packr v1.30.1 // indirect + github.com/gobuffalo/packr/v2 v2.7.1 + github.com/google/go-cmp v0.3.1 + github.com/google/go-github v17.0.0+incompatible + github.com/google/go-querystring v1.0.0 // indirect + github.com/google/uuid v1.1.1 + github.com/gorilla/css v1.0.0 // indirect + github.com/gorilla/mux v1.7.2 + github.com/jinzhu/gorm v1.9.9 + github.com/joho/godotenv v1.3.0 + github.com/justincampbell/bigduration v0.0.0-20160531141349-e45bf03c0666 // indirect + github.com/justincampbell/timeago v0.0.0-20160528003754-027f40306f1d + github.com/lib/pq v1.1.1 + github.com/mattn/go-colorable v0.0.9 // indirect + github.com/mattn/go-isatty v0.0.8 // indirect + github.com/mattn/go-sqlite3 v1.10.0 + github.com/pkg/errors v0.8.1 + github.com/radovskyb/watcher v1.0.7 + github.com/robfig/cron v1.2.0 + github.com/rubenv/sql-migrate v0.0.0-20190618074426-f4d34eae5a5c + github.com/sergi/go-diff v1.0.0 + github.com/spf13/cobra v0.0.5 + github.com/stripe/stripe-go v61.7.1+incompatible + github.com/ziutek/mymysql v1.5.4 // indirect + golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 + golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 // indirect + golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 + gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect + gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737 + gopkg.in/gorp.v1 v1.7.2 // indirect + gopkg.in/yaml.v2 v2.2.2 +) diff --git a/go.sum b/go.sum new file mode 100644 index 00000000..56f77f38 --- /dev/null +++ b/go.sum @@ -0,0 +1,267 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.37.4 h1:glPeL3BQJsbF6aIIYfZizMwc5LTYz250bDMjttbBGAU= +cloud.google.com/go v0.37.4/go.mod h1:NHPJ89PdicEuT9hdPXMROBD91xc5uRDxsMtSB16k7hw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk= +github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= +github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo= +github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o= +github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= +github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk= +github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 h1:tkum0XDgfR0jcVVXuTsYv/erY2NnEDqwRojbxR1rBYA= +github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3/go.mod h1:zAg7JM8CkOJ43xKXIj7eRO9kmWm/TW578qo+oDO6tuM= +github.com/dnote/actions v0.2.0 h1:P1ut2/QRKwfAzIIB374vN9A4IanU94C/payEocvngYo= +github.com/dnote/actions v0.2.0/go.mod h1:bBIassLhppVQdbC3iaE92SHBpM1HOVe+xZoAlj9ROxw= +github.com/dnote/color v1.7.0 h1:8/QGLQKSU8/zcWQaHbMyC1hJRkKO/Uu9M89sH76ecHE= +github.com/dnote/color v1.7.0/go.mod h1:75UcP/TH7CNvjQ5pwDumkUS3vkPdGggy7/3fT8MlxHM= +github.com/eapache/go-resiliency v1.1.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs= +github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21/go.mod h1:+020luEh2TKB4/GOp8oxxtq0Daoen/Cii55CzbTV6DU= +github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFPTqq+I= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= +github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA= +github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/gobuffalo/envy v1.7.0/go.mod h1:n7DRkBerg/aorDM8kbduw5dN3oXGswK5liaSCx4T5NI= +github.com/gobuffalo/envy v1.7.1 h1:OQl5ys5MBea7OGCdvPbBJWRgnhC/fGona6QKfvFeau8= +github.com/gobuffalo/envy v1.7.1/go.mod h1:FurDp9+EDPE4aIUS3ZLyD+7/9fpx7YRt/ukY6jIHf0w= +github.com/gobuffalo/logger v1.0.0/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= +github.com/gobuffalo/logger v1.0.1 h1:ZEgyRGgAm4ZAhAO45YXMs5Fp+bzGLESFewzAVBMKuTg= +github.com/gobuffalo/logger v1.0.1/go.mod h1:2zbswyIUa45I+c+FLXuWl9zSWEiVuthsk8ze5s8JvPs= +github.com/gobuffalo/packd v0.3.0 h1:eMwymTkA1uXsqxS0Tpoop3Lc0u3kTfiMBE6nKtQU4g4= +github.com/gobuffalo/packd v0.3.0/go.mod h1:zC7QkmNkYVGKPw4tHpBQ+ml7W/3tIebgeo1b36chA3Q= +github.com/gobuffalo/packr v1.30.1 h1:hu1fuVR3fXEZR7rXNW3h8rqSML8EVAf6KNm0NKO/wKg= +github.com/gobuffalo/packr v1.30.1/go.mod h1:ljMyFO2EcrnzsHsN99cvbq055Y9OhRrIaviy289eRuk= +github.com/gobuffalo/packr/v2 v2.5.1/go.mod h1:8f9c96ITobJlPzI44jj+4tHnEKNt0xXWSVlXRN9X1Iw= +github.com/gobuffalo/packr/v2 v2.7.1 h1:n3CIW5T17T8v4GGK5sWXLVWJhCz7b5aNLSxW6gYim4o= +github.com/gobuffalo/packr/v2 v2.7.1/go.mod h1:qYEvAazPaVxy7Y7KR0W8qYEE+RymX74kETFqjFoFlOc= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-github v17.0.0+incompatible h1:N0LgJ1j65A7kfXrZnUDaYCs/Sf4rEjNlfyDHW9dolSY= +github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ= +github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY= +github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= +github.com/gorilla/css v1.0.0 h1:BQqNyPTi50JCFMTw/b67hByjMVXZRwGha6wxVGkeihY= +github.com/gorilla/css v1.0.0/go.mod h1:Dn721qIggHpt4+EFCcTLTU/vk5ySda2ReITrtgBl60c= +github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.7.2 h1:zoNxOV7WjqXptQOVngLmcSQgXmgk4NMz1HibBchjl/I= +github.com/gorilla/mux v1.7.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/jinzhu/gorm v1.9.9 h1:Gc8bP20O+vroFUzZEXA1r7vNGQZGQ+RKgOnriuNF3ds= +github.com/jinzhu/gorm v1.9.9/go.mod h1:Kh6hTsSGffh4ui079FHrR5Gg+5D0hgihqDcsDN2BBJY= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.0.1 h1:HjfetcXq097iXP0uoPCdnM4Efp5/9MsM0/M+XOTeR3M= +github.com/jinzhu/now v1.0.1/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= +github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/justincampbell/bigduration v0.0.0-20160531141349-e45bf03c0666 h1:abLciEiilfMf19Q1TFWDrp9j5z5one60dnnpvc6eabg= +github.com/justincampbell/bigduration v0.0.0-20160531141349-e45bf03c0666/go.mod h1:xqGOmDZzLOG7+q/CgsbXv10g4tgPsbjhmAxyaTJMvis= +github.com/justincampbell/timeago v0.0.0-20160528003754-027f40306f1d h1:qtCcYJK2bebPXEC8Wy+enYxQqmWnT6jlVTHnDGpwvkc= +github.com/justincampbell/timeago v0.0.0-20160528003754-027f40306f1d/go.mod h1:U7FWcK1jzZJnYuSnxP6efX3ZoHbK1CEpD0ThYyGNPNI= +github.com/karrick/godirwalk v1.10.12/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.2 h1:DB17ag19krx9CFsz4o3enTrPXyIXCl+2iCXH/aMAp9s= +github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/lib/pq v1.1.1 h1:sJZmqHoEaY7f+NPP8pgLB/WxulyR3fewgCM2qaSlBb4= +github.com/lib/pq v1.1.1/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= +github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= +github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/common v0.2.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/radovskyb/watcher v1.0.7 h1:AYePLih6dpmS32vlHfhCeli8127LzkIgwJGcwwe8tUE= +github.com/radovskyb/watcher v1.0.7/go.mod h1:78okwvY5wPdzcb1UYnip1pvrZNIVEIh/Cm+ZuvsUYIg= +github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/robfig/cron v1.2.0 h1:ZjScXvvxeQ63Dbyxy76Fj3AT3Ut0aKsyd2/tl3DTMuQ= +github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k= +github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.3.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.4.0 h1:LUa41nrWTQNGhzdsZ5lTnkwbNjj6rXTdazA1cSdjkOY= +github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rubenv/sql-migrate v0.0.0-20190618074426-f4d34eae5a5c h1:LCELEbde3/GT141OpHRs+jJZrI1tI3ayVd4VqW7Ui2U= +github.com/rubenv/sql-migrate v0.0.0-20190618074426-f4d34eae5a5c/go.mod h1:WS0rl9eEliYI8DPnr3TOwz4439pay+qNgzJoVya/DmY= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stripe/stripe-go v61.7.1+incompatible h1:sflLf/SPZxu81RtdypT48tjw6/NYQX55JCSuEm0rkWs= +github.com/stripe/stripe-go v61.7.1+incompatible/go.mod h1:A1dQZmO/QypXmsL0T8axYZkSN/uA/T/A64pfKdBAMiY= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/ziutek/mymysql v1.5.4 h1:GB0qdRGsTwQSBVYuVShFBKaXSnSnYYC2d9knnE1LHFs= +github.com/ziutek/mymysql v1.5.4/go.mod h1:LMSpPZ6DbqWFxNCHW77HeMg9I646SAhApZ/wKdgO/C0= +go.opencensus.io v0.20.1/go.mod h1:6WKK9ahsWS3RSO+PY9ZHZUfv2irvY6gN279GOPZjmmk= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4 h1:ydJNl0ENAG67pFbB+9tfhiL2pYqLhfoaZFw/cjLhY4A= +golang.org/x/crypto v0.0.0-20190621222207-cc06ce4a13d4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e h1:vcxGaoTs7kV8m5Np9uUNQin4BrLOthgV7252N8V+FwY= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0 h1:HyfiK1WMnHj5FXFXatD+Qs1A/xC2Run6RzeW1SyHxpc= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2 h1:z99zHgr7hKfrUcX/KsoJk5FJfjTceCKIp96+biqP4To= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20191004055002-72853e10c5a3/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.3.1/go.mod h1:6wY9I6uQWHQ8EM57III9mq/AjF+i8G65rmVagqKMtkk= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= +gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737 h1:NvePS/smRcFQ4bMtTddFtknbGCtoBkJxGmpSpVRafCc= +gopkg.in/gomail.v2 v2.0.0-20150902115704-41f357289737/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw= +gopkg.in/gorp.v1 v1.7.2 h1:j3DWlAyGVv8whO7AcIWznQ2Yj7yJkn34B8s63GViAAw= +gopkg.in/gorp.v1 v1.7.2/go.mod h1:Wo3h+DBQZIxATwftsglhdD/62zRFPhGhTiu5jUJmCaw= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/server/handlers/classic_test.go b/pkg/server/handlers/classic_test.go index 3a5b3f50..004a1edd 100644 --- a/pkg/server/handlers/classic_test.go +++ b/pkg/server/handlers/classic_test.go @@ -22,6 +22,7 @@ import ( "encoding/json" "fmt" "net/http" + "os" "testing" "github.com/dnote/dnote/pkg/assert" @@ -35,7 +36,7 @@ import ( func init() { testutils.InitTestDB() - templatePath := fmt.Sprintf("%s/mailer/templates/src", testutils.ServerPath) + templatePath := os.Getenv("DNOTE_TEST_EMAIL_TEMPLATE_DIR") mailer.InitTemplates(&templatePath) } diff --git a/pkg/server/handlers/user_test.go b/pkg/server/handlers/user_test.go index e9e1ac5b..cd6de035 100644 --- a/pkg/server/handlers/user_test.go +++ b/pkg/server/handlers/user_test.go @@ -22,14 +22,15 @@ import ( "encoding/json" "fmt" "net/http" + "os" "testing" "time" "github.com/dnote/dnote/pkg/assert" "github.com/dnote/dnote/pkg/clock" - "github.com/dnote/dnote/pkg/server/presenters" "github.com/dnote/dnote/pkg/server/database" "github.com/dnote/dnote/pkg/server/mailer" + "github.com/dnote/dnote/pkg/server/presenters" "github.com/dnote/dnote/pkg/server/testutils" "github.com/pkg/errors" "golang.org/x/crypto/bcrypt" @@ -131,7 +132,8 @@ func TestCreateVerificationToken(t *testing.T) { // TODO: send emails in the background using job queue to avoid coupling the // handler itself to the mailer - templatePath := fmt.Sprintf("%s/mailer/templates/src", testutils.ServerPath) + + templatePath := os.Getenv("DNOTE_TEST_EMAIL_TEMPLATE_DIR") mailer.InitTemplates(&templatePath) server := MustNewServer(t, &App{ diff --git a/pkg/server/handlers/v3_auth_test.go b/pkg/server/handlers/v3_auth_test.go index b81d6631..f9c78b3e 100644 --- a/pkg/server/handlers/v3_auth_test.go +++ b/pkg/server/handlers/v3_auth_test.go @@ -22,6 +22,7 @@ import ( "encoding/json" "fmt" "net/http" + "os" "testing" "time" @@ -37,7 +38,7 @@ import ( func init() { testutils.InitTestDB() - templatePath := fmt.Sprintf("%s/mailer/templates/src", testutils.ServerPath) + templatePath := os.Getenv("DNOTE_TEST_EMAIL_TEMPLATE_DIR") mailer.InitTemplates(&templatePath) } diff --git a/pkg/server/mailer/mailer_test.go b/pkg/server/mailer/mailer_test.go index 8d596de0..d87b158d 100644 --- a/pkg/server/mailer/mailer_test.go +++ b/pkg/server/mailer/mailer_test.go @@ -20,6 +20,7 @@ package mailer import ( "fmt" + "os" "strings" "testing" @@ -30,7 +31,7 @@ import ( func init() { testutils.InitTestDB() - templatePath := fmt.Sprintf("%s/mailer/templates/src", testutils.ServerPath) + templatePath := os.Getenv("DNOTE_TEST_EMAIL_TEMPLATE_DIR") InitTemplates(&templatePath) } diff --git a/pkg/server/testutils/config.go b/pkg/server/testutils/config.go deleted file mode 100644 index 71e7fb1e..00000000 --- a/pkg/server/testutils/config.go +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (C) 2019 Monomax Software Pty Ltd - * - * This file is part of Dnote. - * - * Dnote is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * Dnote is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with Dnote. If not, see . - */ - -package testutils - -import ( - "os" - "path/filepath" -) - -// ProjectPath is the path of the proprietary test suite relative to the "GOPATH" -var ProjectPath string - -// CLIPath is the path to the CLI project -var CLIPath string - -// ServerPath is the path to the Dnote server project -var ServerPath string - -func init() { - goPath := os.Getenv("GOPATH") - if goPath == "" { - panic("GOPATH is not set up") - } - - // Populate paths - ProjectPath = filepath.Join(goPath, "src/gitlab.com/monomax/dnote-infra") - CLIPath = filepath.Join(goPath, "src/github.com/dnote/dnote/pkg/cli") - ServerPath = filepath.Join(goPath, "src/github.com/dnote/dnote/pkg/server") -} diff --git a/pkg/cli/scripts/build.sh b/scripts/cli/build.sh similarity index 95% rename from pkg/cli/scripts/build.sh rename to scripts/cli/build.sh index 2d276d31..d198bff9 100755 --- a/pkg/cli/scripts/build.sh +++ b/scripts/cli/build.sh @@ -10,12 +10,13 @@ # use: # ./scripts/build.sh 0.4.8 # GOOS=linux GOARCH=amd64 ./scripts/build.sh 0.4.8 - set -ex +dir=$(dirname "${BASH_SOURCE[0]}") + version=$1 -projectDir="$GOPATH/src/github.com/dnote/dnote" -basedir="$GOPATH/src/github.com/dnote/dnote/pkg/cli" +projectDir="$dir/../.." +basedir="$projectDir/pkg/cli" outputDir="$projectDir/build/cli" command_exists () { diff --git a/pkg/cli/scripts/dev.sh b/scripts/cli/dev.sh similarity index 79% rename from pkg/cli/scripts/dev.sh rename to scripts/cli/dev.sh index 3fd8eff7..0fd21709 100755 --- a/pkg/cli/scripts/dev.sh +++ b/scripts/cli/dev.sh @@ -2,9 +2,10 @@ # dev.sh builds a new binary and replaces the old one in the PATH with it set -eux +dir=$(dirname "${BASH_SOURCE[0]}") sudo rm -rf "$(which dnote)" "$GOPATH/bin/cli" # change tags to darwin if on macos -go install -ldflags "-X main.apiEndpoint=http://127.0.0.1:5000" --tags "linux fts5" "$GOPATH/src/github.com/dnote/dnote/pkg/cli/." +go install -ldflags "-X main.apiEndpoint=http://127.0.0.1:5000" --tags "linux fts5" "$dir/../../pkg/cli" sudo ln -s "$GOPATH/bin/cli" /usr/local/bin/dnote diff --git a/pkg/cli/scripts/dump_schema.sh b/scripts/cli/dump_schema.sh similarity index 100% rename from pkg/cli/scripts/dump_schema.sh rename to scripts/cli/dump_schema.sh diff --git a/pkg/cli/scripts/test.sh b/scripts/cli/test.sh similarity index 56% rename from pkg/cli/scripts/test.sh rename to scripts/cli/test.sh index 042bfd48..e66db37a 100755 --- a/pkg/cli/scripts/test.sh +++ b/scripts/cli/test.sh @@ -1,19 +1,14 @@ #!/usr/bin/env bash -# run_server_test.sh runs server test files sequentially +# test.sh runs test files sequentially # https://stackoverflow.com/questions/23715302/go-how-to-run-tests-for-multiple-packages - set -eux -basePath="$GOPATH/src/github.com/dnote/dnote/pkg/cli" - +dir=$(dirname "${BASH_SOURCE[0]}") +pushd "$dir/../../pkg/cli" # clear tmp dir in case not properly torn down -rm -rf "$basePath/tmp" - -# run test -pushd "$basePath" +rm -rf "./tmp" go test -a ./... \ -p 1\ --tags "fts5" - popd diff --git a/scripts/license.sh b/scripts/license.sh index b4b74cd0..64be9622 100755 --- a/scripts/license.sh +++ b/scripts/license.sh @@ -55,9 +55,10 @@ agpl="/* Copyright (C) 2019 Monomax Software Pty Ltd * along with Dnote. If not, see . */" -pkgPath="$GOPATH/src/github.com/dnote/dnote/pkg" -serverPath="$GOPATH/src/github.com/dnote/dnote/pkg/server" -browserPath="$GOPATH/src/github.com/dnote/dnote/browser" +dir=$(dirname "${BASH_SOURCE[0]}") +pkgPath="$dir/pkg" +serverPath="$dir/pkg/server" +browserPath="$dir/browser" gplFiles=$(find "$pkgPath" "$browserPath" -type f \( -name "*.go" -o -name "*.js" -o -name "*.ts" -o -name "*.tsx" -o -name "*.scss" -o -name "*.css" \) ! -path "**/vendor/*" ! -path "**/node_modules/*" ! -path "$serverPath/*") @@ -66,8 +67,8 @@ for file in $gplFiles; do add_notice "$file" "$gpl" done -webPath="$GOPATH"/src/github.com/dnote/dnote/web -jslibPath="$GOPATH/src/github.com/dnote/dnote/jslib/src" +webPath="$dir/web" +jslibPath="$dir/jslib/src" agplFiles=$(find "$serverPath" "$webPath" "$jslibPath" -type f \( -name "*.go" -o -name "*.js" -o -name "*.ts" -o -name "*.tsx" -o -name "*.scss" -o -name "*.css" \) ! -path "**/vendor/*" ! -path "**/node_modules/*" ! -path "**/dist/*") for file in $agplFiles; do diff --git a/pkg/server/scripts/build.sh b/scripts/server/build.sh similarity index 85% rename from pkg/server/scripts/build.sh rename to scripts/server/build.sh index 8843a8d2..6eec732e 100755 --- a/pkg/server/scripts/build.sh +++ b/scripts/server/build.sh @@ -1,10 +1,11 @@ #!/usr/bin/env bash set -eux +dir=$(dirname "${BASH_SOURCE[0]}") + version=$1 -basePath="$GOPATH/src/github.com/dnote/dnote" -projectDir="$GOPATH/src/github.com/dnote/dnote" -basedir="$GOPATH/src/github.com/dnote/dnote/pkg/server" +projectDir="$dir/../.." +basedir="$projectDir/pkg/server" outputDir="$projectDir/build/server" command_exists () { @@ -38,7 +39,7 @@ build() { GOARCH="$arch" go build \ -o "$destDir/dnote-server" \ -ldflags "-X main.versionTag=$version" \ - "$basePath"/pkg/server/*.go + "$projectDir"/pkg/server/*.go packr2 clean diff --git a/pkg/server/scripts/makeDemoDigests/main.go b/scripts/server/makeDemoDigests/main.go similarity index 100% rename from pkg/server/scripts/makeDemoDigests/main.go rename to scripts/server/makeDemoDigests/main.go diff --git a/pkg/server/scripts/test-local.sh b/scripts/server/test-local.sh similarity index 52% rename from pkg/server/scripts/test-local.sh rename to scripts/server/test-local.sh index 2725a30e..9f99e08a 100755 --- a/pkg/server/scripts/test-local.sh +++ b/scripts/server/test-local.sh @@ -3,10 +3,10 @@ # test-local.sh runs api tests using local setting set -eux -basePath=$GOPATH/src/github.com/dnote/dnote/pkg/server +dir=$(dirname "${BASH_SOURCE[0]}") set -a -source "$basePath/.env.test" +source "$dir/../../pkg/server/.env.test" set +a -"$basePath/scripts/test.sh" +"$dir/test.sh" diff --git a/pkg/server/scripts/test.sh b/scripts/server/test.sh similarity index 68% rename from pkg/server/scripts/test.sh rename to scripts/server/test.sh index 5d81e34f..8422a517 100755 --- a/pkg/server/scripts/test.sh +++ b/scripts/server/test.sh @@ -3,7 +3,10 @@ # appropriate env vars. set -eux -pushd "$GOPATH"/src/github.com/dnote/dnote/pkg/server +dir=$(dirname "${BASH_SOURCE[0]}") +pushd "$dir/../../pkg/server" + +export DNOTE_TEST_EMAIL_TEMPLATE_DIR="$dir/../../pkg/server/mailer/templates/src" if [ "${WATCH-false}" == true ]; then set +e diff --git a/web/scripts/build-prod.sh b/scripts/web/build-prod.sh similarity index 82% rename from web/scripts/build-prod.sh rename to scripts/web/build-prod.sh index 1ce40be7..5372700a 100755 --- a/web/scripts/build-prod.sh +++ b/scripts/web/build-prod.sh @@ -2,7 +2,9 @@ # build.sh builds a production bundle set -eux -basePath="$GOPATH/src/github.com/dnote/dnote" +dir=$(dirname "${BASH_SOURCE[0]}") + +basePath="$dir/../.." publicPath="$basePath/web/public" compiledPath="$basePath/web/compiled" @@ -16,4 +18,4 @@ ROOT_URL="$rootUrl" \ PUBLIC_PATH="$publicPath" \ COMPILED_PATH="$compiledPath" \ VERSION="$VERSION" \ - "$basePath"/web/scripts/build.sh + "$dir/build.sh" diff --git a/web/scripts/build.sh b/scripts/web/build.sh similarity index 86% rename from web/scripts/build.sh rename to scripts/web/build.sh index 1b88ef3f..85b35cc5 100755 --- a/web/scripts/build.sh +++ b/scripts/web/build.sh @@ -2,7 +2,8 @@ # build.sh builds a bundle set -ex -basePath="$GOPATH/src/github.com/dnote/dnote" +dir=$(dirname "${BASH_SOURCE[0]}") +basePath="$dir/../.." isTest=${IS_TEST:-false} set -u @@ -13,7 +14,7 @@ pushd "$basePath/web" PUBLIC_PATH="$PUBLIC_PATH" \ COMPILED_PATH="$COMPILED_PATH" \ ASSET_BASE_URL="$ASSET_BASE_URL" \ - "$basePath"/web/scripts/setup.sh + "$dir/setup.sh" OUTPUT_PATH="$COMPILED_PATH" \ ROOT_URL="$ROOT_URL" \ @@ -29,7 +30,7 @@ pushd "$basePath/web" ASSET_BASE_URL=$ASSET_BASE_URL \ PUBLIC_PATH=$PUBLIC_PATH \ COMPILED_PATH=$COMPILED_PATH \ - node "$basePath"/web/scripts/placeholder.js + node "$dir/placeholder.js" cp "$COMPILED_PATH"/*.js "$COMPILED_PATH"/*.css "$PUBLIC_PATH"/static diff --git a/web/scripts/dev.sh b/scripts/web/dev.sh similarity index 88% rename from web/scripts/dev.sh rename to scripts/web/dev.sh index 4f6d4324..efaddabb 100755 --- a/web/scripts/dev.sh +++ b/scripts/web/dev.sh @@ -9,7 +9,8 @@ function cleanup { } trap cleanup EXIT -basePath="$GOPATH/src/github.com/dnote/dnote" +dir=$(dirname "${BASH_SOURCE[0]}") +basePath="$dir/../.." appPath="$basePath/web" serverPath="$basePath/pkg/server" serverPort=3000 @@ -22,8 +23,6 @@ set +a # run webpack-dev-server for js in the background ( - cd "$appPath" && - BUNDLE_BASE_URL=http://localhost:8080 \ ASSET_BASE_URL=http://localhost:3000/static \ ROOT_URL=http://localhost:$serverPort \ @@ -33,7 +32,7 @@ set +a IS_TEST=true \ VERSION="$VERSION" \ WEBPACK_HOST="0.0.0.0" \ - "$appPath"/scripts/webpack-dev.sh + "$dir/webpack-dev.sh" ) & devServerPID=$! diff --git a/web/scripts/placeholder.js b/scripts/web/placeholder.js similarity index 100% rename from web/scripts/placeholder.js rename to scripts/web/placeholder.js diff --git a/web/scripts/setup.sh b/scripts/web/setup.sh similarity index 90% rename from web/scripts/setup.sh rename to scripts/web/setup.sh index e04fa38f..54649dbf 100755 --- a/web/scripts/setup.sh +++ b/scripts/web/setup.sh @@ -2,7 +2,8 @@ # setup.sh prepares the directory structure and copies static files set -eux -o pipefail -basePath="$GOPATH/src/github.com/dnote/dnote" +dir=$(dirname "${BASH_SOURCE[0]}") +basePath="$dir/../.." publicPath=$PUBLIC_PATH compiledPath=$COMPILED_PATH assetBaseUrl=$ASSET_BASE_URL diff --git a/web/scripts/webpack-dev.sh b/scripts/web/webpack-dev.sh similarity index 76% rename from web/scripts/webpack-dev.sh rename to scripts/web/webpack-dev.sh index c63edf05..37ceb231 100755 --- a/web/scripts/webpack-dev.sh +++ b/scripts/web/webpack-dev.sh @@ -1,22 +1,23 @@ #!/usr/bin/env bash set -eux -basePath="$GOPATH/src/github.com/dnote/dnote" -appPath="$basePath"/web +dir=$(dirname "${BASH_SOURCE[0]}") +basePath="$dir/../.." +appPath="$basePath/web" ( cd "$appPath" && PUBLIC_PATH=$PUBLIC_PATH \ COMPILED_PATH=$COMPILED_PATH \ ASSET_BASE_URL=$ASSET_BASE_URL \ - "$appPath"/scripts/setup.sh && + "$dir/setup.sh" && BUNDLE_BASE_URL=$BUNDLE_BASE_URL ASSET_BASE_URL=$ASSET_BASE_URL \ COMPILED_PATH=$COMPILED_PATH \ PUBLIC_PATH=$PUBLIC_PATH \ IS_TEST=true \ - node "$appPath"/scripts/placeholder.js && + node "$dir/placeholder.js" && ROOT_URL=$ROOT_URL \ VERSION="$VERSION" \ diff --git a/web/package-lock.json b/web/package-lock.json index 53ae4911..08cc4c28 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -7612,14 +7612,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7634,20 +7632,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -7764,8 +7759,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -7777,7 +7771,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -7792,7 +7785,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -7800,14 +7792,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -7826,7 +7816,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -7907,8 +7896,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -7920,7 +7908,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -8042,7 +8029,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",