From 453097240beda2caea219cd54ae676be9e6e5a73 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric@beust.com>
Date: Fri, 1 Apr 2016 22:41:18 -0700
Subject: [PATCH] Fix KobaltSettings.

---
 .../beust/kobalt/internal/KobaltSettingsXml.kt    |  4 ++--
 .../kotlin/com/beust/kobalt/maven/LocalRepo.kt    | 15 +++------------
 .../com/beust/kobalt/maven/aether/Aether.kt       |  2 +-
 .../kotlin/com/beust/kobalt/app/MainModule.kt     |  3 +--
 src/test/kotlin/com/beust/kobalt/TestModule.kt    |  5 ++---
 5 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltSettingsXml.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltSettingsXml.kt
index 71312ca7..f83421b9 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltSettingsXml.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/KobaltSettingsXml.kt
@@ -36,12 +36,12 @@ class KobaltSettings @Inject constructor(val xmlFile: KobaltSettingsXml) {
     /**
      * Location of the local repo.
      */
-    var localRepo = xmlFile.localRepo // var for testing
+    var localRepo = KFiles.makeDir(xmlFile.localRepo) // var for testing
 
     val defaultRepos = xmlFile.defaultRepos?.repo
 
     companion object {
-        val SETTINGS_FILE_PATH = homeDir(KFiles.HOME_KOBALT_DIR.absolutePath, "settings.xml")
+        val SETTINGS_FILE_PATH = KFiles.joinDir(KFiles.HOME_KOBALT_DIR.absolutePath, "settings.xml")
 
         fun readSettingsXml() : KobaltSettings {
             val file = File(KobaltSettings.SETTINGS_FILE_PATH)
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt
index 59913370..e42cc75d 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/LocalRepo.kt
@@ -9,15 +9,8 @@ import java.util.*
 import javax.inject.Singleton
 
 @Singleton
-open public class LocalRepo @Inject constructor(val kobaltSettings: KobaltSettings) {
-    init {
-        val l = File(localRepo)
-        if (! l.exists()) {
-            l.mkdirs()
-        }
-    }
-
-    val localRepo: String
+open class LocalRepo @Inject constructor(val kobaltSettings: KobaltSettings) {
+    val localRepo: File
         get() = kobaltSettings.localRepo
 
     fun existsPom(d: LocalDep, v: String) : Boolean {
@@ -55,9 +48,7 @@ open public class LocalRepo @Inject constructor(val kobaltSettings: KobaltSettin
         return null
     }
 
-    fun toFullPath(path: String) : String {
-        return localRepo + File.separatorChar + path
-    }
+    fun toFullPath(path: String) = File(localRepo, path).absolutePath
 }
 
 
diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt
index b5ff9eca..3ae78f94 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt
@@ -33,7 +33,7 @@ import java.util.concurrent.Future
 class DependencyResult(val dependency: IClasspathDependency, val repoUrl: String)
 
 class KobaltAether @Inject constructor (val settings: KobaltSettings, val aether: Aether) {
-    val localRepo: File get() = File(settings.localRepo)
+    val localRepo: File get() = settings.localRepo
 
     class MaybeArtifact(val result: DependencyResult?, val error: String?)
 
diff --git a/src/main/kotlin/com/beust/kobalt/app/MainModule.kt b/src/main/kotlin/com/beust/kobalt/app/MainModule.kt
index cb4f1572..814bb014 100644
--- a/src/main/kotlin/com/beust/kobalt/app/MainModule.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/MainModule.kt
@@ -15,7 +15,6 @@ import com.google.inject.Provider
 import com.google.inject.Singleton
 import com.google.inject.TypeLiteral
 import com.google.inject.assistedinject.FactoryModuleBuilder
-import java.io.File
 import java.util.concurrent.ExecutorService
 
 public open class MainModule(val args: Args, val settings: KobaltSettings) : AbstractModule() {
@@ -52,7 +51,7 @@ public open class MainModule(val args: Args, val settings: KobaltSettings) : Abs
         bind(KobaltSettings::class.java).toProvider(Provider<KobaltSettings> {
             settings
         }).`in`(Singleton::class.java)
-        bind(Aether::class.java).toInstance(Aether(File(settings.localRepo)))
+        bind(Aether::class.java).toInstance(Aether(settings.localRepo))
 
 //        bindListener(Matchers.any(), object: TypeListener {
 //            override fun <I> hear(typeLiteral: TypeLiteral<I>?, typeEncounter: TypeEncounter<I>?) {
diff --git a/src/test/kotlin/com/beust/kobalt/TestModule.kt b/src/test/kotlin/com/beust/kobalt/TestModule.kt
index 6414504d..113a41e4 100644
--- a/src/test/kotlin/com/beust/kobalt/TestModule.kt
+++ b/src/test/kotlin/com/beust/kobalt/TestModule.kt
@@ -8,13 +8,12 @@ import com.google.inject.Scopes
 import java.io.File
 
 val TEST_KOBALT_SETTINGS = KobaltSettings(KobaltSettingsXml()).apply {
-    localRepo = SystemProperties.homeDir + File.separatorChar + "" +
-            ".kobalt-test"
+    localRepo = File(SystemProperties.homeDir + File.separatorChar + ".kobalt-test")
 }
 
 class TestLocalRepo: LocalRepo(TEST_KOBALT_SETTINGS)
 
-public class TestModule : MainModule(Args(), TEST_KOBALT_SETTINGS) {
+class TestModule : MainModule(Args(), TEST_KOBALT_SETTINGS) {
     override fun configureTest() {
         bind(LocalRepo::class.java).to(TestLocalRepo::class.java).`in`(Scopes.SINGLETON)
     }