Refactoring out the deduction of package name and generation of the c…

…ontainer from ParseYAMLFile(). (#16)

file.go

@@ -18,7 +18,7 @@ type File struct {
 	file     *ast.File
 }
 
-func ParseYAMLFile(filepath, outputFile string) (*File, error) {
+func ParseYAMLFile(filepath string) (*File, error) {
 	f, err := ioutil.ReadFile(filepath)
 	if err != nil {
 		return nil, err
@@ -29,9 +29,13 @@ func ParseYAMLFile(filepath, outputFile string) (*File, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	all.fset = token.NewFileSet()
-	packageLine := fmt.Sprintf("// Code generated by dingo; DO NOT EDIT\npackage %s", all.getPackageName(filepath))
+	return all, nil
+}
+
+func GenerateContainer(all *File, packageName string, outputFile string) (*File, error) {
+	var err error
+	packageLine := fmt.Sprintf("// Code generated by dingo; DO NOT EDIT\npackage %s", packageName)
 	all.file, err = parser.ParseFile(all.fset, outputFile, packageLine, parser.ParseComments)
 	if err != nil {
 		return nil, err

main.go

@@ -28,7 +28,12 @@ func main() {
 	dingoYMLPath := "dingo.yml"
 	outputFile := "dingo.go"
 
-	file, err := ParseYAMLFile(dingoYMLPath, outputFile)
+	file, err := ParseYAMLFile(dingoYMLPath)
+	if err != nil {
+		log.Fatalln(err)
+	}
+	packageName := file.getPackageName(dingoYMLPath)
+	file, err = GenerateContainer(file, packageName, outputFile)
 	if err != nil {
 		log.Fatalln(err)
 	}