updating stuff

Gopkg.lock

@@ -2,43 +2,66 @@
 
 
 [[projects]]
-  branch = "master"
+  digest = "1:4e2e261101d5df31a97e5622520b0448ce77ed7998714004b409fc53215c650c"
-  name = "github.com/cgilling/dbstats"
+  name = "github.com/99designs/gqlgen"
-  packages = ["."]
+  packages = ["graphql"]
-  revision = "c9db8cf218e67da0c12f60591e9ac438d1573a85"
+  pruneopts = "UT"
+  revision = "a7bc468ca1b184a5ce1b07ea331e0121fc56ae82"
+  version = "v0.9.3"
 
 [[projects]]
+  digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761"
+  name = "github.com/BurntSushi/toml"
+  packages = ["."]
+  pruneopts = "UT"
+  revision = "3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005"
+  version = "v0.3.1"
+
+[[projects]]
+  digest = "1:abaaa7489a2f0f3afb2adc8ea1a282a5bd52350b87b26da220c94fc778d6d63b"
   name = "github.com/docopt/docopt.go"
   packages = ["."]
+  pruneopts = "UT"
   revision = "784ddc588536785e7299f7272f39101f7faccc3f"
   version = "0.6.2"
 
 [[projects]]
+  digest = "1:f4f6279cb37479954644babd8f8ef00584ff9fa63555d2c6718c1c3517170202"
   name = "github.com/elazarl/go-bindata-assetfs"
   packages = ["."]
+  pruneopts = "UT"
   revision = "30f82fa23fd844bd5bb1e5f216db87fd77b5eb43"
   version = "v1.0.0"
 
 [[projects]]
+  digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd"
   name = "github.com/fsnotify/fsnotify"
   packages = ["."]
+  pruneopts = "UT"
   revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9"
   version = "v1.4.7"
 
 [[projects]]
-  name = "github.com/gorilla/context"
+  branch = "master"
-  packages = ["."]
+  digest = "1:8f251d09f52a8920bdba202b0c18a24cafb4f70f94b9afd8d02bf7643cfc99a0"
-  revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"
+  name = "github.com/golang/gddo"
-  version = "v1.1.1"
+  packages = [
+    "httputil",
+    "httputil/header",
+  ]
+  pruneopts = "UT"
+  revision = "72a348e765d293ed6d1ded7b699591f14d6cd921"
 
 [[projects]]
+  digest = "1:cbec35fe4d5a4fba369a656a8cd65e244ea2c743007d8f6c1ccb132acf9d1296"
   name = "github.com/gorilla/mux"
   packages = ["."]
-  revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"
+  pruneopts = "UT"
-  version = "v1.6.2"
+  revision = "00bdffe0f3c77e27d2cf6f5c70232a2d3e4d9c15"
+  version = "v1.7.3"
 
 [[projects]]
-  branch = "master"
+  digest = "1:c0d19ab64b32ce9fe5cf4ddceba78d5bc9807f0016db6b1183599da3dcc24d10"
   name = "github.com/hashicorp/hcl"
   packages = [
     ".",
@@ -50,68 +73,112 @@
     "hcl/token",
     "json/parser",
     "json/scanner",
-    "json/token"
+    "json/token",
   ]
-  revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168"
+  pruneopts = "UT"
+  revision = "8cb6e5b959231cc1119e43259c4a608f9c51a241"
+  version = "v1.0.0"
 
 [[projects]]
+  digest = "1:5a0ef768465592efca0412f7e838cdc0826712f8447e70e6ccc52eb441e9ab13"
   name = "github.com/magiconair/properties"
   packages = ["."]
-  revision = "c2353362d570a7bfa228149c62842019201cfb71"
+  pruneopts = "UT"
-  version = "v1.8.0"
+  revision = "de8848e004dd33dc07a2947b3d76f618a7fc7ef1"
+  version = "v1.8.1"
 
 [[projects]]
-  branch = "master"
+  digest = "1:53bc4cd4914cd7cd52139990d5170d6dc99067ae31c56530621b18b35fc30318"
   name = "github.com/mitchellh/mapstructure"
   packages = ["."]
-  revision = "bb74f1db0675b241733089d5a1faa5dd8b0ef57b"
+  pruneopts = "UT"
+  revision = "3536a929edddb9a5b34bd6861dc4a9647cb459fe"
+  version = "v1.1.2"
 
 [[projects]]
+  digest = "1:93131d8002d7025da13582877c32d1fc302486775a1b06f62241741006428c5e"
   name = "github.com/pelletier/go-toml"
   packages = ["."]
-  revision = "c01d1270ff3e442a8a57cddc1c92dc1138598194"
+  pruneopts = "UT"
-  version = "v1.2.0"
+  revision = "728039f679cbcd4f6a54e080d2219a4c4928c546"
+  version = "v1.4.0"
 
 [[projects]]
+  digest = "1:bb495ec276ab82d3dd08504bbc0594a65de8c3b22c6f2aaa92d05b73fbf3a82e"
   name = "github.com/spf13/afero"
   packages = [
     ".",
-    "mem"
+    "mem",
   ]
