Release 0.3

Author: keimoon

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-RELEASE=0.2
+RELEASE=0.3
 dist=dist
 bin=consul-fs
 

cat.go

@@ -12,7 +12,7 @@ import (
 func cmdCat(kv *api.KV, args []string, config *fsConfig) {
 	if len(args) < 1 {
 		fmt.Fprintf(os.Stderr, "USAGE: %s cat OPTIONS <file>\n", os.Args[0])
-		fmt.Fprintf(os.Stderr, "OPTIONS:\n", os.Args[0])
+		fmt.Fprintln(os.Stderr, "OPTIONS:")
 		flag.PrintDefaults()
 		os.Exit(1)
 	}

common.go

@@ -29,6 +29,9 @@ func consulFsFileExit(kv *api.KV, name string) (bool, error) {
 
 func consulFsFolderExist(kv *api.KV, name string) (bool, error) {
 	name = strings.Trim(name, "/") + "/"
+	if name == "/" {
+		name = ""
+	}
 	pairs, _, err := kv.List(name, nil)
 	if err != nil {
 		return false, err
@@ -41,6 +44,9 @@ func consulFsFolderExist(kv *api.KV, name string) (bool, error) {
 
 func consulListFolder(kv *api.KV, name string) ([]string, error) {
 	name = strings.Trim(name, "/") + "/"
+	if name == "/" {
+		name = ""
+	}
 	pairs, _, err := kv.List(name, nil)
 	if err != nil {
 		return nil, err

get.go

@@ -80,7 +80,6 @@ func getFolder(kv *api.KV, remote, local string, config *fsConfig) error {
 }
 
 func get(kv *api.KV, remote, local string, config *fsConfig) error {
-	fmt.Println(remote, local)
 	exist, err := consulFsFolderExist(kv, remote)
 	if err != nil {
 		return err
@@ -101,7 +100,7 @@ func get(kv *api.KV, remote, local string, config *fsConfig) error {
 func cmdGet(kv *api.KV, args []string, config *fsConfig) {
 	if len(args) < 2 {
 		fmt.Fprintf(os.Stderr, "USAGE: %s get OPTIONS <remote> <local>\n", os.Args[0])
-		fmt.Fprintf(os.Stderr, "OPTIONS:\n", os.Args[0])
+		fmt.Fprintln(os.Stderr, "OPTIONS:")
 		flag.PrintDefaults()
 		os.Exit(1)
 	}

ls.go

@@ -12,6 +12,9 @@ import (
 
 func getChildren(kv *api.KV, name string) ([]string, error) {
 	name = strings.Trim(name, "/") + "/"
+	if name == "/" {
+		name = ""
+	}
 	pairs, _, err := kv.List(name, nil)
 	if err != nil {
 		return nil, err
@@ -67,7 +70,7 @@ func ls(kv *api.KV, name string, config *fsConfig) error {
 func cmdLs(kv *api.KV, args []string, config *fsConfig) {
 	if len(args) < 1 {
 		fmt.Fprintf(os.Stderr, "USAGE: %s ls OPTIONS <remote>\n", os.Args[0])
-		fmt.Fprintf(os.Stderr, "OPTIONS:\n", os.Args[0])
+		fmt.Fprintln(os.Stderr, "OPTIONS:")
 		flag.PrintDefaults()
 		os.Exit(1)
 	}

main.go

@@ -1,8 +1,10 @@
 package main
 
 import (
+	"encoding/json"
 	"flag"
 	"fmt"
+	"io/ioutil"
 	"os"
 
 	"github.com/hashicorp/consul/api"
@@ -16,15 +18,47 @@ func printUsage() {
 	os.Exit(1)
 }
 
+type ConsulConfig struct {
+	Scheme   string `json:"scheme"`
+	Host     string `json:"host"`
+	User     string `json:"user"`
+	Password string `json:"password"`
+}
+
+func readConfig() (*ConsulConfig, error) {
+	b, err := ioutil.ReadFile(os.Getenv("HOME") + "/.consul/config.json")
+	if err != nil {
+		return &ConsulConfig{
+			Scheme: "http",
+			Host:   "127.0.0.1:8500",
+		}, nil
+	}
+	var config ConsulConfig
+	err = json.Unmarshal(b, &config)
+	if err != nil {
+		return nil, err
+	}
+	return &config, nil
+}
+
 func main() {
+	fileConfig, err := readConfig()
+	if err != nil {
+		fmt.Fprintln(os.Stderr, err)
+		os.Exit(1)
+	}
 	var (
-		host    string
-		scheme  string
-		recurse bool
-		force   bool
+		host     string
+		scheme   string
+		user     string
+		password string
+		recurse  bool
+		force    bool
 	)
-	flag.StringVar(&host, "consul", "127.0.0.1:8500", "Consul API end point")
-	flag.StringVar(&scheme, "scheme", "http", "Consul API scheme")
+	flag.StringVar(&host, "consul", fileConfig.Host, "Consul API end point")
+	flag.StringVar(&scheme, "scheme", fileConfig.Scheme, "Consul API scheme")
+	flag.StringVar(&user, "user", fileConfig.User, "Consul API scheme")
+	flag.StringVar(&password, "password", fileConfig.Password, "Consul API scheme")
 	flag.BoolVar(&recurse, "recurse", false, "work with put/get/delete/ls action")
 	flag.BoolVar(&force, "force", false, "force put/get if folder exists")
 	flag.Parse()
@@ -37,10 +71,18 @@ func main() {
 		force:   force,
 	}
 
-	client, err := api.NewClient(&api.Config{
+	consulConfig := &api.Config{
 		Address: host,
 		Scheme:  scheme,
-	})
+	}
+	if user != "" && password != "" {
+		consulConfig.HttpAuth = &api.HttpBasicAuth{
+			Username: user,
+			Password: password,
+		}
+	}
+
+	client, err := api.NewClient(consulConfig)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
@@ -56,6 +98,8 @@ func main() {
 		cmdGet(kv, args[1:], config)
 	case "ls":
 		cmdLs(kv, args[1:], config)
+	case "version":
+		cmdVersion()
 	default:
 		printUsage()
 	}

put.go

@@ -84,7 +84,7 @@ func cmdPut(kv *api.KV, args []string, config *fsConfig) {
 	if len(args) < 1 {
 		fmt.Fprintf(os.Stderr, "USAGE: %s put OPTIONS <remote> (read content from stdin)\n", os.Args[0])
 		fmt.Fprintf(os.Stderr, "       %s put OPTIONS <local file or folder> <remote>\n", os.Args[0])
-		fmt.Fprintf(os.Stderr, "OPTIONS:\n", os.Args[0])
+		fmt.Fprintln(os.Stderr, "OPTIONS:")
 		flag.PrintDefaults()
 		os.Exit(1)
 	}

version.go

@@ -0,0 +1,11 @@
+package main
+
+import "fmt"
+
+func getVersion() string {
+	return "0.3"
+}
+
+func cmdVersion() {
+	fmt.Println(getVersion())
+}