fix installation of JARs in amazon_kclpy

whummer · whummer · commit a57a70d33fba · 2016-11-17T10:31:14.000+11:00
diff --git a/Makefile b/Makefile
@@ -8,21 +8,33 @@ usage:             ## Show this help
 	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
 
 install:           ## Install npm/pip dependencies, compile code
+	make install-pypi
+
+install-pypi:
+	make setup-venv && make install-libs
+	# re-install amazon_kclpy as it needs to re-download JAR files which are otherwise missing in the cached copy
+	($(VENV_RUN); pip uninstall -y amazon_kclpy)
+	($(VENV_RUN); cat requirements.txt | grep 'amazon_kclpy==' | xargs pip install --no-cache)
+	make compile
+
+setup-venv:
 	(test `which virtualenv` || pip install virtualenv || sudo pip install virtualenv)
 	(test -e $(VENV_DIR) || virtualenv $(VENV_DIR))
 	($(VENV_RUN) && pip install --upgrade pip)
 	(test ! -e requirements.txt || ($(VENV_RUN) && pip install -r requirements.txt))
+
+install-libs:      ## Install npm/pip dependencies, compile code
 	(test -e localstack/infra/elasticsearch || { mkdir -p localstack/infra; cd localstack/infra; test -f $(TMP_ARCHIVE_ES) || (curl -o $(TMP_ARCHIVE_ES) $(ES_URL)); cp $(TMP_ARCHIVE_ES) es.zip; unzip -q es.zip; mv elasticsearch* elasticsearch; rm es.zip; })
 	(test -e localstack/infra/amazon-kinesis-client/aws-java-sdk-sts.jar || { mkdir -p localstack/infra/amazon-kinesis-client; curl -o localstack/infra/amazon-kinesis-client/aws-java-sdk-sts.jar $(AWS_STS_URL); })
 	(npm install -g npm || sudo npm install -g npm)
 	(cd localstack/ && (test ! -e package.json || (npm install)))
-	make compile
-	# make install-web
 
 install-web:       ## Install npm dependencies for dashboard Web UI
 	(cd localstack/dashboard/web && (test ! -e package.json || npm install))
 
 compile:           ## Compile Java code (KCL library utils)
+	echo "Compiling"
+	$(VENV_RUN); python -c 'from localstack.utils.kinesis import kclipy_helper; print kclipy_helper.get_kcl_classpath()'
 	javac -cp $(shell $(VENV_RUN); python -c 'from localstack.utils.kinesis import kclipy_helper; print kclipy_helper.get_kcl_classpath()') localstack/utils/kinesis/java/com/atlassian/*.java
 	# TODO enable once we want to support Java-based Lambdas
 	# (cd localstack/mock && mvn package)
@@ -57,4 +69,4 @@ clean:             ## Clean up (npm dependencies, downloaded infrastructure code
 	rm -f localstack/utils/kinesis/java/com/atlassian/*.class
 	rm -f $(TMP_ARCHIVE_ES)
 
-.PHONY: usage compile clean install web install-web infra test
+.PHONY: usage compile clean install web install-web infra test install-libs
diff --git a/README.md b/README.md
@@ -112,6 +112,7 @@ make web
 
 ## Change Log
 
+* v0.1.8: Fix installation of JARs in amazon_kclpy if localstack is installed transitively
 * v0.1.7: Bump version of amazon_kclpy to 1.4.0
 * v0.1.6: Add travis-ci and coveralls configuration
 * v0.1.5: Refactor Elasticsearch utils; fix bug in method to delete all ES indexes
diff --git a/localstack/utils/kinesis/kclipy_helper.py b/localstack/utils/kinesis/kclipy_helper.py
@@ -3,11 +3,12 @@
 from __future__ import print_function
 from amazon_kclpy import kcl
 from glob import glob
-from localstack.utils.common import save_file
+from localstack.utils.common import save_file, run
 import os
 import argparse
 import sys
 import samples
+import traceback
 
 
 def get_dir_of_file(f):
@@ -19,7 +20,8 @@ def get_kcl_dir():
 
 
 def get_kcl_jar_path():
-    return ':'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar')))
+    jars = ':'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar')))
+    return jars
 
 
 def get_kcl_classpath(properties=None, paths=[]):
diff --git a/setup.py b/setup.py
@@ -34,7 +34,11 @@ def do_make_install(workdir=None):
     if workdir:
         prev_workdir = os.getcwd()
         os.chdir(workdir)
-    out = subprocess.check_output('make install', shell=True)
+    try:
+        out = subprocess.check_output('make install-pypi', shell=True)
+    except subprocess.CalledProcessError as e:
+        print e.output
+        raise e
     if workdir:
         os.chdir(prev_workdir)
 
@@ -72,7 +76,7 @@ def run(self):
 
     setup(
         name='localstack',
-        version='0.1.7',
+        version='0.1.8',
         description='Provides an easy-to-use test/mocking framework for developing Cloud applications',
         author='Waldemar Hummer (Atlassian)',
         author_email='waldemar.hummer@gmail.com',
