Merge pull request #3 from mcuadros/master

Normalizator and SDK update

Author: mcuadros

.gitignore

@@ -1,2 +1,3 @@
+.composer
 .sdk
-build
+build

.travis.yml

@@ -7,12 +7,12 @@ services:
   - docker
 
 before_script:
-  - go get -v github.com/bblfsh/sdk/...
+  - go get -v gopkg.in/bblfsh/sdk.v1/...
   - bblfsh-sdk prepare-build .
   - go get -v -t ./...
 
 script:
-  - make test
+  - make test integration-test
 
 after_success:
-  - make push
+  - make push

Dockerfile.build.tpl

@@ -1,25 +1,21 @@
-# Dockerfile.build represents the build environment of the driver, used during
-# the development phase to test and in CI to build and test.
-
-# The prefered base image is the lastest stable Alpine image, if alpine doesn't
-# meet the requirements you can switch the from to the latest stable slim
-# version of Debian (eg.: `debian:jessie-slim`).
 FROM alpine:3.5
 
-# To avoid files written in the volume by root or foreign users, we create a
-# container local user with the same UID of the user executing the build.
-# The following commands are defined to use in busybox based distributions,
-# if you are using a standard distributions, replace the `adduser` command with:
-#   `useradd --uid ${BUILD_UID} --home /opt/driver ${BUILD_USER}`
 RUN mkdir -p /opt/driver/src && \
     adduser ${BUILD_USER} -u ${BUILD_UID} -D -h /opt/driver/src
 
+# PHP installation from: http://php-alpine.codecasts.rocks/
+ADD https://php.codecasts.rocks/php-alpine.rsa.pub /etc/apk/keys/php-alpine.rsa.pub
+RUN echo "http://php.codecasts.rocks/v3.5/php-7.1" >> /etc/apk/repositories
+RUN apk add  --no-cache make git ca-certificates \
+        php7=${RUNTIME_NATIVE_VERSION} \
+        php7-openssl php7-zlib php7-mbstring php7-json php7-phar php7-ctype \
+        php7-xml php7-xdebug php7-dom
+
+RUN ln -s /usr/bin/php7 /usr/bin/php
 
-# As minimal build tools you need: make, curl and git, install using the same
-# command the specific tools required to build the driver.
-RUN apk add --no-cache make git curl ca-certificates
 
+# PHP composer installation
+ADD https://getcomposer.org/installer /tmp/composer-setup.php
+RUN php /tmp/composer-setup.php --install-dir=/bin/
 
-# The volume with the full source code is mounted at `/opt/driver/src` so, we
-# set the workdir to this path.
-WORKDIR /opt/driver/src
+WORKDIR /opt/driver/src

Dockerfile.tpl

@@ -1,12 +1,4 @@
-# Dockerfile represents the container being use to run the driver, should be
-# small as possible containing strictly only the tools required to run the
-# driver.
+FROM bblfsh/php-driver-build
 
-# The prefered base image is the lastest stable Alpine image, if alpine doesn't
-# meet the requirements you can switch the from to the latest stable slim
-# version of Debian (eg.: `debian:jessie-slim`). If the excution environment
-# is equals to the build environment the build image can be use as FROM:
-#   bblfsh/<language>-driver-build
-FROM alpine:3.5
-
-CMD /opt/driver/bin/driver
+ADD build /opt/driver
+ENTRYPOINT ["/opt/driver/bin/driver"]

Makefile

@@ -1,17 +1,16 @@
-build-native-internal:
-	echo "build-native-internal > not implemented"
+-include .sdk/Makefile
+
+$(if $(filter true,$(sdkloaded)),,$(error You must install bblfsh-sdk))
 
 test-native-internal:
-	echo "test-native-internal > not implemented"
+	cd native && \
+	composer.phar install && \
+	./vendor/bin/phpunit tests/
 
-test-native:
-	cd native; \
-	echo "test-native > not implemented"
+build-native-internal:
+	cp -rf native $(BUILD_PATH)/src
+	cd $(BUILD_PATH)/src && composer.phar install
 
-build-native:
-	cd native; \
-	echo "build-native > not implemented"
-	echo -e "#!/bin/bash\necho 'not implemented'" > $(BUILD_PATH)/native
-	chmod +x $(BUILD_PATH)/native
+	rm $(BUILD_PATH)/bin/native || true
+	ln -s /opt/driver/src/ast $(BUILD_PATH)/bin/native
 
