From ae7511be25b835e272511671e72b712ab26502c6 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Tue, 10 Nov 2015 13:13:23 -0800
Subject: [PATCH] Support for --download.

---
 kobalt/src/Build.kt                           |  13 +-
 kobalt/wrapper/kobalt-wrapper.jar             | Bin 6806 -> 5804 bytes
 kobalt/wrapper/kobalt-wrapper.properties      |   3 +-
 .../java/com/beust/kobalt/wrapper/Main.java   | 102 +++---
 src/main/kotlin/com/beust/kobalt/Args.kt      |   3 +
 src/main/kotlin/com/beust/kobalt/Main.kt      |  40 ++-
 .../kobalt/misc/KobaltWrapperProperties.kt    |  31 +-
 .../com/beust/kobalt/misc/UpdateKobalt.kt     |  13 +-
 .../com/beust/kobalt/wrapper/Wrapper.kt       | 339 +++++++++---------
 src/main/resources/kobalt.properties          |   2 +-
 10 files changed, 264 insertions(+), 282 deletions(-)

diff --git a/kobalt/src/Build.kt b/kobalt/src/Build.kt
index 06e43965..c7b6de8b 100644
--- a/kobalt/src/Build.kt
+++ b/kobalt/src/Build.kt
@@ -2,6 +2,7 @@
 import com.beust.kobalt.api.License
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.api.Scm
+import com.beust.kobalt.file
 import com.beust.kobalt.homeDir
 import com.beust.kobalt.internal.TaskResult
 import com.beust.kobalt.internal.test
@@ -11,6 +12,7 @@ import com.beust.kobalt.plugin.java.javaProject
 import com.beust.kobalt.plugin.kotlin.kotlinCompiler
 import com.beust.kobalt.plugin.kotlin.kotlinProject
 import com.beust.kobalt.plugin.packaging.assemble
+import com.beust.kobalt.plugin.publish.jcenter
 import java.io.File
 import java.nio.file.Files
 import java.nio.file.Paths
@@ -71,7 +73,8 @@ val kobalt = kotlinProject(wrapper) {
                 "org.apache.maven:maven-model:3.3.3",
                 "com.github.spullara.mustache.java:compiler:0.9.1",
                 "io.reactivex:rxjava:1.0.14",
-                "com.google.code.gson:gson:2.4"
+                "com.google.code.gson:gson:2.4",
+                file("modules/wrapper/kobaltBuild/libs/kobalt-wrapper.jar")
               )
     }
 
@@ -103,10 +106,10 @@ val kobalt = kotlinProject(wrapper) {
         args("-nowarn")
     }
 
