From 0aae394975cbd830a486359abfa3ff7df02c4d47 Mon Sep 17 00:00:00 2001
From: Cedric Beust <cedric.beust@le.com>
Date: Thu, 30 Mar 2017 11:49:26 -0700
Subject: [PATCH] Fix build path.

---
 .../src/main/kotlin/com/beust/kobalt/Args.kt      |  2 +-
 src/main/kotlin/com/beust/kobalt/Options.kt       | 15 +++++++++------
 .../kotlin/com/beust/kobalt/app/ProjectFinder.kt  |  3 ++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
index 69dca61e..b13f0bd3 100644
--- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
+++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/Args.kt
@@ -7,7 +7,7 @@ class Args {
     var targets: List<String> = arrayListOf()
 
     @Parameter(names = arrayOf("-bf", "--buildFile"), description = "The build file")
-    var buildFile: String? = null
+    var buildFile: String? = "kobalt/src/Build.kt"
 
     @Parameter(names = arrayOf("--checkVersions"), description = "Check if there are any newer versions of the " +
             "dependencies")
diff --git a/src/main/kotlin/com/beust/kobalt/Options.kt b/src/main/kotlin/com/beust/kobalt/Options.kt
index 2936dd59..8751bcf1 100644
--- a/src/main/kotlin/com/beust/kobalt/Options.kt
+++ b/src/main/kotlin/com/beust/kobalt/Options.kt
@@ -1,12 +1,17 @@
 package com.beust.kobalt
 
 import com.beust.jcommander.JCommander
-import com.beust.kobalt.api.*
-import com.beust.kobalt.app.*
+import com.beust.kobalt.api.Kobalt
+import com.beust.kobalt.api.PluginTask
+import com.beust.kobalt.app.ProjectFinder
+import com.beust.kobalt.app.ProjectGenerator
+import com.beust.kobalt.app.Templates
+import com.beust.kobalt.app.UpdateKobalt
 import com.beust.kobalt.app.remote.KobaltServer
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.internal.TaskManager
 import com.beust.kobalt.internal.build.BuildSources
+import com.beust.kobalt.internal.build.SingleFileBuildSources
 import com.beust.kobalt.misc.CheckVersions
 import com.beust.kobalt.misc.kobaltLog
 import com.beust.kobalt.wrapper.Main
@@ -38,12 +43,10 @@ class Options @Inject constructor(
     fun run(jc: JCommander, args: Args, argv: Array<String>): Int {
         val p = if (args.buildFile != null) File(args.buildFile) else File(".")
 //        val buildFile = BuildFile(Paths.get(p.absolutePath), p.name)
-        val buildSources = BuildSources(File(p.absolutePath))
+        val buildSources = if (p.isDirectory) BuildSources(p.absoluteFile) else SingleFileBuildSources(p)
         var pluginClassLoader = javaClass.classLoader
 
-        val allProjects =
-            if (buildSources.exists()) projectFinder.initForBuildFile(buildSources, args)
-            else emptyList<Project>()
+        val allProjects = projectFinder.initForBuildFile(buildSources, args)
 
         // Modify `args` with options found in buildScript { kobaltOptions(...) }, if any
         addOptionsFromBuild(args, Kobalt.optionsFromBuild)
diff --git a/src/main/kotlin/com/beust/kobalt/app/ProjectFinder.kt b/src/main/kotlin/com/beust/kobalt/app/ProjectFinder.kt
index 109d72d7..c4449284 100644
--- a/src/main/kotlin/com/beust/kobalt/app/ProjectFinder.kt
+++ b/src/main/kotlin/com/beust/kobalt/app/ProjectFinder.kt
@@ -8,6 +8,7 @@ import com.beust.kobalt.api.Kobalt
 import com.beust.kobalt.api.Project
 import com.beust.kobalt.internal.PluginInfo
 import com.beust.kobalt.internal.build.BuildSources
+import com.beust.kobalt.internal.build.IBuildSources
 import com.beust.kobalt.misc.kobaltLog
 import com.google.inject.Inject
 import java.util.*
@@ -15,7 +16,7 @@ import java.util.*
 class ProjectFinder @Inject constructor(val buildFileCompilerFactory: BuildFileCompiler.IFactory,
         val pluginInfo: PluginInfo, val plugins: Plugins) {
 
-    fun initForBuildFile(buildSources: BuildSources, args: Args): List<Project> {
+    fun initForBuildFile(buildSources: IBuildSources, args: Args): List<Project> {
         val findProjectResult = buildFileCompilerFactory.create(buildSources, pluginInfo)
                 .compileBuildFiles(args)
         if (! findProjectResult.taskResult.success) {