Merge pull request #10 from ieee0824/dump-dotenv

Dump dotenv

Author: ieee0824

.circleci/config.yml

@@ -2,19 +2,15 @@ version: 2
 jobs:
     build:
         docker:
-            - image: golang:1.8.3
+            - image: golang:1.16.4
         working_directory: /go/src/github.com/ieee0824/getenv
         steps:
             - checkout
-            - run:
-                name: install glide
-                command: |
-                    go get github.com/Masterminds/glide
             - run:
                 name: install packages
                 command: |
-                    glide i
+                    go get -u -v ./...
             - run:
                 name: run test
                 command: |
-                    go test $(glide nv)
+                    go test ./...

.go-version

@@ -0,0 +1 @@
+1.16.4

bool.go

@@ -1,8 +1,8 @@
 package getenv
 
 import (
-	"strings"
 	"os"
+	"strings"
 )
 
 func convertStringToBoolean(s string) bool {
@@ -16,6 +16,7 @@ func convertStringToBoolean(s string) bool {
 }
 
 func Bool(key string, def ...bool) bool {
+	Logger.Dump(key, def)
 	var d bool
 	if len(def) != 0 {
 		d = def[0]

bool_test.go

@@ -26,7 +26,7 @@ func TestConvertStringToBoolean(t *testing.T) {
 	for _, test := range tests {
 		got := convertStringToBoolean(test.input)
 		if got != test.want {
-			t.Fatalf("want %q, but %q:", test.want, got)
+			t.Fatalf("want %v, but %v:", test.want, got)
 		}
 	}
 }

duration.go

@@ -1,19 +1,20 @@
 package getenv
 
 import (
-	"time"
 	"os"
+	"time"
 )
 
 func Duration(key string, def ...interface{}) time.Duration {
+	Logger.Dump(key, def)
 	var d time.Duration
 	if len(def) != 0 {
 		if i, ok := def[0].(int); ok {
 			d = time.Duration(int64(i)) * time.Second
 		} else if dr, ok := def[0].(time.Duration); ok {
 			d = dr
 		} else if s, ok := def[0].(string); ok {
-			 d, _ = time.ParseDuration(s)
+			d, _ = time.ParseDuration(s)
 		}
 	}
 
@@ -25,5 +26,3 @@ func Duration(key string, def ...interface{}) time.Duration {
 
 	return d
 }
-
-

example/example.go

@@ -2,29 +2,42 @@ package main
 
 import (
 	"fmt"
-	"github.com/ieee0824/getenv"
-	"time"
 	"os"
+	"time"
+
+	"github.com/ieee0824/getenv"
 )
 
 func main() {
 	fmt.Println(getenv.Duration("ANY_ENV"))
 	fmt.Println(getenv.Duration("ANY_ENV", 60))
-	fmt.Println(getenv.Duration("ANY_ENV","120s"))
-	fmt.Println(getenv.Duration("ANY_ENV", 60 * time.Second))
+	fmt.Println(getenv.Duration("ANY_ENV", "120s"))
+	fmt.Println(getenv.Duration("ANY_ENV", 60*time.Second))
 	fmt.Println(getenv.Duration("ANY_ENV", "1h30m20s"))
 
 	os.Setenv("ANY_ENV", "60h")
 	fmt.Println(getenv.Duration("ANY_ENV"))
 	fmt.Println(getenv.Duration("ANY_ENV", 60))
-	fmt.Println(getenv.Duration("ANY_ENV","120s"))
-	fmt.Println(getenv.Duration("ANY_ENV", 60 * time.Second))
+	fmt.Println(getenv.Duration("ANY_ENV", "120s"))
+	fmt.Println(getenv.Duration("ANY_ENV", 60*time.Second))
 	fmt.Println(getenv.Duration("ANY_ENV", "1h30m20s"))
 
 	os.Setenv("ANY_ENV", "60h")
 	fmt.Println(getenv.Duration("ANY_ENV"))
 	fmt.Println(getenv.Duration("ANY_ENV", 60))
-	fmt.Println(getenv.Duration("ANY_ENV","120s"))
-	fmt.Println(getenv.Duration("ANY_ENV", 60 * time.Second))
+	fmt.Println(getenv.Duration("ANY_ENV", "120s"))
+	fmt.Println(getenv.Duration("ANY_ENV", 60*time.Second))
 	fmt.Println(getenv.Duration("ANY_ENV", "1h30m20s"))
+
+	os.Setenv("GETENV_DUMP_MODE", "dotenv")
+	os.Setenv("ANY_ENV", "true")
+	getenv.Bool("ANY_ENV", false)
+	getenv.Duration("ANY_ENV")
+	getenv.Duration("ANY_ENV", 60)
+	getenv.Duration("ANY_ENV", "120s")
+	getenv.Int("INT_ENV")
+	getenv.Int("INT_ENV", -10)
+	getenv.String("STR_ENV")
+	getenv.String("STR_ENV", "")
+	getenv.String("STR_ENV", "hoge")
 }

glide.lock

@@ -0,0 +1,3 @@
+module github.com/ieee0824/getenv
+
+go 1.16

glide.yaml

@@ -1,12 +1,13 @@
 package getenv
 
 import (
+	"log"
 	"os"
 	"strconv"
-	"log"
 )
 
 func Int(key string, def ...int) int {
+	Logger.Dump(key, def)
 	var d int
 	if len(def) != 0 {
 		d = def[0]
@@ -22,7 +23,8 @@ func Int(key string, def ...int) int {
 	return i
 }
 
-func Int32(key string, def ...int32) (int32) {
+func Int32(key string, def ...int32) int32 {
+	Logger.Dump(key, def)
 	var d int32
 	if len(def) != 0 {
 		d = def[0]
@@ -39,7 +41,8 @@ func Int32(key string, def ...int32) (int32) {
 	return int32(i32)
 }
 
-func Int64(key string, def ...int64) (int64) {
+func Int64(key string, def ...int64) int64 {
+	Logger.Dump(key, def)
 	var d int64
 	if len(def) != 0 {
 		d = def[0]
@@ -56,7 +59,8 @@ func Int64(key string, def ...int64) (int64) {
 	return int64(i64)
 }
 
-func Int16(key string, def ...int16) (int16) {
+func Int16(key string, def ...int16) int16 {
+	Logger.Dump(key, def)
 	var d int16
 	if len(def) != 0 {
 		d = def[0]
@@ -71,4 +75,4 @@ func Int16(key string, def ...int16) (int16) {
 		return d
 	}
 	return int16(i16)
-}
+}

go.mod

@@ -0,0 +1,64 @@
+package getenv
+
+import (
+	"fmt"
+	"io"
+	"os"
+	"reflect"
+)
+
+var Logger = &EnvLogger{
+	w: os.Stdout,
+}
+
+type EnvLogger struct {
+	w io.Writer
+}
+
+func (l *EnvLogger) SetWriter(w io.Writer) {
+	l.w = w
+}
+
+func (l *EnvLogger) Dump(key string, def ...interface{}) {
+	switch os.Getenv("GETENV_DUMP_MODE") {
+	case "dotenv":
+		if err := l.dumpDotEnv(key, def...); err != nil {
+			panic(err)
+		}
+	}
+}
+
+func (l *EnvLogger) dumpDotEnv(key string, def ...interface{}) error {
+	if _, err := l.w.Write([]byte(key)); err != nil {
+		return err
+	}
+	if _, err := l.w.Write([]byte("=")); err != nil {
+		return err
+	}
+	if len(def) == 0 {
+		if _, err := l.w.Write([]byte("\n")); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	var v interface{}
+	switch reflect.TypeOf(def[0]).Kind() {
+	case reflect.Slice:
+		s := reflect.ValueOf(def[0])
+		if s.Len() == 0 {
+			if _, err := l.w.Write([]byte("\n")); err != nil {
+				return err
+			}
+			return nil
+		}
+		v = s.Index(0).Interface()
+	default:
+		v = def[0]
+	}
+	if _, err := l.w.Write([]byte(fmt.Sprintf("%v\n", v))); err != nil {
+		return err
+	}
+
+	return nil
+}

int.go

@@ -3,6 +3,7 @@ package getenv
 import "os"
 
 func String(key string, def ...string) string {
+	Logger.Dump(key, def)
 	var d string
 	if len(def) != 0 {
 		d = def[0]