STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplify CheckForUpdate handling of state file

Browse source
This commit is contained in:
Sam Coe 2020-12-01 12:18:32 -05:00 • committed by Mislav Marohnić
parent 0ec8c2e9ed
commit 42c97509ca
2 changed files with 17 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

37
update/update.go
View file

@ -24,45 +24,36 @@ type StateEntry struct {
// CheckForUpdate checks whether this software has had a newer release on GitHub
func CheckForUpdate(client *api.Client, stateFilePath, repo, currentVersion string) (*ReleaseInfo, error) {
releaseInfo, err := getLatestReleaseInfo(client, stateFilePath, repo)
stateEntry, _ := getStateEntry(stateFilePath)
if stateEntry != nil && time.Since(stateEntry.CheckedForUpdateAt).Hours() < 24 {
return nil, nil
}
releaseInfo, err := getLatestReleaseInfo(client, repo)
if err != nil {
return nil, err
}
if releaseInfo == nil {
return nil, nil
err = setStateEntry(stateFilePath, time.Now(), *releaseInfo)
if err != nil {
return nil, err
}
if versionGreaterThan(releaseInfo.LatestRelease.Version, currentVersion) {
return &releaseInfo.LatestRelease, nil
if versionGreaterThan(releaseInfo.Version, currentVersion) {
return releaseInfo, nil
}
return nil, nil
}
func getLatestReleaseInfo(client *api.Client, stateFilePath, repo string) (*StateEntry, error) {
stateEntry, err := getStateEntry(stateFilePath)
if err == nil && time.Since(stateEntry.CheckedForUpdateAt).Hours() < 24 {
return nil, nil
}
func getLatestReleaseInfo(client *api.Client, repo string) (*ReleaseInfo, error) {
var latestRelease ReleaseInfo
err = client.REST(ghinstance.Default(), "GET", fmt.Sprintf("repos/%s/releases/latest", repo), nil, &latestRelease)
err := client.REST(ghinstance.Default(), "GET", fmt.Sprintf("repos/%s/releases/latest", repo), nil, &latestRelease)
if err != nil {
return nil, err
}
err = setStateEntry(stateFilePath, time.Now(), latestRelease)
if err != nil {
return nil, err
}
stateEntry, err = getStateEntry(stateFilePath)
if err != nil {
return nil, err
}
return stateEntry, nil
return &latestRelease, nil
}
func getStateEntry(stateFilePath string) (*StateEntry, error) {

17
update/update_test.go
View file

@ -52,9 +52,6 @@ func TestCheckForUpdate(t *testing.T) {
for _, s := range scenarios {
t.Run(s.Name, func(t *testing.T) {
stateFilePath := tempFilePath()
defer os.Remove(stateFilePath)
http := &httpmock.Registry{}
client := api.NewClient(api.ReplaceTripper(http))
http.StubResponse(200, bytes.NewBufferString(fmt.Sprintf(`{
@ -62,7 +59,7 @@ func TestCheckForUpdate(t *testing.T) {
"html_url": "%s"
}`, s.LatestVersion, s.LatestURL)))
rel, err := CheckForUpdate(client, stateFilePath, "OWNER/REPO", s.CurrentVersion)
rel, err := CheckForUpdate(client, tempFilePath(), "OWNER/REPO", s.CurrentVersion)
if err != nil {
t.Fatal(err)
}
@ -96,18 +93,10 @@ func TestCheckForUpdate(t *testing.T) {
}
func tempFilePath() string {
content := []byte(
`checked_for_update_at: 2020-11-22T09:53:32.609610344-03:00
latest_release:
version: v1.1.0
url: https://github.com/cli/cli/releases/tag/v1.1.0`)
file, err := ioutil.TempFile("", "state*.yml")
file, err := ioutil.TempFile("", "")
if err != nil {
log.Fatal(err)
}
if _, err := file.Write(content); err != nil {
log.Fatal(err)
}
os.Remove(file.Name())
return file.Name()
}