From de0b6a8911cf1eac705f141fa34a9a935843cb52 Mon Sep 17 00:00:00 2001 From: Rick Olson Date: Fri, 30 Jan 2015 14:23:16 -0500 Subject: [PATCH] update pointer version url with https --- commands/clean_test.go | 4 ++-- commands/smudge_test.go | 6 +++--- docs/spec.md | 2 +- pointer/pointer.go | 2 +- pointer/pointer_test.go | 18 +++++++++--------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/commands/clean_test.go b/commands/clean_test.go index d6c56d9d..b067509f 100644 --- a/commands/clean_test.go +++ b/commands/clean_test.go @@ -19,7 +19,7 @@ func TestClean(t *testing.T) { cmd := repo.Command("clean", "somefile") cmd.Input = bytes.NewBufferString(content) - cmd.Output = `version http://hawser.github.com/spec/v1 + cmd.Output = `version https://hawser.github.com/spec/v1 oid sha256:` + oid + ` size 3` @@ -32,7 +32,7 @@ size 3` cmd = repo.Command("clean") cmd.Input = bytes.NewBufferString(content) - cmd.Output = `version http://hawser.github.com/spec/v1 + cmd.Output = `version https://hawser.github.com/spec/v1 oid sha256:` + oid + ` size 3` customHook := []byte("echo 'yo'") diff --git a/commands/smudge_test.go b/commands/smudge_test.go index 6f4b0ed3..4f670c66 100644 --- a/commands/smudge_test.go +++ b/commands/smudge_test.go @@ -18,7 +18,7 @@ func TestSmudge(t *testing.T) { // simple smudge example cmd := repo.Command("smudge", "somefile") - cmd.Input = bytes.NewBufferString("version http://hawser.github.com/spec/v1\noid sha256:SOMEOID\nsize 9\n") + cmd.Input = bytes.NewBufferString("version https://hawser.github.com/spec/v1\noid sha256:SOMEOID\nsize 9\n") cmd.Output = "whatever" cmd.Env = append(cmd.Env, "GIT_MEDIA_PROGRESS="+progressFile) @@ -105,12 +105,12 @@ func TestSmudgeInfo(t *testing.T) { // smudge --info with hawser pointer format, without local file cmd = repo.Command("smudge", "--info") - cmd.Input = bytes.NewBufferString("version http://hawser.github.com/spec/v1\noid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393\nsize 123\n") + cmd.Input = bytes.NewBufferString("version https://hawser.github.com/spec/v1\noid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393\nsize 123\n") cmd.Output = "123 --" // smudge --info with hawser pointer format, with local file cmd = repo.Command("smudge", "--info") - cmd.Input = bytes.NewBufferString("version http://hawser.github.com/spec/v1\noid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393\nsize 123\n") + cmd.Input = bytes.NewBufferString("version https://hawser.github.com/spec/v1\noid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393\nsize 123\n") cmd.Output = "9 " + mediaFile cmd.Before(func() { diff --git a/docs/spec.md b/docs/spec.md index 3beac7de..a7bcba8f 100644 --- a/docs/spec.md +++ b/docs/spec.md @@ -10,7 +10,7 @@ The core Hawser idea is that instead of writing large blobs to a Git repository, only a pointer file is written. ``` -version http://hawser.github.com/spec/v1 +version https://hawser.github.com/spec/v1 oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393 size 12345 (ending \n) diff --git a/pointer/pointer.go b/pointer/pointer.go index 3ab6c729..a8445b69 100644 --- a/pointer/pointer.go +++ b/pointer/pointer.go @@ -16,7 +16,7 @@ var ( MediaWarning = []byte("# git-media\n") alpha = "http://git-media.io/v/1" beta = "http://git-media.io/v/2" - latest = "http://hawser.github.com/spec/v1" + latest = "https://hawser.github.com/spec/v1" oidType = "sha256" alphaHeaderRE = regexp.MustCompile(`\A# (.*git-media|external)`) oidRE = regexp.MustCompile(`\A[0-9a-fA-F]{64}`) diff --git a/pointer/pointer_test.go b/pointer/pointer_test.go index 7c828a05..b915b888 100644 --- a/pointer/pointer_test.go +++ b/pointer/pointer_test.go @@ -15,7 +15,7 @@ func TestEncode(t *testing.T) { assert.Equal(t, nil, err) bufReader := bufio.NewReader(&buf) - assertLine(t, bufReader, "version http://hawser.github.com/spec/v1\n") + assertLine(t, bufReader, "version https://hawser.github.com/spec/v1\n") assertLine(t, bufReader, "oid sha256:booya\n") assertLine(t, bufReader, "size 12345\n") @@ -33,7 +33,7 @@ func assertLine(t *testing.T, r *bufio.Reader, expected string) { } func TestHawserIniDecode(t *testing.T) { - ex := `version http://hawser.github.com/spec/v1 + ex := `version https://hawser.github.com/spec/v1 oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393 size 12345` @@ -80,12 +80,12 @@ func TestDecodeInvalid(t *testing.T) { "# git-media", // bad oid type - `version http://hawser.github.com/spec/v1 + `version https://hawser.github.com/spec/v1 oid shazam:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393 size 12345`, // no oid - `version http://hawser.github.com/spec/v1 + `version https://hawser.github.com/spec/v1 size 12345`, // bad version @@ -98,16 +98,16 @@ size 12345`, size 12345`, // bad size - `version http://hawser.github.com/spec/v1 + `version https://hawser.github.com/spec/v1 oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393 size fif`, // no size - `version http://hawser.github.com/spec/v1 + `version https://hawser.github.com/spec/v1 oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393`, // bad `key value` format - `version=http://hawser.github.com/spec/v1 + `version=https://hawser.github.com/spec/v1 oid=sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393 size=fif`, @@ -117,13 +117,13 @@ oid=sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393 size=fif`, // extra key - `version http://hawser.github.com/spec/v1 + `version https://hawser.github.com/spec/v1 oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393 size 12345 wat wat`, // keys out of order - `version http://hawser.github.com/spec/v1 + `version https://hawser.github.com/spec/v1 size 12345 oid sha256:4d7a214614ab2935c943f9e0ff69d22eadbb8f32b1258daaa5e2ca24d17e2393`, }