Fix Custom lib path is not added to the classpath #1213

modules/nextflow/src/main/groovy/nextflow/script/ScriptParser.groovy

@@ -58,10 +58,7 @@ class ScriptParser {
 
     ScriptParser(Session session) {
         this.session = session
-    }
-
-    ScriptParser(ClassLoader loader) {
-        this.classLoader = loader
+        this.classLoader = session.getClassLoader()
     }
 
     ScriptParser setSession( Session session ) {
@@ -80,6 +77,10 @@ class ScriptParser {
         return this
     }
 
+    protected ClassLoader getClassLoader() { classLoader }
+
+    protected Session getSession() { session }
+
     ScriptBinding getBinding() { binding }
 
     Object getResult() { result }

modules/nextflow/src/test/groovy/nextflow/script/ScriptParserTest.groovy

@@ -111,5 +111,18 @@ class ScriptParserTest extends Specification {
         result == 'Script_01af1441'
     }
 
+    def 'should set classpath' () {
+
+        given:
+        def CL = Mock(ClassLoader)
+        def SESS = Mock(Session) { getClassLoader() >> CL }
+
+        when:
+        def parser = new ScriptParser(SESS)
+        then:
+        parser.getSession() == SESS
+        parser.getClassLoader() == CL
+
+    }
 
 }

tests/checks/custom-lib.nf/.checks

@@ -0,0 +1,23 @@
+#
+# check the ability to load custom script/classes in the 
+# local `lib` directory 
+#
+set -e
+
+# copy the test script in this directory 
+cp ${NXF_SCRIPT:-../../custom-lib.nf} test.nf
+
+# crate a library class 
+mkdir -p lib
+cat >lib/Foo.groovy <<EOL
+class Foo {
+
+  static String hello() { "Hello world!" }
+
+}
+EOL
+
+${NXF_CMD:-nextflow} run test.nf | tee stdout
+
+[[ `< stdout grep -c 'Hello world!'` == 1 ]] || false
+

tests/custom-lib.nf

@@ -0,0 +1 @@
+println Foo.hello()