1 files changed, 51 insertions, 14 deletions
diff --git a/formats/config/encoder.go b/formats/config/encoder.go
index 4a68e44..88bdf65 100644
--- a/formats/config/encoder.go
+++ b/formats/config/encoder.go
@@ -7,7 +7,7 @@ import (
 
 // An Encoder writes config files to an output stream.
 type Encoder struct {
-	io.Writer
+	w io.Writer
 }
 
 // NewEncoder returns a new encoder that writes to w.
@@ -18,21 +18,58 @@ func NewEncoder(w io.Writer) *Encoder {
 // Encode writes the config in git config format to the stream of the encoder.
 func (e *Encoder) Encode(cfg *Config) error {
 	for _, s := range cfg.Sections {
-		if len(s.Options) > 0 {
-			fmt.Fprintf(e, "[%s]\n", s.Name)
-			for _, o := range s.Options {
-				fmt.Fprintf(e, "\t%s = %s\n", o.Key, o.Value)
-			}
+		if err := e.encodeSection(s); err != nil {
+			return err
 		}
-		for _, ss := range s.Subsections {
-			if len(ss.Options) > 0 {
-				//TODO: escape
-				fmt.Fprintf(e, "[%s \"%s\"]\n", s.Name, ss.Name)
-				for _, o := range ss.Options {
-					fmt.Fprintf(e, "\t%s = %s\n", o.Key, o.Value)
-				}
-			}
+	}
+
+	return nil
+}
+
+func (e *Encoder) encodeSection(s *Section) error {
+	if len(s.Options) > 0 {
+		if err := e.printf("[%s]\n", s.Name); err != nil {
+			return err
+		}
+
+		if err := e.encodeOptions(s.Options); err != nil {
+			return err
+		}
+	}
+
+	for _, ss := range s.Subsections {
+		if err := e.encodeSubsection(s.Name, ss); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (e *Encoder) encodeSubsection(sectionName string, s *Subsection) error {
+	//TODO: escape
+	if err := e.printf("[%s \"%s\"]\n", sectionName, s.Name); err != nil {
+		return err
+	}
+
+	if err := e.encodeOptions(s.Options); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (e *Encoder) encodeOptions(opts Options) error {
+	for _, o := range opts {
+		if err := e.printf("\t%s = %s\n", o.Key, o.Value); err != nil {
+			return err
 		}
 	}
+
 	return nil
 }
+
+func (e *Encoder) printf(msg string, args ...interface{}) error {
+	_, err := fmt.Fprintf(e.w, msg, args...)
+	return err
+}