From 97e4381206e810677b08ddf54c778d84ae4ebf6e Mon Sep 17 00:00:00 2001 From: Mathieu Cornic Date: Tue, 12 Dec 2017 20:25:45 +0100 Subject: [PATCH] Feat/dep update (#28) * feat: dep update * fix: download dep as a binary --- .travis.yml | 6 ++--- Gopkg.lock | 34 ++++++++++++++---------- Gopkg.toml | 6 ++--- examples/default/default.maintenance.txt | 2 +- examples/flat/flat.maintenance.txt | 2 +- hermes.go | 2 +- 6 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1a544c4..e0055bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,10 +7,8 @@ go: - 1.9 install: -- wget https://github.com/golang/dep/releases/download/v0.3.0/dep-linux-amd64.zip -- unzip dep-linux-amd64.zip -- chmod +x dep -- ./dep ensure +- curl -L https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 -o dep +- chmod u+x dep && ./dep ensure - go get -u github.com/alecthomas/gometalinter - gometalinter -u -i -f diff --git a/Gopkg.lock b/Gopkg.lock index 5c8e3a4..85c0094 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -4,14 +4,14 @@ [[projects]] name = "github.com/Masterminds/semver" packages = ["."] - revision = "517734cc7d6470c0d07130e40fd40bdeb9bcd3fd" - version = "v1.3.1" + revision = "15d8430ab86497c5c0da827b748823945e1cf1e1" + version = "v1.4.0" [[projects]] name = "github.com/Masterminds/sprig" packages = ["."] - revision = "9526be0327b26ad31aa70296a7b10704883976d5" - version = "2.12.0" + revision = "b217b9c388de2cacde4354c536e520c52c055563" + version = "v2.14.1" [[projects]] name = "github.com/aokoli/goutils" @@ -29,19 +29,19 @@ branch = "master" name = "github.com/huandu/xstrings" packages = ["."] - revision = "3959339b333561bf62a38b424fd41517c2c90f40" + revision = "37469d0c81a7910b49d64a0d308ded4823e90937" [[projects]] name = "github.com/imdario/mergo" packages = ["."] - revision = "3e95a51e0639b4cf372f2ccf74c86749d747fbdc" - version = "0.2.2" + revision = "7fe0c75c13abdee74b09fcacef5ea1c6bba6a874" + version = "0.2.4" [[projects]] branch = "master" name = "github.com/jaytaylor/html2text" packages = ["."] - revision = "7c7a33a7a158a5ce395c803d2b6a209b2bbc14c8" + revision = "0ee88d3006305456b84cad14a24b2576f9411965" [[projects]] name = "github.com/mattn/go-runewidth" @@ -53,7 +53,7 @@ branch = "master" name = "github.com/olekukonko/tablewriter" packages = ["."] - revision = "be5337e7b39e64e5f91445ce7e721888dbab7387" + revision = "65fec0d89a572b4367094e2058d3ebe667de3b60" [[projects]] name = "github.com/pmezard/go-difflib" @@ -62,10 +62,10 @@ version = "v1.0.0" [[projects]] - branch = "master" name = "github.com/russross/blackfriday" packages = ["."] - revision = "4048872b16cc0fc2c5fd9eacf0ed2c2fedaa0c8c" + revision = "cadec560ec52d93835bf2f15bd794700d3a2473b" + version = "v2.0.0" [[projects]] name = "github.com/satori/go.uuid" @@ -73,6 +73,12 @@ revision = "879c5887cd475cd7864858769793b2ceb0d44feb" version = "v1.1.0" +[[projects]] + branch = "master" + name = "github.com/shurcooL/sanitized_anchor_name" + packages = ["."] + revision = "86672fcb3f950f35f2e675df2240550f2a50762f" + [[projects]] branch = "master" name = "github.com/ssor/bom" @@ -89,17 +95,17 @@ branch = "master" name = "golang.org/x/crypto" packages = ["pbkdf2","scrypt"] - revision = "81e90905daefcd6fd217b62423c0908922eadb30" + revision = "94eea52f7b742c7cbe0b03b22f0c4c8631ece122" [[projects]] branch = "master" name = "golang.org/x/net" packages = ["html","html/atom"] - revision = "57efc9c3d9f91fb3277f8da1cff370539c4d3dc5" + revision = "d866cfc389cec985d6fda2859936a575a55a3ab6" [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "4e74aaf6892a9d5f15468c703ce8ff2ca7ad02da350a56b987946ef7e5761d52" + inputs-digest = "936b042897ce8e2126fd38e5f3b757eb564a83800341f0ad7ef55b27181e8770" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index 122ba94..a400495 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -23,11 +23,11 @@ [[constraint]] name = "github.com/Masterminds/sprig" - version = "2.12.0" + version = "2.14.1" [[constraint]] name = "github.com/imdario/mergo" - version = "0.2.2" + version = "0.2.4" [[constraint]] branch = "master" @@ -35,7 +35,7 @@ [[constraint]] name = "github.com/russross/blackfriday" - branch = "master" + version = "2.0.0" [[constraint]] name = "github.com/stretchr/testify" diff --git a/examples/default/default.maintenance.txt b/examples/default/default.maintenance.txt index 2b290fe..ea650c2 100644 --- a/examples/default/default.maintenance.txt +++ b/examples/default/default.maintenance.txt @@ -20,7 +20,7 @@ Services will be unavailable based on the following schedule: | Service C | 5AM to 6AM | +-----------+------------+ -Feel free to contact us for any question regarding this matter at support@hermes-example.com ( support@hermes-example.com ) or in our Gitter ( https://gitter.im/ ) +Feel free to contact us for any question regarding this matter at support@hermes-example.com or in our Gitter ( https://gitter.im/ ) Yours truly, Hermes - https://example-hermes.com/ diff --git a/examples/flat/flat.maintenance.txt b/examples/flat/flat.maintenance.txt index 2b290fe..ea650c2 100644 --- a/examples/flat/flat.maintenance.txt +++ b/examples/flat/flat.maintenance.txt @@ -20,7 +20,7 @@ Services will be unavailable based on the following schedule: | Service C | 5AM to 6AM | +-----------+------------+ -Feel free to contact us for any question regarding this matter at support@hermes-example.com ( support@hermes-example.com ) or in our Gitter ( https://gitter.im/ ) +Feel free to contact us for any question regarding this matter at support@hermes-example.com or in our Gitter ( https://gitter.im/ ) Yours truly, Hermes - https://example-hermes.com/ diff --git a/hermes.go b/hermes.go index a76a5d1..0834738 100644 --- a/hermes.go +++ b/hermes.go @@ -73,7 +73,7 @@ type Body struct { // ToHTML converts Markdown to HTML func (c Markdown) ToHTML() template.HTML { - return template.HTML(blackfriday.MarkdownCommon([]byte(string(c)))) + return template.HTML(blackfriday.Run([]byte(string(c)))) } // Entry is a simple entry of a map