github
/
statping
mirror of https://github.com/statping/statping
1
0
Fork 0
Code Issues Releases Wiki Activity

go vet - docker changes - makefile

pull/49/head
Hunter Long 2018-08-19 01:48:02 -07:00
parent bd68d8b65f
commit ed2db1a1eb
32 changed files with 381 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
.dockerignore
View File

@ -1,15 +1,11 @@
** .git
.idea
*.log
build
source/rice-box.go
.env
.DS_Store
*/**/node_modules
vendor
!/source !build/alpine-linux-amd64
!/types
!/utils
!/plugin
!/notifiers
!/handlers
!/core
!/cmd
!/Makefile
!/README.md
!/LICENSE
!/Gopkg.lock
!/Gopkg.toml

8
.gitignore vendored
View File

@ -14,8 +14,8 @@ assets
*.log *.log
.env .env
logs logs
.dev/test/node_modules dev/test/node_modules
.dev/test/cypress/videos dev/test/cypress/videos
.dev/test/cypress/screenshots dev/test/cypress/screenshots
.dev/test/app dev/test/app
source/rice-box.go source/rice-box.go

18
Dockerfile
View File

@ -1,25 +1,11 @@
FROM alpine:latest FROM hunterlong/statup:base
MAINTAINER "Hunter Long (https://github.com/hunterlong)" MAINTAINER "Hunter Long (https://github.com/hunterlong)"
# Locked version of Statup for 'latest' Docker tag # Locked version of Statup for 'latest' Docker tag
ENV VERSION=v0.45
RUN apk --no-cache add libstdc++ ca-certificates
RUN wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz && \
tar -xvzf statup-linux-alpine.tar.gz && \
chmod +x statup && \
mv statup /usr/local/bin/statup
# sass Binary built for alpine linux
RUN wget -q https://assets.statup.io/sass && \
chmod +x sass && \
mv sass /usr/local/bin/sass
ENV IS_DOCKER=true ENV IS_DOCKER=true
ENV SASS=/usr/local/bin/sass
ENV STATUP_DIR=/app ENV STATUP_DIR=/app
WORKDIR /app WORKDIR /app
VOLUME /app VOLUME /app
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT statup CMD ["statup"]

40
Makefile
View File

@ -6,7 +6,7 @@ GOBUILD=$(GOCMD) build
GOTEST=$(GOCMD) test GOTEST=$(GOCMD) test
GOGET=$(GOCMD) get GOGET=$(GOCMD) get
GOINSTALL=$(GOCMD) install GOINSTALL=$(GOCMD) install
XGO=GOPATH=$(GOPATH) $(GOPATH)/bin/xgo -go 1.10.x --dest=build XGO=GOPATH=$(GOPATH) xgo -go 1.10.x --dest=build
BUILDVERSION=-ldflags "-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT)" BUILDVERSION=-ldflags "-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT)"
RICE=$(GOPATH)/bin/rice RICE=$(GOPATH)/bin/rice
PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH) PATH:=/usr/local/bin:$(GOPATH)/bin:$(PATH)
@ -67,19 +67,35 @@ docker:
docker build -t hunterlong/statup:latest . docker build -t hunterlong/statup:latest .
docker-run: docker docker-run: docker
docker run -t -p 8080:8080 hunterlong/statup:latest docker run -it -p 8080:8080 hunterlong/statup:latest
docker-dev: clean docker-dev: clean
docker build -t hunterlong/statup:dev -f .dev/Dockerfile . docker build -t hunterlong/statup:dev -f dev/Dockerfile-dev .
docker-push-dev: docker-dev docker-push-dev: docker-base docker-dev docker-test
docker push hunterlong/statup:dev docker push hunterlong/statup:dev
docker push hunterlong/statup:base
docker push hunterlong/statup:test
docker-run-dev: docker-dev docker-run-dev: docker-dev
docker run -t -p 8080:8080 hunterlong/statup:dev docker run -t -p 8080:8080 hunterlong/statup:dev
docker-test: docker-dev docker-test: docker-dev clean
docker run -t -p 8080:8080 -e STATUP_DIR='/go/src/github.com/hunterlong/statup' --entrypoint "go test -v -p=1 $(BUILDVERSION) ./..." hunterlong/statup:dev docker build -t hunterlong/statup:test -f dev/Dockerfile-test .
docker-run-test: docker-test
docker run -t -p 8080:8080 --entrypoint "go test -v -p=1 $(BUILDVERSION) ./..." hunterlong/statup:test
docker-base: clean
wget -q https://assets.statup.io/sass && chmod +x sass
$(XGO) --targets=linux/amd64 -ldflags="-X main.VERSION=$(VERSION) -X main.COMMIT=$(TRAVIS_COMMIT) -linkmode external -extldflags -static" -out alpine ./cmd
docker build -t hunterlong/statup:base -f dev/Dockerfile-base .
docker-build-base:
docker build -t hunterlong/statup:base -f dev/Dockerfile-base .
docker-base-run: clean
docker run -t -p 8080:8080 hunterlong/statup:base
databases: databases:
docker run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres docker run --name statup_postgres -p 5432:5432 -e POSTGRES_PASSWORD=password123 -e POSTGRES_USER=root -e POSTGRES_DB=root -d postgres
@ -87,7 +103,7 @@ databases:
sleep 30 sleep 30
dep: dep:
dep ensure dep ensure -vendor-only
dev-deps: dep dev-deps: dep
$(GOGET) github.com/stretchr/testify/assert $(GOGET) github.com/stretchr/testify/assert
@ -115,7 +131,7 @@ clean:
rm -rf source/{logs,assets,plugins,statup.db,config.yml,.sass-cache} rm -rf source/{logs,assets,plugins,statup.db,config.yml,.sass-cache}
rm -rf types/{logs,assets,plugins,statup.db,config.yml,.sass-cache} rm -rf types/{logs,assets,plugins,statup.db,config.yml,.sass-cache}
rm -rf utils/{logs,assets,plugins,statup.db,config.yml,.sass-cache} rm -rf utils/{logs,assets,plugins,statup.db,config.yml,.sass-cache}
rm -rf .dev/test/cypress/videos rm -rf dev/test/cypress/videos
rm -rf .sass-cache rm -rf .sass-cache
rm -f coverage.out rm -f coverage.out
rm -f coverage.json rm -f coverage.json
@ -151,12 +167,16 @@ 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-statup/requests 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-statup/requests
cypress-install: cypress-install:
cd .dev/test && npm install cd /test && npm install
cypress-test: clean cypress-install cypress-test: clean cypress-install
cd .dev/test && npm test cd dev/test && npm test
travis-build: travis-build:
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%2Fstatup/requests 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%2Fstatup/requests
xgo-install: clean
go get github.com/karalabe/xgo
docker pull karalabe/xgo-latest
.PHONY: build build-all build-alpine test-all test .PHONY: build build-all build-alpine test-all test

27
cmd/Dockerfile
View File

