release v2.2: remove automatic implicit converters java <=> scala

use java.toScala and scala.toJava instead

Author: pathikrit

README.md

@@ -24,7 +24,7 @@ val f = File("/User/johndoe/Documents")
 val f1: File = file"/User/johndoe/Documents"
 val f2: File = root/"User"/"johndoe"/"Documents"
 val f3: File = home/"Documents"
-val f4: File = new java.io.File("/User/johndoe/Documents")
+val f4: File = new java.io.File("/User/johndoe/Documents").toScala
 val f5: File = "/User"/"johndoe"/"Documents"
 val f6: File = "/User/johndoe/Documents".toFile
 val f7: File = root/"User"/"johndoe"/"Documents"/"presentations"/`..`
@@ -89,7 +89,7 @@ val reader       : java.io.BufferedReader       = file.reader
 val outputstream : java.io.OutputStream         = file.out 
 val writer       : java.io.BufferedWriter       = file.writer 
 val inputstream  : java.io.InputStream          = file.in
-val file         : java.io.File                 = file        // implicit conversion
+val javaFile     : java.io.File                 = file.toJava
 val path         : java.nio.file.Path           = file.path
 val fs           : java.nio.file.FileSystem     = file.fileSystem
 val channel      : java.nio.channel.FileChannel = file.channel

build.sbt

@@ -1,5 +1,5 @@
 name := "better-files"
-version := "2.1.1"
+version := "2.2.0"
 description := "Scala wrapper for Java files"
 licenses += ("MIT", url("http://opensource.org/licenses/MIT"))
 organization := "com.github.pathikrit"

src/main/scala/better/files/package.scala

