Drop Vagrant support (#598)

Author: retlehs

README.md

@@ -164,7 +164,6 @@ Supported commands so far:
 | `db` | Commands for database management |
 | `deploy` | Deploys a site to the specified environment |
 | `dotenv` | Template .env files to local system |
-| `down` | Stops the Vagrant machine by running `vagrant halt`|
 | `droplet` | Commands for DigitalOcean Droplets |
 | `exec` | Exec runs a command in the Trellis virtualenv |
 | `galaxy` | Commands for Ansible Galaxy |
@@ -177,7 +176,6 @@ Supported commands so far:
 | `provision` | Provisions the specified environment |
 | `rollback` | Rollsback the last deploy of the site on the specified environment |
 | `ssh` | Connects to host via SSH |
-| `up` | Starts and provisions the Vagrant environment by running `vagrant up` |
 | `valet` | Commands for Laravel Valet |
 | `vault` | Commands for Ansible Vault |
 | `xdebug-tunnel` | Commands for managing Xdebug tunnels |

cmd/alias.go

@@ -214,7 +214,7 @@ Usage: trellis alias [options]
 
 Generate WP CLI aliases for remote environments
 
-Don't include local env (useful for non-Vagrant users):
+Don't include local env (useful for non-Lima users):
 
   $ trellis alias --skip-local
 

cmd/check.go

@@ -25,22 +25,15 @@ var Requirements = []trellis.Requirement{
 		},
 	},
 	{
-		Name:              "Vagrant",
-		Command:           "vagrant",
+		Name:              "Lima",
+		Command:           "limactl",
 		Optional:          true,
-		Url:               "https://www.vagrantup.com/downloads.html",
-		VersionConstraint: ">= 2.1.0",
+		Url:               "https://lima-vm.io/",
+		VersionConstraint: ">= 1.0.2",
 		ExtractVersion: func(output string) string {
-			return strings.Replace(output, "Vagrant ", "", 1)
+			return strings.Replace(output, "limactl version ", "", 1)
 		},
 	},
-	{
-		Name:              "VirtualBox",
-		Command:           "VBoxManage",
-		Optional:          true,
-		Url:               "https://www.virtualbox.org/wiki/Downloads",
-		VersionConstraint: ">= 4.3.10",
-	},
 }
 
 func (c *CheckCommand) Run(args []string) int {

cmd/down.go

@@ -182,7 +182,7 @@ Usage: trellis droplet create [options] ENVIRONMENT
 Creates a droplet (server) on DigitalOcean for the environment specified.
 
 Only remote servers (for staging and production) are currently supported.
-Development should be managed separately through Vagrant.
+Development should be managed separately through Lima.
 
 This command requires a DigitalOcean personal access token.
 Link: https://cloud.digitalocean.com/account/api/tokens/new

cmd/down_test.go

@@ -1,9 +1,6 @@
 package cmd
 
 import (
-	"fmt"
-	"os"
-	"path/filepath"
 	"strings"
 	"testing"
 
@@ -71,155 +68,3 @@ func TestLogsRunValidations(t *testing.T) {
 		})
 	}
 }
