From 569c7924e18757c0ab4189c27912dd3c199640dd Mon Sep 17 00:00:00 2001 From: abdfnx Date: Sun, 19 Dec 2021 09:44:34 +0300 Subject: [PATCH] finish from support `Restofile` #5, add `resto run` command, update all --- README.md | 9 + cli/install/README.md | 16 +- cli/install/command.go | 8 +- cli/run/README.md | 39 +++ cli/run/command.go | 338 ++++++++++++++++++++ cmd/resto/root.go | 9 + core/options/options.go | 5 + examples/restofile/basic_request/Restofile | 4 + examples/restofile/open_editor/Restofile | 9 + examples/restofile/read_from_file/Restofile | 9 + examples/restofile/with_token/Restofile | 14 + 11 files changed, 458 insertions(+), 2 deletions(-) create mode 100755 cli/run/README.md create mode 100755 cli/run/command.go create mode 100755 examples/restofile/basic_request/Restofile create mode 100755 examples/restofile/open_editor/Restofile create mode 100755 examples/restofile/read_from_file/Restofile create mode 100755 examples/restofile/with_token/Restofile diff --git a/README.md b/README.md index 6b73f0c..8ce935e 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,15 @@ iwr -useb https://git.io/resto-win | iex resto i https://get.docker.com ``` +* Send a request from Restofile + + ```bash + resto run + + # from path + resto run --file ./examples/basic_request/Restofile + ``` + ### Flags 1. `GET` & `HEAD` flags diff --git a/cli/install/README.md b/cli/install/README.md index 9fdadcf..db627b7 100755 --- a/cli/install/README.md +++ b/cli/install/README.md @@ -1,4 +1,4 @@ -## Resto install command +## **Resto Install** command > The `resto install` command is used to install binary app from script URL and run it. @@ -9,3 +9,17 @@ resto i https://deno.land/x/install/install.sh deno -V ``` + +### docs + +#### flags + +```bash +-s, --shell string shell to use default: bash +``` + +examples: + +```bash +resto i https://deno.land/x/install/install.sh --shell sh +``` diff --git a/cli/install/command.go b/cli/install/command.go index 500aeea..94f693d 100755 --- a/cli/install/command.go +++ b/cli/install/command.go @@ -43,7 +43,13 @@ func InstallCMD() *cobra.Command { }, } - cmd.Flags().StringVarP(&opts.Shell, "shell", "s", "", "shell to use") + p := "bash" + + if runtime.GOOS == "windows" { + p = "powershell" + } + + cmd.Flags().StringVarP(&opts.Shell, "shell", "s", "", "shell to use (Default: " + p + ")") return cmd } diff --git a/cli/run/README.md b/cli/run/README.md new file mode 100755 index 0000000..265d1d8 --- /dev/null +++ b/cli/run/README.md @@ -0,0 +1,39 @@ +## **Resto Run** command + +> The `resto run` command is used to run requests from `Restofile` + +example of `Restofile` + +```restofile +request { + method "POST" + url "https://api.spacex.land/graphql" + contentType "application/graphql" +} + +body { + openBodyEditor "true" + # if `openBodyEditor` prop is false or not set + readFrom "examples/spacex.gql" +} + +auth { + type "bearer" + token: "MY_TOKEN" + # or basic auth + type "basic" + username: "USERNAME" + password: "P@$$w0rd" + # to use from env variable + password "env:MY_PASSWORD" +} +``` + +examples: + +```bash +resto run + +# from file +resto run --file examples/basic_request/Restofile +``` diff --git a/cli/run/command.go b/cli/run/command.go new file mode 100755 index 0000000..4fb1b06 --- /dev/null +++ b/cli/run/command.go @@ -0,0 +1,338 @@ +/* +Restofile exapmle + +request { + method "POST" + url "https://api.spacex.land/graphql" + contentType "application/graphql" +} + +body { + openBodyEditor "true" + # if `openBodyEditor` prop is false or not set + readFrom "examples/spacex.gql" +} + +auth { + type "bearer" + token: "MY_TOKEN" + # or basic auth + type "basic" + username: "USERNAME" + password: "P@$$w0rd" + # to use from env variable + password "env:MY_PASSWORD" +} +*/ + +package run + +import ( + "fmt" + "os" + "log" + "io/ioutil" + "strings" + + "github.com/abdfnx/resto/tools" + "github.com/abdfnx/resto/core/api" + "github.com/abdfnx/resto/core/editor" + "github.com/abdfnx/resto/core/editor/runtime" + "github.com/abdfnx/resto/core/options" + + tcell "github.com/gdamore/tcell/v2" + "github.com/rivo/tview" + "github.com/spf13/cobra" + "github.com/pkg/errors" +) + +func RunCMD() *cobra.Command { + opts := options.RunCommandOptions{ + Path: "", + ShowAll: false, + } + + cmd := &cobra.Command{ + Use: "run [flags]", + Short: "Send a request from Restofile", + Long: `Send a request via file "Restofile"`, + RunE: func(cmd *cobra.Command, args []string) error { + return run(&opts) + }, + } + + cmd.Flags().StringVarP(&opts.Path, "file", "f", "", "Path to Restofile (Default: PATH/Restofile)") + cmd.Flags().BoolVarP(&opts.ShowAll, "all", "a", false, "Show all response headers & status") + + return cmd +} + +func run(opts *options.RunCommandOptions) error { + path := "./Restofile" + + fn := tools.CLIRequestFile("txt") + cType := "" + + method := "" + url := "" + contentType := "" + + openBodyEditor := false + readFrom := "" + content := "" + + authType := "" + token := "" + username := "" + password := "" + + if opts.Path != "" { + path = opts.Path + } + + data, err := ioutil.ReadFile(path) + + if err != nil { + return errors.Errorf("Error: %v", err) + } + + if strings.Contains(string(data), "request {") || strings.Contains(string(data), "request{") { + if strings.Contains(string(data), "method") { + method = strings.TrimSpace(strings.Split(string(data), "method")[1]) + method = strings.TrimSpace(strings.Split(method, "\"")[1]) + + if strings.Contains(method, "env:") { + method = strings.TrimSpace(strings.Split(method, "env:")[1]) + method = os.Getenv(method) + } + } + + if strings.Contains(string(data), "url") { + url = strings.TrimSpace(strings.Split(string(data), "url")[1]) + url = strings.TrimSpace(strings.Split(url, "\"")[1]) + + if strings.Contains(url, "env:") { + url = strings.TrimSpace(strings.Split(url, "env:")[1]) + url = os.Getenv(url) + } + } + + if strings.Contains(string(data), "contentType") { + contentType = strings.TrimSpace(strings.Split(string(data), "contentType")[1]) + contentType = strings.TrimSpace(strings.Split(contentType, "\"")[1]) + + if strings.Contains(contentType, "env:") { + contentType = strings.TrimSpace(strings.Split(contentType, "env:")[1]) + contentType = os.Getenv(contentType) + } + + if contentType != "" { + if contentType == "application/json" || contentType == "json" { + fn = tools.CLIRequestFile("json") + cType = "application/json" + } else if contentType == "application/graphql" || contentType == "graphql" { + fn = tools.CLIRequestFile("graphql") + cType = "application/graphql" + } else if contentType == "application/xml" || contentType == "xml" { + fn = tools.CLIRequestFile("xml") + cType = "application/xml" + } else if contentType == "text/html" || contentType == "html" { + fn = tools.CLIRequestFile("html") + cType = "text/html" + } else { + fn = tools.CLIRequestFile("txt") + cType = "text/plain" + } + } + } + } + + if strings.Contains(string(data), "body {") || strings.Contains(string(data), "body{") { + if strings.Contains(string(data), "openBodyEditor") { + openBodyEditorValue := strings.TrimSpace(strings.Split(string(data), "openBodyEditor")[1]) + openBodyEditorValue = strings.TrimSpace(strings.Split(openBodyEditorValue, "\"")[1]) + + if strings.Contains(openBodyEditorValue, "env:") { + openBodyEditorValue = strings.TrimSpace(strings.Split(openBodyEditorValue, "env:")[1]) + openBodyEditorValue = os.Getenv(openBodyEditorValue) + } + + if openBodyEditorValue == "yes" || openBodyEditorValue == "true" { + openBodyEditor = true + } else { + openBodyEditor = false + } + + if openBodyEditor { + fileContent, err := ioutil.ReadFile(fn) + buffer := editor.NewBufferFromString(string(fileContent), fn) + if err != nil { + log.Fatalf("could not read %v: %v", fn, err) + } + + var colorscheme editor.Colorscheme + if railscast := runtime.Files.FindFile(editor.RTColorscheme, "railscast"); railscast != nil { + if data, err := railscast.Data(); err == nil { + colorscheme = editor.ParseColorscheme(string(data)) + } + } + + bodyEditor := editor.NewView(buffer) + bodyEditor.SetRuntimeFiles(runtime.Files) + bodyEditor.SetColorscheme(colorscheme) + + app := tview.NewApplication() + bodyEditor.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { + switch event.Key() { + case tcell.KeyCtrlS: + tools.SaveBuffer(buffer, fn) + app.Stop() + return nil + } + + return event + }) + + app.SetRoot(bodyEditor, true) + + if err := app.Run(); err != nil { + log.Fatalf("%v", err) + } + + b, e := os.Open(fn) + + if e != nil { + fmt.Println(e) + } + + defer b.Close() + + body, err := ioutil.ReadAll(b) + + if err != nil { + panic(err) + } + + content = string(body) + } + } + + if strings.Contains(string(data), "readFrom") { + readFrom = strings.TrimSpace(strings.Split(string(data), "readFrom")[1]) + readFrom = strings.TrimSpace(strings.Split(readFrom, "\"")[1]) + + if strings.Contains(readFrom, "env:") { + readFrom = strings.TrimSpace(strings.Split(readFrom, "env:")[1]) + readFrom = os.Getenv(readFrom) + } + + data, err = ioutil.ReadFile(readFrom) + if err != nil { + return err + } + + content = string(data) + } + + if !openBodyEditor && readFrom == "" { + if method == "POST" || method == "PUT" || method == "PATCH" || method == "DELETE" { + return errors.Errorf("Error: body is required") + } + } + } + + if strings.Contains(string(data), "auth {") || strings.Contains(string(data), "auth{") { + if strings.Contains(string(data), "type") { + authType = strings.TrimSpace(strings.Split(string(data), "type")[1]) + authType = strings.TrimSpace(strings.Split(authType, "\"")[1]) + + if strings.Contains(authType, "env:") { + authType = strings.TrimSpace(strings.Split(authType, "env:")[1]) + authType = os.Getenv(authType) + } + } + + if authType == "bearer" { + if strings.Contains(string(data), "token") { + token = strings.TrimSpace(strings.Split(string(data), "token")[1]) + token = strings.TrimSpace(strings.Split(token, "\"")[1]) + + if strings.Contains(token, "env:") { + token = strings.TrimSpace(strings.Split(token, "env:")[1]) + token = os.Getenv(token) + } + } + } else if authType == "basic" { + if strings.Contains(string(data), "username") { + username = strings.TrimSpace(strings.Split(string(data), "username")[1]) + username = strings.TrimSpace(strings.Split(username, "\"")[1]) + + if strings.Contains(username, "env:") { + username = strings.TrimSpace(strings.Split(username, "env:")[1]) + username = os.Getenv(username) + } + } + + if strings.Contains(string(data), "password") { + password = strings.TrimSpace(strings.Split(string(data), "password")[1]) + password = strings.TrimSpace(strings.Split(password, "\"")[1]) + + if strings.Contains(password, "env:") { + password = strings.TrimSpace(strings.Split(password, "env:")[1]) + password = os.Getenv(password) + } + } + } + } + + if method == "GET" || method == "HEAD" { + respone, status, headers, err := api.BasicGet( + url, + method, + authType, + token, + username, + password, + true, + ) + + if err != nil { + return err + } + + if opts.ShowAll { + fmt.Println(headers) + fmt.Println("") + fmt.Println(status) + } + + fmt.Println("\n" + respone) + } else if method == "POST" || method == "PUT" || method == "PATCH" || method == "DELETE" { + respone, status, headers, err := + api.BasicRequestWithBody( + url, + method, + cType, + content, + authType, + token, + username, + password, + true, + ) + + if err != nil { + return err + } + + if opts.ShowAll { + fmt.Println(headers) + fmt.Println("") + fmt.Println(status) + } + + fmt.Println("\n" + respone) + } + + return nil +} diff --git a/cmd/resto/root.go b/cmd/resto/root.go index 376cfad..cc6368f 100755 --- a/cmd/resto/root.go +++ b/cmd/resto/root.go @@ -8,6 +8,7 @@ import ( "github.com/abdfnx/resto/cmd/factory" "github.com/abdfnx/resto/cli" "github.com/abdfnx/resto/cli/install" + runCmd "github.com/abdfnx/resto/cli/run" "github.com/MakeNowJust/heredoc" "github.com/spf13/cobra" @@ -43,6 +44,13 @@ func Execute(f *factory.Factory, version string, versionDate string) *cobra.Comm # Save response to a file resto get http://localhost:3333/api/v1/hello --save response.json + + # Install binary app from script URL and run it. + resto i https://get.docker.com + + # Send a request from Restofile + # after creating a Restofile + resto run `), Annotations: map[string]string{ "help:tellus": heredoc.Doc(` @@ -86,6 +94,7 @@ func Execute(f *factory.Factory, version string, versionDate string) *cobra.Comm cli.DeleteCMD(), cli.HeadCMD(), install_cmd.InstallCMD(), + runCmd.RunCMD(), versionCmd, ) diff --git a/core/options/options.go b/core/options/options.go index 30b572b..74910f4 100755 --- a/core/options/options.go +++ b/core/options/options.go @@ -27,3 +27,8 @@ type InstallCommandOptions struct { Shell string URL string } + +type RunCommandOptions struct { + Path string + ShowAll bool +} diff --git a/examples/restofile/basic_request/Restofile b/examples/restofile/basic_request/Restofile new file mode 100755 index 0000000..c92bc07 --- /dev/null +++ b/examples/restofile/basic_request/Restofile @@ -0,0 +1,4 @@ +request { + method "GET" + url "https://api.github.com" +} diff --git a/examples/restofile/open_editor/Restofile b/examples/restofile/open_editor/Restofile new file mode 100755 index 0000000..8c4651b --- /dev/null +++ b/examples/restofile/open_editor/Restofile @@ -0,0 +1,9 @@ +request { + method "POST" + url "https://api.spacex.land/graphql" + contentType "application/graphql" +} + +body { + openBodyEditor "true" +} diff --git a/examples/restofile/read_from_file/Restofile b/examples/restofile/read_from_file/Restofile new file mode 100755 index 0000000..6044d1e --- /dev/null +++ b/examples/restofile/read_from_file/Restofile @@ -0,0 +1,9 @@ +request { + method "POST" + url "https://api.spacex.land/graphql" + contentType "application/graphql" +} + +body { + readFrom "examples/spacex.gql" +} diff --git a/examples/restofile/with_token/Restofile b/examples/restofile/with_token/Restofile new file mode 100755 index 0000000..9d6db27 --- /dev/null +++ b/examples/restofile/with_token/Restofile @@ -0,0 +1,14 @@ +request { + method "POST" + url "https://graphql.contentful.com/content/v1/spaces/mt0pmhki5db7" + contentType "application/graphql" +} + +body { + openBodyEditor "true" +} + +auth { + type "bearer" + token "env:TOKEN" +}