[WIP] Iterations

.travis.yml

@@ -1,7 +1,7 @@
 language: go
 
 go:
-    - "1.12.x"
+    - "1.14.x"
     - master
 
 script:

Makefile

@@ -14,6 +14,9 @@ pre-build:
 
 build: pre-build
 	@go build -ldflags "-X $(CODEPATH)/cmd.version=$(RESUMIC_VERSION)$(SUFFIX) -X $(CODEPATH)/cmd.gitCommit=$(GITCOMMIT)" -o resumic
+	./resumic generate example
+	./resumic generate uischema
+	./resumic generate jsonschema
 	@packr2 clean
 
 release: pre-build
@@ -25,4 +28,4 @@ test: build
 
 .PHONY: clean
 clean: ./resumic
-	@rm resumic
+	@rm resumic

cmd/generate_example.go

@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"io/ioutil"
 
-	"go.resumic.org/schema/schema"
 	"github.com/spf13/cobra"
+	"go.resumic.org/schema/schema"
 )
 
-// Flag to specify output. Default value is "resume_example.json"
+// Flag to specify output. Default value is "resume-example.json"
 var outputFileName string
 
 func generateExampleRun(cmd *cobra.Command, args []string) error {
@@ -38,6 +38,6 @@ var generateExampleCmd = &cobra.Command{
 }
 
 func init() {
-	generateExampleCmd.Flags().StringVarP(&outputFileName, "output", "o", "resume_example.json", "Specify a custom output file for example resume data.")
+	generateExampleCmd.Flags().StringVarP(&outputFileName, "output", "o", "resume-example.json", "Specify a custom output file for example resume data.")
 	generateCmd.AddCommand(generateExampleCmd)
 }

cmd/generate_example_test.go

@@ -16,7 +16,7 @@ func TestGenerateExampleRunValid(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Could not generate example, %s", err)
 	}
-	r, err := compareJSONFiles("../example.json", tempFile.Name())
+	r, err := compareJSONFiles("../resume-example.json", tempFile.Name())
 	if err != nil {
 		t.Fatalf("could not compare example.json and generated schema: %s", err)
 	}

cmd/generate_jsonschema.go

@@ -31,6 +31,6 @@ var generateJSONSchemaCmd = &cobra.Command{
 }
 
 func init() {
-	generateJSONSchemaCmd.Flags().StringVarP(&schemaPath, "output", "o", "resume.json", "Specify an output file for the resume data")
+	generateJSONSchemaCmd.Flags().StringVarP(&schemaPath, "output", "o", "schema.json", "Specify an output file for the resume data")
 	generateCmd.AddCommand(generateJSONSchemaCmd)
 }

cmd/generate_uischema.go

@@ -31,6 +31,6 @@ var generateUISchemaCmd = &cobra.Command{
 }
 
 func init() {
-	generateUISchemaCmd.Flags().StringVarP(&uiSchemaPath, "output", "o", "resume.json", "Specify an output file for the resume data")
+	generateUISchemaCmd.Flags().StringVarP(&uiSchemaPath, "output", "o", "ui-schema.json", "Specify an output file for the resume data")
 	generateCmd.AddCommand(generateUISchemaCmd)
 }

cmd/generate_uischema_test.go

@@ -16,7 +16,7 @@ func TestGenerateUISchemaRunValid(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Could not generate schema, %s", err)
 	}
-	r, err := compareJSONFiles("../ui.json", tempFile.Name())
+	r, err := compareJSONFiles("../ui-schema.json", tempFile.Name())
 	if err != nil {
 		t.Fatalf("could not compare ui.json and generated schema: %s", err)
 	}

cmd/render_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func TestRenderRun(t *testing.T) {
-	resumePath := "../example.json"
+	resumePath := "../resume-example.json"
 	htmlPath := "../example.html"
 	cacheDir, err := ioutil.TempDir("", "")
 	if err != nil {

cmd/validate_test.go

@@ -3,7 +3,7 @@ package cmd
 import "testing"
 
 func TestValidateRunValid(t *testing.T) {
-	resumeFile := "../example.json"
+	resumeFile := "../resume-example.json"
 	err := Execute([]string{"validate", "-r", resumeFile}) //validateRun(validateCmd, []string{"-r", resumeFile})
 	if err != nil {
 		t.Fatalf("Expected valid state, got error, %s", err)

go.mod

@@ -3,10 +3,11 @@ module go.resumic.org/schema
 go 1.13
 
 require (
-	github.com/gobuffalo/packd v0.3.0
-	github.com/gobuffalo/packr/v2 v2.6.0
+	github.com/gobuffalo/envy v1.7.0 // indirect
+	github.com/gobuffalo/packd v1.0.0
+	github.com/gobuffalo/packr/v2 v2.8.0
 	github.com/gohugoio/hugo v0.58.1
-	github.com/spf13/cobra v0.0.5
+	github.com/spf13/cobra v0.0.6
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
 	github.com/xeipuuv/gojsonschema v1.1.0