-
-func TestLogsRun(t *testing.T) {
-	defer trellis.LoadFixtureProject(t)()
-	trellis := trellis.NewTrellis()
-
-	cases := []struct {
-		name string
-		args []string
-		out  string
-		code int
-	}{
-		{
-			"default",
-			[]string{"development"},
-			"ssh vagrant@example.test tail -f /srv/www/example.com/logs/*[^gz]?",
-			0,
-		},
-		{
-			"access option",
-			[]string{"--access", "development"},
-			"ssh vagrant@example.test tail -f /srv/www/example.com/logs/access.log",
-			0,
-		},
-		{
-			"error option",
-			[]string{"--error", "development"},
-			"ssh vagrant@example.test tail -f /srv/www/example.com/logs/error.log",
-			0,
-		},
-		{
-			"number option",
-			[]string{"--number=10", "development"},
-			"ssh vagrant@example.test tail -n 10 -f /srv/www/example.com/logs/*[^gz]?",
-			0,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			defer MockUiExec(t, ui)()
-
-			logsCommand := NewLogsCommand(ui, trellis)
-			code := logsCommand.Run(tc.args)
-
-			if code != tc.code {
-				t.Errorf("expected code %d to be %d", code, tc.code)
-			}
-
-			combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-
-			if !strings.Contains(combined, tc.out) {
-				t.Errorf("expected output %q to contain %q", combined, tc.out)
-			}
-		})
-	}
-}
-
-func TestLogsRunGoAccess(t *testing.T) {
-	defer trellis.LoadFixtureProject(t)()
-	trellis := trellis.NewTrellis()
-
-	tmpDir := t.TempDir()
-
-	// fake goaccess binary to satisfy ok.LookPath
-	goAccessPath := filepath.Join(tmpDir, "goaccess")
-	_, _ = os.OpenFile(goAccessPath, os.O_CREATE, 0555)
-	path := os.Getenv("PATH")
-	t.Setenv("PATH", fmt.Sprintf("PATH=%s:%s", path, tmpDir))
-
-	cases := []struct {
-		name string
-		args []string
-		out  []string
-		code int
-	}{
-		{
-			"goaccess",
-			[]string{"--goaccess", "development"},
-			[]string{
-				"ssh vagrant@example.test tail -n +0 -f /srv/www/example.com/logs/*",
-				"goaccess --log-format=COMBINED",
-			},
-			0,
-		},
-		{
-			"goaccess flags",
-			[]string{"--goaccess", "--goaccess-flags=-a -m", "development"},
-			[]string{
-				"ssh vagrant@example.test tail -n +0 -f /srv/www/example.com/logs/*",
-				"goaccess --log-format=COMBINED -a -m",
-			},
-			0,
-		},
-		{
-			"goaccess with access only",
-			[]string{"--goaccess", "--access", "development"},
-			[]string{
-				"ssh vagrant@example.test tail -n +0 -f /srv/www/example.com/logs/access.log",
-				"goaccess --log-format=COMBINED",
-			},
-			0,
-		},
-		{
-			"goaccess with error only",
-			[]string{"--goaccess", "--error", "development"},
-			[]string{
-				"ssh vagrant@example.test tail -n +0 -f /srv/www/example.com/logs/error.log",
-				"goaccess --log-format=COMBINED",
-			},
-			0,
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			ui := cli.NewMockUi()
-			defer MockUiExec(t, ui)()
-
-			logsCommand := NewLogsCommand(ui, trellis)
-			code := logsCommand.Run(tc.args)
-
-			if code != tc.code {
-				t.Errorf("%s - actual code %d expected to be %d", tc.name, code, tc.code)
-			}
-
-			combined := ui.OutputWriter.String() + ui.ErrorWriter.String()
-
-			for _, out := range tc.out {
-				if !strings.Contains(combined, out) {
-					t.Errorf("%s - actual output %q expected to contain %q", tc.name, combined, out)
-				}
-			}
-		})
-	}
-}
-
-func TestLogsHelperProcess(t *testing.T) {
-	if os.Getenv("GO_WANT_HELPER_PROCESS") != "1" {
-		return
-	}
-
-	switch os.Args[3] {
-	case "ssh":
-		fmt.Fprintf(os.Stdout, "nginx log")
-		os.Exit(0)
-	case "tail":
-		os.Exit(0)
-	default:
-		t.Fatalf("unexpected command %s", os.Args[3])
-	}
-}

cmd/droplet_create.go

@@ -105,12 +105,6 @@ Connects to production as web user:
 
   $ trellis ssh -u web production
 
-Connects to main development site host:
-
-  $ trellis ssh development
-
-  Note: development always connects with 'vagrant' user
-
 Arguments:
   ENVIRONMENT Name of environment (ie: production)
   SITE        Name of the site (ie: example.com)