diff

Author: kr

bzip2.go

@@ -0,0 +1,40 @@
+package binarydist
+
+import (
+	"io"
+	"os/exec"
+)
+
+type bzip2Writer struct {
+	c *exec.Cmd
+	w io.WriteCloser
+}
+
+func (w bzip2Writer) Write(b []byte) (int, error) {
+	return w.w.Write(b)
+}
+
+func (w bzip2Writer) Close() error {
+	if err := w.w.Close(); err != nil {
+		return err
+	}
+	return w.c.Wait()
+}
+
+// Package compress/bzip2 implements only decompression,
+// so we'll fake it by running bzip2 in another process.
+func newBzip2Writer(w io.Writer) (wc io.WriteCloser, err error) {
+	var bw bzip2Writer
+	bw.c = exec.Command("bzip2", "-c")
+	bw.c.Stdout = w
+
+	if bw.w, err = bw.c.StdinPipe(); err != nil {
+		return nil, err
+	}
+
+	if err = bw.c.Start(); err != nil {
+		return nil, err
+	}
+
+	return bw, nil
+}

common_test.go

@@ -2,6 +2,7 @@ package binarydist
 
 import (
 	"crypto/rand"
+	"io"
 	"io/ioutil"
 	"os"
 )
@@ -15,6 +16,14 @@ func mustOpen(path string) *os.File {
 	return f
 }
 
+func mustReadAll(r io.Reader) []byte {
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		panic(err)
+	}
+	return b
+}
+
 func fileCmp(a, b *os.File) int64 {
 	sa, err := a.Seek(0, 2)
 	if err != nil {
@@ -58,7 +67,7 @@ func fileCmp(a, b *os.File) int64 {
 	return -1
 }
 
-func mustWriteRandFile(path string, size int) {
+func mustWriteRandFile(path string, size int) *os.File {
 	p := make([]byte, size)
 	_, err := rand.Read(p)
 	if err != nil {
@@ -74,4 +83,11 @@ func mustWriteRandFile(path string, size int) {
 	if err != nil {
 		panic(err)
 	}
+
+	_, err = f.Seek(0, 0)
+	if err != nil {
+		panic(err)
+	}
+
+	return f
 }