Remove curl dependency (fixes #29); Use release_url to run expandcp.kts from url-cache to avoid curling another file into ~/bin (fixes #26); prepare for sdkman release

Author: holgerbrandl

.travis.yml

@@ -41,16 +41,16 @@ install:
   - export PATH=$KSCRIPT_HOME::$PATH
 
   - which kscript
-  - which expandcp.kts
+  - which resdeps.kts
   - which assert.sh
 
   ## does it run outside of test-suite?
   - kscript --help
   - java  -version
   - mvn --version
-  - expandcp.kts log4j:log4j:1.2.14
+  - resdeps.kts log4j:log4j:1.2.14
   - kscript 'println("kotlin rocks")'
-#  - expandcp.kts org.docopt:docopt:0.6.0-SNAPSHOT log4j:log4j:1.2.14
+#  - resdeps.kts org.docopt:docopt:0.6.0-SNAPSHOT log4j:log4j:1.2.14
 #  - kscript ${KSCRIPT_HOME}/test/resources/multi_line_deps.kts
 
 script: ./test/test_suite.sh

NEWS.md

@@ -1,5 +1,11 @@
 
 
+## v1.5
+
+* removed `curl` dependency
+* more streamlined dependency lookup
+
+
 ## v1.4
 
 Major new features
@@ -43,8 +49,8 @@ Other changes
 * versioning and auto-update
 * basic command-line help
 * Added support for `KOTLIN_OPTS` (see [#8](https://github.com/holgerbrandl/kscript/issues/8))
-* Added CLI help to `expandcp.kts`
-* Added option to clear dependency lookup cache: `expandcp.kts --clear-cache`
+* Added CLI help to `resdeps.kts`
+* Added option to clear dependency lookup cache: `resdeps.kts --clear-cache`
 
 ## v1.0
 

examples/more_examples.sh

@@ -57,7 +57,7 @@ kscript -st '"huhu" + it'
 
 
 ## REPL test: Filter-Join fasta files by ID
-kotlinc -classpath $(expandcp.kts de.mpicbg.scicomp:kutils:0.2)
+kotlinc -classpath $(resdeps.kts de.mpicbg.scicomp:kutils:0.2)
 <<"EOF"
 import de.mpicbg.scicomp.kscript.*
 

kscript

@@ -11,7 +11,22 @@ trim() { while read -r line; do echo "$line"; done; }
 
 assertInPath kotlinc
 assertInPath mvn
-assertInPath curl
+
+
+## cheap curl replacement to avoid dependency on curl
+## https://superuser.com/questions/238987/how-does-unix-search-for-executable-files
+kurl(){
+kscript 'import java.io.*
+
+try {
+    BufferedReader(InputStreamReader(java.net.URL(args[0]).openStream())).useLines { it.forEach { println(it) } }
+}catch(e: Throwable){
+    System.err.println("[ERROR] Could not read from '" + e.message + "'")
+    kotlin.system.exitProcess(1)
+}
+' "$@"
+}
+# kurl https://git.io/v9R73
 
 ## prefer JAVA_HOME over PATH for javac and jar (to stay in sync with kotlinc; see  #6)
 if [ -n "$JAVA_HOME" -a -x "$JAVA_HOME/bin/java" ]; then
@@ -37,7 +52,7 @@ if [ $# == 0 ]  || [ "$1" == "-v" ] || [ "$1" == "--version" ] || [ "$1" == "-h"
     echo "Website   : https://github.com/holgerbrandl/kscript" >&2
 
     ## determine the latest version
-    latestVersion=$(curl -Ls https://git.io/v9R73 | grep '^KSCRIPT_VERSION' | cut -f2 -d'=' | tr -d '.')
+    latestVersion=$(kurl https://git.io/v9R73 | grep '^KSCRIPT_VERSION' | cut -f2 -d'=' | tr -d '.')
     installedVersion=$(echo $KSCRIPT_VERSION | tr -d '.')
 
     ## http://stackoverflow.com/questions/15224581/floating-point-comparison-with-variable-in-bash
@@ -64,24 +79,21 @@ if [ "$1" == "--clear-cache" ]; then
     exit 0
 fi
 
-
-
-## auto-install expandcp.kts into same dir as kscript for automatic dependency resolution if not yet in PATH
-if ! which expandcp.kts &> /dev/null; then
-    installDir=$(dirname $(which kscript))
-    curl -Lso ${installDir}/expandcp.kts https://git.io/v9R7n
-    chmod u+x ${installDir}/expandcp.kts
+## look up resdeps from repo unless we're having a full local test clone of it
+if [[ -z "$(which resdeps.kts)" ]]; then
+    resolve_script_deps(){ kscript "https://raw.githubusercontent.com/holgerbrandl/kscript/v${KSCRIPT_VERSION}/resdeps.kts" "$@"; }
+else
+    resolve_script_deps(){ resdeps.kts "$@"; }
 fi
+#resolve_script_deps log4j:log4j:1.2.14
 
 
-## optionally self-update kscript ot the newest version
-if [ "$1" == "--self-update" ]; then
+## optionally self-update kscript ot the newest version (if not local copy is not being maintained by sdkman)
+if [[ "$1" == "--self-update" ]] && [[ -z "$(which kotlin | grep .sdkman)" ]]; then
     echo "Installing latest version of kscript..."
-    curl -Lso $(which kscript) https://git.io/v9R73 && chmod u+x $(which kscript)
-    curl -Lso $(which expandcp.kts) https://git.io/v9R7n && chmod u+x $(which expandcp.kts)
+    kurl https://git.io/v9R73 > $(which kscript) && chmod u+x $(which kscript)
 
     echo "You're now running kscript "$(kscript --help 2>&1| grep Version | cut -f2- | tr -d ':')
-
     exit 0
 fi
 
@@ -119,7 +131,9 @@ if [[ "$scriptFile" == "http://"* ]] || [[ "$scriptFile" == "https://"* ]]; then
 
     if [ ! -f "$urlCache" ]; then
 #        echo "fetching kscript from url $scriptFile into ${tmpScript}..."
-        curl -L ${scriptFile} 2>/dev/null > ${urlCache}
+#        curl -L ${scriptFile} 2>/dev/null > ${urlCache}
+        kurl ${scriptFile} > ${urlCache}
+        if [ $? -eq 1 ]; then rm ${urlCache}; exit 1; fi
     fi
 
     scriptFile=${urlCache}
@@ -184,16 +198,16 @@ fi
 dependencies=$(grep "^//DEPS" ${scriptFile} | cut -f2- -d' ' | trim | tr ',;\n' ' ')
 
 
-## First try dependency cache directly to avoid jvm launch for expandcp.kts
+## First try dependency cache directly to avoid jvm launch for resdeps.kts
 # fix me more consistent use of ${TMPDIR}
 dependency_cache="${KSCRIPT_CACHE_DIR}/dependency_cache.txt"
 if [ -n "$dependencies" ] && [ -f "$dependency_cache" ]; then
     classpath=$(grep -F $(echo ${dependencies} | tr ' ' ';')" " ${dependency_cache} | cut -d' ' -f2)
 fi
 
-## If there are dependencies but cache-lookup failed we run expandcp.kts
+## If there are dependencies but cache-lookup failed we run resdeps.kts
 if [ -n "$dependencies" ] && [ -z "$classpath" ];then
-    classpath=$(expandcp.kts ${dependencies})
+    classpath=$(resolve_script_deps ${dependencies})
     if [ $? -eq 1 ]; then exit 1; fi
 fi
 
@@ -204,7 +218,7 @@ kotlin_opts=$(grep -F "//KOTLIN_OPTS" ${scriptFile} | head -n1 | cut -f2- -d' ')
 ## Optionally enter interactive mode
 if [ "$is_interactive" = true ]; then
     echo "To create a shell with script dependencies run:"
-    echo "kotlinc ${kotlin_opts} -classpath '$(expandcp.kts ${dependencies})'"
+    echo "kotlinc ${kotlin_opts} -classpath '$(resdeps.kts ${dependencies})'"
     exit 0
 fi
 

misc/kscript_dev_notes.md

@@ -2,7 +2,65 @@
 
 1. Increment version in `kscript`
 2. Make sure that support api version is up to date and available from jcenter
-3. push and create github release tag
+3. Push and create github release tag
+```bash
+export KSCRIPT_HOME="/Users/brandl/projects/kotlin/kscript"; 
+export PATH=${KSCRIPT_HOME}:${PATH}
+export PATH=~/go/bin/:$PATH
+
+kscript_version=$(grep 'export KSCRIPT_VERSION' ${KSCRIPT_HOME}/kscript | cut -f2 -d'=')
+echo "new version is $kscript_version" 
+## see https://github.com/aktau/github-release
+
+## create and upload deployment file for sdkman
+KSCRIPT_ARCHIVE=~/Dropbox/archive/kscript_versions/
+
+mkdir -p $KSCRIPT_ARCHIVE/kscript-${kscript_version}/bin
+cp ${KSCRIPT_HOME}/kscript ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}/bin
+
+cd ${KSCRIPT_ARCHIVE}
+zip  -r ${KSCRIPT_ARCHIVE}/kscript-${kscript_version}.zip kscript-${kscript_version}
+open ${KSCRIPT_ARCHIVE}
+
+
+## create tag on github 
+#github-release --help 
+
+export GITHUB_TOKEN=${GH_TOKEN}
+#echo $GITHUB_TOKEN
+
+
+# make your tag and upload
+cd ${KSCRIPT_HOME}
+
+#git tag v${kscript_version} && git push --tags
+(git diff --exit-code && git tag v${kscript_version})  || echo "could not tag current branch"
+git push --tags
+
+# check the current tags and existing releases of the repo
+github-release info -u holgerbrandl -r kscript
+
+# create a formal release
+github-release release \\
+    --user holgerbrandl \\
+    --repo kscript \\
+    --tag "v${kscript_version}" \\
+    --name "v${kscript_version}" \\
+    --description "NEWS.md](https://github.com/holgerbrandl/kscript/blob/master/NEWS.md)" 
+#    \\
+#    --pre-release
+
+
+## upload sdk-man binary set
+github-release upload \\
+    --user aktau \\
+    --repo gofinance \\
+    --tag v0.1.0 \\
+    --name "gofinance-osx-amd64" \\
+    --file bin/darwin/amd64/gofinance
+```
+
+
 4. Update release branch
 
 ```bash
@@ -14,7 +72,7 @@ cd kscript_releases
 #git rm --cached -r .
 
 git checkout releases
-cp ~/projects/kotlin/kscript/expandcp.kts ~/projects/kotlin/kscript/kscript .
+cp ~/projects/kotlin/kscript/resdeps.kts ~/projects/kotlin/kscript/kscript .
 git add -A 
 git status
 git commit -m "v1.4 release"

notes.md

@@ -119,7 +119,7 @@ https://unix.stackexchange.com/questions/153896/bash-process-substitution-and-st
 Related Projects
 ----------------
 
-* [coursier](https://github.com/alexarchambault/coursier) - Pure Scala Artifact Fetching. Potential more powerful replacement for `expandcp.kts`
+* [coursier](https://github.com/alexarchambault/coursier) - Pure Scala Artifact Fetching. Potential more powerful replacement for `resdeps.kts`
 * [kotlin-script](https://github.com/andrewoma/kotlin-script) - Support for using Kotlin as a scripting language
 
 

pom.xml

@@ -7,7 +7,7 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <kotlin.version>1.0.7</kotlin.version>
+        <kotlin.version>1.1.2-3</kotlin.version>
         <!-- updating here would render kscript incompatible with older versions of kotlins. do it carefully-->
         <!--<kotlin.version>1.1.1</kotlin.version>-->
     </properties>
@@ -22,11 +22,11 @@
         <dependency>
             <groupId>de.mpicbg.scicomp</groupId>
             <artifactId>kutils</artifactId>
-            <version>0.4</version>
+            <version>0.7</version>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-stdlib</artifactId>
+            <artifactId>kotlin-stdlib-jre8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
         <dependency>
@@ -35,11 +35,6 @@
             <version>${kotlin.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-js-library</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
 
     </dependencies>
 
@@ -57,12 +52,6 @@
                             <goal>compile</goal>
                             <goal>js</goal>
                         </goals>
-                        <configuration>
-                            <sourceDirs>
-                                <source>examples</source>
-                                <source></source>
-                            </sourceDirs>
-                        </configuration>
                     </execution>
                     <execution>
                         <id>test-compile</id>
@@ -77,5 +66,11 @@
         </plugins>
     </build>
 
+    <repositories>
+        <repository>
+            <id>jcenter</id>
+            <url>http://jcenter.bintray.com/</url>
+        </repository>
+    </repositories>
 
 </project>

expandcp.kts resdeps.ktsexpandcp.kts renamed to resdeps.kts

@@ -8,19 +8,19 @@ import kotlin.system.exitProcess
 //val args = arrayOf("org.docopt:docopt:0.6.0-SNAPSHOT", "log4j:log4j:1.2.14")
 
 if (args.isNotEmpty() && listOf("--help", "-help", "-h").contains(args[0])) {
-    System.err.println("""expandcp.kts resolves a space separated list of gradle-style resource locators into a
-classpath suitable for use with 'java -cp' or 'kotlin -cp'. expandcp.kts will use maven to resolve dependencies.
+    System.err.println("""resdeps.kts resolves a space separated list of gradle-style resource locators into a
+classpath suitable for use with 'java -cp' or 'kotlin -cp'. resdeps.kts will use maven to resolve dependencies.
 
 For details see https://github.com/holgerbrandl/kscript
 
 ## Example
 
-expandcp.kts org.apache.commons:commons-csv:1.3 log4j:log4j:1.2.14
+resdeps.kts org.apache.commons:commons-csv:1.3 log4j:log4j:1.2.14
 
 ## Features
 
 * Support for transitive Maven dependencies
-* Caching of dependency requests (cached requests take just around 30ms). Use `expandcp.kts --clear-cache` to
+* Caching of dependency requests (cached requests take just around 30ms). Use `resdeps.kts --clear-cache` to
   clear this cache in case the dependency tree has changed
 
 ## Copyright
@@ -114,7 +114,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
 
 fun runMaven(pom: String, goal: String): Iterable<String> {
-    val temp = File.createTempFile("__expandcp__temp__", "_pom.xml")
+    val temp = File.createTempFile("__resdeps__temp__", "_pom.xml")
     temp.writeText(pom)
     val exec = Runtime.getRuntime().exec("mvn -f ${temp.absolutePath} ${goal}")
     return BufferedReader(InputStreamReader(exec.inputStream)).
@@ -128,7 +128,7 @@ val mavenResult = runMaven(pom, "dependency:build-classpath")
 
 // The following artifacts could not be resolved: log4ja:log4ja:jar:9.8.87, log4j:log4j:jar:9.8.105: Could not
 
-// Check for errors (e.g. when using non-existing deps expandcp.kts log4j:log4j:1.2.14 org.docopt:docopt:22.3-MISSING)
+// Check for errors (e.g. when using non-existing deps resdeps.kts log4j:log4j:1.2.14 org.docopt:docopt:22.3-MISSING)
 mavenResult.filter { it.startsWith("[ERROR]") }.find { it.contains("Could not resolve dependencie") }?.let {
     System.err.println("Failed to lookup dependencies. Maven reported the following error:")
     System.err.println(it)

test/TestsReadme.md

@@ -34,14 +34,16 @@ cd ${KSCRIPT_HOME}
 #sdk use kotlin 1.1-RC
 kscript --clear-cache
 
-./test/test_suite.sh
+${KSCRIPT_HOME}/test/test_suite.sh
 
 # run again with kotlin 1.0.X
 sdk use kotlin 1.0.6
 ./test/test_suite.sh
 
 ```
 
+export PATH=`echo ${PATH} | awk -v RS=: -v ORS=: '/kscript/ {next} {print}'`
+
 
 For more examples see https://github.com/lehmannro/assert.sh/blob/master/tests.sh
 

test/test_suite.sh

@@ -77,22 +77,22 @@ assert_end environment_tests
 
 # export KSCRIPT_HOME="/Users/brandl/projects/kotlin/kscript"; export PATH=${KSCRIPT_HOME}:${PATH}
 
-assert "expandcp.kts log4j:log4j:1.2.14" "${HOME}/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar"
+assert "resdeps.kts log4j:log4j:1.2.14" "${HOME}/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar"
 
 ## impossible version
-assert_raises "expandcp.kts log4j:log4j:9.8.76" 1
+assert_raises "resdeps.kts log4j:log4j:9.8.76" 1
 
 ## wrong format should exit with 1
-assert_raises "expandcp.kts log4j:1.0" 1
+assert_raises "resdeps.kts log4j:1.0" 1
 
 ## wrong format should give meaningful error message
-assert "expandcp.kts log4j:1.0 2>&1" "invalid dependency locator: log4j:1.0\nExpected format is groupId:artifactId:version[:classifier]"
+assert "resdeps.kts log4j:1.0 2>&1" "invalid dependency locator: log4j:1.0\nExpected format is groupId:artifactId:version[:classifier]"
 
 ## other version of wrong format should die with useful error.
-assert "expandcp.kts log4j:::1.0 2>&1" "Failed to lookup dependencies. Check dependency locators or file a bug on https://github.com/holgerbrandl/kscript"
+assert "resdeps.kts log4j:::1.0 2>&1" "Failed to lookup dependencies. Check dependency locators or file a bug on https://github.com/holgerbrandl/kscript"
 
 ## one good dependency,  one wrong
-assert_raises "expandcp.kts org.docopt:docopt:0.9.0-SNAPSHOT log4j:log4j:1.2.14" 1
+assert_raises "resdeps.kts org.docopt:docopt:0.9.0-SNAPSHOT log4j:log4j:1.2.14" 1
 
 assert_end dependency_lookup