Rename -only-compose and -only-generate to -compose and -render

Author: snipem

README.md

@@ -37,10 +37,10 @@ Usage of monako:
         Fail on document conversion errors
   -menu-config string
         Menu file for monako-book theme (default "config.menu.md")
-  -only-compose
+  -compose
         Only compose the Monako structure
-  -only-generate
-        Only generate HTML files from an existing Monako structure
+  -render
+        Only render HTML files from an existing Monako structure
   -trace
         Enable trace logging
 ```

cmd/monako/main.go

@@ -25,15 +25,15 @@ func parseCommandLine() (cliSettings compose.CommandLineSettings) {
 	var trace = f.Bool("trace", false, "Enable trace logging")
 	var showVersion = f.Bool("version", false, "Show version")
 	var failOnHugoError = f.Bool("fail-on-error", false, "Fail on document conversion errors")
-	var onlyCompose = f.Bool("only-compose", false, "Only compose the Monako structure")
-	var onlyGenerate = f.Bool("only-generate", false, "Only generate HTML files from an existing Monako structure")
+	var onlyCompose = f.Bool("compose", false, "Only compose the Monako structure")
+	var onlyRender = f.Bool("render", false, "Only render HTML files from an existing Monako structure")
 
 	err := f.Parse(os.Args[1:])
 	if err != nil {
 		log.Fatal("Can't parse arguments")
 	}
-	if *onlyCompose && *onlyGenerate {
-		log.Fatal("only-compose and only-generate can't be set both")
+	if *onlyCompose && *onlyRender {
+		log.Fatal("compose and render can't be set both")
 	}
 
 	return compose.CommandLineSettings{
@@ -45,7 +45,7 @@ func parseCommandLine() (cliSettings compose.CommandLineSettings) {
 		ShowVersion:        *showVersion,
 		FailOnHugoError:    *failOnHugoError,
 		OnlyCompose:        *onlyCompose,
-		OnlyGenerate:       *onlyGenerate,
+		OnlyRender:         *onlyRender,
 	}
 }
 
@@ -73,7 +73,7 @@ func main() {
 	}
 
 	config := compose.Init(cliSettings)
-	if !cliSettings.OnlyGenerate {
+	if !cliSettings.OnlyRender {
 		err := config.Compose()
 		if err != nil {
 			log.Fatal(err)

cmd/monako/main_test.go

@@ -182,7 +182,7 @@ func TestMainSplitCalls(t *testing.T) {
 
 	os.Args = []string{
 		"monako",
-		"-only-compose",
+		"-compose",
 		"-fail-on-error",
 		"-working-dir", targetDir,
 		"-config", monakoConfig,
@@ -195,7 +195,7 @@ func TestMainSplitCalls(t *testing.T) {
 
 	os.Args = []string{
 		"monako",
-		"-only-generate",
+		"-render",
 		"-fail-on-error",
 		"-working-dir", targetDir,
 		"-config", monakoConfig,
@@ -215,7 +215,7 @@ func TestFailOnNoComposeBeforeGenerate(t *testing.T) {
 	monakoConfig, menuConfig := writeConfig("https://github.com/snipem/monako-test.git")
 	os.Args = []string{
 		"monako",
-		"-only-generate",
+		"-render",
 		"-fail-on-error",
 		"-working-dir", targetDir,
 		"-config", monakoConfig,

pkg/compose/config.go

@@ -49,8 +49,8 @@ type CommandLineSettings struct {
 	FailOnHugoError bool
 	// OnlyCompose will only compose files but not generate HTML
 	OnlyCompose bool
-	// OnlyGenerate will only generate HTML files but not compose them
-	OnlyGenerate bool
+	// OnlyRender will only render HTML files but not compose them
+	OnlyRender bool
 }
 
 // LoadConfig returns the Monako config from the given configfilepath
@@ -180,7 +180,7 @@ func Init(cliSettings CommandLineSettings) (config *Config) {
 		}
 	}
 
-	if !cliSettings.OnlyGenerate {
+	if !cliSettings.OnlyRender {
 		// Dont do these steps if only generate
 		config.CleanUp()
 
@@ -198,7 +198,7 @@ func Init(cliSettings CommandLineSettings) (config *Config) {
 func (config *Config) Generate() error {
 
 	if _, err := os.Stat(config.HugoWorkingDir); os.IsNotExist(err) {
-		log.Fatalf("%s does not exist, run monako only-generate before?", config.HugoWorkingDir)
+		log.Fatalf("%s does not exist, run monako -render before?", config.HugoWorkingDir)
 	}
 
 	err := helpers.HugoRun([]string{"--source", config.HugoWorkingDir})