Merge pull request #161 from carolynvs/fix-use-experimental

Fix regression with use experimental

dvm-helper/dockerversion/dockerversion.go

@@ -97,6 +97,17 @@ func (version Version) Value() string {
 	return version.formatRaw()
 }
 
+// Slug is the path segment under DVM_DIR where the binary is located
+func (version Version) Slug() string {
+	if version.IsSystem() {
+		return ""
+	}
+	if version.IsExperimental() {
+		return version.alias
+	}
+	return version.formatRaw()
+}
+
 func (version Version) Name() string {
 	if version.alias != "" {
 		return version.alias

dvm-helper/dockerversion/dockerversion_test.go

@@ -47,30 +47,60 @@ func TestLeadingZeroInVersion(t *testing.T) {
 
 func TestSystemAlias(t *testing.T) {
 	v := dockerversion.Parse(dockerversion.SystemAlias)
+	assert.Empty(t, v.Slug(),
+		"The system alias should not have a slug")
 	assert.Equal(t, dockerversion.SystemAlias, v.String(),
 		"An empty alias should only print the alias")
-	assert.Equal(t, dockerversion.SystemAlias, v.String(),
+	assert.Equal(t, dockerversion.SystemAlias, v.Name(),
+		"The name for an aliased version should be its alias")
+	assert.Equal(t, "", v.Value(),
+		"The value for an empty aliased version should be empty")
+}
+
+func TestExperimentalAlias(t *testing.T) {
+	v := dockerversion.Parse(dockerversion.ExperimentalAlias)
+	assert.Equal(t, dockerversion.ExperimentalAlias, v.Slug(),
+		"The slug for the experimental version should be 'experimental'")
+	assert.Equal(t, dockerversion.ExperimentalAlias, v.String(),
+		"An empty alias should only print the alias")
+	assert.Equal(t, dockerversion.ExperimentalAlias, v.Name(),
 		"The name for an aliased version should be its alias")
 	assert.Equal(t, "", v.Value(),
 		"The value for an empty aliased version should be empty")
 }
 
 func TestAlias(t *testing.T) {
 	v := dockerversion.NewAlias("prod", "1.2.3")
+	assert.Equal(t, "1.2.3", v.Slug(),
+		"The slug for an aliased version should be its semver value")
 	assert.Equal(t, "prod (1.2.3)", v.String(),
 		"The string representation for an aliased version should include both alias and version")
 	assert.Equal(t, "prod", v.Name(),
 		"The name for an aliased version should be its alias")
 	assert.Equal(t, "1.2.3", v.Value(),
-		"The value for an aliased version should be its version")
+		"The value for an aliased version should be its semver value")
 }
 
 func TestSemanticVersion(t *testing.T) {
 	v := dockerversion.Parse("1.2.3")
+	assert.Equal(t, "1.2.3", v.Slug(),
+		"The slug for a a semantic version should be its semver value")
 	assert.Equal(t, "1.2.3", v.String(),
 		"The string representation for a semantic version should only include the semver value")
 	assert.Equal(t, "1.2.3", v.Name(),
 		"The name for a semantic version should be its semver value")
 	assert.Equal(t, "1.2.3", v.Value(),
 		"The value for a semantic version should be its semver value")
 }
+
+func TestSetAsExperimental(t *testing.T) {
+	v := dockerversion.Parse("1.2.3")
+	v.SetAsExperimental()
+	assert.True(t, v.IsExperimental())
+}
+
+func TestSetAsSystem(t *testing.T) {
+	v := dockerversion.Parse("1.2.3")
+	v.SetAsSystem()
+	assert.True(t, v.IsSystem())
+}

dvm-helper/dvm-helper.go

@@ -878,7 +878,7 @@ func getVersionsDir() string {
 }
 
 func getVersionDir(version dockerversion.Version) string {
-	versionPath := version.Name()
+	versionPath := version.Slug()
 	if version.IsExperimental() {
 		versionPath = dockerversion.ExperimentalAlias
 	}