change overwrite protection to be proactive

Fixes #168

cmd/apps.go

@@ -16,6 +16,7 @@ import (
 	"github.com/superfly/flyctl/cmd/presenters"
 	"github.com/superfly/flyctl/docstrings"
 	"github.com/superfly/flyctl/flyctl"
+	"github.com/superfly/flyctl/helpers"
 )
 
 //TODO: Move all output to status styled begin/done updates
@@ -203,6 +204,16 @@ func runAppsCreate(commandContext *cmdctx.CmdContext) error {
 		}
 	}
 
+	configfilename, err := flyctl.ResolveConfigFileFromPath(commandContext.WorkingDir)
+
+	if helpers.FileExists(configfilename) {
+		commandContext.Status("create", cmdctx.SERROR, "An existing configuration file has been found.")
+		confirmation := confirm(fmt.Sprintf("Overwrite file '%s'", configfilename))
+		if !confirmation {
+			return nil
+		}
+	}
+
 	newAppConfig := flyctl.NewAppConfig()
 
 	if builder, _ := commandContext.Config.GetString("builder"); builder != "" {

cmd/config.go

@@ -3,9 +3,10 @@ package cmd
 import (
 	"errors"
 	"fmt"
-	"github.com/superfly/flyctl/cmdctx"
 	"os"
 
+	"github.com/superfly/flyctl/cmdctx"
+
 	"github.com/superfly/flyctl/docstrings"
 
 	"github.com/logrusorgru/aurora"
@@ -53,6 +54,16 @@ func runDisplayConfig(ctx *cmdctx.CmdContext) error {
 }
 
 func runSaveConfig(ctx *cmdctx.CmdContext) error {
+	configfilename, err := flyctl.ResolveConfigFileFromPath(ctx.WorkingDir)
+
+	if helpers.FileExists(configfilename) {
+		ctx.Status("create", cmdctx.SERROR, "An existing configuration file has been found.")
+		confirmation := confirm(fmt.Sprintf("Overwrite file '%s'", configfilename))
+		if !confirmation {
+			return nil
+		}
+	}
+
 	if ctx.AppConfig == nil {
 		ctx.AppConfig = flyctl.NewAppConfig()
 	}
@@ -99,9 +110,6 @@ func printAppConfigErrors(cfg api.AppConfig) {
 }
 
 func writeAppConfig(path string, appConfig *flyctl.AppConfig) error {
-	if !confirmFileOverwrite(path) {
-		return nil
-	}
 
 	if err := appConfig.WriteToFile(path); err != nil {
 		return err