-include .sdk/Makefile

README.md

@@ -1,21 +1,22 @@
-# php-driver  ![Driver Status](https://img.shields.io/badge/status-pre--alpha-d6ae86.svg) [![Build Status](https://travis-ci.org/bblfsh/php-driver.svg?branch=master)](https://travis-ci.org/bblfsh/php-driver) ![Native Version](https://img.shields.io/badge/php%20version-7.1-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.8-63afbf.svg)
+# php-driver  ![Driver Status](https://img.shields.io/badge/status-alpha-db975c.svg) [![Build Status](https://travis-ci.org/bblfsh/php-driver.svg?branch=master)](https://travis-ci.org/bblfsh/php-driver) ![Native Version](https://img.shields.io/badge/php%20version-7.1.7--r0-aa93ea.svg) ![Go Version](https://img.shields.io/badge/go%20version-1.8-63afbf.svg)
 
-php driver for [babelfish](https://github.com/bblfsh/server).
+php driver for [babelfish](https://github.com/bblfsh/bblfshd).
 
 
 Development Environment
 -----------------------
 
 Requirements:
 - `docker`
-- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u github.com/bblfsh/sdk/...)_
+- [`bblfsh-sdk`](https://github.com/bblfsh/sdk) _(go get -u gopkg.in/bblfsh/sdk.v1/...)_
+- UAST converter dependencies _(go get -t -v ./...)_
 
 To initialize the build system execute: `bblfsh-sdk prepare-build`, at the root of the project. This will install the SDK at `.sdk` for this driver.
 
 To execute the tests just execute `make test`, this will execute the test over the native and the go components of the driver. Use `make test-native` to run the test only over the native component or `make test-driver` to run the test just over the go component.
 
-The build is done executing `make build`. To evaluate the result, a docker container, execute:
-`docker run -it bblfsh/php-driver:dev-<commit[:6]>`
+The build is done executing `make build`. To evaluate the result using a docker container, execute:
+`docker run -it bblfsh/php-driver:dev-<commit[:7]>-dirty`
 
 
 License

driver/main.go

@@ -1,25 +1,19 @@
 package main
 
 import (
-	"fmt"
-	"os"
+	"github.com/bblfsh/php-driver/driver/normalizer"
 
-	"github.com/bblfsh/sdk"
-
-	_ "github.com/bblfsh/php-driver/driver/normalizer"
+	"gopkg.in/bblfsh/sdk.v1/sdk/driver"
 )
 
-var version string
-var build string
-
 func main() {
-	fmt.Printf("version: %s\nbuild: %s\n", version, build)
-
-	_, err := os.Stat(sdk.NativeBin)
-	if err == nil {
-		fmt.Println("native: ok")
-		return
+	d, err := driver.NewDriver(normalizer.ToNode, normalizer.Transformers)
+	if err != nil {
+		panic(err)
 	}
 
-	fmt.Printf("native: %s\n", err)
-}
+	s := driver.NewServer(d)
+	if err := s.Start(); err != nil {
+		panic(err)
+	}
+}

driver/normalizer/annotation.go

@@ -0,0 +1,22 @@
+package normalizer
+
+import (
+	"github.com/bblfsh/sdk/uast/transformer/positioner"
+	"gopkg.in/bblfsh/sdk.v1/uast"
+	. "gopkg.in/bblfsh/sdk.v1/uast/ann"
+	"gopkg.in/bblfsh/sdk.v1/uast/transformer"
+	"gopkg.in/bblfsh/sdk.v1/uast/transformer/annotatter"
+)
+
+// Transformers is the list of `transformer.Transfomer` to apply to a UAST, to
+// learn more about the Transformers and the available ones take a look to:
+// https://godoc.org/gopkg.in/bblfsh/sdk.v1/uast/transformers
+var Transformers = []transformer.Tranformer{
+	annotatter.NewAnnotatter(AnnotationRules),
+	positioner.NewFillLineColFromOffset(),
+}
+
+// AnnotationRules describes how a UAST should be annotated with `uast.Role`.
+//
+// https://godoc.org/gopkg.in/bblfsh/sdk.v1/uast/ann
+var AnnotationRules = On(Any).Roles(uast.File)