Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed warn on already latest version #791

Merged
merged 3 commits into from
Sep 26, 2018
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions client/cmd/kcoin/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/kowala-tech/kcoin/client/node"
"gopkg.in/urfave/cli.v1"
"github.com/kowala-tech/kcoin/client/version"
"github.com/blang/semver"
"github.com/kowala-tech/kcoin/client/params"
)

Expand Down Expand Up @@ -359,7 +358,7 @@ func mustBeLatestMajorVersion(ctx *cli.Context) {
return
}

current, err := semver.Make(params.Version)
current, err := version.MakeSemver(params.Version)
if err != nil {
log.Error("Error parsing current version, exiting checker", "err", err)
return
Expand Down
22 changes: 11 additions & 11 deletions client/version/checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,34 @@ import (
"github.com/kowala-tech/kcoin/client/params"
)

const checkInterval = time.Minute

func Checker(repository string) {
current, err := semver.Make(params.Version)
current, err := MakeSemver(params.Version)
if err != nil {
log.Error("error parsing current version, exiting checker", "err", err)
return
}

checker := &checker{
repository: repository,
current: current,
repository: repository,
current: current,
checkInterval: time.Minute,
}
go checker.check()
}

type checker struct {
repository string
current semver.Version
latest semver.Version
repository string
current semver.Version
latest semver.Version
checkInterval time.Duration
}

func (c *checker) check() {
for range time.Tick(checkInterval) {
for {
time.Sleep(c.checkInterval)
if c.isNewVersionAvailable() {
c.printNewVersionAvailable()
// we exit this go routine, we only tell the user once
break
c.checkInterval = c.checkInterval * 2
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions client/version/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package version

import (
"errors"
"github.com/blang/semver"
"regexp"
)

Expand All @@ -23,7 +22,7 @@ func filenameParser(filename string) (Asset, error) {
return asset{}, errors.New("cant parse filename")
}

version, err := semver.Make(matches[0][1])
version, err := MakeSemver(matches[0][1])
if err != nil {
return asset{}, err
}
Expand Down
14 changes: 14 additions & 0 deletions client/version/semver_parser.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package version

import (
"github.com/blang/semver"
"strings"
)

// MakeSemver returns a new semver version instance personalised to ignore Pre tag
func MakeSemver(s string) (semver.Version, error) {
if preIndex := strings.IndexRune(s, '-'); preIndex != -1 {
s = s[:preIndex]
}
return semver.Make(s)
}
26 changes: 26 additions & 0 deletions client/version/semver_parser_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package version

import (
"github.com/stretchr/testify/assert"
"testing"
)

func TestMakeSemver(t *testing.T) {
semver, err := MakeSemver("2.0.0")
assert.NoError(t, err)

assert.Equal(t, uint64(2), semver.Major)
assert.Equal(t, uint64(0), semver.Minor)
assert.Equal(t, uint64(0), semver.Patch)
assert.Len(t, semver.Pre, 0)
}

func TestMakeSemverIgnoresPre(t *testing.T) {
semver, err := MakeSemver("2.0.1-stable")
assert.NoError(t, err)

assert.Equal(t, uint64(2), semver.Major)
assert.Equal(t, uint64(0), semver.Minor)
assert.Equal(t, uint64(1), semver.Patch)
assert.Len(t, semver.Pre, 0)
}
2 changes: 1 addition & 1 deletion client/version/updater.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ type updater struct {
}

func NewUpdater(repository string, logger log.Logger) (*updater, error) {
current, err := semver.Make(params.Version)
current, err := MakeSemver(params.Version)
if err != nil {
return nil, err
}
Expand Down