Fix-up publish.sh shell script, which was broken after some refactors to the property parsing in Java

Author: jmorton

.gitignore

@@ -2,3 +2,9 @@
 target/
 dependency-reduced-pom.xml
 tableau.iml
+tableau-sdk-wrapper*.zip
+logs/
+tableau-sdk-wrapper-*/
+tmp/
+lib/
+DataExtract.log

Makefile

@@ -10,7 +10,10 @@ BIN_DIR = bin
 DOCKER_DIR = docker
 DOCKER_REPOSITORY = jlmorton
 
-all: mkdir copy_files archive docker
+all: compile mkdir copy_files archive docker
+
+compile:
+	mvn install
 
 mkdir:
 	${MKDIR_P} ${BUILD_DIR}/bin
@@ -30,6 +33,7 @@ archive:
 	zip -r ${ARCHIVE} ${BUILD_DIR}
 
 clean:
+	mvn clean
 	rm -rf ${BUILD_DIR}
 	rm -rf ${DOCKER_DIR}/${BUILD_DIR}
 	rm -f ${ARCHIVE}

bin/publish.sh

@@ -1,18 +1,19 @@
 #!/bin/bash
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-BASE_PATH="$DIR/..";
+BASE_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/.."
 LIB="$BASE_PATH/lib"
 JARFILE="$LIB/tableau-1.2.jar"
 SDK_DIR="$LIB/tableausdk-linux64-10300.18.0510.1135"
 JAVA_SDK_DIR="$SDK_DIR/lib64/tableausdk/Java/"
 
-export LD_LIBRARY_PATH="$SDK_DIR/lib64/tableausdk"
+export LD_LIBRARY_PATH="$SDK_DIR/lib64/tableausdk:$LD_LIBRARY_PATH"
 
 #export http_proxy="http://$PROXY_HOST:$PROXY_PORT"
 #export https_proxy="http://$PROXY_HOST:$PROXY_PORT"
 
-usage() { echo "Usage: $0 -e <extract path> -s <site name> -d <datasource name>"; }
-while getopts "e:s:d:p:" i; do
+set -e
+
+usage() { echo "Usage: $0 -e <extract path> -s <site name> -d <datasource name> -u <url> -p <project name> -n <username> -x <password>"; exit 1; }
+while getopts "u:n:x:e:s:d:p:" i; do
     case "${i}" in
 	u) url=${OPTARG};;
 	n) username=${OPTARG};;
@@ -26,9 +27,39 @@ while getopts "e:s:d:p:" i; do
 done
 shift $((OPTIND-1))
 
-if [[ -z $extract ]] || [[ -z $site ]] || [[ -z $datasource_name ]] || [[ -z $project_name ]]; then
-        usage
-        exit
+if [[ -z $extract ]]; then
+	echo "Error: extract argument expected (-e <extract>)";
+	usage;
+fi
+
+if [[ -z $site ]]; then
+	echo "Error: site name argument expected (-s <site name>)";
+	usage;
+fi
+
+if [[ -z $datasource_name ]]; then
+	echo "Error: datasource name argument expected (-d <datasource name>)";
+	usage;
+fi
+
+if [[ -z $url ]]; then
+	echo "Error: Tableau servre URL argument expected (-u <url>)";
+	usage;
+fi
+
+if [[ -z $project_name ]]; then
+	echo "Error: Project Name argument expected (-p <project>)";
+	usage;
+fi
+
+if [[ -z $username ]]; then
+	echo "Error: Username argument expected (-n <username>)";
+	usage;
+fi
+
+if [[ -z $password ]]; then
+	echo "Error: Password argument expected (-x <password>)";
+	usage;
 fi
 
-java -jar $JARFILE -p -extract $extract -site $site -project $project_name -name $datasource_name
+java -jar $JARFILE -p -extract $extract -site $site -project $project_name -datasource $datasource_name -url $url -username $username -password $password

src/main/java/net/jlmorton/tableau/CommandLinePropertySource.java

@@ -1,6 +1,7 @@
 package net.jlmorton.tableau;
 
 import org.apache.commons.cli.*;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -28,7 +29,13 @@ public Schema getSchema() {
 
             @Override
             public File getCsvFile() {
-                return new File(commandLine.getOptionValue("file"));
+                String csvFilePath = commandLine.getOptionValue("file");
+
+                if (StringUtils.isBlank(csvFilePath)) {
+                    return null;
+                }
+
+                return new File(csvFilePath);
             }
 
             @Override

src/main/java/net/jlmorton/tableau/Main.java

@@ -15,14 +15,14 @@ public static void main(String... args) throws Exception {
         CommandLinePropertySource commandLinePropertySource = new CommandLinePropertySource(args);
         Properties properties = commandLinePropertySource.getProperties();
 
-        if (properties.isExtract()) {
-            createExtract(properties);
-        }
-
         if (properties.isPublish()) {
             publish(properties);
         }
 
+        if (properties.isExtract()) {
+            createExtract(properties);
+        }
+
         if (!properties.isExtract() & !properties.isPublish()) {
             CommandLinePropertySource.printHelp();
         }