-  revision = "787d034dfe70e44075ccc060d346146ef53270ad"
+  pruneopts = "UT"
-  version = "v1.1.1"
+  revision = "588a75ec4f32903aa5e39a2619ba6a4631e28424"
+  version = "v1.2.2"
 
 [[projects]]
+  digest = "1:08d65904057412fc0270fc4812a1c90c594186819243160dc779a402d4b6d0bc"
   name = "github.com/spf13/cast"
   packages = ["."]
-  revision = "8965335b8c7107321228e3e3702cab9832751bac"
+  pruneopts = "UT"
-  version = "v1.2.0"
+  revision = "8c9545af88b134710ab1cd196795e7f2388358d7"
+  version = "v1.3.0"
 
 [[projects]]
-  branch = "master"
+  digest = "1:1b753ec16506f5864d26a28b43703c58831255059644351bbcb019b843950900"
   name = "github.com/spf13/jwalterweatherman"
   packages = ["."]
-  revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394"
+  pruneopts = "UT"
+  revision = "94f6ae3ed3bceceafa716478c5fbf8d29ca601a1"
+  version = "v1.1.0"
 
 [[projects]]
+  digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2"
   name = "github.com/spf13/pflag"
   packages = ["."]
-  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
+  pruneopts = "UT"
-  version = "v1.0.1"
+  revision = "298182f68c66c05229eb03ac171abe6e309ee79a"
+  version = "v1.0.3"
 
 [[projects]]
+  digest = "1:11118bd196646c6515fea3d6c43f66162833c6ae4939bfb229b9956d91c6cf17"
   name = "github.com/spf13/viper"
   packages = ["."]
-  revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736"
+  pruneopts = "UT"
-  version = "v1.0.2"
+  revision = "b5bf975e5823809fb22c7644d008757f78a4259e"
+  version = "v1.4.0"
+
+[[projects]]
+  digest = "1:a60032f9606b13e643204c6abe115a5cd7ff60883761eb3ab727c02acb6df57d"
+  name = "github.com/vektah/gqlparser"
+  packages = [
+    "ast",
+    "gqlerror",
+  ]
+  pruneopts = "UT"
+  revision = "05741cdb0871330d8bc980d4afd21ab34eceee83"
+  version = "v1.1.2"
+
+[[projects]]
+  digest = "1:354f484e2e0407e47113cabaea24401f1f96d43e6590ff830d5589a7fef7c736"
+  name = "github.com/yosssi/gmq"
+  packages = [
+    "mqtt",
+    "mqtt/client",
+    "mqtt/packet",
+  ]
+  pruneopts = "UT"
+  revision = "31fa037b1019e383aa033aee1e4d04e106c88ed2"
+  version = "v0.0.1"
 
 [[projects]]
   branch = "master"
+  digest = "1:767025ef5997eeba9a3b7fba288b8b9e71b44f0e3a2ec6dcd01f144d3dc8f173"
   name = "golang.org/x/sys"
   packages = ["unix"]
-  revision = "a200a19cb90b19de298170992778b1fda7217bd6"
+  pruneopts = "UT"
+  revision = "749cb33beabd9aa6d3178e3de05bcc914f70b2bf"
 
 [[projects]]
+  digest = "1:1093f2eb4b344996604f7d8b29a16c5b22ab9e1b25652140d3fede39f640d5cd"
   name = "golang.org/x/text"
   packages = [
     "internal/gen",
@@ -119,32 +186,55 @@
     "internal/ucd",
     "transform",
     "unicode/cldr",
-    "unicode/norm"
+    "unicode/norm",
   ]
-  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
+  pruneopts = "UT"
-  version = "v0.3.0"
+  revision = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"
+  version = "v0.3.2"
 
 [[projects]]
+  digest = "1:4d2e5a73dc1500038e504a8d78b986630e3626dc027bc030ba5c75da257cdb96"
   name = "gopkg.in/yaml.v2"
   packages = ["."]
-  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  pruneopts = "UT"
-  version = "v2.2.1"
+  revision = "51d6538a90f86fe93ac480b35f37b2be17fef232"
+  version = "v2.2.2"
 
 [[projects]]
   branch = "master"
+  digest = "1:aa490da067668459fcf2eddc3204471682ad59e12e983500c0ab472515457d56"
   name = "sour.is/x/toolbox"
   packages = [
+    "dbm/rsql",
+    "gql",
     "httpsrv",
     "ident",
     "log",
+    "log/event",
+    "log/loggers",
+    "log/scheme",
+    "log/tag",
+    "mercury",
+    "mqtt",
     "stats",
-    "uuid"
+    "stats/exposition",
+    "uuid",
   ]
-  revision = "9487992f8fbf29e66bef06b4fa787389832193a4"
+  pruneopts = "UT"
+  revision = "1f19846d4ad4b4817f8373a5947ec5cbd2b53c0c"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "992f6e13bd909fa436a615718637dac016f185163cb35a6611b9c842c23ba756"
+  input-imports = [
+    "github.com/docopt/docopt.go",
+    "github.com/elazarl/go-bindata-assetfs",
+    "github.com/gorilla/mux",
+    "github.com/spf13/viper",
+    "golang.org/x/sys/unix",
+    "sour.is/x/toolbox/httpsrv",
+    "sour.is/x/toolbox/log",
+    "sour.is/x/toolbox/stats",
+  ]
   solver-name = "gps-cdcl"
   solver-version = 1

