GOMODULES
/
godotenv
mirror of https://github.com/joho/godotenv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support key names beginning with 'export' 

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
pull/70/head
Dave Henderson 2019-02-03 23:11:51 -05:00
parent 69ed1d913a
commit 263a1dda9d
No known key found for this signature in database
GPG Key ID: 765A97405DCE5AFA
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
godotenv.go
View File

@ -252,11 +252,8 @@ func parseLine(line string, envMap map[string]string) (key string, value string,
} }
// Parse the key // Parse the key
key = splitString[0] re := regexp.MustCompile(`^\s*(?:export\s+)?(.*?)\s*$`)
if strings.HasPrefix(key, "export") { key = re.ReplaceAllString(splitString[0], "$1")
key = strings.TrimPrefix(key, "export")
}
key = strings.Trim(key, " ")
// Parse the value // Parse the value
value = parseValue(splitString[1], envMap) value = parseValue(splitString[1], envMap)

9
godotenv_test.go
View File

@ -5,8 +5,8 @@ import (
"fmt" "fmt"
"os" "os"
"reflect" "reflect"
"testing"
"strings" "strings"
"testing"
) )
var noopPresets = make(map[string]string) var noopPresets = make(map[string]string)
@ -313,6 +313,13 @@ func TestParsing(t *testing.T) {
// parses export keyword // parses export keyword
parseAndCompare(t, "export OPTION_A=2", "OPTION_A", "2") parseAndCompare(t, "export OPTION_A=2", "OPTION_A", "2")
parseAndCompare(t, `export OPTION_B='\n'`, "OPTION_B", "\\n") parseAndCompare(t, `export OPTION_B='\n'`, "OPTION_B", "\\n")
parseAndCompare(t, "export exportFoo=2", "exportFoo", "2")
parseAndCompare(t, "exportFOO=2", "exportFOO", "2")
parseAndCompare(t, "export_FOO =2", "export_FOO", "2")
parseAndCompare(t, "export.FOO= 2", "export.FOO", "2")
parseAndCompare(t, "export\tOPTION_A=2", "OPTION_A", "2")
parseAndCompare(t, " export OPTION_A=2", "OPTION_A", "2")
parseAndCompare(t, "\texport OPTION_A=2", "OPTION_A", "2")
// it 'expands newlines in quoted strings' do // it 'expands newlines in quoted strings' do
// expect(env('FOO="bar\nbaz"')).to eql('FOO' => "bar\nbaz") // expect(env('FOO="bar\nbaz"')).to eql('FOO' => "bar\nbaz")