From a29a131c563520607a2aa475659f5a9970b4dde4 Mon Sep 17 00:00:00 2001 From: Carlos Rueda Date: Wed, 13 Apr 2022 10:47:31 -0700 Subject: [PATCH] 0.998 with recent adjustments --- ChangeLog.md | 6 ++++++ README.md | 2 +- build.sbt | 6 +++--- src/main/scala/tscfg/Main.scala | 6 +++++- src/main/scala/tscfg/util.scala | 2 +- 5 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 71f78a7..d1e5b70 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,11 @@ 2022-01 +0.9.998 + +- bumped versions for scala, scribe and pprint +- adjusted defaultDestDir: "/tmp" if already existing; else as given by "java.io.tmpdir" property. + (Thanks @ckittl for motivating this adjustment.) + 0.9.997 - use sbt-buildinfo diff --git a/README.md b/README.md index 7e0ad96..3ebd9c9 100644 --- a/README.md +++ b/README.md @@ -196,7 +196,7 @@ Usage: tscfg.Main --spec inputFile [options] Options (default): --pn (tscfg.example) --cn (ExampleCfg) - --dd (OS dependent temp dir) + --dd (/tmp if existing or OS dependent temp dir) --java generate java code (the default) --j7 generate code for java <= 7 (>= 8) --java:getters generate getters (see #31) (false) diff --git a/build.sbt b/build.sbt index de96e6f..41aa2c8 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ enablePlugins(BuildInfoPlugin) organization := "com.github.carueda" name := "tscfg" -version := "0.9.997" +version := "0.9.998" scalaVersion := "3.1.2" crossScalaVersions := Seq("2.13.8", "3.1.2") @@ -10,9 +10,9 @@ buildInfoKeys := Seq[BuildInfoKey](version) buildInfoPackage := "tscfg" libraryDependencies ++= Seq( - "com.outr" %% "scribe" % "3.6.10", + "com.outr" %% "scribe" % "3.8.2", "com.typesafe" % "config" % "1.4.2", - "com.lihaoyi" %% "pprint" % "0.7.2", + "com.lihaoyi" %% "pprint" % "0.7.3", "org.scalatest" %% "scalatest" % "3.2.11" % Test, "com.google.code.gson" % "gson" % "2.8.9" ) diff --git a/src/main/scala/tscfg/Main.scala b/src/main/scala/tscfg/Main.scala index fbb7917..79621a5 100644 --- a/src/main/scala/tscfg/Main.scala +++ b/src/main/scala/tscfg/Main.scala @@ -19,7 +19,11 @@ object Main { className = "ExampleCfg" ) - val defaultDestDir: String = System.getProperty("java.io.tmpdir") + val defaultDestDir: String = { + val tmp = new File("/tmp") + if (tmp.isDirectory && tmp.canWrite) "/tmp" + else System.getProperty("java.io.tmpdir") + } var templateOpts: TemplateOpts = TemplateOpts() diff --git a/src/main/scala/tscfg/util.scala b/src/main/scala/tscfg/util.scala index f27a5bb..2fbdd59 100644 --- a/src/main/scala/tscfg/util.scala +++ b/src/main/scala/tscfg/util.scala @@ -34,7 +34,7 @@ object util { .clearModifiers() .withHandler( formatter = - formatter"${string("[")}$levelColored${string("]")} ${green(positionAbbreviated)} - $message$mdc", + formatter"${string("[")}$levelColored${string("]")} ${green(positionAbbreviated)} - $messages$mdc", minimumLevel = minimumLevel ) .replace()