Makefile

@@ -61,3 +61,4 @@ deploy: $(SOURCE) $(ROUTE_ASSET)
 	cd debian && make
 
 .PHONEY: all clean deploy run setup
+# DO NOT DELETE

Makefile.bak

@@ -0,0 +1,63 @@
+ROUTE_ASSET=src/routes/bindata.go
+ROUTE_FILES=$(wildcard assets/src/*) $(wildcard assets/public/*)
+
+DOCS_ASSET=src/docs/bindata.go
+DOCS_FILES=$(wildcard src/docs/ui/*)
+
+VENDOR_FILES=$(shell find vendor -type f -name '*.go')
+
+SOURCE=$(wildcard cmd/paste/*.go) $(filter-out src/routes/bindata.go, $(wildcard src/routes/*.go))
+BINARY=paste
+
+define DUMMY_BINDATA
+package docs
+import "net/http"
+func assetFS() (fs http.FileSystem) { return }
+endef
+export DUMMY_BINDATA
+
+all: $(BINARY)
+
+clean:
+	rm -rf $(BINARY) $(ROUTE_ASSET) $(DOCS_ASSET)
+
+setup:
+	dep ensure
+	go get github.com/jteeuwen/go-bindata/...
+	go get github.com/elazarl/go-bindata-assetfs/...
+	git submodule update
+	cd assets; npm i
+
+ensure:
+	dep ensure -update
+	dep status
+
+fmt:
+	go fmt ./...
+
+run:   $(BINARY)
+	./$(BINARY) -vv serve
+
+$(BINARY): $(SOURCE) $(ROUTE_ASSET) $(VENDOR_FILES) $(DOCS_ASSET)
+	go vet ./...
+	go test ./...
+	go build "sour.is/x/paste/cmd/paste"
+
+$(ROUTE_ASSET): $(ROUTE_FILES)
+	cd assets; \
+	rm -rf build ../public; \
+	npm run build; \
+	cp -r build ../public
+
+	export PATH=$$GOPATH/bin:$$PATH; go generate "sour.is/x/paste/src/routes"
+
+$(DOCS_ASSET): $(DOCS_FILES) $(SOURCE)
+	echo "$$DUMMY_BINDATA" > src/docs/bindata.go
+	export PATH=$$GOPATH/bin:$$PATH; go generate "sour.is/x/paste/cmd/paste"
+	export PATH=$$GOPATH/bin:$$PATH; go generate "sour.is/x/paste/src/docs"
+
+
+deploy: $(SOURCE) $(ROUTE_ASSET)
+	cd debian && make
+
+.PHONEY: all clean deploy run setup

assets/package.json

@@ -3,9 +3,9 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "react": "^16.2.0",
+    "react": "^16.9.0",
-    "react-dom": "^16.2.0",
+    "react-dom": "^16.9.0",
-    "react-scripts": "1.1.1",
+    "react-scripts": "^3.1.1",
     "sour-is": "file:src/vendor/sour-is"
   },
   "scripts": {
@@ -14,5 +14,17 @@
     "test": "react-scripts test --env=jsdom",
     "eject": "react-scripts eject",
     "postinstall": "npm install src/vendor/sour-is"
+  },
+  "browserslist": {
+    "production": [
+      ">0.2%",
+      "not dead",
+      "not op_mini all"
+    ],
+    "development": [
+      "last 1 chrome version",
+      "last 1 firefox version",
+      "last 1 safari version"
+    ]
   }
 }

assets/src/vendor/sour-is

@@ -1 +1 @@
-Subproject commit 46cbe64d1c0a8014976667fef853dae184cff9c2
+Subproject commit 61d4fa92de9864ec5f23a479be7f8432e94e1680

cmd/paste/config.go

@@ -2,10 +2,12 @@ package main
 
 import (
 	"bytes"
+
 	"github.com/docopt/docopt.go"
 	"github.com/spf13/viper"
 	"sour.is/x/toolbox/httpsrv"
 	"sour.is/x/toolbox/log"
+	"sour.is/x/toolbox/log/event"
 	_ "sour.is/x/toolbox/stats"
 )
 
@@ -68,12 +70,12 @@ func init() {
 	}
 
 	if args["-v"].(int) == 1 {
-		log.SetVerbose(log.Vinfo)
+		log.SetVerbose(event.VerbInfo)
+		log.Info("Verbose Logging.")
 	}
 	if args["-v"].(int) == 2 {
-		log.SetVerbose(log.Vdebug)
+		log.SetVerbose(event.VerbDebug)
-		log.SetFlags(log.LstdFlags | log.Lshortfile)
+		log.Debug("Very Verbose Logging.")
-		log.Debug("Debug Logging.")
 	}
 
 	log.Printf("%s (%s %s)\n",