Merge pull request #347 from erizocosmico/upgrade/client-go

vendor: upgrade bblfsh client-go

Author: ajnavarro

.travis.yml

@@ -22,12 +22,6 @@ before_install:
   - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-6 90
   - sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-6 90
 
-install:
-  - cd ./vendor/gopkg.in/bblfsh/client-go.v2
-  - make dependencies
-  - cd ./../../../..
-  - make dependencies
-
 before_script:
   - docker run -d --name bblfshd --privileged -p 9432:9432 -v /var/lib/bblfshd:/var/lib/bblfshd bblfsh/bblfshd
   - docker exec -it bblfshd bblfshctl driver install python bblfsh/python-driver

Gopkg.lock

@@ -49,8 +49,8 @@
 
 [[constraint]]
   name = "gopkg.in/bblfsh/client-go.v2"
-  version = "2.5.1"
+  version = "2.6.0"
 
 [[constraint]]
   name = "gopkg.in/bblfsh/sdk.v1"
-  version = "1.16.0"
+  version = "1.16.0"

Gopkg.toml

@@ -13,7 +13,8 @@ $(MAKEFILE):
 
 -include $(MAKEFILE)
 
+# we still need to do this for windows
 bblfsh-client:
 	cd vendor/gopkg.in/bblfsh/client-go.v2 && make dependencies
 
-dependencies: bblfsh-client
+dependencies: bblfsh-client

Makefile

@@ -21,10 +21,15 @@ $ gitbase server -v -g /path/to/repositories
 
 ## Installing from source
 
-Because gitbase uses [bblfsh's client-go](https://github.com/bblfsh/client-go), which uses cgo, you need to install some dependencies by hand instead of just using `go get`.
+On Linux and macOS:
 
-**Note**: we use `go get -d` so the code is not compiled yet, as it would
-fail before `make dependencies` is executed successfully.
+```
+go get -u github.com/src-d/gitbase/...
+```
+
+On Windows:
+
+Because gitbase uses [bblfsh's client-go](https://github.com/bblfsh/client-go), which uses cgo, you need to install some dependencies by hand instead of just using `go get`. Use this instead:
 
 ```
 $ go get -d github.com/src-d/gitbase

docs/using-gitbase/getting-started.md

@@ -197,7 +197,7 @@ func (f UAST) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 
 	resp, err := client.Parse(ctx, lang, bytes)
 	if err != nil {
-		return nil, err
+		return nil, ErrParseBlob.New(err)
 	}
 
 	if resp.Status != protocol.Ok {