remove fmtr status from init(), include container runtime info in ver…

…sion cmd

cmd/hof/cmd/version.go

@@ -8,8 +8,8 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/hofstadter-io/hof/cmd/hof/ga"
-
 	"github.com/hofstadter-io/hof/cmd/hof/verinfo"
+	"github.com/hofstadter-io/hof/lib/container"
 )
 
 const versionMessage = `hof - the high code framework
@@ -23,6 +23,7 @@ CueVersion:  %s
 OS / Arch:   %s %s
 ConfigDir:   %s
 CacheDir:    %s
+Containers:  %s
 
 Author:      Hofstadter, Inc
 Homepage:    https://hofstadter.io
@@ -48,6 +49,16 @@ var VersionCmd = &cobra.Command{
 		configDir, _ := os.UserConfigDir()
 		cacheDir, _ := os.UserCacheDir()
 
+		err := container.InitClient()
+		if err != nil {
+			fmt.Println(err)
+		}
+
+		rt, err := container.GetVersion()
+		if err != nil {
+			fmt.Println(err)
+		}
+
 		fmt.Printf(
 			versionMessage,
 			verinfo.Version,
@@ -59,6 +70,7 @@ var VersionCmd = &cobra.Command{
 			verinfo.BuildArch,
 			filepath.Join(configDir,"hof"),
 			filepath.Join(cacheDir,"hof"),
+			rt,
 		)
 	},
 }

cmd/hof/verinfo/verinfo.go

@@ -14,15 +14,17 @@ var (
 	BuildOS   = "Unknown"
 	BuildArch = "Unknown"
 
-	CueVersion = "0.5.0"
+	// todo, look this up from deps
+	CueVersion = "0.6.0-beta.1"
 
 	// this is a version we can fetch with hof mod
 	// the value gets injected into templates in various places
 	// the default here is set to something useful for dev
 	// the release version is the same as the cli running it
-	HofVersion = "v0.6.8-beta.10"
+	HofVersion = "v0.6.8-rc.5"
 )
 
+
 func init() {
 	info, _ := debug.ReadBuildInfo()
 	GoVersion = info.GoVersion

lib/container/responses.go

@@ -16,8 +16,6 @@ type Image struct {
 	Names []string
 }
 
-var portExp = regexp.MustCompile(`:(\d+)->`)
-
 type Container struct {
 	Ports  PortList
 	Image  string
@@ -28,6 +26,14 @@ type Container struct {
 
 type PortList []int
 
+type NameList []string
+
+type structuredPort struct {
+	HostPort int `json:"host_port"`
+}
+
+var portExp = regexp.MustCompile(`:(\d+)->`)
+
 func (l *PortList) UnmarshalJSON(b []byte) error {
 	if len(b) == 0 {
 		return nil
@@ -72,8 +78,6 @@ func (l *PortList) UnmarshalJSON(b []byte) error {
 	return nil
 }
 
-type NameList []string
-
 func (l *NameList) UnmarshalJSON(b []byte) error {
 	if len(b) == 0 {
 		return nil
@@ -98,19 +102,3 @@ func (l *NameList) UnmarshalJSON(b []byte) error {
 
 	return nil
 }
-
-type structuredPort struct {
-	HostPort int `json:"host_port"`
-}
-
-type RuntimeVersion struct {
-	Client struct {
-		Version    string
-		APIVersion string
-	}
-	Server struct {
-		Version       string
-		APIVersion    string
-		MinAPIVersion string
-	}
-}

lib/container/runtime.go

@@ -93,15 +93,6 @@ func (r runtime) execJSON(ctx context.Context, resp any, args ...string) error {
 	return nil
 }
 
-func (r runtime) Version(ctx context.Context) (RuntimeVersion, error) {
-	var rv RuntimeVersion
-	if err := r.execJSON(ctx, &rv, "version", "--format", "{{ json . }}"); err != nil {
-		return rv, fmt.Errorf("exec json: %w", err)
-	}
-
-	return rv, nil
-}
-
 func (r runtime) Containers(ctx context.Context, name Name) ([]Container, error) {
 	args := []string{
 		"container", "ls", "-a",
@@ -272,6 +263,5 @@ func ndjson[T any](r io.Reader) ([]T, error) {
 		}
 	}
 
-	// fmt.Println("ts:", ts)
 	return ts, nil
 }

lib/container/version.go

@@ -2,12 +2,45 @@ package container
 
 import (
 	"context"
+	"fmt"
 	"time"
 )
 
+type RuntimeVersion struct {
+	Name string
+	Client struct {
+		Version    string
+		APIVersion string
+	}
+	Server struct {
+		Version       string
+		APIVersion    string
+		MinAPIVersion string
+	}
+}
+
 func GetVersion() (RuntimeVersion, error) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	defer cancel()
 
 	return rt.Version(ctx)
 }
+
+func (r runtime) Version(ctx context.Context) (RuntimeVersion, error) {
+	var rv RuntimeVersion
+	if err := r.execJSON(ctx, &rv, "version", "--format", "{{ json . }}"); err != nil {
+		return rv, fmt.Errorf("exec json: %w", err)
+	}
+
+	rv.Name = string(r.bin)
+	return rv, nil
+}
+
+func (r RuntimeVersion) String() string {
+	return fmt.Sprintf(
+		"%s [%s (client) | %s (server)]",
+		r.Name,
+		r.Client.Version,
+		r.Server.Version,
+	)
+}

lib/fmt/call.go

@@ -74,6 +74,11 @@ func (fmtr *Formatter) Call(filename string, content []byte, config any) ([]byte
 }
 
 func (fmtr *Formatter) WaitForRunning(retry int, delay time.Duration) error {
+
+	// We should probably rethink how this works, such that
+	// we minimize our exec out to docker (et al)
+	// we can exec once and then check on all formatters
+
 	// fmt.Println("wait-running.0:", fmtr.Name, fmtr.Status, fmtr.Running, fmtr.Ready)
 	// return if already running
 	if fmtr.Running {
@@ -99,6 +104,11 @@ func (fmtr *Formatter) WaitForRunning(retry int, delay time.Duration) error {
 
 		if fmtr.Status == "running" {
 			fmtr.Running = true
+			// we need to be more detailed here if we are going to make this a sync.Once
+			// (well we can't once here, but we want to generally for most other uses)
+			// here, we update all formatter statuses in the wait/retry loop of each
+			// this might end up being ok, since the next formatter will come in return immediately
+			// ... maybe we can just remove this call?
 			err = updateFormatterStatus()
 			if err != nil {
 				return err

lib/fmt/cmd.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"sort"
 	"time"
 
 	"github.com/olekukonko/tablewriter"
@@ -440,6 +441,8 @@ func Info(which string) (err error) {
 					}
 				}
 
+				sort.Strings(fmtr.Available)
+
 				if fmtr.Container != nil {
 					rows = append(rows, []string{
 						fmtr.Name,
@@ -466,8 +469,6 @@ func Info(which string) (err error) {
 			return rows, nil
 		},
 	)
-
-	return nil
 }
 
 func updateFormatterStatus() error {

lib/fmt/fmtrs.go

@@ -79,7 +79,7 @@ func init() {
 	}
 
 	// gracefully init images / containers
-	err := Init()
+	err := container.InitClient()
 	if err != nil {
 		if debug {
 			fmt.Println("fmt init error:", err)
@@ -93,20 +93,6 @@ func init() {
 	}
 }
 
-func Init() error {
-	err := container.InitClient()
-	if err != nil {
-		return err
-	}
-
-	err = updateFormatterStatus()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 type Formatter struct {
 	// name, same as tools/%
 	Name      string