Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #170: ls() workaround #280

Merged
merged 2 commits into from
Mar 29, 2017
Merged

Issue #170: ls() workaround #280

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4f5ea2
Notify user about deprecated ls() call. Resolves #170 (workaround)
foxmk Mar 28, 2017
5d6f55d
Fix issue link in comment
foxmk Mar 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 27 additions & 2 deletions library/src/main/scala/giter8/PropertyResolvers.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package giter8

import java.io.{File, FileInputStream}
import java.util.Properties
import java.util.logging.Logger

import giter8.StringRenderer.ParameterNotFoundError

Expand Down Expand Up @@ -75,6 +76,8 @@ case class PropertyResolverChain(propertyResolvers: PropertyResolver*) extends P
case class FilePropertyResolver(files: File*) extends PropertyResolver {
import PropertyResolver._

private val log = Logger.getLogger("giter8.FilePropertyResolver")

override protected def resolveImpl(old: Map[String, String]): Try[Map[String, String]] = {
files.foldLeft(Try(old)) {
case (properties, file) =>
Expand All @@ -95,7 +98,21 @@ case class FilePropertyResolver(files: File*) extends PropertyResolver {
var result = mutable.Map.empty[String, String]
properties.stringPropertyNames.asScala.foreach { name =>
if (result.contains(name)) throw DuplicatePropertyError(name)
result += name -> properties.getProperty(name)

val value = properties.getProperty(name)

// Workaround for https://github.com/foundweekends/giter8/issues/170.
// We notify user about deprecated call to implicit.ly.
val LsCall = """ls\((.*),(.*)\)""".r
value match {
case LsCall(group, artifact) =>
log.warning(
s"ls() function is deprecated. " +
s"Use maven() function to get latest version of ${group.trim}#${artifact.trim}.")
case _ => ()
}

result += name -> value
}
result.toMap
}
Expand All @@ -111,7 +128,15 @@ object InteractivePropertyResolver extends PropertyResolver {
old.foreach {
case (name, value) =>
if (name != "verbatim" || name != "description") {
println(s"$name [$value]: ")

// Workaround for https://github.com/foundweekends/giter8/issues/170.
// We ask user to enter dependency version manually.
val LsCall = """ls\((.*),(.*)\)""".r
value match {
case LsCall(group, artifact) =>
println(s"$name [Please, enter the ${group.trim}#${artifact.trim} version]: ")
case _ => println(s"$name [$value]: ")
}
Console.flush() // Gotta flush for Windows console!
Option(Console.readLine()) match {
case Some(in) if in.trim.nonEmpty => result += name -> in.trim
Expand Down