Move version to package, add version to rwp command

Author: chocolatkey

cmd/rwp/cmd/root.go

@@ -3,13 +3,15 @@ package cmd
 import (
 	"os"
 
+	"github.com/readium/go-toolkit/pkg/util/version"
 	"github.com/spf13/cobra"
 )
 
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
-	Use:   "rwp",
-	Short: "Utilities for Readium Web Publications",
+	Use:     "rwp",
+	Short:   "Utilities for Readium Web Publications",
+	Version: version.Version,
 }
 
 // Execute adds all child commands to the root command and sets flags appropriately.

pkg/manifest/metadata.go

@@ -2,13 +2,13 @@ package manifest
 
 import (
 	"encoding/json"
-	"runtime/debug"
 	"strings"
 	"time"
 
 	"github.com/go-viper/mapstructure/v2"
 	"github.com/pkg/errors"
 	"github.com/readium/go-toolkit/pkg/internal/util"
+	"github.com/readium/go-toolkit/pkg/util/version"
 )
 
 // TODO replace with generic
@@ -456,8 +456,6 @@ func (m *Metadata) UnmarshalJSON(b []byte) error {
 // If you really don't want the version info in your manifest, you can blank this value.
 var ToolkitVersionKey = "https://github.com/readium/go-toolkit/releases"
 
-const toolkitRepo = "github.com/readium/go-toolkit"
-
 func (m Metadata) MarshalJSON() ([]byte, error) {
 	j := make(map[string]interface{})
 	if m.OtherMetadata != nil {
@@ -467,19 +465,7 @@ func (m Metadata) MarshalJSON() ([]byte, error) {
 	}
 
 	if ToolkitVersionKey != "" {
-		if info, ok := debug.ReadBuildInfo(); ok {
-			if info.Main.Path == toolkitRepo {
-				// This is the toolkit itself
-				j[ToolkitVersionKey] = info.Main.Version
-			} else {
-				// This is a module that uses the toolkit
-				for _, dep := range info.Deps {
-					if dep.Path == toolkitRepo {
-						j[ToolkitVersionKey] = dep.Version
-					}
-				}
-			}
-		}
+		j[ToolkitVersionKey] = version.Version
 	}
 
 	if m.Presentation != nil {

pkg/util/version/version.go

@@ -0,0 +1,24 @@
+package version
+
+import "runtime/debug"
+
+const toolkitRepo = "github.com/readium/go-toolkit"
+
+var Version = "unknown"
+
+func init() {
+	if info, ok := debug.ReadBuildInfo(); ok {
+		if info.Main.Path == toolkitRepo && info.Main.Version != "(devel)" {
+			// This is the toolkit itself
+			Version = info.Main.Version
+		} else {
+			// This is a module that uses the toolkit
+			for _, dep := range info.Deps {
+				if dep.Path == toolkitRepo {
+					Version = dep.Version
+					break
+				}
+			}
+		}
+	}
+}