-//    jcenter {
-//        publish = true
-//        file("$buildDirectory/libs/$name-$version.zip", "$name/$version/$name-$version.zip")
-//    }
+    jcenter {
+        publish = true
+        file("$buildDirectory/libs/$name-$version.zip", "$name/$version/$name-$version.zip")
+    }
 }
 
 fun readVersion() : String {
diff --git a/kobalt/wrapper/kobalt-wrapper.jar b/kobalt/wrapper/kobalt-wrapper.jar
index 5ae9002f9baad7c81e4e998a0240419f25623ca1..5542de571a580705f9db53b910f30ec85c861ac7 100644
GIT binary patch
delta 5495
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

literal 6806
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
C%0*HD

diff --git a/kobalt/wrapper/kobalt-wrapper.properties b/kobalt/wrapper/kobalt-wrapper.properties
index fde79fa5..64f7a285 100644
--- a/kobalt/wrapper/kobalt-wrapper.properties
+++ b/kobalt/wrapper/kobalt-wrapper.properties
@@ -1,2 +1 @@
-kobalt.version=0.238
-kobalt.downloadUrl=https://github.com/cbeust/kobalt/releases/download/0.238/kobalt-0.238.zip
+kobalt.version=0.244
\ No newline at end of file
diff --git a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
index e74ab74b..7bb703bd 100644
--- a/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
+++ b/modules/wrapper/src/main/java/com/beust/kobalt/wrapper/Main.java
@@ -34,8 +34,12 @@ public class Main {
     private static int logLevel = 1;
 
     private void installAndLaunchMain(String[] argv) throws IOException, InterruptedException {
+        boolean noLaunch = false;
         for (int i = 0; i < argv.length; i++) {
             switch(argv[i]) {
+                case "--no-launch":
+                    noLaunch = true;
+                    break;
                 case "--log":
                     logLevel = Integer.parseInt(argv[i + 1]);
                     i++;
@@ -43,7 +47,9 @@ public class Main {
             }
         }
         Path kobaltJarFile = installJarFile();
-        launchMain(kobaltJarFile, argv);
+        if (! noLaunch) {
+            launchMain(kobaltJarFile, argv);
+        }
     }
 
     private void readProperties(Properties properties, InputStream ins) throws IOException {
@@ -106,66 +112,62 @@ public class Main {
         Path kobaltJarFile = Paths.get(zipOutputDir,
                 getWrapperDir().getPath() + "/" + FILE_NAME + "-" + getWrapperVersion() + ".jar");
         if (! Files.exists(localZipFile) || ! Files.exists(kobaltJarFile)) {
-            if (!Files.exists(localZipFile)) {
-                download(localZipFile.toFile());
-            }
+            download(localZipFile.toFile());
+        }
 
-            //
-            // Extract all the zip files
-            //
-            boolean success = false;
-            int retries = 0;
-            while (! success && retries < 2) {
-                try {
-                    ZipFile zipFile = new ZipFile(localZipFile.toFile());
-                    Enumeration<? extends ZipEntry> entries = zipFile.entries();
-                    File outputDirectory = new File(DISTRIBUTIONS_DIR);
-                    outputDirectory.mkdirs();
-                    while (entries.hasMoreElements()) {
-                        ZipEntry entry = entries.nextElement();
-                        File entryFile = new File(entry.getName());
-                        if (entry.isDirectory()) {
-                            entryFile.mkdirs();
-                        } else {
-                            Path dest = Paths.get(zipOutputDir, entryFile.getPath());
-                            log(2, "  Writing " + entry.getName() + " to " + dest);
-                            Files.createDirectories(dest.getParent());
-                            Files.copy(zipFile.getInputStream(entry), dest, StandardCopyOption.REPLACE_EXISTING);
-                        }
+        //
+        // Extract all the zip files
+        //
+        boolean success = false;
+        int retries = 0;
+        while (! success && retries < 2) {
+            try {
+                ZipFile zipFile = new ZipFile(localZipFile.toFile());
+                Enumeration<? extends ZipEntry> entries = zipFile.entries();
+                File outputDirectory = new File(DISTRIBUTIONS_DIR);
+                outputDirectory.mkdirs();
+                while (entries.hasMoreElements()) {
+                    ZipEntry entry = entries.nextElement();
+                    File entryFile = new File(entry.getName());
+                    if (entry.isDirectory()) {
+                        entryFile.mkdirs();
+                    } else {
+                        Path dest = Paths.get(zipOutputDir, entryFile.getPath());
+                        log(2, "  Writing " + entry.getName() + " to " + dest);
+                        Files.createDirectories(dest.getParent());
+                        Files.copy(zipFile.getInputStream(entry), dest, StandardCopyOption.REPLACE_EXISTING);
                     }
-                    success = true;
-                } catch (ZipException e) {
-                    retries++;
-                    error("Couldn't open zip file " + localZipFile + ": " + e.getMessage());
-                    error("The file is probably corrupt, downloading it again");
-                    Files.delete(localZipFile);
-                    download(localZipFile.toFile());
                 }
+                success = true;
+            } catch (ZipException e) {
+                retries++;
+                error("Couldn't open zip file " + localZipFile + ": " + e.getMessage());
+                error("The file is probably corrupt, downloading it again");
+                Files.delete(localZipFile);
+                download(localZipFile.toFile());
             }
         }
 
         //
         // Copy the wrapper files in the current kobalt/wrapper directory
         //
-        if (! version.equals(getWrapperVersion())) {
-            log(2, "Copying the wrapper files");
-            for (String file : FILES) {
-                Path from = Paths.get(zipOutputDir, file);
-                Path to = Paths.get(new File(".").getAbsolutePath(), file);
-                try {
-                    if (isWindows() && to.toFile().exists()) {
-                        log(1, "Windows detected, not overwriting " + to);
-                    } else {
-                        Files.copy(from, to, StandardCopyOption.REPLACE_EXISTING);
-                    }
-                } catch (IOException ex) {
-                    log(1, "Couldn't copy " + from + " to " + to + ": " + ex.getMessage());
+        boolean sameVersion = equals(getWrapperVersion());
+        log(2, "Copying the wrapper files");
+        for (String file : FILES) {
+            Path from = Paths.get(zipOutputDir, file);
+            Path to = Paths.get(new File(".").getAbsolutePath(), file);
+            try {
+                if (isWindows() && to.toFile().exists()) {
+                    log(1, "Windows detected, not overwriting " + to);
+                } else {
+                    Files.copy(from, to, StandardCopyOption.REPLACE_EXISTING);
                 }
+            } catch (IOException ex) {
+                log(1, "Couldn't copy " + from + " to " + to + ": " + ex.getMessage());
             }
-            new File(KOBALTW).setExecutable(true);
-        } else {
-            log(2, "Wrapper and current versions are identical");
         }
+        new File(KOBALTW).setExecutable(true);
+
         return kobaltJarFile;
     }
 
@@ -267,8 +269,6 @@ public class Main {
         System.out.println("[Wrapper error] *** " + s);
     }
 
-    private static final String KOBALT_MAIN_CLASS = "com.beust.kobalt.KobaltPackage";
-
     private void launchMain(Path kobaltJarFile, String[] argv) throws IOException, InterruptedException {
         List<String> args = new ArrayList<>();
         args.add("java");
diff --git a/src/main/kotlin/com/beust/kobalt/Args.kt b/src/main/kotlin/com/beust/kobalt/Args.kt
index d910349f..cb058639 100644
--- a/src/main/kotlin/com/beust/kobalt/Args.kt
+++ b/src/main/kotlin/com/beust/kobalt/Args.kt
@@ -19,6 +19,9 @@ class Args {
     @Parameter(names = arrayOf("--dev"), description = "Turn of dev mode, resulting in a more verbose log output")
     var dev: Boolean = false
 
+    @Parameter(names = arrayOf("--download"), description = "Force a download from the downloadUrl in the wrapper")
+    var download: Boolean = false
+
     @Parameter(names = arrayOf("--dryRun"), description = "Display all the tasks that will get run without " +
             "actually running them")
     var dryRun: Boolean = false
diff --git a/src/main/kotlin/com/beust/kobalt/Main.kt b/src/main/kotlin/com/beust/kobalt/Main.kt
index a16867dc..8706a767 100644
--- a/src/main/kotlin/com/beust/kobalt/Main.kt
+++ b/src/main/kotlin/com/beust/kobalt/Main.kt
@@ -14,7 +14,6 @@ import com.beust.kobalt.maven.Http
 import com.beust.kobalt.maven.KobaltException
 import com.beust.kobalt.maven.LocalRepo
 import com.beust.kobalt.misc.*
-import com.beust.kobalt.wrapper.Wrapper
 import com.google.inject.Guice
 import java.io.File
 import java.nio.file.Paths
@@ -37,10 +36,10 @@ private fun parseArgs(argv: Array<String>): Main.RunInfo {
 }
 
 
-public fun mainNoExit(argv: Array<String>) : Int {
+public fun mainNoExit(argv: Array<String>): Int {
     val (jc, args) = parseArgs(argv)
     Kobalt.INJECTOR = Guice.createInjector(MainModule(args))
-    return Kobalt.INJECTOR.getInstance(Main::class.java).run(jc, args)
+    return Kobalt.INJECTOR.getInstance(Main::class.java).run(jc, args, argv)
 }
 
 private class Main @Inject constructor(
@@ -59,19 +58,18 @@ private class Main @Inject constructor(
         val server: KobaltServer,
         val pluginInfo: PluginInfo,
         val projectGenerator: ProjectGenerator,
-        val resolveDependency: ResolveDependency,
-        val wrapper: Wrapper) {
+        val resolveDependency: ResolveDependency) {
 
     data class RunInfo(val jc: JCommander, val args: Args)
 
     private fun addReposFromContributors(project: Project?) =
-        pluginInfo.repoContributors.forEach {
-            it.reposFor(project).forEach {
-                Kobalt.addRepo(it.toString())
+            pluginInfo.repoContributors.forEach {
+                it.reposFor(project).forEach {
+                    Kobalt.addRepo(it.toString())
+                }
             }
-        }
 
-    public fun run(jc: JCommander, args: Args) : Int {
+    public fun run(jc: JCommander, args: Args, argv: Array<String>): Int {
 
         //
         // Add all the repos from repo contributors (at least those that return values without a Project)
@@ -93,9 +91,9 @@ private class Main @Inject constructor(
         var result = 0
         val latestVersionFuture = github.latestKobaltVersion
         val seconds = benchmark("build", {
-//            runTest()
+            //            runTest()
             try {
-                result = runWithArgs(jc, args)
+                result = runWithArgs(jc, args, argv)
             } catch(ex: KobaltException) {
                 error(ex.message ?: "", ex)
                 result = 1
@@ -120,32 +118,33 @@ private class Main @Inject constructor(
     }
 
 
-//    public fun runTest() {
-//        val file = File("src\\main\\resources\\META-INF\\plugin.ml")
-//    }
+    //    public fun runTest() {
+    //        val file = File("src\\main\\resources\\META-INF\\plugin.ml")
+    //    }
 
-    private fun runWithArgs(jc: JCommander, args: Args) : Int {
+    private fun runWithArgs(jc: JCommander, args: Args, argv: Array<String>): Int {
         var result = 0
         val p = if (args.buildFile != null) File(args.buildFile) else findBuildFile()
         args.buildFile = p.absolutePath
         val buildFile = BuildFile(Paths.get(p.absolutePath), p.name)
 
-        if (! args.update) {
+        if (!args.update) {
             println(AsciiArt.banner + Kobalt.version + "\n")
         }
 
         if (args.init) {
             //
             // --init: create a new build project and install the wrapper
+            // Make sure the wrapper won't call us back with --no-launch
             //
-            wrapper.install()
+            com.beust.kobalt.wrapper.Main.main(arrayOf("--no-launch") + argv)
             projectGenerator.run(args)
         } else if (args.usage) {
             jc.usage()
         } else if (args.serverMode) {
             server.run()
         } else {
-            if (! buildFile.exists()) {
+            if (!buildFile.exists()) {
                 error(buildFile.path.toFile().path + " does not exist")
             } else {
                 val allProjects = buildFileCompilerFactory.create(listOf(buildFile), pluginInfo)
@@ -177,6 +176,8 @@ private class Main @Inject constructor(
                     println(sb.toString())
                 } else if (args.checkVersions) {
                     checkVersions.run(allProjects)
+                } else if (args.download) {
+                    updateKobalt.downloadKobalt()
                 } else if (args.update) {
                     updateKobalt.updateKobalt()
                 } else {
@@ -192,6 +193,7 @@ private class Main @Inject constructor(
         }
         return result
     }
+
     private fun findBuildFile(): File {
         val files = arrayListOf("Build.kt", "build.kobalt", KFiles.src("build.kobalt"),
                 KFiles.src("Build.kt"))
diff --git a/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt b/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
index f18ecece..80fcc72a 100644
--- a/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
+++ b/src/main/kotlin/com/beust/kobalt/misc/KobaltWrapperProperties.kt
@@ -15,12 +15,6 @@ class KobaltWrapperProperties @Inject constructor() {
     private val PROPERTY_VERSION = "kobalt.version"
     private val PROPERTY_DOWNLOAD_URL = "kobalt.downloadUrl"
 
-    fun defaultUrlFor(version: String) =
-            "bogushttps://github.com/cbeust/kobalt/releases/download/$version/kobalt-$version.zip"
-
-    val file: File
-            get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES")
-
     fun create(version: String) {
         log(2, "Creating $file with $version and ${defaultUrlFor(version)}")
         KFiles.saveFile(file, listOf(
@@ -29,7 +23,13 @@ class KobaltWrapperProperties @Inject constructor() {
         ).joinToString("\n"))
     }
 
-    val properties : Properties
+    private fun defaultUrlFor(version: String) =
+            "https://github.com/cbeust/kobalt/releases/download/$version/kobalt-$version.zip"
+
+    private val file: File
+            get() = File("$WRAPPER_DIR/$KOBALT_WRAPPER_PROPERTIES")
+
+    private val properties : Properties
         get() {
             val config = file
             if (!config.exists()) {
@@ -45,20 +45,5 @@ class KobaltWrapperProperties @Inject constructor() {
         get() = properties.getProperty(PROPERTY_VERSION)
 
     val downloadUrl : String
-        get() {
-            return properties.getProperty(PROPERTY_DOWNLOAD_URL)
-                ?: defaultUrlFor(version)
-        }
-
-    fun maybeCreate(version: String) {
-        if (! file.exists()) {
-            create(version)
-        }
-    }
-
-//    fun urlFor(version: String) : String {
-//        //        val URL = "https://dl.bintray.com/cbeust/generic/"
-//        //        return "https://dl.bintray.com/cbeust/generic/$fileName-$version.zip"
-//        return downloadUrl ?: defaultUrlFor(version)
-//    }
+        get() = properties.getProperty(PROPERTY_DOWNLOAD_URL)
 }
diff --git a/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt b/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt
index 5040d86b..08dba92a 100644
--- a/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt
+++ b/src/main/kotlin/com/beust/kobalt/misc/UpdateKobalt.kt
@@ -5,10 +5,17 @@ import javax.inject.Inject
 /**
  * Update Kobalt to the latest version.
  */
-public class UpdateKobalt @Inject constructor(val github: GithubApi, val kobaltWrapperProperties: KobaltWrapperProperties) {
+public class UpdateKobalt @Inject constructor(val github: GithubApi, val wrapperProperties: KobaltWrapperProperties) {
     fun updateKobalt() {
         val newVersion = github.latestKobaltVersion
-        kobaltWrapperProperties.maybeCreate(newVersion.get())
-        com.beust.kobalt.wrapper.main(arrayOf())
+        wrapperProperties.create(newVersion.get())
+        com.beust.kobalt.wrapper.Main.main(arrayOf())
+    }
+
+    /**
+     * Download from the URL found in the kobalt-wrapper.properties regardless of what the latest version is
+     */
+    fun downloadKobalt() {
+        com.beust.kobalt.wrapper.Main.main(arrayOf("--download"))
     }
 }
diff --git a/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt b/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt
index 743ea432..a2e9e25e 100644
--- a/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt
+++ b/src/main/kotlin/com/beust/kobalt/wrapper/Wrapper.kt
@@ -1,187 +1,170 @@
 package com.beust.kobalt.wrapper
 
-import com.beust.kobalt.JavaInfo
-import com.beust.kobalt.SystemProperties
-import com.beust.kobalt.api.Kobalt
-import com.beust.kobalt.maven.Http
-import com.beust.kobalt.misc.KFiles
-import com.beust.kobalt.misc.KobaltWrapperProperties
-import com.beust.kobalt.misc.benchmark
-import com.beust.kobalt.misc.log
-import com.google.inject.Inject
-import java.io.File
-import java.io.InputStream
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.util.*
-import java.util.zip.ZipFile
-
-public fun main(argv: Array<String>) {
-    Kobalt.INJECTOR.getInstance(Wrapper::class.java).installAndLaunchMain(argv)
-}
+//public fun main(argv: Array<String>) {
+//    Kobalt.INJECTOR.getInstance(Wrapper::class.java).installAndLaunchMain(argv)
+//}
 
 /**
  * Download and install a new wrapper if requested.
  */
-public class Wrapper @Inject constructor(val wrapperProperties: KobaltWrapperProperties){
-    // kobalt.properties
-    private val KOBALT_PROPERTIES = "kobalt.properties"
-    private val KOBALTW = "kobaltw"
-
-    val FILE_NAME = "kobalt"
-
-    private val properties = Properties()
-
-    public fun installAndLaunchMain(argv: Array<String>) {
-        val kobaltJarFile = install()
-        launchMain(kobaltJarFile, argv)
-    }
-
-    private fun readProperties(properties: Properties, ins: InputStream) {
-        properties.load(ins)
-        ins.close()
-        properties.forEach { es -> System.setProperty(es.key.toString(), es.value.toString()) }
-    }
-
-    /**
-     * Attemps to read kobalt.properties (which should always exist).
-     */
-    private fun maybeCreateKobaltProperties() : Properties {
-        val result = Properties()
-
-        // kobalt.properties is internal to Kobalt
-        val url = javaClass.classLoader.getResource(KOBALT_PROPERTIES)
-        if (url != null) {
-            readProperties(result, url.openConnection().inputStream)
-        } else {
-            throw IllegalArgumentException("Couldn't find $KOBALT_PROPERTIES")
-        }
-
-        return result
-    }
-
-//    private fun initWrapperFile(version: String) {
-//        val config = wrapperProperties.file
-//        if (! config.exists()) {
-//            wrapperProperties.create(version)
-//        }
-//        properties.load(FileReader(config))
+//public class Wrapper @Inject constructor(val wrapperProperties: KobaltWrapperProperties){
+//    // kobalt.properties
+//    private val KOBALT_PROPERTIES = "kobalt.properties"
+//    private val KOBALTW = "kobaltw"
+//
+//    val FILE_NAME = "kobalt"
+//
+//    private val properties = Properties()
+//
+//    public fun installAndLaunchMain(argv: Array<String>) {
+//        val kobaltJarFile = install()
+//        launchMain(kobaltJarFile, argv)
 //    }
 //
-//    private val wrapperVersion : String
-//        get() {
-//            return properties.getProperty(PROPERTY_VERSION)
-//        }
-//
-//    private val wrapperDownloadUrl : String
-//        get() {
-//            return properties.getProperty(PROPERTY_DOWNLOAD_URL)
-//        }
-//
-//    fun urlFor(version: String) : String {
-//        //        val URL = "https://dl.bintray.com/cbeust/generic/"
-//        //        return "https://dl.bintray.com/cbeust/generic/$fileName-$version.zip"
-//        return wrapperDownloadUrl ?: defaultUrlFor(version)
+//    private fun readProperties(properties: Properties, ins: InputStream) {
+//        properties.load(ins)
+//        ins.close()
+//        properties.forEach { es -> System.setProperty(es.key.toString(), es.value.toString()) }
 //    }
-
-    /**
-     * Install a new version if requested in .kobalt/wrapper/kobalt-wrapper.properties
-     *
-     * @return the path to the Kobalt jar file
-     */
-    public fun install() : Path {
-        val properties = maybeCreateKobaltProperties()
-        val version = properties.getProperty("kobalt.version")
-        wrapperProperties.maybeCreate(version)
-        log(2, "Wrapper version: ${wrapperProperties.version}")
-
-        val wrapperVersion = wrapperProperties.version
-        val fileName = "$FILE_NAME-$wrapperVersion.zip"
-        File(KFiles.distributionsDir).mkdirs()
-        val localZipFile = Paths.get(KFiles.distributionsDir, fileName)
-        val zipOutputDir = KFiles.distributionsDir + "/" + wrapperVersion
-        val kobaltJarFile = Paths.get(zipOutputDir, "kobalt/wrapper/$FILE_NAME-$wrapperVersion.jar")
-        if (!Files.exists(localZipFile) || !Files.exists(kobaltJarFile)) {
-            log(1, "Downloading $fileName")
-            val fullUrl = wrapperProperties.downloadUrl
-            val body = Http().get(fullUrl)
-            if (body.code == 200) {
-                if (!Files.exists(localZipFile)) {
-                    val target = localZipFile.toAbsolutePath()
-                    val ins = body.getAsStream()
-                    benchmark("Download .zip file") {
-                        // This takes about eight seconds for a 21M file because of the extra copying, not good.
-                        // Should use Okio.sink(file) to create a Sink and then call readAll(fileSink) on
-                        // the BufferedSource returned in the ResponseBody
-                        Files.copy(ins, target)
-                    }
-                    log(2, "$localZipFile downloaded, extracting it")
-                } else {
-                    log(2, "$localZipFile already exists, extracting it")
-                }
-
-                //
-                // Extract all the zip files
-                //
-                val zipFile = ZipFile(localZipFile.toFile())
-                val entries = zipFile.entries()
-                val outputDirectory = File(KFiles.distributionsDir)
-                outputDirectory.mkdirs()
-                while (entries.hasMoreElements()) {
-                    val entry = entries.nextElement()
-                    val entryFile = File(entry.name)
-                    if (entry.isDirectory) {
-                        entryFile.mkdirs()
-                    } else {
-                        val dest = Paths.get(zipOutputDir, entryFile.path)
-                        log(2, "  Writing ${entry.name} to $dest")
-                        Files.createDirectories(dest.parent)
-                        Files.copy(zipFile.getInputStream(entry),
-                                dest,
-                                java.nio.file.StandardCopyOption.REPLACE_EXISTING)
-                    }
-                }
-                log(2, "$localZipFile extracted")
-            } else {
-                error("Couldn't download $fullUrl")
-            }
-        }
-
-        //
-        // Copy the wrapper files in the current kobalt/wrapper directory
-        //
-        log(2, "Copying the wrapper files...")
-        arrayListOf(KOBALTW, "kobalt/wrapper/$FILE_NAME-wrapper.jar").forEach {
-            val from = Paths.get(zipOutputDir, it)
-            val to = Paths.get(File(".").absolutePath, it)
-            KFiles.copy(from, to, java.nio.file.StandardCopyOption.REPLACE_EXISTING)
-        }
-        File(KOBALTW).setExecutable(true)
-
-        return kobaltJarFile
-    }
-
-    /**
-     * Launch kobalt-xxx.jar
-     *
-     * Note: currently launching it in a separate VM because both this jar file and the wrapper contain
-     * the same classes, so the old classes will be run. Once wrapper.jar contains only the
-     * wrapper class and nothing else from the Kobalt distribution, we can just invoke main from the same JVM here,
-     * which will speed up the start up
-     */
-    private fun launchMain(kobaltJarFile: Path, argv: Array<String>) {
-        val jvm = JavaInfo.create(File(SystemProperties.javaBase))
-        val java = jvm.javaExecutable
-
-        val args = arrayListOf(
-                java!!.absolutePath,
-                "-jar", kobaltJarFile.toFile().absolutePath)
-        args.addAll(argv)
-        val pb = ProcessBuilder(args)
-        pb.inheritIO()
-        log(2, "Launching\n    ${args.joinToString(" ")}")
-        val process = pb.start()
-        process.waitFor()
-    }
-}
+//
+//    /**
+//     * Attemps to read kobalt.properties (which should always exist).
+//     */
+//    private fun maybeCreateKobaltProperties() : Properties {
+//        val result = Properties()
+//
+//        // kobalt.properties is internal to Kobalt
+//        val url = javaClass.classLoader.getResource(KOBALT_PROPERTIES)
+//        if (url != null) {
+//            readProperties(result, url.openConnection().inputStream)
+//        } else {
+//            throw IllegalArgumentException("Couldn't find $KOBALT_PROPERTIES")
+//        }
+//
+//        return result
+//    }
+//
+////    private fun initWrapperFile(version: String) {
+////        val config = wrapperProperties.file
+////        if (! config.exists()) {
+////            wrapperProperties.create(version)
+////        }
+////        properties.load(FileReader(config))
+////    }
+////
+////    private val wrapperVersion : String
+////        get() {
+////            return properties.getProperty(PROPERTY_VERSION)
+////        }
+////
+////    private val wrapperDownloadUrl : String
+////        get() {
+////            return properties.getProperty(PROPERTY_DOWNLOAD_URL)
+////        }
+////
+////    fun urlFor(version: String) : String {
+////        //        val URL = "https://dl.bintray.com/cbeust/generic/"
+////        //        return "https://dl.bintray.com/cbeust/generic/$fileName-$version.zip"
+////        return wrapperDownloadUrl ?: defaultUrlFor(version)
+////    }
+//
+//    /**
+//     * Install a new version if requested in .kobalt/wrapper/kobalt-wrapper.properties
+//     *
+//     * @return the path to the Kobalt jar file
+//     */
+//    public fun install() : Path {
+//        val properties = maybeCreateKobaltProperties()
+//        val version = properties.getProperty("kobalt.version")
+//        wrapperProperties.maybeCreate(version)
+//        log(2, "Wrapper version: ${wrapperProperties.version}")
+//
+//        val wrapperVersion = wrapperProperties.version
+//        val fileName = "$FILE_NAME-$wrapperVersion.zip"
+//        File(KFiles.distributionsDir).mkdirs()
+//        val localZipFile = Paths.get(KFiles.distributionsDir, fileName)
+//        val zipOutputDir = KFiles.distributionsDir + "/" + wrapperVersion
+//        val kobaltJarFile = Paths.get(zipOutputDir, "kobalt/wrapper/$FILE_NAME-$wrapperVersion.jar")
+//        if (!Files.exists(localZipFile) || !Files.exists(kobaltJarFile)) {
+//            log(1, "Downloading $fileName")
+//            val fullUrl = wrapperProperties.downloadUrl
+//            val body = Http().get(fullUrl)
+//            if (body.code == 200) {
+//                if (!Files.exists(localZipFile)) {
+//                    val target = localZipFile.toAbsolutePath()
+//                    val ins = body.getAsStream()
+//                    benchmark("Download .zip file") {
+//                        // This takes about eight seconds for a 21M file because of the extra copying, not good.
+//                        // Should use Okio.sink(file) to create a Sink and then call readAll(fileSink) on
+//                        // the BufferedSource returned in the ResponseBody
+//                        Files.copy(ins, target)
+//                    }
+//                    log(2, "$localZipFile downloaded, extracting it")
+//                } else {
+//                    log(2, "$localZipFile already exists, extracting it")
+//                }
+//
+//                //
+//                // Extract all the zip files
+//                //
+//                val zipFile = ZipFile(localZipFile.toFile())
+//                val entries = zipFile.entries()
+//                val outputDirectory = File(KFiles.distributionsDir)
+//                outputDirectory.mkdirs()
+//                while (entries.hasMoreElements()) {
+//                    val entry = entries.nextElement()
+//                    val entryFile = File(entry.name)
+//                    if (entry.isDirectory) {
+//                        entryFile.mkdirs()
+//                    } else {
+//                        val dest = Paths.get(zipOutputDir, entryFile.path)
+//                        log(2, "  Writing ${entry.name} to $dest")
+//                        Files.createDirectories(dest.parent)
+//                        Files.copy(zipFile.getInputStream(entry),
+//                                dest,
+//                                java.nio.file.StandardCopyOption.REPLACE_EXISTING)
+//                    }
+//                }
+//                log(2, "$localZipFile extracted")
+//            } else {
+//                error("Couldn't download $fullUrl")
+//            }
+//        }
+//
+//        //
+//        // Copy the wrapper files in the current kobalt/wrapper directory
+//        //
+//        log(2, "Copying the wrapper files...")
+//        arrayListOf(KOBALTW, "kobalt/wrapper/$FILE_NAME-wrapper.jar").forEach {
+//            val from = Paths.get(zipOutputDir, it)
+//            val to = Paths.get(File(".").absolutePath, it)
+//            KFiles.copy(from, to, java.nio.file.StandardCopyOption.REPLACE_EXISTING)
+//        }
+//        File(KOBALTW).setExecutable(true)
+//
+//        return kobaltJarFile
+//    }
+//
+//    /**
+//     * Launch kobalt-xxx.jar
+//     *
+//     * Note: currently launching it in a separate VM because both this jar file and the wrapper contain
+//     * the same classes, so the old classes will be run. Once wrapper.jar contains only the
+//     * wrapper class and nothing else from the Kobalt distribution, we can just invoke main from the same JVM here,
+//     * which will speed up the start up
+//     */
+//    private fun launchMain(kobaltJarFile: Path, argv: Array<String>) {
+//        val jvm = JavaInfo.create(File(SystemProperties.javaBase))
+//        val java = jvm.javaExecutable
+//
+//        val args = arrayListOf(
+//                java!!.absolutePath,
+//                "-jar", kobaltJarFile.toFile().absolutePath)
+//        args.addAll(argv)
+//        val pb = ProcessBuilder(args)
+//        pb.inheritIO()
+//        log(2, "Launching\n    ${args.joinToString(" ")}")
+//        val process = pb.start()
+//        process.waitFor()
+//    }
+//}
diff --git a/src/main/resources/kobalt.properties b/src/main/resources/kobalt.properties
index b27d957c..b28a10ab 100644
--- a/src/main/resources/kobalt.properties
+++ b/src/main/resources/kobalt.properties
@@ -1,2 +1,2 @@
-kobalt.version=0.238
+kobalt.version=0.244