merge master into develop and change to pass acceptance test

BBVA · Oct 3, 2017 · d9150b3 · d9150b3
2 parents e93be4c + 66b471a
commit d9150b3
Show file tree

Hide file tree

Showing 42 changed files with 540 additions and 622 deletions.
diff --git a/.env.required b/.env.required
@@ -1,3 +1,4 @@
 BROKER_URI
 DATABASE_URI
 SCAN_PATH
+SHARED_VOLUME_PATH
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,12 @@
+language: python
+
+services: docker
+
+python:
+  - "3.6"
+
+install:
+  - pip install tox
+
+script:
+  - tox
diff --git a/Dockerfile b/Dockerfile
@@ -3,17 +3,26 @@ FROM python:3.6
 # install docker
 RUN curl -sSL https://get.docker.com/ | /bin/bash
 
-# add sources
 RUN mkdir /tmp/install
-ADD . /tmp/install
+WORKDIR /tmp/install
+
+# add dependencies
+ADD requirements* /tmp/install/
+RUN pip install -r /tmp/install/requirements.txt
+
+# add sources
+ADD deeptracy /tmp/install/deeptracy
+ADD README.rst /tmp/install
+ADD setup.py /tmp/install
 
 # install sources and romove them
-WORKDIR /tmp/install
 RUN pip install -U .
 RUN rm -rf /tmp/install
 
 # add run script
 RUN mkdir /opt/deeptracy
+WORKDIR /opt/deeptracy
+ADD wait-for-it.sh /opt/deeptracy
 ADD run.sh /opt/deeptracy
 RUN chmod +x /opt/deeptracy/run.sh
 

diff --git a/Makefile b/Makefile
@@ -60,7 +60,7 @@ lint: ## check style with flake8
 
 .PHONY: coverage
 coverage: install ## check code coverage
-	coverage run --source=deeptracy -m unittest  discover -s tests/unit
+	coverage run --source=deeptracy -m unittest discover -s tests/unit
 	coverage report -m --fail-under 80
 	coverage xml -o coverage-reports/report.xml
 
@@ -73,7 +73,7 @@ docs: ## generate and shows documentation
 	@make -C docs html
 
 .PHONY: run
-run: ## local run the app
+run: ## local run the API
 	./run.sh
 
 .PHONY: demo
@@ -82,4 +82,9 @@ demo: ## local run the app
 
 .PHONY: behave
 behave: ## run behave tests
-	behave tests/behave/features
+	behave --no-capture --no-capture-stderr tests/acceptance/features
+
+.PHONY: local_behave
+local_behave: ## run behave tests
+	LOCAL_BEHAVE=True behave --no-capture --no-capture-stderr tests/acceptance/features
+
diff --git a/README.rst b/README.rst
@@ -3,9 +3,17 @@ Deeptracy
 
 Deeptracy scans your project dependencies to spot vulnerabilities.
 
+.. image:: https://readthedocs.org/projects/deeptracy/badge/?version=latest
+  :target: http://deeptracy.readthedocs.io/en/latest/?badge=latest
+  :alt: Documentation Status
+
+.. image:: https://travis-ci.org/BBVA/deeptracy.svg?branch=master
+  :target: https://travis-ci.org/BBVA/deeptracy
+  :alt: Build Status
+
 .. image::  https://raw.githubusercontent.com/BBVA/deeptracy/develop/docs/_static/deeptracy-logo-small.png
-    :alt: Deeptracy logo
-    :width: 250 px
+  :alt: Deeptracy logo
+  :width: 250 px
 
 
 +----------------+----------------------------------------------+

diff --git a/deeptracy/app.py → deeptracy/celery.py b/deeptracy/app.py → deeptracy/celery.py
@@ -4,13 +4,12 @@
 """
 from celery import Celery
 from deeptracy.config import BROKER_URI
-from deeptracy.dal.database import db
-from deeptracy.redis import redis
-from deeptracy.plugins.store import plugin_store
+from deeptracy_core.dal.database import db
+from deeptracy.plugin_store import plugin_store
 
 db.init_engine()  # Init database engine
-redis.set_up()    # Setup redis client
-plugin_store.load_plugins()    # Load analyzer plugins
+plugin_store.load_plugins()  # Load analyzer plugins
+
 
 # SETUP AND CREATE CELERY APP
 celery = Celery('deeptracy',

diff --git a/deeptracy/dal/database.py b/deeptracy/dal/database.py
diff --git a/deeptracy/dal/models.py b/deeptracy/dal/models.py
diff --git a/deeptracy/dal/plugin_manager.py b/deeptracy/dal/plugin_manager.py
diff --git a/deeptracy/dal/project_manager.py b/deeptracy/dal/project_manager.py
diff --git a/deeptracy/dal/scan_analysis_manager.py b/deeptracy/dal/scan_analysis_manager.py
diff --git a/deeptracy/dal/scan_manager.py b/deeptracy/dal/scan_manager.py