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

Fix tests

Browse source
This commit is contained in:
Corey Johnson 2019-12-11 16:48:33 -08:00
parent deac6da2f4
commit 9428df4597
3 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

13
main.go
View file

@ -8,8 +8,8 @@ import (
"github.com/github/gh-cli/command"
"github.com/github/gh-cli/update"
"github.com/github/gh-cli/utils"
"github.com/mattn/go-isatty"
"github.com/mgutz/ansi"
"github.com/mitchellh/go-homedir"
)
var updaterEnabled = ""
@ -45,8 +45,9 @@ func main() {
}
func shouldCheckForUpdate() bool {
errFd := os.Stderr.Fd()
return updaterEnabled != "" && (isatty.IsTerminal(errFd) || isatty.IsCygwinTerminal(errFd))
// errFd := os.Stderr.Fd()
// return updaterEnabled != "" && (isatty.IsTerminal(errFd) || isatty.IsCygwinTerminal(errFd))
return true
}
func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) {
@ -60,5 +61,9 @@ func checkForUpdate(currentVersion string) (*update.ReleaseInfo, error) {
}
repo := updaterEnabled
return update.CheckForUpdate(client, repo, currentVersion)
stateFilePath, err := homedir.Expand("~/.config/gh/state.yml")
if err != nil {
return nil, err
}
return update.CheckForUpdate(client, stateFilePath, repo, currentVersion)
}

37
update/update.go
View file

@ -7,14 +7,13 @@ import (
"github.com/github/gh-cli/api"
"github.com/hashicorp/go-version"
"github.com/mitchellh/go-homedir"
"gopkg.in/yaml.v3"
)
// ReleaseInfo stores information about a release
type ReleaseInfo struct {
Version string
URL string
Version string `json:"tag_name"`
URL string `json:"html_url"`
}
type StateEntry struct {
@ -23,12 +22,13 @@ type StateEntry struct {
}
// CheckForUpdate checks whether this software has had a newer relase on GitHub
func CheckForUpdate(client *api.Client, repo, currentVersion string) (*ReleaseInfo, error) {
latestRelease, err := getLatestReleaseInfo(client, repo, currentVersion)
func CheckForUpdate(client *api.Client, stateFilePath, repo, currentVersion string) (*ReleaseInfo, error) {
latestRelease, err := getLatestReleaseInfo(client, stateFilePath, repo, currentVersion)
if err != nil {
return nil, err
}
fmt.Printf("🌭 %+v -> %+v\n", latestRelease.Version, currentVersion)
if versionGreaterThan(latestRelease.Version, currentVersion) {
return latestRelease, nil
}
@ -36,8 +36,8 @@ func CheckForUpdate(client *api.Client, repo, currentVersion string) (*ReleaseIn
return nil, nil
}
func getLatestReleaseInfo(client *api.Client, repo, currentVersion string) (*ReleaseInfo, error) {
stateEntry, err := getStateEntry()
func getLatestReleaseInfo(client *api.Client, stateFilePath, repo, currentVersion string) (*ReleaseInfo, error) {
stateEntry, err := getStateEntry(stateFilePath)
if err != nil {
return nil, err
}
@ -52,8 +52,9 @@ func getLatestReleaseInfo(client *api.Client, repo, currentVersion string) (*Rel
if err != nil {
return nil, err
}
fmt.Printf("🌭 latestRelease: %+v\n", latestRelease)
err = setStateEntry(time.Now(), latestRelease)
err = setStateEntry(stateFilePath, time.Now(), latestRelease)
if err != nil {
return nil, err
}
@ -61,17 +62,13 @@ func getLatestReleaseInfo(client *api.Client, repo, currentVersion string) (*Rel
return &latestRelease, nil
}
func stateFileName() string {
f, _ := homedir.Expand("~/.config/gh/state.yml")
return f
}
func getStateEntry() (*StateEntry, error) {
f := stateFileName()
content, err := ioutil.ReadFile(f)
func getStateEntry(stateFilePath string) (*StateEntry, error) {
content, err := ioutil.ReadFile(stateFilePath)
if err != nil {
// State files doesn't exist, so create one with default values.
lastWeek := time.Now().Add(-time.Hour * 24 * 7)
data := StateEntry{
CheckedForUpdateAt: time.Now(),
CheckedForUpdateAt: lastWeek,
LatestRelease: ReleaseInfo{
Version: "v0.0.0",
URL: "<?>",
@ -81,7 +78,7 @@ func getStateEntry() (*StateEntry, error) {
if err != nil {
return nil, err
}
ioutil.WriteFile(f, content, 0600)
ioutil.WriteFile(stateFilePath, content, 0600)
}
var stateEntry StateEntry
@ -93,7 +90,7 @@ func getStateEntry() (*StateEntry, error) {
return &stateEntry, nil
}
func setStateEntry(t time.Time, r ReleaseInfo) error {
func setStateEntry(stateFilePath string, t time.Time, r ReleaseInfo) error {
data := StateEntry{
CheckedForUpdateAt: t,
LatestRelease: r,
@ -102,7 +99,7 @@ func setStateEntry(t time.Time, r ReleaseInfo) error {
if err != nil {
return err
}
ioutil.WriteFile(stateFileName(), content, 0600)
ioutil.WriteFile(stateFilePath, content, 0600)
return nil
}

15
update/update_test.go
View file

@ -3,6 +3,9 @@ package update
import (
"bytes"
"fmt"
"io/ioutil"
"log"
"os"
"testing"
"github.com/github/gh-cli/api"
@ -55,7 +58,7 @@ func TestCheckForUpdate(t *testing.T) {
"html_url": "%s"
}`, s.LatestVersion, s.LatestURL)))
rel, err := CheckForUpdate(client, "OWNER/REPO", s.CurrentVersion)
rel, err := CheckForUpdate(client, tempFilePath(), "OWNER/REPO", s.CurrentVersion)
if err != nil {
t.Fatal(err)
}
@ -87,3 +90,13 @@ func TestCheckForUpdate(t *testing.T) {
})
}
}
func tempFilePath() string {
file, err := ioutil.TempFile("", "")
if err != nil {
log.Fatal(err)
}
os.Remove(file.Name())
fmt.Printf("🌭 %+v\n", file.Name())
return file.Name()
}