More WIP

Author: kyleconroy

internal/bundler/build.go

@@ -9,6 +9,7 @@ import (
 	"path/filepath"
 
 	"github.com/kyleconroy/sqlc/internal/config"
+	"github.com/kyleconroy/sqlc/internal/debug"
 	"github.com/kyleconroy/sqlc/internal/sql/sqlpath"
 )
 
@@ -40,18 +41,17 @@ func Build(file string, conf *config.Config) ([]byte, error) {
 			return nil, err
 		}
 	}
-
+	if err := addMetadata(w); err != nil {
+		return nil, err
+	}
 	if err := w.Flush(); err != nil {
 		return nil, err
 	}
-
 	if err := gw.Flush(); err != nil {
 		return nil, err
 	}
-
 	w.Close()
 	gw.Close()
-
 	return b.Bytes(), nil
 }
 
@@ -69,6 +69,7 @@ func addFile(w *tar.Writer, file string) error {
 	if err != nil {
 		return err
 	}
+	debug.Dump(header)
 	header.Name = file
 	if err := w.WriteHeader(header); err != nil {
 		return err

internal/bundler/metadata.go

@@ -0,0 +1,70 @@
+package bundler
+
+import (
+	"archive/tar"
+	"encoding/json"
+	"fmt"
+	"runtime"
+	"time"
+
+	"github.com/kyleconroy/sqlc/internal/info"
+)
+
+type jsonTime struct {
+	time.Time
+}
+
+func (t jsonTime) MarshalJSON() ([]byte, error) {
+	//do your serializing here
+	stamp := fmt.Sprintf("\"%s\"", t.Format(time.RFC3339))
+	return []byte(stamp), nil
+}
+
+type setting struct {
+	Key, Value string
+}
+
+type metadata struct {
+	Version   string    `json:"version"`
+	GoVersion string    `json:"go_version"`
+	GOOS      string    `json:"goos"`
+	GOARCH    string    `json:"goarch"`
+	Created   jsonTime  `json:"created"`
+	Settings  []setting `json:"settings"`
+}
+
+func buildMetadata() (*metadata, error) {
+	return &metadata{
+		Version:   info.Version,
+		GoVersion: runtime.Version(),
+		GOOS:      runtime.GOOS,
+		GOARCH:    runtime.GOARCH,
+		Created:   jsonTime{time.Now().UTC()},
+	}, nil
+}
+
+func addMetadata(w *tar.Writer) error {
+	md, err := buildMetadata()
+	if err != nil {
+		return err
+	}
+	blob, err := json.Marshal(md)
+	if err != nil {
+		return err
+	}
+	header := &tar.Header{
+		Name:       "metadata.json",
+		Size:       int64(len(blob)),
+		Mode:       0420,
+		ModTime:    md.Created.Time,
+		AccessTime: md.Created.Time,
+		ChangeTime: md.Created.Time,
+	}
+	if err := w.WriteHeader(header); err != nil {
+		return err
+	}
+	if _, err := w.Write(blob); err != nil {
+		return err
+	}
+	return nil
+}

internal/cmd/cmd.go

@@ -15,6 +15,7 @@ import (
 
 	"github.com/kyleconroy/sqlc/internal/config"
 	"github.com/kyleconroy/sqlc/internal/debug"
+	"github.com/kyleconroy/sqlc/internal/info"
 	"github.com/kyleconroy/sqlc/internal/tracer"
 )
 
@@ -61,9 +62,7 @@ var versionCmd = &cobra.Command{
 			defer trace.StartRegion(cmd.Context(), "version").End()
 		}
 		if version == "" {
-			// When no version is set, return the next bug fix version
-			// after the most recent tag
-			fmt.Printf("%s\n", "v1.12.0")
+			fmt.Printf("%s\n", info.Version)
 		} else {
 			fmt.Printf("%s\n", version)
 		}

internal/cmd/package.go

@@ -18,6 +18,7 @@ var packageCmd = &cobra.Command{
 		stderr := cmd.ErrOrStderr()
 		dir, name := getConfigPath(stderr, cmd.Flag("file"))
 		if err := createPkg(ParseEnv(cmd), dir, name, stderr); err != nil {
+			fmt.Fprintf(stderr, "error building package: %s\n", err)
 			os.Exit(1)
 		}
 		return nil

internal/info/facts.go

@@ -0,0 +1,5 @@
+package info
+
+// When no version is set, return the next bug fix version
+// after the most recent tag
+const Version = "v1.12.0"