0.998 with recent adjustments

carueda · Apr 13, 2022 · a29a131 · a29a131
1 parent 2d1b9f6
commit a29a131
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 6 deletions.
diff --git 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
@@ -196,7 +196,7 @@ Usage:  tscfg.Main --spec inputFile [options]
 Options (default):
   --pn <packageName>                                     (tscfg.example)
   --cn <className>                                       (ExampleCfg)
-  --dd <destDir>                                         (OS dependent temp dir)
+  --dd <destDir>                                         (/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
@@ -2,17 +2,17 @@ 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")
 
 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
@@ -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
@@ -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()