@@ -20,6 +20,9 @@ package object files {
    * Scala wrapper for java.io.File
    */
   case class File(file: JFile) {
+
+    def toJava: JFile = file
+
     def path: Path = file.toPath
 
     def fullPath: String = path.toString
@@ -43,14 +46,16 @@ package object files {
 
     def contentType: Option[String] = Option(Files.probeContentType(path))
 
-    def parent: File = file.getParentFile
+    def parent: File = file.getParentFile.toScala
 
-    def /(child: String): File = new JFile(file, child)
+    def /(child: String): File = new JFile(file, child).toScala
 
     def /(f: File => File): File = f(this)
 
     def createIfNotExists(): File = if (file.exists()) this else {parent.mkdirs(); Files.createFile(path)}
 
+    def exists: Boolean = file.exists()
+
     def content(implicit codec: Codec): BufferedSource = Source.fromFile(file)(codec)
     def source(implicit codec: Codec): BufferedSource = content(codec)
 
@@ -59,7 +64,7 @@ package object files {
       Iterator.continually(stream.read()).takeWhile(-1 !=).map(_.toByte)  //TODO: close the stream
     }
 
-    def mkdir(): File = {file.mkdirs(); this}
+    def mkdirs(): File = {file.mkdirs(); this}
 
     def chars(implicit codec: Codec): Iterator[Char] = content(codec)
 
@@ -117,7 +122,7 @@ package object files {
     //def hide(): Boolean = ???
     //def unhide(): Boolean = ???
 
-    def list: Files = file.listFiles().toIterator map javaToFile
+    def list: Files = file.listFiles().toIterator.map(_.toScala)
     def children: Files = list
 
     def listRecursively(maxDepth: Int = Int.MaxValue): Files = Files.walk(path, maxDepth)
@@ -223,7 +228,7 @@ package object files {
     def sameFileAs(that: File): Boolean = Files.isSameFile(this.path, that.path)
 
     /**
-     * @return true if this file is exactly same as that file TODO: recursively for directories
+     * @return true if this file is exactly same as that file TODO: recursively for directories (or empty files?)
      */
     def contentSameAs(that: File): Boolean = this.bytes sameElements that.bytes
     val `===` = contentSameAs _
@@ -296,13 +301,17 @@ package object files {
     def ls(file: File): Files = file.list
     def ls_r(file: File): Files = file.listRecursively()
     def touch(file: File): File = file.touch()
-    def mkdir(file: File): File = file.mkdir()
+    def mkdir(file: File): File = file.mkdirs()
     def chown(owner: String, file: File): File = file.setOwner(owner)
     def chgrp(group: String, file: File): File = file.setGroup(group)
     def chmod_+(permission: PosixFilePermission, file: File): File = file.addPermissions(permission)
     def chmod_-(permission: PosixFilePermission, file: File): File = file.removePermissions(permission)
   }
 
+  implicit class FileOps(file: JFile) {
+    def toScala: File = File(file)
+  }
+
   implicit class InputStreamOps(in: InputStream) {
     def >(out: OutputStream): Unit = pipeTo(out)
 
@@ -344,9 +353,8 @@ package object files {
   }
 
   implicit def codecToCharSet(codec: Codec): Charset = codec.charSet
-  implicit def pathToFile(path: Path): File = path.toFile
-  implicit def javaToFile(file: JFile): File = File(file)           //TODO: ISO micro-macros
-  implicit def toJavaFile(file: File): JFile = file.file            //TODO: Move implicit converters to a special import?
+
+  implicit def pathToFile(path: Path): File = path.toFile.toScala
 
   private[files] implicit def pathStreamToFiles(files: JStream[Path]): Files = files.iterator().map(pathToFile)
   private[files] def when[A](condition: Boolean)(f: => A): Option[A] = if (condition) Some(f) else None

src/test/scala/better/FilesSpec.scala

@@ -49,7 +49,7 @@ class FilesSpec extends FlatSpec with BeforeAndAfterEach with Matchers {
     val f1: File = file"/User/johndoe/Documents"
     val f2: File = root/"User"/"johndoe"/"Documents"
     val f3: File = home/"Documents"
-    val f4: File = new java.io.File("/User/johndoe/Documents")
+    val f4: File = new java.io.File("/User/johndoe/Documents").toScala
     val f5: File = "/User"/"johndoe"/"Documents"
     val f6: File = "/User/johndoe/Documents".toFile
     val f7: File = root/"User"/"johndoe"/"Documents"/"presentations" / `..`
@@ -65,14 +65,14 @@ class FilesSpec extends FlatSpec with BeforeAndAfterEach with Matchers {
       case SymbolicLink(to) => fail()   //this must be first case statement if you want to handle symlinks specially; else will follow link
       case Directory(children) => fail()
       case RegularFile(contents) => fail()
-      case other if other.exists() => fail()  //A file may not be one of the above e.g. UNIX pipes, sockets, devices etc
+      case other if other.exists => fail()  //A file may not be one of the above e.g. UNIX pipes, sockets, devices etc
       case _ =>                               //A file that does not exist
     }
     root/"dev"/"null" match {
       case SymbolicLink(to) => fail()
       case Directory(children) => fail()
       case RegularFile(contents) => fail()
-      case other if other.exists() =>   //A file can be not any of the above e.g. UNIX pipes & sockets etc
+      case other if other.exists =>   //A file can be not any of the above e.g. UNIX pipes & sockets etc
       case _ => fail()
     }
     root/"dev" match {
@@ -168,20 +168,20 @@ class FilesSpec extends FlatSpec with BeforeAndAfterEach with Matchers {
     t1.checksum() should not equal t2.checksum()
     a[java.nio.file.FileAlreadyExistsException] should be thrownBy (t1 copyTo t2)
     t1.copyTo(t2, overwrite = true)
-    t1.exists() shouldBe true
+    t1.exists shouldBe true
     t1.checksum() shouldEqual t2.checksum()
     b2.contentAsString shouldEqual magicWord
     // rename
     t2.name shouldBe "t2.txt"
-    t2.exists() shouldBe true
+    t2.exists shouldBe true
     val t3 = t2 renameTo "t3.txt"
     t3.name shouldBe "t3.txt"
-    t2.exists() shouldBe false
-    t3.exists() shouldBe true
+    t2.exists shouldBe false
+    t3.exists shouldBe true
     // move
     t3 moveTo t2
-    t2.exists() shouldBe true
-    t3.exists() shouldBe false
+    t2.exists shouldBe true
+    t3.exists shouldBe false
   }
 
   it should "do I/O via streams/writers" in {