Moved sources to version folder

Merged PR Masterminds#173 of upstream repository
piccobit · Jul 26, 2022 · bc087ca · bc087ca
1 parent d8e6814
commit bc087ca
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 0 deletions.
diff --git a/Makefile → v4/Makefile b/Makefile → v4/Makefile
diff --git a/benchmark_test.go → v4/benchmark_test.go b/benchmark_test.go → v4/benchmark_test.go
diff --git a/collection.go → v4/collection.go b/collection.go → v4/collection.go
diff --git a/collection_test.go → v4/collection_test.go b/collection_test.go → v4/collection_test.go
diff --git a/constraints.go → v4/constraints.go b/constraints.go → v4/constraints.go
diff --git a/constraints_test.go → v4/constraints_test.go b/constraints_test.go → v4/constraints_test.go
diff --git a/doc.go → v4/doc.go b/doc.go → v4/doc.go
diff --git a/fuzz.go → v4/fuzz.go b/fuzz.go → v4/fuzz.go
diff --git a/go.mod → v4/go.mod b/go.mod → v4/go.mod
diff --git a/go.sum → v4/go.sum b/go.sum → v4/go.sum
diff --git a/version.go → v4/version.go b/version.go → v4/version.go
@@ -458,6 +458,23 @@ func (v *Version) Value() (driver.Value, error) {
 	return v.String(), nil
 }
 
+// UnmarshalText implements the encoding.TextUnmarshaler interface.
+func (v *Version) UnmarshalText(text []byte) error {
+	temp, err := NewVersion(string(text))
+	if err != nil {
+		return err
+	}
+
+	*v = *temp
+
+	return nil
+}
+
+// MarshalText implements the encoding.TextMarshaler interface.
+func (v *Version) MarshalText() ([]byte, error) {
+	return []byte(v.String()), nil
+}
+
 func compareSegment(v, o uint64) int {
 	if v < o {
 		return -1

diff --git a/version_test.go → v4/version_test.go b/version_test.go → v4/version_test.go
@@ -623,3 +623,39 @@ func TestValidateMetadata(t *testing.T) {
 		}
 	}
 }
+
+func TestTextMarshal(t *testing.T) {
+	sVer := "1.1.1"
+
+	x, err := StrictNewVersion(sVer)
+	if err != nil {
+		t.Errorf("Error creating version: %s", err)
+	}
+
+	out, err2 := x.MarshalText()
+	if err2 != nil {
+		t.Errorf("Error marshaling version: %s", err2)
+	}
+
+	got := string(out)
+	want := sVer
+	if got != want {
+		t.Errorf("Error marshaling unexpected marshaled content: got=%q want=%q", got, want)
+	}
+}
+
+func TestTextUnmarshal(t *testing.T) {
+	sVer := "1.1.1"
+	ver := &Version{}
+
+	err := ver.UnmarshalText([]byte(sVer))
+	if err != nil {
+		t.Errorf("Error unmarshaling version: %s", err)
+	}
+
+	got := ver.String()
+	want := sVer
+	if got != want {
+		t.Errorf("Error unmarshaling unexpected object content: got=%q want=%q", got, want)
+	}
+}