add validate cmd

Author: Oleg Sucharevich

build/cli-generator.yaml

@@ -1,7 +1,7 @@
 metadata:
   name: cli-generator
   description: Generate CLI entrypoints from spec file
-  version: 0.13.0
+  version: 0.14.0
   maintainers:
     - Oleg Sucharevich
 loose: true
@@ -42,3 +42,8 @@ commands:
       type: string
     - name: project-dir
       type: string
+- name: validate
+  description: Validate cli.yaml with spec file
+  flags:
+    - name: spec
+      type: string

cmd/validate.go

@@ -56,13 +56,16 @@
             "type": "object",
             "properties": {
                 "name": {
-                    "type": "string"
+                    "type": "string",
+                    "pattern": ".+"
                 },
                 "parent": {
-                    "type": "string"
+                    "type": "string",
+                    "description": "Applicative property, user data will be ignored"
                 },
                 "root": {
                     "type": "boolean",
+                    "description": "Applicative property, user data will be ignored",
                     "default": false
                 },
                 "flags": {
@@ -88,7 +91,8 @@
             "properties": {
                 "name": {
                     "description": "CLI Name",
-                    "type": "string"
+                    "type": "string",
+                    "pattern": ".+"
                 },
                 "version": {
                     "type": "string"

configs/templates/spec.json

@@ -228,8 +228,6 @@ github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb
 github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
-github.com/santhosh-tekuri/jsonschema v1.2.4 h1:hNhW8e7t+H1vgY+1QeEQpveR6D4+OwKPXCfD2aieJis=
-github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/sergi/go-diff v1.0.0 h1:Kpca3qRNrduNnOQeazBd0ysaKrUJiIuISHxogkT9RPQ=

configs/templates/templates.go

@@ -8,8 +8,6 @@ import (
 	"github.com/olegsu/cli-generator/pkg/logger"
 	"github.com/olegsu/cli-generator/pkg/spec"
 	"github.com/spf13/viper"
-
-	"github.com/ghodss/yaml"
 )
 
 type (
@@ -26,7 +24,7 @@ func handle(cnf *viper.Viper, log logger.Logger, processor resultRenderProcessor
 	var s *spec.CLISpec
 	var specJSON map[string]interface{}
 
-	if s, err = getCliSpec(cnf.GetString("spec"), ioutil.ReadFile); err != nil {
+	if s, err = spec.GetCliSpec(cnf.GetString("spec"), ioutil.ReadFile); err != nil {
 		return err
 	}
 
@@ -61,16 +59,3 @@ func handle(cnf *viper.Viper, log logger.Logger, processor resultRenderProcessor
 	return processor.Process(res)
 
 }
-
-func getCliSpec(path string, readFromFile func(path string) ([]byte, error)) (*spec.CLISpec, error) {
-	var err error
-	var specData []byte
-	var spec = spec.CLISpec{}
-	if specData, err = readFromFile(path); err != nil {
-		return nil, err
-	}
-	if err = yaml.Unmarshal(specData, &spec); err != nil {
-		return nil, err
-	}
-	return &spec, nil
-}

go.sum

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/ghodss/yaml"
 	"github.com/qri-io/jsonschema"
 )
 
@@ -30,6 +31,7 @@ func (cli *CLISpec) Validate(schema []byte) error {
 	if err != nil {
 		return err
 	}
+	fmt.Println(string(b))
 	res, err := rs.ValidateBytes(b)
 	if err != nil {
 		return err
@@ -43,3 +45,16 @@ func (cli *CLISpec) Validate(schema []byte) error {
 	}
 	return nil
 }
+
+func GetCliSpec(path string, readFromFile func(path string) ([]byte, error)) (*CLISpec, error) {
+	var err error
+	var specData []byte
+	var spec = CLISpec{}
+	if specData, err = readFromFile(path); err != nil {
+		return nil, err
+	}
+	if err = yaml.Unmarshal(specData, &spec); err != nil {
+		return nil, err
+	}
+	return &spec, nil
+}

pkg/generate/generate.go

@@ -0,0 +1,35 @@
+package validate
+
+import (
+	"io/ioutil"
+
+	"github.com/olegsu/cli-generator/configs/templates"
+	"github.com/olegsu/cli-generator/pkg/logger"
+	"github.com/olegsu/cli-generator/pkg/spec"
+	"github.com/spf13/viper"
+)
+
+type (
+	// Handler - exposed struct that implementd Handler interface
+	Handler struct{}
+)
+
+// Handle - the function that will be called from the CLI with viper config
+// to provide access to all flags
+func (g *Handler) Handle(cnf *viper.Viper) error {
+	log := logger.New(&logger.Options{
+		Verbose: cnf.GetBool("verbose"),
+	})
+	var s *spec.CLISpec
+	var err error
+
+	log.Debug("Validating spec", "path", cnf.GetString("spec"))
+	if s, err = spec.GetCliSpec(cnf.GetString("spec"), ioutil.ReadFile); err != nil {
+		return err
+	}
+
+	if err = s.Validate([]byte(templates.TemplatesMap()["spec.json"])); err != nil {
+		return err
+	}
+	return nil
+}