additional updates on issues

CHANGELOG.md

@@ -1,2 +1,10 @@
+# 0.90.13
+- Added new function `utils.RenameDirectory` to rename directory
+- Added new function `(*DbConfig) BackupAssets` to backup a customized theme and place into a directory named `assets_backup`. Only for migration 0.80 to 0.90+, entirely new frontend.
+- Updated JS function `convertToChartData` to return an empty chart data if API response was empty. 
+- Updated `banner.png` to make a bit smaller, (680px)
+- Fixed method that returns `no such table: services` on startup, check table first.
+- Fixed version from not being added into Core table. [Issue #436](https://github.com/statping/statping/issues/436)
+
 # 0.90.12
 - Fixed MySQL timestamp formatting. (issue #432)

cmd/main.go

@@ -19,6 +19,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/getsentry/sentry-go"
+	"github.com/statping/statping/types/core"
 	"os"
 	"os/signal"
 	"syscall"
@@ -48,10 +49,6 @@ var (
 	confgs *configs.DbConfig
 )
 
-func init() {
-
-}
-
 // parseFlags will parse the application flags
 // -ip = 0.0.0.0 IP address for outgoing HTTP server
 // -port = 8080 Port number for outgoing HTTP server
@@ -75,6 +72,11 @@ func exit(err error) {
 	os.Exit(2)
 }
 
+func init() {
+	core.App = new(core.Core)
+	core.App.Version = VERSION
+}
+
 // main will run the Statping application
 func main() {
 	var err error
@@ -129,12 +131,14 @@ func main() {
 		exit(err)
 	}
 
-	exists := confgs.Db.HasTable("core")
+	if !confgs.Db.HasTable("core") {
-	if !exists {
 		var srvs int64
+		if confgs.Db.HasTable(&services.Service{}) {
 			confgs.Db.Model(&services.Service{}).Count(&srvs)
 			if srvs > 0 {
 				exit(errors.Wrap(err, "there are already services setup."))
+				return
+			}
 		}
 
 		if err := confgs.DropDatabase(); err != nil {

database/database.go

@@ -155,12 +155,6 @@ func (it *Db) MultipleSelects(args ...string) Database {
 	return it.Select(joined)
 }
 
-func OrderStatus(status []string) func(db *gorm.DB) *gorm.DB {
-	return func(db *gorm.DB) *gorm.DB {
-		return db.Scopes(AmountGreaterThan1000).Where("status IN (?)", status)
-	}
-}
-
 type Db struct {
 	Database *gorm.DB
 	Type     string
@@ -180,7 +174,21 @@ func Openw(dialect string, args ...interface{}) (db Database, err error) {
 }
 
 func OpenTester() (Database, error) {
-	newDb, err := Openw("sqlite3", fmt.Sprintf("file:%s?mode=memory&cache=shared", utils.RandomString(12)))
+	testDB := utils.Getenv("TEST_DB", "sqlite3").(string)
+	var dbParamsstring string
+	switch testDB {
+	case "mysql":
+		dbParamsstring = fmt.Sprintf("root:password123@tcp(localhost:3306)/statping?charset=utf8&parseTime=True&loc=UTC&time_zone=%%27UTC%%27")
+	case "postgres":
+		dbParamsstring = fmt.Sprintf("host=localhost port=5432 user=root dbname=statping password=password123 timezone=UTC")
+	default:
+		dbParamsstring = fmt.Sprintf("file:%s?mode=memory&cache=shared", utils.RandomString(12))
+	}
+	fmt.Println(testDB, dbParamsstring)
+	newDb, err := Openw(testDB, dbParamsstring)
+	if err != nil {
+		return nil, err
+	}
 	newDb.DB().SetMaxOpenConns(1)
 	return newDb, err
 }

frontend/src/forms/Setup.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="container col-md-7 col-sm-12 mt-2 sm-container">
         <div class="col-12 col-md-8 offset-md-2 mb-4">
-            <img class="col-12 mt-5 mt-md-0" src="/banner.png">
+            <img class="col-12 mt-5 mt-md-0" style="max-width:680px" src="/banner.png">
         </div>
 
         <div class="col-12">

frontend/src/mixin.js

@@ -99,6 +99,9 @@ export default Vue.mixin({
       }
     },
     convertToChartData(data = [], multiplier=1, asInt=false) {
+      if (!data) {
+        return {data: []}
+      }
       let newSet = [];
       data.forEach((f) => {
         let amount = f.amount * multiplier;

frontend/src/pages/Login.vue

@@ -2,7 +2,7 @@
     <div class="container col-md-7 col-sm-12 mt-md-5 bg-light">
         <div class="col-10 offset-1 col-md-8 offset-md-2 mt-md-2">
             <div class="col-12 col-md-8 offset-md-2 mb-4">
-                <img class="col-12 mt-5 mt-md-0" src="/banner.png">
+                <img class="col-12 mt-5 mt-md-0" style="max-width:680px" src="/banner.png">
             </div>
 
             <FormLogin/>

handlers/setup.go

@@ -101,8 +101,8 @@ func processSetupHandler(w http.ResponseWriter, r *http.Request) {
 		//ApiKey:      apiKey.(string),
 		//ApiSecret:   apiSecret.(string),
 		Domain:    "http://localhost:8080",
-		Version:   "test",
+		Version:   core.App.Version,
-		CreatedAt: time.Now().UTC(),
+		CreatedAt: utils.Now(),
 		UseCdn:    null.NewNullBool(false),
 		Footer:    null.NewNullString(""),
 	}

old_Makefile

@@ -1,385 +0,0 @@
-VERSION=$(shell cat version.txt)
-SIGN_KEY=B76D61FAA6DB759466E83D9964B9C6AAE2D55278
-BINARY_NAME=statping
-GOBUILD=go build -a
-GOVERSION=1.13.7
-XGO=xgo -go $(GOVERSION) --dest=build
-BUILDVERSION=-ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)"
-TRVIS_SECRET=lRqWSt5BoekFK6+padJF+b77YkGdispPXEUKNuD7/Hxb7yJMoI8T/n8xZrTHtCZPdjtpy7wIlJCezNoYEZB3l2GnD6Y1QEZEXF7MIxP7hwsB/uSc5/lgdGW0ZLvTBfv6lwI/GjQIklPBW/4xcKJtj4s1YBP7xvqyIb/lDN7TiOqAKF4gqRVVfsxvlkm7j4TiPCXtz17hYQfU8kKBbd+vd3PuZgdWqs//5RwKk3Ld8QR8zoo9xXQVC5NthiyVbHznzczBsHy2cRZZoWxyi7eJM1HrDw8Jn/ivJONIHNv3RgFVn2rAoKu1X8F6FyuvPO0D2hWC62mdO/e0kt4X0mn9/6xlLSKwrHir67UgNVQe3tvlH0xNKh+yNZqR5x9t0V54vNks6Pgbhas5EfLHoWn5cF4kbJzqkXeHjt1msrsqpA3HKbmtwwjJr4Slotfiu22mAhqLSOV+xWV+IxrcNnrEq/Pa+JAzU12Uyxs8swaLJGPRAlWnJwzL9HK5aOpN0sGTuSEsTwj0WxeMMRx25YEq3+LZOgwOy3fvezmeDnKuBZa6MVCoMMpx1CRxMqAOlTGZXHjj+ZPmqDUUBpzAsFSzIdVRgcnDlLy7YRiz3tVWa1G5S07l/VcBN7ZgvCwOWZ0QgOH0MxkoDfhrfoMhNO6MBFDTRKCEl4TroPEhcInmXU8=
-PUBLISH_BODY='{ "request": { "branch": "master", "message": "Homebrew update version v${VERSION}", "config": { "env": { "VERSION": "${VERSION}", "COMMIT": "$(TRAVIS_COMMIT)" } } } }'
-TRAVIS_BUILD_CMD='{ "request": { "branch": "master", "message": "Compile master for Statping v${VERSION}", "config": { "os": [ "linux" ], "language": "go", "go": [ "${GOVERSION}" ], "go_import_path": "github.com/statping/statping", "install": true, "sudo": "required", "services": [ "docker" ], "env": { "VERSION": "${VERSION}", "secure": "${TRVIS_SECRET}" }, "matrix": { "allow_failures": [ { "go": "master" } ], "fast_finish": true }, "before_deploy": [ "git config --local user.name \"hunterlong\"", "git config --local user.email \"info@socialeck.com\"", "git tag v$(VERSION) --force"], "deploy": [ { "provider": "releases", "api_key": "$$TAG_TOKEN", "file_glob": true, "file": "build/*", "skip_cleanup": true, "on": {"branch": "master"} } ], "notifications": { "email": false }, "before_script": ["gem install sass"], "script": [ "travis_wait 30 docker pull crazymax/xgo:$(GOVERSION)", "make release" ], "after_success": [], "after_deploy": [ "make publish-homebrew" ] } } }'
-TEST_DIR=$(GOPATH)/src/github.com/statping/statping
-PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH)
-
-# build all arch's and release Statping
-release: dev-deps
-	wget -O statping.gpg $(SIGN_URL)
-	gpg --import statping.gpg
-	make build-all
-
-frontend:
-	cd frontend && yarn serve
-
-frontend-build:
-	cd frontend && rm -rf dist && yarn build
-	rm -rf source/dist && cp -r frontend/dist source/ && cp -r frontend/src/assets/scss source/dist/
-	cp -r source/tmpl/*.* source/dist/
-
-# build and push the images to docker hub
-docker: docker-build-all docker-publish-all
-
-push-vue:
-	docker build -t hunterlong/statping:vue .
-	docker push hunterlong/statping:vue
-
-# test all versions of Statping, golang testing and then cypress UI testing
-test-all: dev-deps test
-
-# test all versions of Statping, golang testing and then cypress UI testing
-test-ui: dev-deps docker-build-dev cypress-test
-
-# testing to be ran on travis ci
-travis-test: dev-deps cypress-install test coverage
-
-# build and compile all arch's for Statping
-build-all: build-mac build-linux build-windows build-alpine compress
-
-# build all docker tags
-docker-build-all: docker-build-latest
-
-# push all docker tags built
-docker-publish-all: docker-push-latest
-
-snapcraft: clean snapcraft-build snapcraft-release
-
-# build Statping for local arch
-build: compile
-	go mod vendor
-	$(GOBUILD) $(BUILDVERSION) -o $(BINARY_NAME) -v ./cmd
-
-# build Statping plugins
-build-plugin:
-	$(GOBUILD) $(BUILDVERSION) -buildmode=plugin -o ./dev/plugin/example.so -v ./dev/plugin
-
-test-plugin: clean
-	mkdir plugins
-	$(GOBUILD) $(BUILDVERSION) -buildmode=plugin -o ./dev/plugin/example.so -v ./dev/plugin
-	mv ./dev/plugin/example.so ./plugins/example.so
-	STATPING_DIR=$(TEST_DIR) go test -v -p=1 $(BUILDVERSION) -coverprofile=coverage.out ./plugin
-
-# build Statping debug app
-build-debug: compile
-	$(GOBUILD) $(BUILDVERSION) -tags debug -o $(BINARY_NAME) -v ./cmd
-
-# install Statping for local arch and move binary to gopath/src/bin/statping
-install: build
-	mv $(BINARY_NAME) $(GOPATH)/bin/$(BINARY_NAME)
-	$(GOPATH)/bin/$(BINARY_NAME) version
-
-# run Statping from local arch
-run: build
-	./$(BINARY_NAME) --ip 0.0.0.0 --port 8080
-
-# run Statping with Delve for debugging
-rundlv:
-	lsof -ti:8080 | xargs kill
-	DB_CONN=sqlite DB_HOST=localhost DB_DATABASE=sqlite DB_PASS=none DB_USER=none GO_ENV=test \
-	dlv --listen=:2345 --headless=true --api-version=2 --accept-multiclient exec ./statping
-
-killdlv:
-	lsof -ti:2345 | xargs kill
-
-builddlv:
-	$(GOBUILD) -gcflags "all=-N -l" -o ./$(BINARY_NAME) -v ./cmd
-
-watch:
-	find . -print | grep -i '.*\.\(go\|gohtml\)' | justrun -v -c \
-	'go build -v -gcflags "all=-N -l" -o statping ./cmd && make rundlv &' \
-	-delay 10s -stdin \
-	-i="Makefile,statping,statup.db,statup.db-journal,handlers/graphql/generated.go"
-
-# compile assets using SASS and Rice. compiles scss -> css, and run rice embed-go
-compile: frontend-build generate
-	cd source && rice embed-go
-
-# benchmark testing
-benchmark:
-	cd handlers && go test -v -run=^$ -bench=. -benchtime=5s -memprofile=prof.mem -cpuprofile=prof.cpu
-
-# view benchmark testing using pprof
-benchmark-view:
-	go tool pprof handlers/handlers.test handlers/prof.cpu > top20
-
-# test Statping golang tetsing files
-test: clean compile install build-plugin
-	STATPING_DIR=$(TEST_DIR) go test -v -p=1 $(BUILDVERSION) -coverprofile=coverage.out ./...
-	gocov convert coverage.out > coverage.json
-
-test-api:
-	DB_CONN=sqlite DB_HOST=localhost DB_DATABASE=sqlite DB_PASS=none DB_USER=none statping &
-	sleep 300 && newman run source/tmpl/postman.json -e dev/postman_environment.json --delay-request 500
-
-# report coverage to Coveralls
-coverage:
-	$(GOPATH)/bin/goveralls -coverprofile=coverage.out -service=travis -repotoken $(COVERALLS)
-
-# generate documentation for Statping functions
-docs:
-	rm -f dev/README.md
-	printf "# Statping Dev Documentation\n" > dev/README.md
-	printf "This readme is automatically generated from the Golang documentation. [![GoDoc](https://godoc.org/github.com/golang/gddo?status.svg)](https://godoc.org/github.com/statping/statping)\n\n" > dev/README.md
-	godocdown github.com/statping/statping >> dev/README.md
-	godocdown github.com/statping/statping/cmd >> dev/README.md
-	godocdown github.com/statping/statping/core >> dev/README.md
-	godocdown github.com/statping/statping/handlers >> dev/README.md
-	godocdown github.com/statping/statping/notifiers >> dev/README.md
-	godocdown github.com/statping/statping/plugin >> dev/README.md
-	godocdown github.com/statping/statping/source >> dev/README.md
-	godocdown github.com/statping/statping/types >> dev/README.md
-	godocdown github.com/statping/statping/utils >> dev/README.md
-	gocov-html coverage.json > dev/COVERAGE.html
-	revive -formatter stylish > dev/LINT.md
-
-#
-#    Build binary for Statping
-#
-
-# build Statping for Mac, 64 and 32 bit
-build-mac: compile
-	mkdir build
-	$(XGO) $(BUILDVERSION) --targets=darwin/amd64,darwin/386 ./cmd
-
-# build Statping for Linux 64, 32 bit, arm6/arm7
-build-linux: compile
-	$(XGO) $(BUILDVERSION) --targets=linux/amd64,linux/386,linux/arm-7,linux/arm-6,linux/arm64 ./cmd
-
-# build for windows 64 bit only
-build-windows: compile
-	$(XGO) $(BUILDVERSION) --targets=windows-6.0/amd64 ./cmd
-
-# build Alpine linux binary (used in docker images)
-build-alpine: compile
-	$(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd
-
-#
-#    Docker Makefile commands
-#
-
-docker-test:
-	docker-compose -f docker-compose.test.yml -p statping build
-	docker-compose -f docker-compose.test.yml -p statping up -d
-	docker logs -f statping_sut_1
-	docker wait statping_sut_1
-
-# build :latest docker tag
-docker-build-latest:
-	docker build --build-arg VERSION=${VERSION} -t hunterlong/statping:latest --no-cache -f Dockerfile .
-	docker tag hunterlong/statping:latest hunterlong/statping:v${VERSION}
-
-# build :dev docker tag
-docker-build-dev:
-	docker build --build-arg VERSION=${VERSION} -t hunterlong/statping:latest --no-cache -f Dockerfile .
-	docker tag hunterlong/statping:dev hunterlong/statping:dev-v${VERSION}
-
-# build Cypress UI testing :cypress docker tag
-docker-build-cypress: clean
-	GOPATH=$(GOPATH) xgo -out statping -go $(GOVERSION) -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" --targets=linux/amd64 ./cmd
-	docker build -t hunterlong/statping:cypress -f dev/Dockerfile-cypress .
-	rm -f statping
-
-# run hunterlong/statping:latest docker image
-docker-run: docker-build-latest
-	docker run -it -p 8080:8080 hunterlong/statping:latest
-
-# run hunterlong/statping:dev docker image
-docker-run-dev: docker-build-dev
-	docker run -t -p 8080:8080 hunterlong/statping:dev
-
-# run Cypress UI testing, hunterlong/statping:cypress docker image
-docker-run-cypress: docker-build-cypress
-	docker run -t hunterlong/statping:cypress
-
-# push the :base and :base-v{VERSION} tag to Docker hub
-docker-push-base:
-	docker tag hunterlong/statping:base hunterlong/statping:base-v${VERSION}
-	docker push hunterlong/statping:base
-	docker push hunterlong/statping:base-v${VERSION}
-
-# push the :dev tag to Docker hub
-docker-push-dev:
-	docker push hunterlong/statping:dev
-	docker push hunterlong/statping:dev-v${VERSION}
-
-# push the :cypress tag to Docker hub
-docker-push-cypress:
-	docker push hunterlong/statping:cypress
-
-# push the :latest tag to Docker hub
-docker-push-latest:
-	docker tag hunterlong/statping hunterlong/statping:dev
-	docker push hunterlong/statping:latest
-	docker push hunterlong/statping:dev
-	docker push hunterlong/statping:v${VERSION}
-
-docker-run-mssql:
-	docker run -e 'ACCEPT_EULA=Y' -e 'SA_PASSWORD=PaSsW0rD123' -p 1433:1433 -d microsoft/mssql-server-linux
-
-# create Postgres, and MySQL instance using Docker (used for testing)
-databases:
-	docker run --name statping_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres
-	docker run --name statping_mysql -p 3306:3306 -e MYSQL_ROOT_PASSWORD=password123 -e MYSQL_DATABASE=root -d mysql
-	sleep 30
-
-# install all required golang dependecies
-dev-deps:
-	go get github.com/stretchr/testify/assert
-	go get golang.org/x/tools/cmd/cover
-	go get github.com/mattn/goveralls
-	go install github.com/mattn/goveralls
-	go get github.com/rendon/testcli
-	go get github.com/robertkrimen/godocdown/godocdown
-	go get github.com/crazy-max/xgo
-	go get github.com/GeertJohan/go.rice
-	go get github.com/GeertJohan/go.rice/rice
-	go install github.com/GeertJohan/go.rice/rice
-	go get github.com/axw/gocov/gocov
-	go get github.com/matm/gocov-html
-	go get github.com/fatih/structs
-	go get github.com/ararog/timeago
-	go get gopkg.in/natefinch/lumberjack.v2
-	go get golang.org/x/crypto/bcrypt
-
-# remove files for a clean compile/build
-clean:
-	rm -rf ./{logs,assets,plugins,*.db,config.yml,.sass-cache,config.yml,statping,build,.sass-cache,index.html,vendor}
-	rm -rf cmd/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log,*.html,*.json}
-	rm -rf core/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf handlers/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf notifiers/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf source/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf types/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf utils/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log}
-	rm -rf dev/{logs,assets,plugins,*.db,config.yml,.sass-cache,*.log,test/app,plugin/*.so}
-	rm -rf {parts,prime,snap,stage}
-	rm -rf dev/test/cypress/videos
-	rm -f coverage.* sass
-	rm -f source/rice-box.go
-	rm -rf **/*.db-journal
-	rm -rf *.snap
-	find . -name "*.out" -type f -delete
-	find . -name "*.cpu" -type f -delete
-	find . -name "*.mem" -type f -delete
-	rm -rf {build,tmp}
-
-# tag version using git
-tag:
-	git tag v${VERSION} --force
-
-generate:
-	cd source && go generate
-	cd handlers/graphql && go generate
-
-# compress built binaries into tar.gz and zip formats
-compress:
-	cd build && mv alpine-linux-amd64 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-linux-alpine.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-	cd build && mv cmd-darwin-10.6-amd64 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-osx-x64.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-	cd build && mv cmd-darwin-10.6-386 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-osx-x32.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-	cd build && mv cmd-linux-amd64 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-linux-x64.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-	cd build && mv cmd-linux-386 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-linux-x32.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-	cd build && mv cmd-windows-6.0-amd64.exe $(BINARY_NAME).exe
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME).exe
-	cd build && zip $(BINARY_NAME)-windows-x64.zip $(BINARY_NAME).exe statping.asc && rm -f $(BINARY_NAME).exe statping.asc
-	cd build && mv cmd-linux-arm-7 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-linux-arm7.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-	cd build && mv cmd-linux-arm-6 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-linux-arm6.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-	cd build && mv cmd-linux-arm64 $(BINARY_NAME)
-	cd build && gpg --default-key $(SIGN_KEY) --batch --detach-sign --output statping.asc --armor $(BINARY_NAME)
-	cd build && tar -czvf $(BINARY_NAME)-linux-arm64.tar.gz $(BINARY_NAME) statping.asc && rm -f $(BINARY_NAME) statping.asc
-
-# push the :dev docker tag using curl
-publish-dev:
-	curl -H "Content-Type: application/json" --data '{"docker_tag": "dev"}' -X POST $(DOCKER)
-
-# update the homebrew application to latest for mac
-publish-homebrew:
-	curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d $(PUBLISH_BODY) https://api.travis-ci.com/repo/hunterlong%2Fhomebrew-statping/requests
-
-# install NPM reuqirements for cypress testing
-cypress-install:
-	cd dev/test && npm install
-
-# run Cypress UI testing
-cypress-test: clean cypress-install
-	cd dev/test && npm test
-
-upload_to_s3:
-	aws s3 cp ./source/css $(ASSETS_BKT) --recursive --exclude "*" --include "*.css"
-	aws s3 cp ./source/js $(ASSETS_BKT) --recursive --exclude "*" --include "*.js"
-	aws s3 cp ./source/font $(ASSETS_BKT) --recursive --exclude "*" --include "*.eot" --include "*.svg" --include "*.woff" --include "*.woff2" --include "*.ttf" --include "*.css"
-	aws s3 cp ./source/scss $(ASSETS_BKT) --recursive --exclude "*" --include "*.scss"
-	aws s3 cp ./install.sh $(ASSETS_BKT)
-
-travis_s3_creds:
-	mkdir -p ~/.aws
-	echo "[default]\naws_access_key_id = ${AWS_ACCESS_KEY_ID}\naws_secret_access_key = ${AWS_SECRET_ACCESS_KEY}" > ~/.aws/credentials
-
-# build Statping using a travis ci trigger
-travis-build: travis_s3_creds upload_to_s3
-	curl -s -X POST -H "Content-Type: application/json" -H "Accept: application/json" -H "Travis-API-Version: 3" -H "Authorization: token $(TRAVIS_API)" -d $(TRAVIS_BUILD_CMD) https://api.travis-ci.com/repo/hunterlong%2Fstatping/requests
-	curl -H "Content-Type: application/json" --data '{"docker_tag": "latest"}' -X POST $(DOCKER)
-
-snapcraft-build: build-all
-	PWD=$(shell pwd)
-	cp build/$(BINARY_NAME)-linux-x64.tar.gz build/$(BINARY_NAME)-linux.tar.gz
-	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=amd64"
-	cp build/$(BINARY_NAME)-linux-x32.tar.gz build/$(BINARY_NAME)-linux.tar.gz
-	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=i386"
-	cp build/$(BINARY_NAME)-linux-arm64.tar.gz build/$(BINARY_NAME)-linux.tar.gz
-	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=arm64"
-	cp build/$(BINARY_NAME)-linux-arm7.tar.gz build/$(BINARY_NAME)-linux.tar.gz
-	snapcraft clean statping -s pull
-	docker run --rm -v ${PWD}:/build -w /build --env VERSION=${VERSION} snapcore/snapcraft bash -c "apt update && snapcraft --target-arch=armhf"
-	rm -f build/$(BINARY_NAME)-linux.tar.gz
-
-snapcraft-release:
-	snapcraft push statping_${VERSION}_arm64.snap --release stable
-	snapcraft push statping_${VERSION}_i386.snap --release stable
-	snapcraft push statping_${VERSION}_armhf.snap --release stable
-
-sign-all:
-	gpg --default-key $SIGN_KEY --detach-sign --armor statpinger
-
-valid-sign:
-	gpg --verify statping.asc
-
-# install xgo and pull the xgo docker image
-xgo-install: clean
-	go get github.com/crazy-max/xgo
-	docker pull crazy-max/xgo:${GOVERSION}
-
-heroku:
-	git push heroku master
-	heroku container:push web
-	heroku container:release web
-
-checkall:
-	golangci-lint run ./...
-
-.PHONY: all build build-all build-alpine test-all test test-api docker frontend
-.SILENT: travis_s3_creds

types/configs/migration.go

@@ -5,7 +5,9 @@ import (
 	_ "github.com/jinzhu/gorm/dialects/mysql"
 	_ "github.com/jinzhu/gorm/dialects/postgres"
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
+	"github.com/statping/statping/source"
 	"github.com/statping/statping/types/notifications"
+	"github.com/statping/statping/utils"
 
 	"github.com/statping/statping/types/checkins"
 	"github.com/statping/statping/types/core"
@@ -44,6 +46,22 @@ func (c *DbConfig) DatabaseChanges() error {
 			return err
 		}
 
+		if err := c.BackupAssets(); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+// BackupAssets is a temporary function (to version 0.90.*) to backup your customized theme
+// to a new folder called 'assets_backup'.
+func (c *DbConfig) BackupAssets() error {
+	if source.UsingAssets(utils.Directory) {
+		log.Infof("Backing up 'assets' folder to 'assets_backup'")
+		if err := utils.RenameDirectory(utils.Directory+"/assets", utils.Directory+"/assets_backup"); err != nil {
+			return err
+		}
+		log.Infof("Old assets are now stored in: " + utils.Directory + "/assets_backup")
 	}
 	return nil
 }
@@ -69,6 +87,8 @@ func (c *DbConfig) MigrateDatabase() error {
 			return tx.Error()
 		}
 	}
+
+	log.Infof("Migrating App to version: %s", core.App.Version)
 	if err := tx.Table("core").AutoMigrate(&core.Core{}); err.Error() != nil {
 		tx.Rollback()
 		log.Errorln(fmt.Sprintf("Statping Database could not be migrated: %v", tx.Error()))
@@ -78,6 +98,9 @@ func (c *DbConfig) MigrateDatabase() error {
 	if err := tx.Commit().Error(); err != nil {
 		return err
 	}
+
+	c.Db.Table("core").Model(&core.Core{}).Update("version", core.App.Version)
+
 	log.Infoln("Statping Database Tables Migrated")
 
 	if err := c.Db.Model(&hits.Hit{}).AddIndex("idx_service_hit", "service").Error(); err != nil {

types/core/database.go

@@ -50,6 +50,7 @@ func (c *Core) Create() error {
 		ConfigFile:  utils.Directory + "/config.yml",
 		ApiKey:      c.ApiKey,
 		ApiSecret:   c.ApiSecret,
+		Version:     App.Version,
 		Domain:      c.Domain,
 		MigrationId: time.Now().Unix(),
 	}

types/core/struct.go

@@ -9,10 +9,6 @@ var (
 	App *Core
 )
 
-func init() {
-	App = new(Core)
-}
-
 // Core struct contains all the required fields for Statping. All application settings
 // will be saved into 1 row in the 'core' table. You can use the core.CoreApp
 // global variable to interact with the attributes to the application, such as services.

utils/utils.go

@@ -222,6 +222,12 @@ func DeleteFile(file string) error {
 	return os.Remove(file)
 }
 
+// RenameDirectory will attempt rename a directory to a new name
+func RenameDirectory(fromDir string, toDir string) error {
+	Log.Debugln("renaming directory: " + fromDir + "to: " + toDir)
+	return os.Rename(fromDir, toDir)
+}
+
 // DeleteDirectory will attempt to delete a directory and all contents inside
 //		DeleteDirectory("assets")
 func DeleteDirectory(directory string) error {

utils/utils_test.go

@@ -18,8 +18,10 @@ package utils
 import (
 	"fmt"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"net/http"
 	"net/http/httptest"
+	"os"
 	"testing"
 	"time"
 )
@@ -169,6 +171,14 @@ func TestDeleteDirectory(t *testing.T) {
 	assert.Nil(t, DeleteDirectory(Directory+"/logs"))
 }
 
+func TestRenameDirectory(t *testing.T) {
+	assert.Nil(t, CreateDirectory(Directory+"/example"))
+	require.DirExists(t, Directory+"/example")
+	assert.Nil(t, RenameDirectory(Directory+"/example", Directory+"/renamed_example"))
+	require.DirExists(t, Directory+"/renamed_example")
+	assert.Nil(t, os.RemoveAll(Directory+"/renamed_example"))
+}
+
 func TestHttpRequest(t *testing.T) {
 	// Start a local HTTP server
 	server := httptest.NewServer(http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {

version.txt

@@ -1 +1 @@
-0.90.12
+0.90.13