From c6420e2ca0ee7fd843c038670bef4a50fd3cec44 Mon Sep 17 00:00:00 2001 From: Alper Kalaycioglu Date: Mon, 1 Nov 2021 20:40:10 +0100 Subject: [PATCH 1/2] #214 Correct gradle deployment --- piku.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piku.py b/piku.py index 6d1ef26..fbc24b4 100755 --- a/piku.py +++ b/piku.py @@ -363,7 +363,7 @@ def do_deploy(app, deltas={}, newrev=None): elif exists(join(app_path, 'pom.xml')) and found_app("Java Maven") and check_requirements(['java', 'mvn']): settings.update(deploy_java(app, deltas)) elif exists(join(app_path, 'build.gradle')) and found_app("Java Gradle") and check_requirements(['java', 'gradle']): - settings.update(deploy_java(app, deltas)) + settings.update(deploy_gradle(app, deltas)) elif (exists(join(app_path, 'Godeps')) or len(glob(join(app_path, '*.go')))) and found_app("Go") and check_requirements(['go']): settings.update(deploy_go(app, deltas)) elif exists(join(app_path, 'project.clj')) and found_app("Clojure Lein") and check_requirements(['java', 'lein']): From 82678c59a679b02a96cba19b2015308f9af31abc Mon Sep 17 00:00:00 2001 From: Alper Kalaycioglu Date: Mon, 1 Nov 2021 20:53:58 +0100 Subject: [PATCH 2/2] #214 Rename deploy java functions --- piku.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/piku.py b/piku.py index fbc24b4..bcbc964 100755 --- a/piku.py +++ b/piku.py @@ -361,9 +361,9 @@ def do_deploy(app, deltas={}, newrev=None): check_requirements(['nodejs', 'npm']) or check_requirements(['node', 'npm']) or check_requirements(['nodeenv'])): settings.update(deploy_node(app, deltas)) elif exists(join(app_path, 'pom.xml')) and found_app("Java Maven") and check_requirements(['java', 'mvn']): - settings.update(deploy_java(app, deltas)) + settings.update(deploy_java_maven(app, deltas)) elif exists(join(app_path, 'build.gradle')) and found_app("Java Gradle") and check_requirements(['java', 'gradle']): - settings.update(deploy_gradle(app, deltas)) + settings.update(deploy_java_gradle(app, deltas)) elif (exists(join(app_path, 'Godeps')) or len(glob(join(app_path, '*.go')))) and found_app("Go") and check_requirements(['go']): settings.update(deploy_go(app, deltas)) elif exists(join(app_path, 'project.clj')) and found_app("Clojure Lein") and check_requirements(['java', 'lein']): @@ -392,7 +392,7 @@ def do_deploy(app, deltas={}, newrev=None): echo("Error: app '{}' not found.".format(app), fg='red') -def deploy_gradle(app, deltas={}): +def deploy_java_gradle(app, deltas={}): """Deploy a Java application using Gradle""" java_path = join(ENV_ROOT, app) build_path = join(APP_ROOT, app, 'build') @@ -421,7 +421,7 @@ def deploy_gradle(app, deltas={}): return spawn_app(app, deltas) -def deploy_java(app, deltas={}): +def deploy_java_maven(app, deltas={}): """Deploy a Java application using Maven""" # TODO: Use jenv to isolate Java Application environments