genesis

Author: Southclaws

.env

@@ -0,0 +1 @@
+DEBUG=true

.gitignore

@@ -0,0 +1,21 @@
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+
+# Test binary, build with `go test -c`
+*.test
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Mac crap
+.DS_Store
+
+# Local repos for tests
+*.local
+
+# The binary
+wadsworth

README.md

@@ -0,0 +1,7 @@
+# Wadsworth
+
+_The Mister Handy robot of automation!_
+
+![https://d1u5p3l4wpay3k.cloudfront.net/fallout_gamepedia/8/8c/Mister_Handy.png?version=e4b210e0cf711aefe37d6c3fccb8bc8e](https://d1u5p3l4wpay3k.cloudfront.net/fallout_gamepedia/8/8c/Mister_Handy.png?version=e4b210e0cf711aefe37d6c3fccb8bc8e)
+
+(Work in progress, come back later...)

go.mod

@@ -0,0 +1,10 @@
+module github.com/Southclaws/wadsworth
+
+require (
+	github.com/Southclaws/gitwatch v1.0.1
+	github.com/pkg/errors v0.8.0
+	github.com/urfave/cli v1.20.0
+	go.uber.org/atomic v1.3.2 // indirect
+	go.uber.org/multierr v1.1.0 // indirect
+	go.uber.org/zap v1.9.1
+)

go.sum

@@ -0,0 +1,69 @@
+github.com/Southclaws/gitwatch v1.0.1 h1:BbSvA6+ex4TF0U2ISj8F3Sa8JnaFK7uMsSt+Kt7ZB5Y=
+github.com/Southclaws/gitwatch v1.0.1/go.mod h1:sJD5HhPZpjHla0hMzeJQg+oY7wCqSHso9vefmPdnW/o=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
+github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
+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/emirpasic/gods v1.9.0 h1:rUF4PuzEjMChMiNsVjdI+SyLu7rEqpQ5reNFnhC7oFo=
+github.com/emirpasic/gods v1.9.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/gliderlabs/ssh v0.1.1 h1:j3L6gSLQalDETeEg/Jg0mGY0/y/N6zI2xX1978P0Uqw=
+github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/google/go-cmp v0.2.0 h1:+dTQ8DZQJz0Mb/HjFlkptS1FeQ4cWSnN941F8aEG4SQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A=
+github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo=
+github.com/kevinburke/ssh_config v0.0.0-20180711164746-82cf3f926438 h1:O2UbfXNOrED3WZ12PoAr2hYOb8hOXYyIHImqrEjkFGQ=
+github.com/kevinburke/ssh_config v0.0.0-20180711164746-82cf3f926438/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
+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/mitchellh/go-homedir v1.0.0 h1:vKb8ShqSby24Yrqr/yDYkuFz8d0WUjys40rvnGC8aR0=
+github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/pelletier/go-buffruneio v0.2.0 h1:U4t4R6YkofJ5xHm3dJzuRpPZ0mr5MMCoAWooScCR7aA=
+github.com/pelletier/go-buffruneio v0.2.0/go.mod h1:JkE26KsDizTr40EUHkXVtNPvgGtbSNq5BcowyYOWdKo=
+github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw=
+github.com/pkg/errors v0.8.0/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/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/src-d/gcfg v1.3.0 h1:2BEDr8r0I0b8h/fOqwtxCEiq2HJu8n2JGZJQFGXWLjg=
+github.com/src-d/gcfg v1.3.0/go.mod h1:p/UMsR43ujA89BJY9duynAwIpvqEujIH/jFlfL7jWoI=
+github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+github.com/xanzy/ssh-agent v0.2.0 h1:Adglfbi5p9Z0BmK2oKU9nTG+zKfniSfnaMYB+ULd+Ro=
+github.com/xanzy/ssh-agent v0.2.0/go.mod h1:0NyE30eGUDliuLEHJgYte/zncp2zdTStcOnWhgSqHD8=
+go.uber.org/atomic v1.3.2 h1:2Oa65PReHzfn29GpvgsYwloV9AVFHPDk8tYxt2c2tr4=
+go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
+go.uber.org/multierr v1.1.0 h1:HoEmRHQPVSqub6w2z2d2EOVs2fjyFRGyofhKuyDq0QI=
+go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
+go.uber.org/zap v1.9.1 h1:XCJQEf3W6eZaVwhRBof6ImoYGJSITeKWsyeh3HFu/5o=
+go.uber.org/zap v1.9.1/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
+golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac h1:7d7lG9fHOLdL6jZPtnV4LpI41SbohIJ1Atq7U991dMg=
+golang.org/x/crypto v0.0.0-20180820150726-614d502a4dac/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20180828065106-d99a578cf41b h1:cmOZLU2i7CLArKNViO+ZCQ47wqYFyKEIpbGWp+b6Uoc=
+golang.org/x/sys v0.0.0-20180828065106-d99a578cf41b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+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/src-d/go-billy.v4 v4.2.0 h1:VGbrP1EsYxtvVPEiHui+4//imr4E5MGEFLx66bQtusg=
+gopkg.in/src-d/go-billy.v4 v4.2.0/go.mod h1:ZHSF0JP+7oD97194otDUCD7Ofbk63+xFcfWP5bT6h+Q=
+gopkg.in/src-d/go-git-fixtures.v3 v3.1.0 h1:xjgkEQtv542nRaDzOALYfbFzcRwdt07Q/s2b82fq7AA=
+gopkg.in/src-d/go-git-fixtures.v3 v3.1.0/go.mod h1:dLBcvytrw/TYZsNTWCnkNF2DSIlzWYqTe3rJR56Ac7g=
+gopkg.in/src-d/go-git.v4 v4.6.0 h1:3XrA9Qxiwfj7Iusd7dVYUqxMjJYPsLuBdUeQbwnL/NQ=
+gopkg.in/src-d/go-git.v4 v4.6.0/go.mod h1:CzbUWqMn4pvmvndg3gnh5iZFmSsbhyhUWdI0IQ60AQo=
+gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
+gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=

main.go

@@ -0,0 +1,107 @@
+package main
+
+import (
+	"context"
+	"os"
+	"os/signal"
+	"strconv"
+	"time"
+
+	"github.com/pkg/errors"
+	"github.com/urfave/cli"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+
+	"github.com/Southclaws/wadsworth/service"
+)
+
+var (
+	version = "master"
+)
+
+func init() {
+	// constructs a logger and replaces the default global logger
+	var config zap.Config
+	if d, e := strconv.ParseBool(os.Getenv("DEVELOPMENT")); d && e == nil {
+		config = zap.NewDevelopmentConfig()
+	} else {
+		config = zap.NewProductionConfig()
+	}
+	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	config.DisableStacktrace = true
+	if d, e := strconv.ParseBool(os.Getenv("DEBUG")); d && e == nil {
+		config.Level = zap.NewAtomicLevelAt(zap.DebugLevel)
+	}
+	logger, err := config.Build()
+	if err != nil {
+		panic(err)
+	}
+	zap.ReplaceGlobals(logger)
+}
+
+func main() {
+	app := cli.NewApp()
+
+	app.Name = "wadsworth"
+	app.Usage = "A git-driven task automation butler."
+	app.UsageText = `TODO: Short usage info`
+	app.Version = version
+	app.Description = `TODO: Longform description`
+	app.Author = "Southclaws"
+	app.Email = "hello@southcla.ws"
+
+	app.Commands = []cli.Command{
+		{
+			Name:    "run",
+			Aliases: []string{"r"},
+			Description: `Starts the Wadsworth daemon with the specified target repository. This
+repository should contain one or more configuration files for Wadsworth. When
+this repository has new commits, Wadsworth will automatically reconfigure.`,
+			Usage:     "argument `target` specifies Git repository for configuration.",
+			ArgsUsage: "target",
+			Flags: []cli.Flag{
+				cli.StringFlag{Name: "directory", EnvVar: "DIRECTORY", Value: "./cache/"},
+				cli.DurationFlag{Name: "check-interval", EnvVar: "CHECK_INTERVAL", Value: time.Second * 5},
+			},
+			Action: func(c *cli.Context) (err error) {
+				if !c.Args().Present() {
+					cli.ShowCommandHelp(c, "run")
+					return errors.New("missing argument: target")
+				}
+
+				ctx, cancel := context.WithCancel(context.Background())
+				defer cancel()
+
+				svc, err := service.Initialise(ctx, service.Config{
+					Target:        c.Args().First(),
+					Directory:     c.String("directory"),
+					CheckInterval: c.Duration("check-interval"),
+				})
+				if err != nil {
+					return errors.Wrap(err, "failed to initialise")
+				}
+
+				zap.L().Info("service initialised")
+
+				errs := make(chan error, 1)
+				go func() { errs <- svc.Start() }()
+
+				s := make(chan os.Signal, 1)
+				signal.Notify(s, os.Interrupt)
+
+				select {
+				case sig := <-s:
+					err = errors.New(sig.String())
+				case err = <-errs:
+				}
+
+				return
+			},
+		},
+	}
+
+	err := app.Run(os.Args)
+	if err != nil {
+		zap.L().Fatal("exit", zap.Error(err))
+	}
+}

makefile

@@ -0,0 +1,41 @@
+VERSION := $(shell git describe --tags --dirty --always)
+SERVICE := $(shell basename $(shell pwd))
+OWNER := southclaws
+LDFLAGS := -ldflags "-X main.version=$(VERSION)"
+-include .env
+
+# -
+# Local Development
+#-
+
+static:
+	go get
+	CGO_ENABLED=0 GOOS=linux go build -a $(LDFLAGS) -o $(SERVICE) .
+
+fast:
+	go build $(LDFLAGS) -o $(SERVICE)
+
+local: fast
+	./$(SERVICE)
+
+test:
+	go test -v -race ./storage
+	go test -v -race ./bot/commands
+
+version:
+	git tag $(VERSION)
+	git push
+	git push origin $(VERSION)
+
+
+# -
+# Docker
+# -
+
+build:
+	docker build --no-cache -t $(OWNER)/$(SERVICE):$(VERSION) .
+
+push:
+	docker push $(OWNER)/$(SERVICE):$(VERSION)
+	docker tag $(OWNER)/$(SERVICE):$(VERSION) $(OWNER)/$(SERVICE):latest
+	docker push $(OWNER)/$(SERVICE):latest

service/reconfigure.go

@@ -0,0 +1,44 @@
+package service
+
+import (
+	"github.com/Southclaws/gitwatch"
+	"github.com/pkg/errors"
+	"go.uber.org/zap"
+)
+
+// reconfigure will close the configuration watcher and target watcher (unless
+// it's the first run) then create a watcher for the application's config target
+// repo (the repo that contains the configuration file(s)) then wait for the
+// first event (either from a fresh clone, a pull, or just a noop event) then
+// read the configuration file(s) from the repository, gather all the targets
+// and set up the target watcher. This should always happen in sync with the
+// rest of the service to prevent a reconfiguration during an event handler.
+func (app *App) reconfigure() (err error) {
+	zap.L().Debug("reconfiguring")
+	if app.configWatcher != nil {
+		zap.L().Debug("closing existing watcher")
+		app.configWatcher.Close()
+	}
+
+	app.configWatcher, err = gitwatch.New(
+		app.ctx,
+		[]string{app.config.Target},
+		app.config.CheckInterval,
+		app.config.Directory,
+		nil,
+		true)
+	if err != nil {
+		return errors.Wrap(err, "failed to watch config target")
+	}
+	go app.configWatcher.Run() //nolint:errcheck - no worthwhile errors returned
+	zap.L().Debug("created new watcher, awaiting initial event")
+
+	<-app.configWatcher.InitialDone
+	zap.L().Debug("initial event received")
+
+	// read config from repo
+	// recreate targets gitwatch
+	// diff?
+
+	return
+}

service/service.go

@@ -0,0 +1,61 @@
+package service
+
+import (
+	"context"
+	"time"
+
+	"github.com/Southclaws/gitwatch"
+	"go.uber.org/zap"
+)
+
+// App stores application state
+type App struct {
+	config         Config
+	configWatcher  *gitwatch.Session
+	targets        []string
+	targetsWatcher *gitwatch.Session
+	ctx            context.Context
+	cancel         context.CancelFunc
+}
+
+type Config struct {
+	Target        string
+	Directory     string
+	CheckInterval time.Duration
+}
+
+// Initialise prepares an instance of the app to run
+func Initialise(ctx context.Context, config Config) (app *App, err error) {
+	app = new(App)
+
+	app.ctx, app.cancel = context.WithCancel(ctx)
+	app.config = config
+
+	err = app.reconfigure()
+	if err != nil {
+		return
+	}
+
+	return
+}
+
+// Start launches the app and blocks until fatal error
+func (app *App) Start() (final error) {
+	f := func() (err error) {
+		select {
+		case <-app.configWatcher.Events:
+			err = app.reconfigure()
+		}
+		return
+	}
+
+	zap.L().Debug("starting service daemon")
+
+	for {
+		final = f()
+		if final != nil {
+			break
+		}
+	}
+	return
+}