Update to beta6 of the protocol

Fixes #4

.github/workflows/test.yml

@@ -17,20 +17,20 @@ jobs:
     - name: Install dart-sass-embedded Linux
       if: matrix.os == 'ubuntu-latest'
       run: |
-        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-linux-x64.tar.gz;
-        tar -xvf sass_embedded-1.0.0-beta.5-linux-x64.tar.gz;
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.6/sass_embedded-1.0.0-beta.6-linux-x64.tar.gz;
+        tar -xvf sass_embedded-1.0.0-beta.6-linux-x64.tar.gz;
         echo "DART_SASS_EMBEDDED_BINARY=$GITHUB_WORKSPACE/sass_embedded/dart-sass-embedded" >> $GITHUB_ENV
     - name: Install dart-sass-embedded MacOS
       if: matrix.os == 'macos-latest'
       run: |
-        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-macos-x64.tar.gz;
-        tar -xvf sass_embedded-1.0.0-beta.5-macos-x64.tar.gz;
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.6/sass_embedded-1.0.0-beta.6-macos-x64.tar.gz;
+        tar -xvf sass_embedded-1.0.0-beta.6-macos-x64.tar.gz;
         echo "DART_SASS_EMBEDDED_BINARY=$GITHUB_WORKSPACE/sass_embedded/dart-sass-embedded" >> $GITHUB_ENV
     - name: Install dart-sass-embedded Windows
       if: matrix.os == 'windows-latest'
       run: |
-        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.5/sass_embedded-1.0.0-beta.5-windows-x64.zip;
-        unzip sass_embedded-1.0.0-beta.5-windows-x64.zip;
+        curl -LJO https://github.com/sass/dart-sass-embedded/releases/download/1.0.0-beta.6/sass_embedded-1.0.0-beta.6-windows-x64.zip;
+        unzip sass_embedded-1.0.0-beta.6-windows-x64.zip;
         echo  "DART_SASS_EMBEDDED_BINARY=$env:GITHUB_WORKSPACE/sass_embedded/dart-sass-embedded.bat" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf-8 -Append
     - name: Test
       run: go test -race . -coverprofile=coverage.txt -covermode=atomic

.gitignore

@@ -11,5 +11,7 @@
 # Output of the go coverage tool, specifically when used with LiteIDE
 *.out
 
+lib/
+
 # Dependency directories (remove the comment below to include it)
 # vendor/

conn.go

@@ -1,6 +1,7 @@
 package godartsass
 
 import (
+	"bufio"
 	"bytes"
 	"errors"
 	"io"
@@ -22,15 +23,22 @@ func newConn(cmd *exec.Cmd) (_ conn, err error) {
 
 	out, err := cmd.StdoutPipe()
 	stdErr := &tailBuffer{limit: 1024}
-	c := conn{out, in, stdErr, cmd}
+	buff := bufio.NewReader(out)
+	c := conn{buff, buff, out, in, stdErr, cmd}
 	cmd.Stderr = c.stdErr
 
 	return c, err
 }
 
-// conn wraps a ReadCloser, WriteCloser, and a Cmd.
+type byteReadWriteCloser interface {
+	io.ReadWriteCloser
+	io.ByteReader
+}
+
 type conn struct {
-	io.ReadCloser
+	io.ByteReader
+	io.Reader
+	readerCloser io.Closer
 	io.WriteCloser
 	stdErr *tailBuffer
 	cmd    *exec.Cmd
@@ -48,7 +56,7 @@ func (c conn) Start() error {
 // Close closes conn's WriteCloser, ReadClosers, and waits for the command to finish.
 func (c conn) Close() error {
 	writeErr := c.WriteCloser.Close()
-	readErr := c.ReadCloser.Close()
+	readErr := c.readerCloser.Close()
 	cmdErr := c.waitWithTimeout()
 
 	if writeErr != nil {

go.sum

@@ -17,7 +17,6 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x
 github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

internal/embeddedsass/README.md

@@ -0,0 +1,6 @@
+
+* Install protobuf: https://github.com/protocolbuffers/protobuf
+* Install the Go plugin: go get -u google.golang.org/protobuf/cmd/protoc-gen-go
+* Download the correct version of the proto file: https://github.com/sass/embedded-protocol/blob/master/embedded_sass.proto
+* protoc --go_out=. embedded_sass.proto
+* Fix package name in embedded_sass.pb.go (TODO(bep))