diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 0000000..6d92d3e --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,7 @@ +# https://github.com/golangci/golangci/wiki/Configuration + +service: + project-path: github.com/Ullaakut/cameradar + prepare: + - apt-get update && apt-get install -y libcurl4-gnutls-dev + - dep ensure diff --git a/.travis.yml b/.travis.yml index f98c28f..270fc0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ sudo: required language: go env: - - DEP_VERSION="0.4.1" + - DEP_VERSION="0.5.0" -services: +services: - docker before_install: @@ -35,7 +35,7 @@ install: script: # Run unit tests - go test -v -covermode=count -coverprofile=coverage.out -- $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken $COVERALLS_TOKEN +- $HOME/gopath/bin/goveralls -coverprofile=coverage.out -service=travis-ci -repotoken=$COVERALLS_TOKEN # Launch a fake camera to check if cameradar is able to access it - docker run -d --name=fake_camera -e RTSP_USERNAME=admin -e RTSP_PASSWORD=12345 -p 8554:8554 ullaakut/rtspatt # Launch cameradar on the local machine diff --git a/Dockerfile b/Dockerfile index e965ad0..4363901 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN apk update && \ libc-dev \ git \ pkgconfig -ENV DEP_VERSION="0.4.1" +ENV DEP_VERSION="0.5.0" RUN curl -L -s https://github.com/golang/dep/releases/download/v${DEP_VERSION}/dep-linux-amd64 -o $GOPATH/bin/dep RUN chmod +x $GOPATH/bin/dep RUN dep ensure diff --git a/Gopkg.lock b/Gopkg.lock index d0ecbcc..1501bda 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,56 +1,79 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + digest = "1:9276bdb9eeded2b565dc65245d6011b68a2a6d6ffd4eeb389eb96df79a382169" + name = "github.com/Ullaakut/cameradar" + packages = ["."] + pruneopts = "UT" + revision = "a8c1c8c63b519919b3b375209fbc0b5da091a377" + version = "v2.1.0" + [[projects]] branch = "master" + digest = "1:f7dac107fd63208504e091d06051ef3596b19652433c1362b37e893332995ecf" name = "github.com/andelf/go-curl" packages = ["."] + pruneopts = "UT" revision = "f8b334df3789fbdf98df3b3b22815e958b956c19" [[projects]] + digest = "1:a2c1d0e43bd3baaa071d1b9ed72c27d78169b2b269f71c105ac4ba34b1be4a39" name = "github.com/davecgh/go-spew" packages = ["spew"] + pruneopts = "UT" revision = "346938d642f2ec3594ed81d874461961cd0faa76" version = "v1.1.0" [[projects]] + digest = "1:938a2672d6ebbb7f7bc63eee3e4b9464c16ffcf77ec8913d3edbf32b4e3984dd" name = "github.com/fatih/color" packages = ["."] + pruneopts = "UT" revision = "570b54cabe6b8eb0bc2dfce68d964677d63b5260" version = "v1.5.0" [[projects]] + digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd" name = "github.com/fsnotify/fsnotify" packages = ["."] + pruneopts = "UT" revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" version = "v1.4.7" [[projects]] branch = "master" + digest = "1:842de8d5a4c8fdbbceb55ab398dd8b68a35fe7f322012cf70571baa35c333ffa" name = "github.com/gernest/wow" packages = [ ".", - "spin" + "spin", ] + pruneopts = "UT" revision = "7e0b2a2398989a5d220eebac5742d45422ba7de8" [[projects]] + digest = "1:c42f32253560d1527291221734a9b0d9f20ace8ad076398c86b4e8cb59a72307" name = "github.com/go-playground/locales" packages = [ ".", - "currency" + "currency", ] + pruneopts = "UT" revision = "e4cbcb5d0652150d40ad0646651076b6bd2be4f6" version = "v0.11.2" [[projects]] + digest = "1:e022cf244bcac1b6ef933f1a2e0adcf6a6dfd7b872d8d41e4d4179bb09a87cbc" name = "github.com/go-playground/universal-translator" packages = ["."] + pruneopts = "UT" revision = "b32fa301c9fe55953584134cb6853a13c87ec0a1" version = "v0.16.0" [[projects]] branch = "master" + digest = "1:145eff5207977eb95c3649a27cdc2e467d8a1c104810bc12b6a53745a91d823a" name = "github.com/hashicorp/hcl" packages = [ ".", @@ -61,127 +84,163 @@ "hcl/token", "json/parser", "json/scanner", - "json/token" + "json/token", ] + pruneopts = "UT" revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" [[projects]] + digest = "1:f445828f7530db7a8608d69ffa858dacba0226df1b9dcc49b658d0a50b9245c6" name = "github.com/magefile/mage" packages = [ "mg", "sh", - "types" + "types", ] + pruneopts = "UT" revision = "ab3ca2f6f85577d7ec82e0a6df721147a2e737f9" version = "v2.0.1" [[projects]] + digest = "1:737b7bc969e207193639c1f96c7b9d0ed8d6c5b5fa33fa3e0c2adb899a02e388" name = "github.com/magiconair/properties" packages = ["."] + pruneopts = "UT" revision = "d419a98cdbed11a922bf76f257b7c4be79b50e73" version = "v1.7.4" [[projects]] + digest = "1:c658e84ad3916da105a761660dcaeb01e63416c8ec7bc62256a9b411a05fcd67" name = "github.com/mattn/go-colorable" packages = ["."] + pruneopts = "UT" revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072" version = "v0.0.9" [[projects]] + digest = "1:d4d17353dbd05cb52a2a52b7fe1771883b682806f68db442b436294926bbfafb" name = "github.com/mattn/go-isatty" packages = ["."] + pruneopts = "UT" revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" version = "v0.0.3" [[projects]] branch = "master" + digest = "1:8abbe3953d396fad8a4106b77e0fc89c6ee6d308a78f739be31a20fb8c9b4ed0" name = "github.com/mitchellh/mapstructure" packages = ["."] + pruneopts = "UT" revision = "b4575eea38cca1123ec2dc90c26529b5c5acfcff" [[projects]] + digest = "1:7231124c9669dfb54b82ef8b89f2735cf5d5d2529a23c6ac93a8c4b8bbb28b28" name = "github.com/pelletier/go-toml" packages = ["."] + pruneopts = "UT" revision = "acdc4509485b587f5e675510c4f2c63e90ff68a8" version = "v1.1.0" [[projects]] + digest = "1:40e195917a951a8bf867cd05de2a46aaf1806c50cf92eebf4c16f78cd196f747" name = "github.com/pkg/errors" packages = ["."] + pruneopts = "UT" revision = "645ef00459ed84a119197bfb8d8205042c6df63d" version = "v0.8.0" [[projects]] + digest = "1:0028cb19b2e4c3112225cd871870f2d9cf49b9b4276531f03438a88e94be86fe" name = "github.com/pmezard/go-difflib" packages = ["difflib"] + pruneopts = "UT" revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" [[projects]] + digest = "1:25cbfdc8c07a45b5aaa2ae0be642ea653554393aed77fcad692f201a2f3bf253" name = "github.com/spf13/afero" packages = [ ".", - "mem" + "mem", ] + pruneopts = "UT" revision = "bb8f1927f2a9d3ab41c9340aa034f6b803f4359c" version = "v1.0.2" [[projects]] + digest = "1:9b28ee2984c69d78afe2ce52b1650ba91a6381f355ff08c1d0e53d9e66bd62fe" name = "github.com/spf13/cast" packages = ["."] + pruneopts = "UT" revision = "acbeb36b902d72a7a4c18e8f3241075e7ab763e4" version = "v1.1.0" [[projects]] branch = "master" + digest = "1:080e5f630945ad754f4b920e60b4d3095ba0237ebf88dc462eb28002932e3805" name = "github.com/spf13/jwalterweatherman" packages = ["."] + pruneopts = "UT" revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394" [[projects]] + digest = "1:1b21a2b4058a779f290c7341cd93267492e0ecea6c8b54f64a4a5fd7ff131034" name = "github.com/spf13/pflag" packages = ["."] + pruneopts = "UT" revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66" version = "v1.0.0" [[projects]] + digest = "1:f8e1a678a2571e265f4bf91a3e5e32aa6b1474a55cb0ea849750cc177b664d96" name = "github.com/spf13/viper" packages = ["."] + pruneopts = "UT" revision = "25b30aa063fc18e48662b86996252eabdcf2f0c7" version = "v1.0.0" [[projects]] + digest = "1:1bc4a5bd879ce6b44fdaa2e8e1144921c145604764e92220009b951c1f2439f5" name = "github.com/stretchr/objx" packages = ["."] + pruneopts = "UT" revision = "facf9a85c22f48d2f52f2380e4efce1768749a89" version = "v0.1" [[projects]] + digest = "1:eca8319bce847b7208ed5ae89ef2efb28586a7095657217241641e1da78a3c13" name = "github.com/stretchr/testify" packages = [ "assert", - "mock" + "mock", ] + pruneopts = "UT" revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71" version = "v1.2.1" [[projects]] branch = "master" + digest = "1:38cb27d3525635c34e84e2dbc2207c37d10832776997665bf0ddaeae2c861f1f" name = "golang.org/x/crypto" packages = ["ssh/terminal"] + pruneopts = "UT" revision = "1875d0a70c90e57f11972aefd42276df65e895b9" [[projects]] branch = "master" + digest = "1:23a8ca440e5b60e8e31212e367e929a439256157e371842fca19f7618bd247c4" name = "golang.org/x/sys" packages = [ "unix", - "windows" + "windows", ] + pruneopts = "UT" revision = "8f27ce8a604014414f8dfffc25cbcde83a3f2216" [[projects]] branch = "master" + digest = "1:8029e9743749d4be5bc9f7d42ea1659471767860f0cdc34d37c3111bd308a295" name = "golang.org/x/text" packages = [ "internal/gen", @@ -189,25 +248,42 @@ "internal/ucd", "transform", "unicode/cldr", - "unicode/norm" + "unicode/norm", ] + pruneopts = "UT" revision = "e19ae1496984b1c655b8044a65c0300a3c878dd3" [[projects]] + digest = "1:25c1a739866b8300bfe91b47ad482ea10f8a337efd5966a006cb6c9ab30ef6bd" name = "gopkg.in/go-playground/validator.v9" packages = ["."] + pruneopts = "UT" revision = "48a433ba4bcadc5be9aa16d4bdcb383d3f57a741" version = "v9.9.3" [[projects]] branch = "v2" + digest = "1:73e6fda93622790d2371344759df06ff5ff2fac64a6b6e8832b792e7402956e7" name = "gopkg.in/yaml.v2" packages = ["."] + pruneopts = "UT" revision = "d670f9405373e636a5a2765eea47fac0c9bc91a4" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "cd90160a373567d6046fe1f1f30e822740533c06a766bcb75d2ed83820cd8526" + input-imports = [ + "github.com/Ullaakut/cameradar", + "github.com/andelf/go-curl", + "github.com/fatih/color", + "github.com/gernest/wow", + "github.com/gernest/wow/spin", + "github.com/pkg/errors", + "github.com/spf13/pflag", + "github.com/spf13/viper", + "github.com/stretchr/testify/assert", + "github.com/stretchr/testify/mock", + "gopkg.in/go-playground/validator.v9", + ] solver-name = "gps-cdcl" solver-version = 1