diff --git a/config/config.go b/config/config.go index 68516e79a..1db76a004 100644 --- a/config/config.go +++ b/config/config.go @@ -5,6 +5,7 @@ package config import ( "io" "io/ioutil" + "os" yaml "gopkg.in/yaml.v1" ) @@ -111,15 +112,14 @@ type Project struct { // Load config file func Load(file string) (config Project, err error) { - data, err := ioutil.ReadFile(file) + f, err := os.Open(file) if err != nil { - return config, err + return } - err = yaml.Unmarshal(data, &config) - return + return LoadReader(f) } -// Load config via io.Reader +// LoadReader config via io.Reader func LoadReader(fd io.Reader) (config Project, err error) { data, err := ioutil.ReadAll(fd) if err != nil { diff --git a/config/config_test.go b/config/config_test.go index 8f14d64d9..c3ee5af24 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -1,6 +1,10 @@ package config import ( + "fmt" + "io/ioutil" + "os" + "path/filepath" "strings" "testing" @@ -26,3 +30,28 @@ fpm: assert.Nil(err) assert.Equal("http://goreleaser.github.io", prop.FPM.Homepage, "yaml did not load correctly") } + +type errorReader struct{} + +func (errorReader) Read(p []byte) (n int, err error) { + return 1, fmt.Errorf("error") +} +func TestLoadBadReader(t *testing.T) { + var assert = assert.New(t) + _, err := LoadReader(errorReader{}) + assert.Error(err) +} + +func TestFile(t *testing.T) { + var assert = assert.New(t) + f, err := ioutil.TempFile(os.TempDir(), "config") + assert.NoError(err) + _, err = Load(filepath.Join(f.Name())) + assert.NoError(err) +} + +func TestFileNotFound(t *testing.T) { + var assert = assert.New(t) + _, err := Load("/nope/no-way.yml") + assert.Error(err) +}