Merge pull request #74 from pixelandtonic/feature/prompt-when-no-conf…

…ig-is-present

Feature/prompt when no config is present

CHANGELOG.md

@@ -7,6 +7,8 @@
 
 ### Changed
 - Nitro now installs the PHP SOAP extension by default.
+- Nitro will now walk users through the creation of a machine when no config file is present ([#44](https://github.com/pixelandtonic/nitro/issues/44)).
+- Nitro now prompts you to modify your hosts file after using `add` ([#40](https://github.com/pixelandtonic/nitro/issues/40)).
 
 ## 0.9.1 - 2020-04-18
 

README.md

@@ -68,25 +68,31 @@ This works like you might expect, it will create a new machine named `diesel` wi
 nitro machine create
 ```
 
-> Note: `nitro machine create` has options you can pass when creating a new server. However, Nitro sets some “sane” defaults by default. To view the options, run `nitro machine create --help`.
+> Note: If you run `nitro machine create` and it cannot locate the `nitro.yaml` it will walk you through setting up the machine.
 
 After running `machine create`. The bootstrap process will install the latest PHP version, MySQL, Postgres, and Redis from the `nitro.yaml` file.
 
-The next step is to add a new virtual host to the server:
+The next step is to add a new site to the machine:
 
 ```bash
-nitro site add /Users/jason/Sites/craftcms myclientsite.test
+cd /Users/jasonmccallister/dev
+$ nitro add my-project
+→ What should the hostname be? [my-project] $ myproject.test
+→ Where is the webroot? [web] $
+myproject.test has been added to nitro.yaml.
+→ apply nitro.yaml changes now? [y] $ n
+You can apply new nitro.yaml changes later by running `nitro apply`.
 ```
 
-> Note: You can use any top level domain you wish, but we recomend using .test
+> Note: You can use any top-level domain you wish, but we recommend using .test
 
 This process will perform the following tasks:
 
-1. Set up a new nginx virtual server for `myclientsite.test`.
-2. Attach the directory `/Users/jason/Sites/craftcms` to that virtual server.
-3. Edit your `/etc/hosts` file to point `myclientsite.test` to the virtual server for use locally.
+1. Set up a new nginx virtual server for `myproject.test`.
+2. Attach the directory `/Users/jasonmccallister/dev/my-project` to that virtual server.
+3. Edit your `/etc/hosts` file to point `myproject.test` to the virtual server for use locally.
 
-You can now visit `http://myclientsite.test` in your browser!
+You can now visit `http://myproject.test` in your browser!
 
 ## Commands
 

internal/cmd/add.go

@@ -1,7 +1,11 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
 
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
@@ -177,7 +181,29 @@ var addCommand = &cobra.Command{
 
 		fmt.Println("Applied the changes and added", hostname, "to", name)
 
-		return nil
+		// prompt to add hosts file
+		cfgFile := viper.ConfigFileUsed()
+		if cfgFile == "" {
+			return errors.New("unable to find the config file")
+		}
+
+		filePath, err := filepath.Abs(cfgFile)
+		if err != nil {
+			return err
+		}
+
+		nitro, err := exec.LookPath("nitro")
+		if err != nil {
+			return err
+		}
+
+		fmt.Println("Modifying the hosts file to add sites for", config.GetString("name", ""), "(you will be prompted for your password)... ")
+
+		hostsCmd := exec.Command("sudo", nitro, "-f", filePath, "hosts", "add")
+		hostsCmd.Stdout = os.Stdout
+		hostsCmd.Stderr = os.Stderr
+
+		return hostsCmd.Run()
 	},
 }
 

internal/cmd/context.go

@@ -11,7 +11,7 @@ import (
 
 var contextCommand = &cobra.Command{
 	Use:   "context",
-	Short: "View the current Nitro context",
+	Short: "View current config",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		configFile := viper.ConfigFileUsed()
 		if configFile == "" {
@@ -27,7 +27,6 @@ var contextCommand = &cobra.Command{
 		fmt.Println("Using config file: ", configFile)
 		fmt.Println("------")
 		fmt.Print(string(data))
-		fmt.Println("------")
 		return nil
 	},
 }

internal/cmd/import.go

@@ -81,3 +81,11 @@ func fileExists(filename string) bool {
 	}
 	return !info.IsDir()
 }
+
+func dirExists(dir string) bool {
+	info, err := os.Stat(dir)
+	if os.IsExist(err) {
+		return false
+	}
+	return info.IsDir()
+}