From 4e73d39f3522809b22f6ef85998f82e3a888f0a8 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 28 Nov 2017 11:43:11 -0600 Subject: [PATCH] updates --- .gitignore | 2 ++ Gopkg.lock | 26 +------------------------- cmd/herald-worker/main.go | 28 ++++++++++++++-------------- lib/herald.go => herald.go | 24 +++++++++++++----------- 4 files changed, 30 insertions(+), 50 deletions(-) rename lib/herald.go => herald.go (68%) diff --git a/.gitignore b/.gitignore index 7b67ebd..ebc0977 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /vendor/ /.envrc + +/.DS_Store diff --git a/Gopkg.lock b/Gopkg.lock index e5f028f..d5f4654 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -13,24 +13,12 @@ packages = ["netrc"] revision = "9fd32a8b3d3d3f9d43c341bfe098430e07609480" -[[projects]] - name = "github.com/garyburd/redigo" - packages = ["internal","redis"] - revision = "47dc60e71eed504e3ef8e77ee3c6fe720f3be57f" - version = "v1.3.0" - [[projects]] name = "github.com/go-ini/ini" packages = ["."] revision = "32e4c1e6bc4e7d0d8451aa6b75200d19e37a536a" version = "v1.32.0" -[[projects]] - branch = "master" - name = "github.com/gocelery/gocelery" - packages = ["."] - revision = "972c809603510c059c57b81cada024c57171c67e" - [[projects]] branch = "master" name = "github.com/hashicorp/go-cleanhttp" @@ -78,18 +66,6 @@ revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" -[[projects]] - name = "github.com/satori/go.uuid" - packages = ["."] - revision = "879c5887cd475cd7864858769793b2ceb0d44feb" - version = "v1.1.0" - -[[projects]] - branch = "master" - name = "github.com/streadway/amqp" - packages = ["."] - revision = "ff791c2d22d3f1588b4e2cc71a9fba5e1da90654" - [[projects]] name = "github.com/ulikunitz/xz" packages = [".","internal/hash","internal/xlog","lzma"] @@ -99,6 +75,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "b46b195c8834e4eaf1c07958f9b06af7453db264d083a100a6e2b2a91725a7d6" + inputs-digest = "7198e74aa670d4bad5d88c1cb81fe96a2f2ee464137ab514c6e99abc4d49e5c6" solver-name = "gps-cdcl" solver-version = 1 diff --git a/cmd/herald-worker/main.go b/cmd/herald-worker/main.go index 95e1449..6eb1775 100644 --- a/cmd/herald-worker/main.go +++ b/cmd/herald-worker/main.go @@ -1,24 +1,24 @@ package main -import "os" -import "fmt" -import "time" -import "github.com/gocelery/gocelery" -import "github.com/heroku/herald/lib" +import "github.com/heroku/herald" // todo: name that herlad +import "time" +import "log" func main() { - for { - - // Do the buldpack thing. - lib. - - // Sleep for five minutes. - time.sleep(5*time.Minute) - - } + for { + + // Do the buldpack thing. + herald.DownloadBuildpacks() + + log.Print("Sleeping for 5 minutes…") + + // Sleep for five minutes. + time.Sleep(5*time.Minute) + + } } \ No newline at end of file diff --git a/lib/herald.go b/herald.go similarity index 68% rename from lib/herald.go rename to herald.go index fb82d70..5f57a1b 100644 --- a/lib/herald.go +++ b/herald.go @@ -1,8 +1,8 @@ -package lib +package herald -import "os" +// import "os" import "fmt" -import "time" +// import "time" import "github.com/hashicorp/go-getter" import "io/ioutil" import "log" @@ -26,19 +26,21 @@ func DownloadBuildpacks() { // create temp directory // use 'fake' for now - target, err := ioutil.TempDir("", "buildpacks") + target, err := ioutil.TempDir("", "buildpacks") if err != nil { log.Fatal(err) } - + // Download and unpack each Zipball from GitHub. - for _, tb := range(getBuildpackZipballs()) { - getter.Get(target, tb) - } + for _, tb := range(getBuildpackZipballs()) { + log.Printf("Downloading '%s' to '%s'…", tb, target) + getter.Get(target, tb) + } } -func ExecutesBuildpacks() { - glob('*/updater/detect' +// func ExecutesBuildpacks() { + +// glob('*/updater/detect' -} \ No newline at end of file +// } \ No newline at end of file