Allow modifying default host/schema used in sail run

Author: coadler

config.go

@@ -32,9 +32,11 @@ func resolvePath(homedir string, path string) string {
 // config describes the config.toml.
 // Changes to this should be accompanied by changes to DefaultConfig.
 type config struct {
-	DefaultImage string `toml:"default_image"`
-	ProjectRoot  string `toml:"project_root"`
-	DefaultHat   string `toml:"default_hat"`
+	DefaultImage  string `toml:"default_image"`
+	ProjectRoot   string `toml:"project_root"`
+	DefaultHat    string `toml:"default_hat"`
+	DefaultSchema string `toml:"default_schema"`
+	DefaultHost   string `toml:"default_host"`
 }
 
 const DefaultConfig = `# sail configuration.
@@ -47,6 +49,12 @@ project_root = "~/Projects"
 
 # default hat lets you configure a hat that's applied automatically by default.
 # default_hat = ""
+
+# default schema used to clone repo in sail run if none given
+default_schema = "ssh"
+
+# default host used to clone repo in sail run if none given
+default_host = "github.com"
 `
 
 // metaRoot returns the root path of all metadata stored on the host.

editcmd.go

@@ -43,7 +43,7 @@ func (c *editcmd) Spec() cli.CommandSpec {
 }
 
 func (c *editcmd) Run(fl *flag.FlagSet) {
-	proj := c.gf.project(fl)
+	proj := c.gf.project(schemaPrefs{}, fl)
 
 	c.gf.ensureDockerDaemon()
 

globalflags.go

@@ -37,23 +37,39 @@ func (gf *globalFlags) ensureDockerDaemon() {
 	gf.debug("verified Docker is running")
 }
 
-func requireRepo(fl *flag.FlagSet) repo {
+func requireRepo(conf config, prefs schemaPrefs, fl *flag.FlagSet) repo {
 	repoURI := fl.Arg(0)
 	if repoURI == "" {
 		flog.Fatal("Argument <repo> must be provided.")
 	}
 
-	r, err := parseRepo("ssh", repoURI)
+	r, err := parseRepo(defaultSchema(conf, prefs), repoURI)
 	if err != nil {
 		flog.Fatal("failed to parse repo %q: %v", repoURI, err)
 	}
 	return r
 }
 
+func defaultSchema(conf config, prefs schemaPrefs) string {
+	switch {
+	case prefs.ssh:
+		return "ssh"
+	case prefs.https:
+		return "https"
+	case prefs.http:
+		return "http"
+	case conf.DefaultSchema != "":
+		return conf.DefaultSchema
+	default:
+		return "ssh"
+	}
+}
+
 // project reads the project as the first parameter.
-func (gf *globalFlags) project(fl *flag.FlagSet) *project {
+func (gf *globalFlags) project(prefs schemaPrefs, fl *flag.FlagSet) *project {
+	conf := gf.config()
 	return &project{
-		conf: gf.config(),
-		repo: requireRepo(fl),
+		conf: conf,
+		repo: requireRepo(conf, prefs, fl),
 	}
 }

runcmd.go

@@ -21,6 +21,14 @@ type runcmd struct {
 	hat     string
 	keep    bool
 	testCmd string
+
+	schemaPrefs
+}
+
+type schemaPrefs struct {
+	ssh   bool
+	http  bool
+	https bool
 }
 
 func (c *runcmd) Spec() cli.CommandSpec {
@@ -32,7 +40,41 @@ If a project is not yet created or running with the name,
 one will be created and a new editor will be opened.
 If a project is already up and running, this won't
 start a new container, but instead will reuse the
-already running container and open a new editor.`,
+already running container and open a new editor.
+
+If a schema and host are not provided, sail will use github over SSH.
+There are multiple ways to modify this behavior.
+
+1. Specify a host. See examples section
+2. Specify a schema and host. See examples section
+3. Edit the config to provide your preferred defaults.
+
+Examples:
+	Use default host and schema (github.com over SSH, editable in config)
+	- sail run cdr/code-server
+
+	Force SSH on a Github repo (user git is assumed by default)
+	- sail run ssh://github.com/cdr/sshcode
+	- sail run --ssh github.com/cdr/sshcode
+
+	Specify a custom SSH user
+	- sail run ssh://[email protected]/super/secret-repo
+	- sail run --ssh [email protected]/super/secret-repo
+
+	Force HTTPS on a Gitlab repo
+	- sail run https://gitlab.com/inkscape/inkscape
+	- sail run --https gitlab.com/inkscape/inkscape
+	
+Note:
+If you use ssh://, http://, or https://, you must specify a host. 
+
+This won't work:
+	- sail run ssh://cdr/code-server
+
+Instead, use flags to avoid providing a host.
+
+This will work:
+	- sail run --ssh cdr/code-server`,
 	}
 }
 
@@ -41,17 +83,18 @@ func (c *runcmd) RegisterFlags(fl *flag.FlagSet) {
 	fl.StringVar(&c.hat, "hat", "", "Custom hat to use.")
 	fl.BoolVar(&c.keep, "keep", false, "Keep container when it fails to build.")
 	fl.StringVar(&c.testCmd, "test-cmd", "", "A command to use in-place of starting code-server for testing purposes.")
+
+	fl.BoolVar(&c.ssh, "ssh", false, "Clone repo over SSH")
+	fl.BoolVar(&c.http, "http", false, "Clone repo over HTTP")
+	fl.BoolVar(&c.https, "https", false, "Clone repo over HTTPS")
 }
 
 const guestHomeDir = "/home/user"
 
 func (c *runcmd) Run(fl *flag.FlagSet) {
-	var (
-		err error
-	)
 	c.gf.ensureDockerDaemon()
 
-	proj := c.gf.project(fl)
+	proj := c.gf.project(c.schemaPrefs, fl)
 
 	// Abort if container already exists.
 	exists, err := proj.cntExists()

shellcmd.go

@@ -24,7 +24,7 @@ func (c *shellcmd) Spec() cli.CommandSpec {
 }
 
 func (c *shellcmd) Run(fl *flag.FlagSet) {
-	proj := c.gf.project(fl)
+	proj := c.gf.project(schemaPrefs{}, fl)
 	c.gf.ensureDockerDaemon()
 
 	out, err := dockutil.FmtExec(proj.cntName(), "grep ^.*:.*:$(id -u): /etc/passwd | cut -d : -f 7-").CombinedOutput()