Merge pull request #4 from stilvoid/modernise

Modernise

Author: stilvoid

.gitignore

@@ -0,0 +1,57 @@
+package identify
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/spf13/cobra"
+	"github.com/stilvoid/please"
+	"github.com/stilvoid/please/internal"
+)
+
+var Cmd = &cobra.Command{
+	Use:   "identify (FILENAME)",
+	Short: "Identify the format of some structured data from FILENAME or stdin if omitted",
+	Args:  cobra.RangeArgs(0, 1),
+	Run: func(cmd *cobra.Command, args []string) {
+		data, err := internal.ReadFileOrStdin(args...)
+		if err != nil {
+			if len(args) == 0 {
+				cmd.Help()
+				os.Exit(1)
+			}
+			cobra.CheckErr(err)
+		}
+
+		format, _, err := Identify(data)
+		cobra.CheckErr(err)
+
+		fmt.Println(format)
+	},
+}
+
+// These should be in order of least to most likely
+// i.e. more picky formats should be listed first
+var order = []string{
+	"xml",
+	"mime",
+	"json",
+	"toml",
+	"yaml",
+}
+
+// Identify tries to figure out the format of the structured data passed in
+// If successful, the name of the detected format and a copy of its data parsed into an any will be returned
+// If the data format could not be identified, an error will be returned
+func Identify(input []byte) (string, any, error) {
+	for _, name := range order {
+		output, err := please.Parse(name, input)
+		if err != nil {
+			continue
+		}
+
+		return name, output, nil
+	}
+
+	return "", nil, fmt.Errorf("input format could not be identified")
+}

README.md

@@ -0,0 +1,10 @@
+package main
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/stilvoid/please/cmd/please"
+)
+
+func main() {
+	cobra.CheckErr(please.Cmd.Execute())
+}

TODO.md

@@ -0,0 +1,82 @@
+package parse
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/jmespath/go-jmespath"
+	"github.com/spf13/cobra"
+	"github.com/stilvoid/please"
+	"github.com/stilvoid/please/cmd/identify"
+	"github.com/stilvoid/please/internal"
+)
+
+var inFormat string
+var outFormat string
+var query string
+
+func init() {
+	Cmd.Flags().StringVarP(&inFormat, "from", "f", "auto", "input format (see please help parse for formats)")
+	Cmd.Flags().StringVarP(&outFormat, "to", "t", "auto", "output format (see please help parse for formats)")
+	Cmd.Flags().StringVarP(&query, "query", "q", "", "JMESPath query")
+
+	formats := strings.Builder{}
+	formats.WriteString("Input formats:\n")
+	for _, name := range please.Parsers {
+		formats.WriteString(fmt.Sprintf("  %s\n", name))
+	}
+	formats.WriteString("\n")
+	formats.WriteString("Output formats:\n")
+	for _, name := range please.Formatters {
+		formats.WriteString(fmt.Sprintf("  %s\n", name))
+	}
+
+	Cmd.Long = "Parse and converted structured data from FILENAME or stdin if omitted.\n\n" + formats.String()
+}
+
+var Cmd = &cobra.Command{
+	Use:   "parse (FILENAME)",
+	Short: "Parse and convert structured data from FILENAME or stdin if omitted",
+	Args:  cobra.RangeArgs(0, 1),
+	Run: func(cmd *cobra.Command, args []string) {
+		input, err := internal.ReadFileOrStdin(args...)
+		if err != nil {
+			if len(args) == 0 {
+				fmt.Fprintln(os.Stderr, cmd.Short+"\n")
+				cmd.Usage()
+				os.Exit(1)
+			}
+			cobra.CheckErr(err)
+		}
+
+		// Try parsing
+		var parsed any
+
+		// Deal with format detection
+		if inFormat == "auto" {
+			inFormat, parsed, err = identify.Identify(input)
+		} else {
+			// Try parsing
+			parsed, err = please.Parse(inFormat, input)
+		}
+
+		cobra.CheckErr(err)
+
+		// Path
+		if query != "" {
+			parsed, err = jmespath.Search(query, parsed)
+			cobra.CheckErr(err)
+		}
+
+		if outFormat == "auto" {
+			outFormat = inFormat
+		}
+
+		// ...and format back out :)
+		output, err := please.Format(outFormat, parsed)
+		cobra.CheckErr(err)
+
+		fmt.Println(output)
+	},
+}

build.sh

@@ -0,0 +1,27 @@
+package please
+
+import (
+	"github.com/spf13/cobra"
+	"github.com/stilvoid/please/cmd/identify"
+	"github.com/stilvoid/please/cmd/parse"
+	"github.com/stilvoid/please/cmd/request"
+	"github.com/stilvoid/please/cmd/respond"
+	"github.com/stilvoid/please/cmd/serve"
+	"github.com/stilvoid/please/internal"
+)
+
+func init() {
+	Cmd.AddCommand(identify.Cmd)
+	Cmd.AddCommand(parse.Cmd)
+	Cmd.AddCommand(request.Cmd)
+	Cmd.AddCommand(respond.Cmd)
+	Cmd.AddCommand(serve.Cmd)
+
+	Cmd.Root().CompletionOptions.DisableDefaultCmd = true
+}
+
+var Cmd = &cobra.Command{
+	Use:     "please",
+	Short:   "Please is a utility for making and receiving web requests and parsing and reformatting the common data formats that are sent over them.",
+	Version: internal.Version,
+}