Merge pull request #63 from juanjux/fix/issue60

Test for issue 60 + bblfshd/libuast update

Author: juanjux

README.md

@@ -1,7 +1,7 @@
 ## client-python [![Build Status](https://travis-ci.org/bblfsh/client-python.svg?branch=master)](https://travis-ci.org/bblfsh/client-python) [![PyPI](https://img.shields.io/pypi/v/bblfsh.svg)](https://pypi.python.org/pypi/bblfsh)
 
 [Babelfish](https://doc.bblf.sh) Python client library provides functionality to both
-connect to the Babelfish server to parse code
+connect to the Babelfish bblfshd to parse code
 (obtaining an [UAST](https://doc.bblf.sh/uast/specification.html) as a result)
 and to analyse UASTs with the functionality provided by [libuast](https://github.com/bblfsh/libuast).
 
@@ -37,10 +37,11 @@ A small example of how to parse a Python file and extract the import declaration
 If you don't have a bblfsh server running you can execute it using the following command:
 
 ```sh
-docker run --privileged --rm -it -p 9432:9432 --name bblfsh bblfsh/server
+docker run --privileged --rm -it -p 9432:9432 -v bblfsh_cache:/var/lib/bblfshd --name bblfshd bblfsh/bblfshd
+docker exec -it bblfshd bblfshctl driver install python bblfsh/python-driver:latest
 ```
 
-Please, read the [getting started](https://doc.bblf.sh/user/getting-started.html) guide to learn more about how to use and deploy a bblfsh server.
+Please, read the [getting started](https://doc.bblf.sh/user/getting-started.html) guide to learn more about how to use and deploy a bblfshd.
 
 ```python
 from bblfsh import BblfshClient, filter

bblfsh/fixtures/issue60.py

@@ -0,0 +1,33 @@
+from setuptools import setup, find_packages
+
+setup(
+    name="apollo",
+    description="source{d} Gemini's evil twin which runs everything using Python.",
+    version="0.1.0",
+    license="Apache 2.0",
+    author="source{d}",
+    author_email="machine-learning@sourced.tech",
+    url="https://github.com/src-d/gemini",
+    download_url="https://github.com/src-d/gemini",
+    packages=find_packages(exclude=("gemini.tests",)),
+    entry_points={
+        "console_scripts": ["gemini=gemini.__main__:main"],
+    },
+    keywords=["machine learning on source code", "weighted minhash", "minhash",
+              "bblfsh", "babelfish"],
+    install_requires=["cassandra_driver >= 3.12.0, <4.0",
+                      "libMHCUDA >= 1.1.5, <2.0"],
+                      # "sourcedml >= 0.4.0, <1.0"],
+    package_data={"": ["LICENSE", "README.md"]},
+    classifiers=[
+        "Development Status :: 3 - Alpha",
+        "Environment :: Console",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Apache Software License",
+        "Operating System :: POSIX",
+        "Programming Language :: Python :: 3.4",
+        "Programming Language :: Python :: 3.5",
+        "Programming Language :: Python :: 3.6",
+        "Topic :: Software Development :: Libraries"
+    ]
+)

bblfsh/launcher.py

@@ -16,22 +16,24 @@ def ensure_bblfsh_is_running():
 
     def after_start(container):
         log.warning(
-            "Launched the Babelfish server (name bblfsh, id %s).\nStop it "
-            "with: docker rm -f bblfsh", container.id)
+            "Launched the Babelfish server (name bblfshd, id %s).\nStop it "
+            "with: docker rm -f bblfshd", container.id)
         with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
             result = -1
             while result != 0:
                 time.sleep(0.1)
                 result = sock.connect_ex(("0.0.0.0", 9432))
         log.warning("Babelfish server is up and running.")
+        log.info("Installing Python driver")
+        container.exec_run("bblfshctl driver install python bblfsh/python-driver:latest")
 
     try:
-        container = client.containers.get("bblfsh")
+        container = client.containers.get("bblfshd")
         if container.status != "running":
             try:
                 container.start()
             except Exception as e:
-                log.warning("Failed to start the existing bblfsh container: "
+                log.warning("Failed to start the existing bblfshd container: "
                             "%s: %s", type(e).__name__, e)
             else:
                 after_start(container)
@@ -44,7 +46,7 @@ def after_start(container):
         return False
     except docker.errors.NotFound:
         container = client.containers.run(
-                "bblfsh/server", name="bblfsh", detach=True, privileged=True,
+                "bblfsh/bblfshd", name="bblfshd", detach=True, privileged=True,
             ports={9432: 9432}
         )
         after_start(container)

bblfsh/test.py

@@ -1,3 +1,4 @@
+import os
 import unittest
 
 import docker
@@ -17,7 +18,7 @@ def setUpClass(cls):
     def tearDownClass(cls):
         if not cls.BBLFSH_SERVER_EXISTED:
             client = docker.from_env(version="auto")
-            client.containers.get("bblfsh").remove(force=True)
+            client.containers.get("bblfshd").remove(force=True)
             client.api.close()
 
     def setUp(self):
@@ -112,6 +113,18 @@ def testFilterEndCol(self):
         self.assertTrue(any(filter(node, "//*[@endCol=50]")))
         self.assertFalse(any(filter(node, "//*[@endCol=5]")))
 
+    def testFilterBadQuery(self):
+        node = Node()
+        self.assertRaises(RuntimeError, filter, node, "//*roleModule")
+
+    def testIssue60(self):
+        fixtures_dir = os.path.join(
+                        os.path.dirname(os.path.realpath(__file__)),
+                        "fixtures")
+        rep = self.client.parse(os.path.join(fixtures_dir, "issue60.py"))
+        assert(rep.uast)
+        self.assertFalse(any(filter(rep.uast, "//@roleLiteral")))
+
     def testRoleIdName(sedlf):
         assert(role_id(role_name(1)) == 1)
         assert(role_name(role_id("IDENTIFIER")) == "IDENTIFIER")
@@ -129,6 +142,7 @@ def _validate_resp(self, resp):
 
     def _validate_filter(self, resp):
         results = filter(resp.uast, "//Import[@roleImport and @roleDeclaration]//alias")
+        self.assertEqual(next(results).token, "os")
         self.assertEqual(next(results).token, "unittest")
         self.assertEqual(next(results).token, "docker")
 

setup.py

@@ -5,12 +5,13 @@
 from setuptools import setup, find_packages, Extension
 from setuptools.command.build_ext import build_ext
 
-LIBUAST_VERSION = "v1.4.1"
+LIBUAST_VERSION = "v1.5.1"
 SDK_VERSION = "v1.8.0"
 SDK_MAJOR = SDK_VERSION.split('.')[0]
 PYTHON = "python3"
 
-
+os.environ["CC"] = "g++"
+os.environ["CXX"] = "g++"
 libraries = ['xml2']
 sources = ['bblfsh/pyuast.c']
 
@@ -23,7 +24,7 @@ def run(self):
         if "--global-uast" in sys.argv:
             libraries.append('uast')
         else:
-            sources.append('bblfsh/libuast/uast.c')
+            sources.append('bblfsh/libuast/uast.cc')
             sources.append('bblfsh/libuast/roles.c')
 
         getLibuast()
@@ -123,7 +124,7 @@ def main():
         'bblfsh.pyuast',
         libraries=libraries,
         library_dirs=['/usr/lib', '/usr/local/lib'],
-        extra_compile_args=['-std=gnu99'],
+        extra_compile_args=['-std=c++11'],
         include_dirs=['bblfsh/libuast/', '/usr/local/include', '/usr/local/include/libxml2',
                       '/usr/include', '/usr/include/libxml2'], sources=sources)