@ -1,27 +0,0 @@
FROM alpine:latest
MAINTAINER 'Hunter Long (https://github.com/hunterlong)'
# Statup 'dev' image that will download the latest version of Statup from github
RUN apk --no-cache add libstdc++ ca-certificates curl grep sed
RUN export VERSION=$(curl --silent "https://api.github.com/repos/hunterlong/statup/releases/latest" \
| grep '"tag_name":' \
| sed -E 's/.*"([^"]+)".*/\1/'); \
wget -q https://github.com/hunterlong/statup/releases/download/$VERSION/statup-linux-alpine.tar.gz;
RUN tar -xvzf statup-linux-alpine.tar.gz && \
chmod +x statup && \
mv statup /usr/local/bin/statup
RUN statup version
RUN wget -q https://assets.statup.io/sass && \
chmod +x sass && \
mv sass /usr/local/bin/sass
ENV IS_DOCKER=true
WORKDIR /app
VOLUME /app
EXPOSE 8080
ENTRYPOINT statup

4
cmd/cli.go
View File

@ -319,7 +319,7 @@ func CheckGithubUpdates() (GithubResponse, error) {
response, err := http.Get("https://api.github.com/repos/hunterlong/statup/releases/latest") response, err := http.Get("https://api.github.com/repos/hunterlong/statup/releases/latest")
if err != nil { if err != nil {
return GithubResponse{}, err return GithubResponse{}, err
} else { }
defer response.Body.Close() defer response.Body.Close()
contents, err := ioutil.ReadAll(response.Body) contents, err := ioutil.ReadAll(response.Body)
if err != nil { if err != nil {
@ -327,8 +327,6 @@ func CheckGithubUpdates() (GithubResponse, error) {
} }
err = json.Unmarshal(contents, &gitResp) err = json.Unmarshal(contents, &gitResp)
return gitResp, err return gitResp, err
}
return gitResp, err
} }
type GithubResponse struct { type GithubResponse struct {

42
cmd/main_test.go
View File

@ -198,22 +198,32 @@ func RunMakeDatabaseConfig(t *testing.T, db string) {
if db == "mysql" { if db == "mysql" {
port = 3306 port = 3306
} }
config := &core.DbConfig{
db, //Project string `yaml:"-"`
os.Getenv("DB_HOST"), //Description string `yaml:"-"`
os.Getenv("DB_USER"), //Domain string `yaml:"-"`
os.Getenv("DB_PASS"), //Username string `yaml:"-"`
os.Getenv("DB_DATABASE"), //Password string `yaml:"-"`
port, //Email string `yaml:"-"`
"Testing " + db, //Error error `yaml:"-"`
"This is a test of Statup.io!", //Location string `yaml:"location"`
"",
"admin", config := &core.DbConfig{DbConfig: &types.DbConfig{
"admin", DbConn: db,
"", DbHost: os.Getenv("DB_HOST"),
nil, DbUser: os.Getenv("DB_USER"),
dir, DbPass: os.Getenv("DB_PASS"),
} DbData: os.Getenv("DB_DATABASE"),
DbPort: port,
Project: "Testing " + db,
Description: "This is a test of Statup.io!",
Domain: "",
Username: "admin",
Password: "admin",
Email: "",
Error: nil,
Location: dir,
}}
err := config.Save() err := config.Save()
assert.Nil(t, err) assert.Nil(t, err)

4
core/configs.go
View File

@ -74,7 +74,7 @@ func LoadUsingEnv() (*types.Config, error) {
CoreApp.UseCdn = true CoreApp.UseCdn = true
} }
dbConfig := &DbConfig{ dbConfig := &DbConfig{DbConfig: &types.DbConfig{
DbConn: os.Getenv("DB_CONN"), DbConn: os.Getenv("DB_CONN"),
DbHost: os.Getenv("DB_HOST"), DbHost: os.Getenv("DB_HOST"),
DbUser: os.Getenv("DB_USER"), DbUser: os.Getenv("DB_USER"),
@ -87,7 +87,7 @@ func LoadUsingEnv() (*types.Config, error) {
Username: "admin", Username: "admin",
Password: "admin", Password: "admin",
Email: "info@localhost.com", Email: "info@localhost.com",
} }}
err := DbConnection(dbConfig.DbConn, true, ".") err := DbConnection(dbConfig.DbConn, true, ".")
if err != nil { if err != nil {

4
core/database.go
View File

@ -39,7 +39,9 @@ var (
currentMigration int64 currentMigration int64
) )
type DbConfig types.DbConfig type DbConfig struct {
*types.DbConfig
}
func DbConnection(dbType string, retry bool, location string) error { func DbConnection(dbType string, retry bool, location string) error {
var err error var err error

16
core/services.go
View File

@ -111,21 +111,19 @@ func NewService(s *types.Service) *Service {
func (s *Service) SmallText() string { func (s *Service) SmallText() string {
last := s.LimitedFailures() last := s.LimitedFailures()
hits, _ := s.LimitedHits() hits, _ := s.LimitedHits()
if !s.Online { if s.Online {
if len(last) > 0 {
lastFailure := MakeFailure(last[0].ToFailure())
return fmt.Sprintf("%v on %v", lastFailure.ParseError(), last[0].ToFailure().CreatedAt.Format("Monday 3:04PM, Jan _2 2006"))
} else {
return fmt.Sprintf("%v is currently offline", s.Name)
}
} else {
if len(last) == 0 { if len(last) == 0 {
return fmt.Sprintf("Online since %v", s.CreatedAt.Format("Monday 3:04PM, Jan _2 2006")) return fmt.Sprintf("Online since %v", s.CreatedAt.Format("Monday 3:04PM, Jan _2 2006"))
} else { } else {
return fmt.Sprintf("Online, last failure was %v", hits[0].CreatedAt.Format("Monday 3:04PM, Jan _2 2006")) return fmt.Sprintf("Online, last failure was %v", hits[0].CreatedAt.Format("Monday 3:04PM, Jan _2 2006"))
} }
} }
return fmt.Sprintf("No Failures in the last 24 hours! %v", hits[0]) if len(last) > 0 {
lastFailure := MakeFailure(last[0].ToFailure())
return fmt.Sprintf("%v on %v", lastFailure.ParseError(), last[0].ToFailure().CreatedAt.Format("Monday 3:04PM, Jan _2 2006"))
} else {
return fmt.Sprintf("%v is currently offline", s.Name)
}
} }
func GroupDataBy(column string, id int64, tm time.Time, increment string) string { func GroupDataBy(column string, id int64, tm time.Time, increment string) string {

5
dev/Dockerfile-base Normal file
View File

@ -0,0 +1,5 @@
FROM scratch
MAINTAINER "Hunter Long (https://github.com/hunterlong)"
WORKDIR /app
ADD sass /usr/local/bin/
ADD ./build/alpine-linux-amd64 /usr/local/bin/statup

2
.dev/Dockerfile → dev/Dockerfile-dev
View File

@ -17,5 +17,7 @@ ENV VERSION=$(VERSION)
ENV IS_DOCKER=true ENV IS_DOCKER=true
RUN make dev-deps RUN make dev-deps
RUN make install
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT make run ENTRYPOINT make run

41
dev/Dockerfile-test Normal file
View File

@ -0,0 +1,41 @@
FROM hunterlong/statup:dev
MAINTAINER "Hunter Long (https://github.com/hunterlong)"
# Statup 'test' image for running Statup golang tests and crypress UI tests
RUN apk add --update nodejs nodejs-npm
USER root
RUN node --version
RUN echo "force new chrome here"
# install Chromebrowser
RUN \
wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - && \
echo "deb http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google.list && \
apt-get update && \
apt-get install -y dbus-x11 google-chrome-stable && \
rm -rf /var/lib/apt/lists/*
# "fake" dbus address to prevent errors
# https://github.com/SeleniumHQ/docker-selenium/issues/87
ENV DBUS_SESSION_BUS_ADDRESS=/dev/null
# Add zip utility - it comes in very handy
RUN apt-get update && apt-get install -y zip
# versions of local tools
RUN node -v
RUN npm -v
RUN yarn -v
RUN google-chrome --version
RUN zip --version
RUN git --version
# a few environment variables to make NPM installs easier
# good colors for most applications
ENV TERM xterm
# avoid million NPM install messages
ENV npm_config_loglevel warn
# allow installing when the main user is root
ENV npm_config_unsafe_perm true

0
.dev/test/cypress.json → dev/test/cypress.json
View File

0
.dev/test/cypress/fixtures/example.json → dev/test/cypress/fixtures/example.json
View File

0
.dev/test/cypress/integration/0_setup.js → dev/test/cypress/integration/0_setup.js
View File

0
.dev/test/cypress/integration/assets.js → dev/test/cypress/integration/assets.js
View File

0
.dev/test/cypress/integration/dashboard.js → dev/test/cypress/integration/dashboard.js
View File

0
.dev/test/cypress/integration/services.js → dev/test/cypress/integration/services.js
View File

0
.dev/test/cypress/integration/settings.js → dev/test/cypress/integration/settings.js
View File

0
.dev/test/cypress/integration/users.js → dev/test/cypress/integration/users.js
View File

0
.dev/test/cypress/plugins/index.js → dev/test/cypress/plugins/index.js
View File

0
.dev/test/cypress/support/commands.js → dev/test/cypress/support/commands.js
View File

0
.dev/test/cypress/support/index.js → dev/test/cypress/support/index.js
View File

448
.dev/test/package-lock.json → dev/test/package-lock.json generated
View File

@ -9,10 +9,10 @@
"resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz", "resolved": "https://registry.npmjs.org/@cypress/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
"integrity": "sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=", "integrity": "sha1-p3SS9LEdzHxEajSz4ochr9M8ZCo=",
"requires": { "requires": {
"chalk": "^1.1.3", "chalk": "1.1.3",
"cli-cursor": "^1.0.2", "cli-cursor": "1.0.2",
"date-fns": "^1.27.2", "date-fns": "1.29.0",
"figures": "^1.7.0" "figures": "1.7.0"
}, },
"dependencies": { "dependencies": {
"chalk": { "chalk": {
@ -20,11 +20,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": { "requires": {
"ansi-styles": "^2.2.1", "ansi-styles": "2.2.1",
"escape-string-regexp": "^1.0.2", "escape-string-regexp": "1.0.5",
"has-ansi": "^2.0.0", "has-ansi": "2.0.0",
"strip-ansi": "^3.0.0", "strip-ansi": "3.0.1",
"supports-color": "^2.0.0" "supports-color": "2.0.0"
} }
}, },
"supports-color": { "supports-color": {
@ -39,8 +39,8 @@
"resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.3.tgz", "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.3.tgz",
"integrity": "sha512-yYrK+/bgL3hwoRHMZG4r5fyLniCy1pXex5fimtewAY6vE/jsVs8Q37UsEO03tFlcmiLnQ3rBNMaZBYTi/+C1cw==", "integrity": "sha512-yYrK+/bgL3hwoRHMZG4r5fyLniCy1pXex5fimtewAY6vE/jsVs8Q37UsEO03tFlcmiLnQ3rBNMaZBYTi/+C1cw==",
"requires": { "requires": {
"debug": "^3.1.0", "debug": "3.1.0",
"lodash.once": "^4.1.1" "lodash.once": "4.1.1"
} }
}, },
"@types/blob-util": { "@types/blob-util": {
@ -63,8 +63,8 @@
"resolved": "https://registry.npmjs.org/@types/chai-jquery/-/chai-jquery-1.1.35.tgz", "resolved": "https://registry.npmjs.org/@types/chai-jquery/-/chai-jquery-1.1.35.tgz",
"integrity": "sha512-7aIt9QMRdxuagLLI48dPz96YJdhu64p6FCa6n4qkGN5DQLHnrIjZpD9bXCvV2G0NwgZ1FAmfP214dxc5zNCfgQ==", "integrity": "sha512-7aIt9QMRdxuagLLI48dPz96YJdhu64p6FCa6n4qkGN5DQLHnrIjZpD9bXCvV2G0NwgZ1FAmfP214dxc5zNCfgQ==",
"requires": { "requires": {
"@types/chai": "*", "@types/chai": "4.0.8",
"@types/jquery": "*" "@types/jquery": "3.2.16"
} }
}, },
"@types/jquery": { "@types/jquery": {
@ -97,8 +97,8 @@
"resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-2.7.29.tgz", "resolved": "https://registry.npmjs.org/@types/sinon-chai/-/sinon-chai-2.7.29.tgz",
"integrity": "sha512-EkI/ZvJT4hglWo7Ipf9SX+J+R9htNOMjW8xiOhce7+0csqvgoF5IXqY5Ae1GqRgNtWCuaywR5HjVa1snkTqpOw==", "integrity": "sha512-EkI/ZvJT4hglWo7Ipf9SX+J+R9htNOMjW8xiOhce7+0csqvgoF5IXqY5Ae1GqRgNtWCuaywR5HjVa1snkTqpOw==",
"requires": { "requires": {
"@types/chai": "*", "@types/chai": "4.0.8",
"@types/sinon": "*" "@types/sinon": "4.0.0"
} }
}, },
"ajv": { "ajv": {
@ -106,10 +106,10 @@
"resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
"integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
"requires": { "requires": {
"co": "^4.6.0", "co": "4.6.0",
"fast-deep-equal": "^1.0.0", "fast-deep-equal": "1.1.0",
"fast-json-stable-stringify": "^2.0.0", "fast-json-stable-stringify": "2.0.0",
"json-schema-traverse": "^0.3.0" "json-schema-traverse": "0.3.1"
} }
}, },
"ansi-escapes": { "ansi-escapes": {
@ -132,7 +132,7 @@
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
"integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
"requires": { "requires": {
"safer-buffer": "~2.1.0" "safer-buffer": "2.1.2"
} }
}, },
"assert-plus": { "assert-plus": {
@ -145,7 +145,7 @@
"resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz", "resolved": "https://registry.npmjs.org/async/-/async-2.4.0.tgz",
"integrity": "sha1-SZAgDxjqW4N8LMT4wDGmmFw4VhE=", "integrity": "sha1-SZAgDxjqW4N8LMT4wDGmmFw4VhE=",
"requires": { "requires": {
"lodash": "^4.14.0" "lodash": "4.17.10"
} }
}, },
"asynckit": { "asynckit": {
@ -168,8 +168,8 @@
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
"integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=",
"requires": { "requires": {
"core-js": "^2.4.0", "core-js": "2.5.7",
"regenerator-runtime": "^0.11.0" "regenerator-runtime": "0.11.1"
} }
}, },
"balanced-match": { "balanced-match": {
@ -183,7 +183,7 @@
"integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
"optional": true, "optional": true,
"requires": { "requires": {
"tweetnacl": "^0.14.3" "tweetnacl": "0.14.5"
} }
}, },
"bluebird": { "bluebird": {
@ -196,7 +196,7 @@
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
} }
}, },
@ -210,7 +210,7 @@
"resolved": "https://registry.npmjs.org/cachedir/-/cachedir-1.3.0.tgz", "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-1.3.0.tgz",
"integrity": "sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==", "integrity": "sha512-O1ji32oyON9laVPJL1IZ5bmwd2cB46VfpxkDequezH+15FDzzVddEyrGEeX4WusDSqKxdyFdDQDEG1yo1GoWkg==",
"requires": { "requires": {
"os-homedir": "^1.0.1" "os-homedir": "1.0.2"
} }
}, },
"caseless": { "caseless": {
@ -223,9 +223,9 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz",
"integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==",
"requires": { "requires": {
"ansi-styles": "^3.2.1", "ansi-styles": "3.2.1",
"escape-string-regexp": "^1.0.5", "escape-string-regexp": "1.0.5",
"supports-color": "^5.3.0" "supports-color": "5.4.0"
}, },
"dependencies": { "dependencies": {
"ansi-styles": { "ansi-styles": {
@ -233,7 +233,7 @@
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
"requires": { "requires": {
"color-convert": "^1.9.0" "color-convert": "1.9.2"
} }
}, },
"supports-color": { "supports-color": {
@ -241,7 +241,7 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz",
"integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==",
"requires": { "requires": {
"has-flag": "^3.0.0" "has-flag": "3.0.0"
} }
} }
} }
@ -261,7 +261,7 @@
"resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz",
"integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=",
"requires": { "requires": {
"restore-cursor": "^1.0.1" "restore-cursor": "1.0.1"
} }
}, },
"cli-spinners": { "cli-spinners": {
@ -275,7 +275,7 @@
"integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=", "integrity": "sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ=",
"requires": { "requires": {
"slice-ansi": "0.0.4", "slice-ansi": "0.0.4",
"string-width": "^1.0.1" "string-width": "1.0.2"
} }
}, },
"co": { "co": {
@ -306,7 +306,7 @@
"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
"integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
"requires": { "requires": {
"delayed-stream": "~1.0.0" "delayed-stream": "1.0.0"
} }
}, },
"commander": { "commander": {
@ -319,7 +319,7 @@
"resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz", "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.4.0.tgz",
"integrity": "sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA=", "integrity": "sha1-EYe+Tz1M8MBCfUP3Tu8fc1AWFMA=",
"requires": { "requires": {
"babel-runtime": "^6.18.0" "babel-runtime": "6.26.0"
} }
}, },
"concat-map": { "concat-map": {
@ -332,9 +332,9 @@
"resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz",
"integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=",
"requires": { "requires": {
"inherits": "^2.0.3", "inherits": "2.0.3",
"readable-stream": "^2.2.2", "readable-stream": "2.3.6",
"typedarray": "^0.0.6" "typedarray": "0.0.6"
} }
}, },
"core-js": { "core-js": {
@ -352,11 +352,11 @@
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
"requires": { "requires": {
"nice-try": "^1.0.4", "nice-try": "1.0.4",
"path-key": "^2.0.1", "path-key": "2.0.1",
"semver": "^5.5.0", "semver": "5.5.0",
"shebang-command": "^1.2.0", "shebang-command": "1.2.0",
"which": "^1.2.9" "which": "1.3.1"
} }
}, },
"cypress": { "cypress": {
@ -411,7 +411,7 @@
"resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
"integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "1.0.0"
} }
}, },
"date-fns": { "date-fns": {
@ -444,8 +444,8 @@
"integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
"optional": true, "optional": true,
"requires": { "requires": {
"jsbn": "~0.1.0", "jsbn": "0.1.1",
"safer-buffer": "^2.1.0" "safer-buffer": "2.1.2"
} }
}, },
"elegant-spinner": { "elegant-spinner": {
@ -464,13 +464,13 @@
"integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=",
"dev": true, "dev": true,
"requires": { "requires": {
"duplexer": "~0.1.1", "duplexer": "0.1.1",
"from": "~0", "from": "0.1.7",
"map-stream": "~0.1.0", "map-stream": "0.1.0",
"pause-stream": "0.0.11", "pause-stream": "0.0.11",
"split": "0.3", "split": "0.3.3",
"stream-combiner": "~0.0.4", "stream-combiner": "0.0.4",
"through": "~2.3.1" "through": "2.3.8"
} }
}, },
"execa": { "execa": {
@ -478,13 +478,13 @@
"resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz", "resolved": "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz",
"integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==", "integrity": "sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==",
"requires": { "requires": {
"cross-spawn": "^6.0.0", "cross-spawn": "6.0.5",
"get-stream": "^3.0.0", "get-stream": "3.0.0",
"is-stream": "^1.1.0", "is-stream": "1.1.0",
"npm-run-path": "^2.0.0", "npm-run-path": "2.0.2",
"p-finally": "^1.0.0", "p-finally": "1.0.0",
"signal-exit": "^3.0.0", "signal-exit": "3.0.2",
"strip-eof": "^1.0.0" "strip-eof": "1.0.0"
} }
}, },
"executable": { "executable": {
@ -492,7 +492,7 @@
"resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz", "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
"integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==", "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
"requires": { "requires": {
"pify": "^2.2.0" "pify": "2.3.0"
} }
}, },
"exit-hook": { "exit-hook": {
@ -529,7 +529,7 @@
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
"integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
"requires": { "requires": {
"fd-slicer": "~1.0.1" "fd-slicer": "1.0.1"
} }
} }
} }
@ -554,7 +554,7 @@
"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
"requires": { "requires": {
"pend": "~1.2.0" "pend": "1.2.0"
} }
}, },
"figures": { "figures": {
@ -562,8 +562,8 @@
"resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
"integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
"requires": { "requires": {
"escape-string-regexp": "^1.0.5", "escape-string-regexp": "1.0.5",
"object-assign": "^4.1.0" "object-assign": "4.1.1"
} }
}, },
"forever-agent": { "forever-agent": {
@ -576,9 +576,9 @@
"resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
"integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
"requires": { "requires": {
"asynckit": "^0.4.0", "asynckit": "0.4.0",
"combined-stream": "1.0.6", "combined-stream": "1.0.6",
"mime-types": "^2.1.12" "mime-types": "2.1.19"
} }
}, },
"from": { "from": {
@ -592,9 +592,9 @@
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.1.tgz",
"integrity": "sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=", "integrity": "sha1-f8DGyJV/mD9X8waiTlud3Y0N2IA=",
"requires": { "requires": {
"graceful-fs": "^4.1.2", "graceful-fs": "4.1.11",
"jsonfile": "^3.0.0", "jsonfile": "3.0.1",
"universalify": "^0.1.0" "universalify": "0.1.2"
} }
}, },
"fs.realpath": { "fs.realpath": {
@ -620,7 +620,7 @@
"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
"integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
"requires": { "requires": {
"assert-plus": "^1.0.0" "assert-plus": "1.0.0"
} }
}, },
"glob": { "glob": {
@ -628,12 +628,12 @@
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"requires": { "requires": {
"fs.realpath": "^1.0.0", "fs.realpath": "1.0.0",
"inflight": "^1.0.4", "inflight": "1.0.6",
"inherits": "2", "inherits": "2.0.3",
"minimatch": "^3.0.4", "minimatch": "3.0.4",
"once": "^1.3.0", "once": "1.4.0",
"path-is-absolute": "^1.0.0" "path-is-absolute": "1.0.1"
} }
}, },
"global-dirs": { "global-dirs": {
@ -641,7 +641,7 @@
"resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz",
"integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=",
"requires": { "requires": {
"ini": "^1.3.4" "ini": "1.3.5"
} }
}, },
"graceful-fs": { "graceful-fs": {
@ -659,8 +659,8 @@
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
"integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
"requires": { "requires": {
"ajv": "^5.1.0", "ajv": "5.5.2",
"har-schema": "^2.0.0" "har-schema": "2.0.0"
} }
}, },
"has-ansi": { "has-ansi": {
@ -668,7 +668,7 @@
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "2.1.1"
} }
}, },
"has-flag": { "has-flag": {
@ -687,9 +687,9 @@
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
"integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "1.0.0",
"jsprim": "^1.2.2", "jsprim": "1.4.1",
"sshpk": "^1.7.0" "sshpk": "1.14.2"
} }
}, },
"indent-string": { "indent-string": {
@ -697,7 +697,7 @@
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
"integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
"requires": { "requires": {
"repeating": "^2.0.0" "repeating": "2.0.1"
} }
}, },
"inflight": { "inflight": {
@ -705,8 +705,8 @@
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
"requires": { "requires": {
"once": "^1.3.0", "once": "1.4.0",
"wrappy": "1" "wrappy": "1.0.2"
} }
}, },
"inherits": { "inherits": {
@ -724,7 +724,7 @@
"resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz",
"integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=",
"requires": { "requires": {
"ci-info": "^1.0.0" "ci-info": "1.3.1"
} }
}, },
"is-finite": { "is-finite": {
@ -732,7 +732,7 @@
"resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
"integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "1.0.1"
} }
}, },
"is-fullwidth-code-point": { "is-fullwidth-code-point": {
@ -740,7 +740,7 @@
"resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
"integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "1.0.1"
} }
}, },
"is-installed-globally": { "is-installed-globally": {
@ -748,8 +748,8 @@
"resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz",
"integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=",
"requires": { "requires": {
"global-dirs": "^0.1.0", "global-dirs": "0.1.1",
"is-path-inside": "^1.0.0" "is-path-inside": "1.0.1"
} }
}, },
"is-path-inside": { "is-path-inside": {
@ -757,7 +757,7 @@
"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz",
"integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=",
"requires": { "requires": {
"path-is-inside": "^1.0.1" "path-is-inside": "1.0.2"
} }
}, },
"is-promise": { "is-promise": {
@ -808,11 +808,11 @@
"integrity": "sha1-M4WseQGSEwy+Iw6ALsAskhW7/to=", "integrity": "sha1-M4WseQGSEwy+Iw6ALsAskhW7/to=",
"dev": true, "dev": true,
"requires": { "requires": {
"hoek": "4.x.x", "hoek": "4.2.1",
"isemail": "2.x.x", "isemail": "2.2.1",
"items": "2.x.x", "items": "2.1.1",
"moment": "2.x.x", "moment": "2.22.2",
"topo": "2.x.x" "topo": "2.0.2"
} }
}, },
"jsbn": { "jsbn": {
@ -841,7 +841,7 @@
"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz",
"integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=", "integrity": "sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=",
"requires": { "requires": {
"graceful-fs": "^4.1.6" "graceful-fs": "4.1.11"
} }
}, },
"jsprim": { "jsprim": {
@ -865,22 +865,22 @@
"resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz", "resolved": "https://registry.npmjs.org/listr/-/listr-0.12.0.tgz",
"integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=", "integrity": "sha1-a84sD1YD+klYDqF81qAMwOX6RRo=",
"requires": { "requires": {
"chalk": "^1.1.3", "chalk": "1.1.3",
"cli-truncate": "^0.2.1", "cli-truncate": "0.2.1",
"figures": "^1.7.0", "figures": "1.7.0",
"indent-string": "^2.1.0", "indent-string": "2.1.0",
"is-promise": "^2.1.0", "is-promise": "2.1.0",
"is-stream": "^1.1.0", "is-stream": "1.1.0",
"listr-silent-renderer": "^1.1.1", "listr-silent-renderer": "1.1.1",
"listr-update-renderer": "^0.2.0", "listr-update-renderer": "0.2.0",
"listr-verbose-renderer": "^0.4.0", "listr-verbose-renderer": "0.4.1",
"log-symbols": "^1.0.2", "log-symbols": "1.0.2",
"log-update": "^1.0.2", "log-update": "1.0.2",
"ora": "^0.2.3", "ora": "0.2.3",
"p-map": "^1.1.1", "p-map": "1.2.0",
"rxjs": "^5.0.0-beta.11", "rxjs": "5.5.11",
"stream-to-observable": "^0.1.0", "stream-to-observable": "0.1.0",
"strip-ansi": "^3.0.1" "strip-ansi": "3.0.1"
}, },
"dependencies": { "dependencies": {
"chalk": { "chalk": {
@ -888,11 +888,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": { "requires": {
"ansi-styles": "^2.2.1", "ansi-styles": "2.2.1",
"escape-string-regexp": "^1.0.2", "escape-string-regexp": "1.0.5",
"has-ansi": "^2.0.0", "has-ansi": "2.0.0",
"strip-ansi": "^3.0.0", "strip-ansi": "3.0.1",
"supports-color": "^2.0.0" "supports-color": "2.0.0"
} }
}, },
"log-symbols": { "log-symbols": {
@ -900,7 +900,7 @@
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
"requires": { "requires": {
"chalk": "^1.0.0" "chalk": "1.1.3"
} }
}, },
"supports-color": { "supports-color": {
@ -920,14 +920,14 @@
"resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz", "resolved": "https://registry.npmjs.org/listr-update-renderer/-/listr-update-renderer-0.2.0.tgz",
"integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=", "integrity": "sha1-yoDhd5tOcCZoB+ju0a1qvjmFUPk=",
"requires": { "requires": {
"chalk": "^1.1.3", "chalk": "1.1.3",
"cli-truncate": "^0.2.1", "cli-truncate": "0.2.1",
"elegant-spinner": "^1.0.1", "elegant-spinner": "1.0.1",
"figures": "^1.7.0", "figures": "1.7.0",
"indent-string": "^3.0.0", "indent-string": "3.2.0",
"log-symbols": "^1.0.2", "log-symbols": "1.0.2",
"log-update": "^1.0.2", "log-update": "1.0.2",
"strip-ansi": "^3.0.1" "strip-ansi": "3.0.1"
}, },
"dependencies": { "dependencies": {
"chalk": { "chalk": {
@ -935,11 +935,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": { "requires": {
"ansi-styles": "^2.2.1", "ansi-styles": "2.2.1",
"escape-string-regexp": "^1.0.2", "escape-string-regexp": "1.0.5",
"has-ansi": "^2.0.0", "has-ansi": "2.0.0",
"strip-ansi": "^3.0.0", "strip-ansi": "3.0.1",
"supports-color": "^2.0.0" "supports-color": "2.0.0"
} }
}, },
"indent-string": { "indent-string": {
@ -952,7 +952,7 @@
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz",
"integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=",
"requires": { "requires": {
"chalk": "^1.0.0" "chalk": "1.1.3"
} }
}, },
"supports-color": { "supports-color": {
@ -967,10 +967,10 @@
"resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz", "resolved": "https://registry.npmjs.org/listr-verbose-renderer/-/listr-verbose-renderer-0.4.1.tgz",
"integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=", "integrity": "sha1-ggb0z21S3cWCfl/RSYng6WWTOjU=",
"requires": { "requires": {
"chalk": "^1.1.3", "chalk": "1.1.3",
"cli-cursor": "^1.0.2", "cli-cursor": "1.0.2",
"date-fns": "^1.27.2", "date-fns": "1.29.0",
"figures": "^1.7.0" "figures": "1.7.0"
}, },
"dependencies": { "dependencies": {
"chalk": { "chalk": {
@ -978,11 +978,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": { "requires": {
"ansi-styles": "^2.2.1", "ansi-styles": "2.2.1",
"escape-string-regexp": "^1.0.2", "escape-string-regexp": "1.0.5",
"has-ansi": "^2.0.0", "has-ansi": "2.0.0",
"strip-ansi": "^3.0.0", "strip-ansi": "3.0.1",
"supports-color": "^2.0.0" "supports-color": "2.0.0"
} }
}, },
"supports-color": { "supports-color": {
@ -1007,7 +1007,7 @@
"resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
"integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
"requires": { "requires": {
"chalk": "^2.0.1" "chalk": "2.4.1"
} }
}, },
"log-update": { "log-update": {
@ -1015,8 +1015,8 @@
"resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz", "resolved": "https://registry.npmjs.org/log-update/-/log-update-1.0.2.tgz",
"integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=", "integrity": "sha1-GZKfZMQJPS0ucHWh2tivWcKWuNE=",
"requires": { "requires": {
"ansi-escapes": "^1.0.0", "ansi-escapes": "1.4.0",
"cli-cursor": "^1.0.2" "cli-cursor": "1.0.2"
} }
}, },
"map-stream": { "map-stream": {
@ -1035,7 +1035,7 @@
"resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.19.tgz",
"integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==", "integrity": "sha512-P1tKYHVSZ6uFo26mtnve4HQFE3koh1UWVkp8YUC+ESBHe945xWSoXuHHiGarDqcEZ+whpCDnlNw5LON0kLo+sw==",
"requires": { "requires": {
"mime-db": "~1.35.0" "mime-db": "1.35.0"
} }
}, },
"minimatch": { "minimatch": {
@ -1043,7 +1043,7 @@
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
"integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "1.1.11"
} }
}, },
"minimist": { "minimist": {
@ -1087,7 +1087,7 @@
"resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
"integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
"requires": { "requires": {
"path-key": "^2.0.0" "path-key": "2.0.1"
} }
}, },
"number-is-nan": { "number-is-nan": {
@ -1110,7 +1110,7 @@
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
"requires": { "requires": {
"wrappy": "1" "wrappy": "1.0.2"
} }
}, },
"onetime": { "onetime": {
@ -1123,10 +1123,10 @@
"resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz", "resolved": "https://registry.npmjs.org/ora/-/ora-0.2.3.tgz",
"integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=", "integrity": "sha1-N1J9Igrc1Tw5tzVx11QVbV22V6Q=",
"requires": { "requires": {
"chalk": "^1.1.1", "chalk": "1.1.3",
"cli-cursor": "^1.0.2", "cli-cursor": "1.0.2",
"cli-spinners": "^0.1.2", "cli-spinners": "0.1.2",
"object-assign": "^4.0.1" "object-assign": "4.1.1"
}, },
"dependencies": { "dependencies": {
"chalk": { "chalk": {
@ -1134,11 +1134,11 @@
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
"integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
"requires": { "requires": {
"ansi-styles": "^2.2.1", "ansi-styles": "2.2.1",
"escape-string-regexp": "^1.0.2", "escape-string-regexp": "1.0.5",
"has-ansi": "^2.0.0", "has-ansi": "2.0.0",
"strip-ansi": "^3.0.0", "strip-ansi": "3.0.1",
"supports-color": "^2.0.0" "supports-color": "2.0.0"
} }
}, },
"supports-color": { "supports-color": {
@ -1189,7 +1189,7 @@
"integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=",
"dev": true, "dev": true,
"requires": { "requires": {
"through": "~2.3" "through": "2.3.8"
} }
}, },
"pend": { "pend": {
@ -1223,7 +1223,7 @@
"integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=", "integrity": "sha1-tCGyQUDWID8e08dplrRCewjowBQ=",
"dev": true, "dev": true,
"requires": { "requires": {
"event-stream": "~3.3.0" "event-stream": "3.3.4"
} }
}, },
"punycode": { "punycode": {
@ -1251,13 +1251,13 @@
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
"requires": { "requires": {
"core-util-is": "~1.0.0", "core-util-is": "1.0.2",
"inherits": "~2.0.3", "inherits": "2.0.3",
"isarray": "~1.0.0", "isarray": "1.0.0",
"process-nextick-args": "~2.0.0", "process-nextick-args": "2.0.0",
"safe-buffer": "~5.1.1", "safe-buffer": "5.1.2",
"string_decoder": "~1.1.1", "string_decoder": "1.1.1",
"util-deprecate": "~1.0.1" "util-deprecate": "1.0.2"
} }
}, },
"regenerator-runtime": { "regenerator-runtime": {
@ -1270,7 +1270,7 @@
"resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
"integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
"requires": { "requires": {
"is-finite": "^1.0.0" "is-finite": "1.0.2"
} }
}, },
"request": { "request": {
@ -1278,26 +1278,26 @@
"resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
"integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
"requires": { "requires": {
"aws-sign2": "~0.7.0", "aws-sign2": "0.7.0",
"aws4": "^1.6.0", "aws4": "1.8.0",
"caseless": "~0.12.0", "caseless": "0.12.0",
"combined-stream": "~1.0.5", "combined-stream": "1.0.6",
"extend": "~3.0.1", "extend": "3.0.2",
"forever-agent": "~0.6.1", "forever-agent": "0.6.1",
"form-data": "~2.3.1", "form-data": "2.3.2",
"har-validator": "~5.0.3", "har-validator": "5.0.3",
"http-signature": "~1.2.0", "http-signature": "1.2.0",
"is-typedarray": "~1.0.0", "is-typedarray": "1.0.0",
"isstream": "~0.1.2", "isstream": "0.1.2",
"json-stringify-safe": "~5.0.1", "json-stringify-safe": "5.0.1",
"mime-types": "~2.1.17", "mime-types": "2.1.19",
"oauth-sign": "~0.8.2", "oauth-sign": "0.8.2",
"performance-now": "^2.1.0", "performance-now": "2.1.0",
"qs": "~6.5.1", "qs": "6.5.2",
"safe-buffer": "^5.1.1", "safe-buffer": "5.1.2",
"tough-cookie": "~2.3.3", "tough-cookie": "2.3.4",
"tunnel-agent": "^0.6.0", "tunnel-agent": "0.6.0",
"uuid": "^3.1.0" "uuid": "3.3.2"
} }
}, },
"request-progress": { "request-progress": {
@ -1305,7 +1305,7 @@
"resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz", "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.1.tgz",
"integrity": "sha1-ByHBBdipasayzossia4tXs/Pazo=", "integrity": "sha1-ByHBBdipasayzossia4tXs/Pazo=",
"requires": { "requires": {
"throttleit": "~0.0.2" "throttleit": "0.0.2"
} }
}, },
"restore-cursor": { "restore-cursor": {
@ -1313,8 +1313,8 @@
"resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz",
"integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=",
"requires": { "requires": {
"exit-hook": "^1.0.0", "exit-hook": "1.1.1",
"onetime": "^1.0.0" "onetime": "1.1.0"
} }
}, },
"rx": { "rx": {
@ -1351,7 +1351,7 @@
"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
"integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
"requires": { "requires": {
"shebang-regex": "^1.0.0" "shebang-regex": "1.0.0"
} }
}, },
"shebang-regex": { "shebang-regex": {
@ -1375,7 +1375,7 @@
"integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=",
"dev": true, "dev": true,
"requires": { "requires": {
"through": "2" "through": "2.3.8"
} }
}, },
"sshpk": { "sshpk": {
@ -1383,15 +1383,15 @@
"resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.2.tgz",
"integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=", "integrity": "sha1-xvxhZIo9nE52T9P8306hBeSSupg=",
"requires": { "requires": {
"asn1": "~0.2.3", "asn1": "0.2.4",
"assert-plus": "^1.0.0", "assert-plus": "1.0.0",
"bcrypt-pbkdf": "^1.0.0", "bcrypt-pbkdf": "1.0.2",
"dashdash": "^1.12.0", "dashdash": "1.14.1",
"ecc-jsbn": "~0.1.1", "ecc-jsbn": "0.1.2",
"getpass": "^0.1.1", "getpass": "0.1.7",
"jsbn": "~0.1.0", "jsbn": "0.1.1",
"safer-buffer": "^2.0.2", "safer-buffer": "2.1.2",
"tweetnacl": "~0.14.0" "tweetnacl": "0.14.5"
} }
}, },
"start-server-and-test": { "start-server-and-test": {
@ -1423,7 +1423,7 @@
"integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=",
"dev": true, "dev": true,
"requires": { "requires": {
"duplexer": "~0.1.1" "duplexer": "0.1.1"
} }
}, },
"stream-to-observable": { "stream-to-observable": {
@ -1436,9 +1436,9 @@
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "1.1.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "1.0.0",
"strip-ansi": "^3.0.0" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": { "string_decoder": {
@ -1446,7 +1446,7 @@
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": { "requires": {
"safe-buffer": "~5.1.0" "safe-buffer": "5.1.2"
} }
}, },
"strip-ansi": { "strip-ansi": {
@ -1454,7 +1454,7 @@
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "2.1.1"
} }
}, },
"strip-eof": { "strip-eof": {
@ -1467,7 +1467,7 @@
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.1.0.tgz",
"integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==", "integrity": "sha512-Ry0AwkoKjDpVKK4sV4h6o3UJmNRbjYm2uXhwfj3J56lMVdvnUNqzQVRztOOMGQ++w1K/TjNDFvpJk0F/LoeBCQ==",
"requires": { "requires": {
"has-flag": "^2.0.0" "has-flag": "2.0.0"
}, },
"dependencies": { "dependencies": {
"has-flag": { "has-flag": {
@ -1498,7 +1498,7 @@
"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz",
"integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=",
"requires": { "requires": {
"os-tmpdir": "~1.0.1" "os-tmpdir": "1.0.2"
} }
}, },
"topo": { "topo": {
@ -1507,7 +1507,7 @@
"integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=", "integrity": "sha1-zVYVdSU5BXwNwEkaYhw7xvvh0YI=",
"dev": true, "dev": true,
"requires": { "requires": {
"hoek": "4.x.x" "hoek": "4.2.1"
} }
}, },
"tough-cookie": { "tough-cookie": {
@ -1515,7 +1515,7 @@
"resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
"integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
"requires": { "requires": {
"punycode": "^1.4.1" "punycode": "1.4.1"
} }
}, },
"tunnel-agent": { "tunnel-agent": {
@ -1523,7 +1523,7 @@
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
"integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
"requires": { "requires": {
"safe-buffer": "^5.0.1" "safe-buffer": "5.1.2"
} }
}, },
"tweetnacl": { "tweetnacl": {
@ -1573,9 +1573,9 @@
"resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
"integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
"requires": { "requires": {
"assert-plus": "^1.0.0", "assert-plus": "1.0.0",
"core-util-is": "1.0.2", "core-util-is": "1.0.2",
"extsprintf": "^1.2.0" "extsprintf": "1.3.0"
} }
}, },
"wait-on": { "wait-on": {
@ -1584,11 +1584,11 @@
"integrity": "sha512-hDwJ674+7dfiiK/cxtYCwPxlnjXDjto/pCz1PF02sXUhqCqCWsgvxZln0699PReWqXXgkxqkF6DDo5Rj9sjNvw==", "integrity": "sha512-hDwJ674+7dfiiK/cxtYCwPxlnjXDjto/pCz1PF02sXUhqCqCWsgvxZln0699PReWqXXgkxqkF6DDo5Rj9sjNvw==",
"dev": true, "dev": true,
"requires": { "requires": {
"core-js": "^2.4.1", "core-js": "2.5.7",
"joi": "^9.2.0", "joi": "9.2.0",
"minimist": "^1.2.0", "minimist": "1.2.0",
"request": "^2.78.0", "request": "2.87.0",
"rx": "^4.1.0" "rx": "4.1.0"
} }
}, },
"which": { "which": {
@ -1596,7 +1596,7 @@
"resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
"integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
"requires": { "requires": {
"isexe": "^2.0.0" "isexe": "2.0.0"
} }
}, },
"wrappy": { "wrappy": {
@ -1609,8 +1609,8 @@
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz",
"integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=", "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=",
"requires": { "requires": {
"buffer-crc32": "~0.2.3", "buffer-crc32": "0.2.13",
"fd-slicer": "~1.0.1" "fd-slicer": "1.0.1"
} }
} }
} }

0
.dev/test/package.json → dev/test/package.json
View File

0
.dev/test/release.sh → dev/test/release.sh
View File

0
.dev/test/test.sh → dev/test/test.sh
View File

33
handlers/setup.go
View File

@ -74,22 +74,23 @@ func ProcessSetupHandler(w http.ResponseWriter, r *http.Request) {
domain := r.PostForm.Get("domain") domain := r.PostForm.Get("domain")
email := r.PostForm.Get("email") email := r.PostForm.Get("email")
config := &core.DbConfig{ config := &core.DbConfig{DbConfig: &types.DbConfig{
dbConn, DbConn: dbConn,
dbHost, DbHost: dbHost,
dbUser, DbUser: dbUser,
dbPass, DbPass: dbPass,
dbDatabase, DbData: dbDatabase,
dbPort, DbPort: dbPort,
project, Project: project,
description, Description: description,
domain, Domain: domain,
username, Username: username,
password, Password: password,
email, Email: email,
nil, Error: nil,
".", Location: ".",
} }}
err := config.Save() err := config.Save()
if err != nil { if err != nil {
utils.Log(4, err) utils.Log(4, err)

4
source/js/charts.js
View File

@ -1,6 +1,6 @@
{{ range . }}{{$s := .}}{{ if .AvgTime }}var ctx_{{$s.Id}}=document.getElementById("service_{{$s.Id}}").getContext('2d');var chartdata=new Chart(ctx_{{$s.Id}},{type:'line',data:{datasets:[{label:'Response Time (Milliseconds)',data:{{safe .GraphData}},backgroundColor:['rgba(47, 206, 30, 0.92)'],borderColor:['rgb(47, 171, 34)'],borderWidth:1}]},options:{maintainAspectRatio:!1,scaleShowValues:!0,layout:{padding:{left:0,right:0,top:0,bottom:-10}},hover:{animationDuration:0,},responsiveAnimationDuration:0,animation:{duration:3500,onComplete:function(){var chartInstance=this.chart,ctx=chartInstance.ctx;var controller=this.chart.controller;var xAxis=controller.scales['x-axis-0'];var yAxis=controller.scales['y-axis-0'];ctx.font=Chart.helpers.fontString(Chart.defaults.global.defaultFontSize,Chart.defaults.global.defaultFontStyle,Chart.defaults.global.defaultFontFamily);ctx.textAlign='center';ctx.textBaseline='bottom';var numTicks=xAxis.ticks.length;var yOffsetStart=xAxis.width/numTicks;var halfBarWidth=(xAxis.width/(numTicks*2));xAxis.ticks.forEach(function(value,index){var xOffset=20;var yOffset=(yOffsetStart*index)+halfBarWidth;ctx.fillStyle='#e2e2e2';ctx.fillText(value,yOffset,xOffset)});this.data.datasets.forEach(function(dataset,i){var meta=chartInstance.controller.getDatasetMeta(i);var hxH=0;var hyH=0;var hxL=0;var hyL=0;var highestNum=0;var lowestnum=999999999999;meta.data.forEach(function(bar,index){var data=dataset.data[index];if(lowestnum>data.y){lowestnum=data.y;hxL=bar._model.x;hyL=bar._model.y} {{ range . }}{{ if .AvgTime }}var ctx_{{.Id}}=document.getElementById("service_{{.Id}}").getContext('2d');var chartdata=new Chart(ctx_{{.Id}},{type:'line',data:{datasets:[{label:'Response Time (Milliseconds)',data:{{safe .GraphData}},backgroundColor:['rgba(47, 206, 30, 0.92)'],borderColor:['rgb(47, 171, 34)'],borderWidth:1}]},options:{maintainAspectRatio:!1,scaleShowValues:!0,layout:{padding:{left:0,right:0,top:0,bottom:-10}},hover:{animationDuration:0,},responsiveAnimationDuration:0,animation:{duration:3500,onComplete:function(){var chartInstance=this.chart,ctx=chartInstance.ctx;var controller=this.chart.controller;var xAxis=controller.scales['x-axis-0'];var yAxis=controller.scales['y-axis-0'];ctx.font=Chart.helpers.fontString(Chart.defaults.global.defaultFontSize,Chart.defaults.global.defaultFontStyle,Chart.defaults.global.defaultFontFamily);ctx.textAlign='center';ctx.textBaseline='bottom';var numTicks=xAxis.ticks.length;var yOffsetStart=xAxis.width/numTicks;var halfBarWidth=(xAxis.width/(numTicks*2));xAxis.ticks.forEach(function(value,index){var xOffset=20;var yOffset=(yOffsetStart*index)+halfBarWidth;ctx.fillStyle='#e2e2e2';ctx.fillText(value,yOffset,xOffset)});this.data.datasets.forEach(function(dataset,i){var meta=chartInstance.controller.getDatasetMeta(i);var hxH=0;var hyH=0;var hxL=0;var hyL=0;var highestNum=0;var lowestnum=999999999999;meta.data.forEach(function(bar,index){var data=dataset.data[index];if(lowestnum>data.y){lowestnum=data.y;hxL=bar._model.x;hyL=bar._model.y}
if(data.y>highestNum){highestNum=data.y;hxH=bar._model.x;hyH=bar._model.y}});if(hxH>=820){hxH=820}else if(50>=hxH){hxH=50} if(data.y>highestNum){highestNum=data.y;hxH=bar._model.x;hyH=bar._model.y}});if(hxH>=820){hxH=820}else if(50>=hxH){hxH=50}
if(hxL>=820){hxL=820}else if(70>=hxL){hxL=70} if(hxL>=820){hxL=820}else if(70>=hxL){hxL=70}
ctx.fillStyle='#ffa7a2';ctx.fillText(highestNum+"ms",hxH-40,hyH+15);ctx.fillStyle='#45d642';ctx.fillText(lowestnum+"ms",hxL,hyL+10);console.log("done service_id_{{$s.Id}}")})}},legend:{display:!1},tooltips:{"enabled":!1},scales:{yAxes:[{display:!1,ticks:{fontSize:20,display:!1,beginAtZero:!1},gridLines:{display:!1}}],xAxes:[{type:'time',distribution:'series',autoSkip:!1,gridLines:{display:!1},ticks:{stepSize:1,min:0,fontColor:"white",fontSize:20,display:!1,}}]},elements:{point:{radius:0}}}}) ctx.fillStyle='#ffa7a2';ctx.fillText(highestNum+"ms",hxH-40,hyH+15);ctx.fillStyle='#45d642';ctx.fillText(lowestnum+"ms",hxL,hyL+10);console.log("done service_id_{{.Id}}")})}},legend:{display:!1},tooltips:{"enabled":!1},scales:{yAxes:[{display:!1,ticks:{fontSize:20,display:!1,beginAtZero:!1},gridLines:{display:!1}}],xAxes:[{type:'time',distribution:'series',autoSkip:!1,gridLines:{display:!1},ticks:{stepSize:1,min:0,fontColor:"white",fontSize:20,display:!1,}}]},elements:{point:{radius:0}}}})
{{ end }} {{ end }}
{{ end }} {{ end }}

1
source/source.go
View File

@ -216,5 +216,4 @@ func copyAndCapture(w io.Writer, r io.Reader) ([]byte, error) {
return out, err return out, err
} }
} }
return nil, nil
} }

2
types/service.go
View File

@ -38,7 +38,6 @@ type Service struct {
Online24Hours float32 `json:"24_hours_online"` Online24Hours float32 `json:"24_hours_online"`
AvgResponse string `json:"avg_response"` AvgResponse string `json:"avg_response"`
TotalUptime string `json:"uptime"` TotalUptime string `json:"uptime"`
OrderId int64 `json:"order_id"`
Failures []*Failure `json:"failures"` Failures []*Failure `json:"failures"`
Checkins []*Checkin `json:"checkins"` Checkins []*Checkin `json:"checkins"`
Running chan bool `json:"-"` Running chan bool `json:"-"`
@ -70,5 +69,4 @@ func (s *Service) IsRunning() bool {
default: default:
return true return true
} }
return false
} }