Move versioning/updates stuff to a separate package

cmd/ipfs/init.go

@@ -11,6 +11,7 @@ import (
 	config "github.com/jbenet/go-ipfs/config"
 	ci "github.com/jbenet/go-ipfs/crypto"
 	spipe "github.com/jbenet/go-ipfs/crypto/spipe"
+	updates "github.com/jbenet/go-ipfs/updates"
 	u "github.com/jbenet/go-ipfs/util"
 )
 
@@ -138,7 +139,7 @@ func initCmd(c *commander.Command, inp []string) error {
 	// tracking ipfs version used to generate the init folder and adding update checker default setting.
 	cfg.Version = config.Version{
 		Check:   "error",
-		Current: currentVersion.String(),
+		Current: updates.Version,
 	}
 
 	err = config.WriteConfigFile(filename, cfg)

cmd/ipfs/ipfs.go

@@ -13,6 +13,7 @@ import (
 	config "github.com/jbenet/go-ipfs/config"
 	core "github.com/jbenet/go-ipfs/core"
 	daemon "github.com/jbenet/go-ipfs/daemon"
+	updates "github.com/jbenet/go-ipfs/updates"
 	u "github.com/jbenet/go-ipfs/util"
 )
 
@@ -120,7 +121,7 @@ func localNode(confdir string, online bool) (*core.IpfsNode, error) {
 	}
 
 	if cfg.Version.Check != config.CheckIgnore {
-		obsolete := checkForUpdates()
+		obsolete := updates.CheckForUpdates()
 		if obsolete != nil {
 			if cfg.Version.Check == config.CheckError {
 				return nil, obsolete

cmd/ipfs/version.go

 package main
 
 import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"os"
-
-	semver "github.com/coreos/go-semver/semver"
 	"github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/commander"
+	updates "github.com/jbenet/go-ipfs/updates"
 	u "github.com/jbenet/go-ipfs/util"
 )
 
-// The IPFS version.
-const (
-	Version                   = "0.1.0"
-	EndpointURLLatestReleases = "https://api.github.com/repos/jbenet/go-ipfs/tags"
-	VersionErrorShort         = `Warning: You are running version %s of go-ipfs. The latest version is %s.`
-	VersionErrorLong          = `
-	Warning: You are running version %s of go-ipfs. The latest version is %s.
-	Since this is alpha software, it is strongly recommended you update.
-
-	You can update go-ipfs by running
-
-	    ipfs version update
-
-	You can silence this message by running
-
-	    ipfs config update.check ignore
-
-	`
-)
-
 var cmdIpfsVersion = &commander.Command{
 	UsageLine: "version",
 	Short:     "Show ipfs version information.",
@@ -41,15 +16,7 @@ var cmdIpfsVersion = &commander.Command{
 	Run: versionCmd,
 }
 
-var currentVersion *semver.Version
-
 func init() {
-	var err error
-	currentVersion, err = semver.NewVersion(Version)
-	if err != nil {
-		fmt.Printf("The const Version literal in version.go needs to be in semver format: %s \n", Version)
-		os.Exit(1)
-	}
 	cmdIpfsVersion.Flag.Bool("number", false, "show only the number")
 }
 
@@ -58,46 +25,6 @@ func versionCmd(c *commander.Command, _ []string) error {
 	if !number {
 		u.POut("ipfs version ")
 	}
-	u.POut("%s\n", Version)
-	return nil
-}
-
-func checkForUpdates() error {
-	resp, err := http.Get(EndpointURLLatestReleases)
-	if err != nil {
-		// can't reach the endpoint, coud be firewall, or no internet connection or something else
-		// will just silently move on
-		return nil
-	}
-	var body interface{}
-	_ = json.NewDecoder(resp.Body).Decode(&body)
-	releases, ok := body.([]interface{})
-	if !ok {
-		// the response body does not seem to meet specified Github API format
-		// https://developer.github.com/v3/repos/#list-tags
-		// will just silently move on
-		return nil
-	}
-	for _, r := range releases {
-		release, ok := r.(map[string]interface{})
-		if !ok {
-			continue
-		}
-		tagName, ok := release["name"].(string)
-		if !ok {
-			continue
-		}
-		if len(tagName) > 0 && tagName[0] == 'v' {
-			// both 'v0.1.0' and '0.1.0' semver tagname conventions can be encountered
-			tagName = tagName[1:]
-		}
-		releaseVersion, err := semver.NewVersion(tagName)
-		if err != nil {
-			continue
-		}
-		if currentVersion.LessThan(*releaseVersion) {
-			return fmt.Errorf(VersionErrorLong, Version, tagName)
-		}
-	}
+	u.POut("%s\n", updates.Version)
 	return nil
 }

updates/updates.go

+package updates
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"os"
+
+	"github.com/coreos/go-semver/semver"
+)
+
+const (
+	Version                   = "0.1.0" // actual current application's version literal
+	EndpointURLLatestReleases = "https://api.github.com/repos/jbenet/go-ipfs/tags"
+	VersionErrorShort         = `Warning: You are running version %s of go-ipfs. The latest version is %s.`
+	VersionErrorLong          = `
+  Warning: You are running version %s of go-ipfs. The latest version is %s.
+  Since this is alpha software, it is strongly recommended you update.
+
+  You can update go-ipfs by running
+
+      ipfs version update
+
+  You can silence this message by running
+
+      ipfs config update.check ignore
+
+  `
+)
+
+var currentVersion *semver.Version
+
+func init() {
+	var err error
+	currentVersion, err = semver.NewVersion(Version)
+	if err != nil {
+		fmt.Printf("The const Version literal in version.go needs to be in semver format: %s \n", Version)
+		os.Exit(1)
+	}
+}
+
+func CheckForUpdates() error {
+	resp, err := http.Get(EndpointURLLatestReleases)
+	if err != nil {
+		// can't reach the endpoint, coud be firewall, or no internet connection or something else
+		// will just silently move on
+		return nil
+	}
+	var body interface{}
+	_ = json.NewDecoder(resp.Body).Decode(&body)
+	releases, ok := body.([]interface{})
+	if !ok {
+		// the response body does not seem to meet specified Github API format
+		// https://developer.github.com/v3/repos/#list-tags
+		// will just silently move on
+		return nil
+	}
+	for _, r := range releases {
+		release, ok := r.(map[string]interface{})
+		if !ok {
+			continue
+		}
+		tagName, ok := release["name"].(string)
+		if !ok {
+			continue
+		}
+		if len(tagName) > 0 && tagName[0] == 'v' {
+			// both 'v0.1.0' and '0.1.0' semver tagname conventions can be encountered
+			tagName = tagName[1:]
+		}
+		releaseVersion, err := semver.NewVersion(tagName)
+		if err != nil {
+			continue
+		}
+		if currentVersion.LessThan(*releaseVersion) {
+			return fmt.Errorf(VersionErrorLong, Version, tagName)
+		}
+	}
+	return nil
+}