Remove docker settings from config, Update header

Author: geektimus

build.sbt

@@ -25,7 +25,6 @@ lazy val `file-system-exercise` =
     .enablePlugins(AutomateHeaderPlugin, GitVersioning, JavaAppPackaging, AshScriptPlugin)
     .settings(name := "Virtual Filesystem (Exercise)")
     .settings(settings)
-    .settings(dockerSettings)
     .settings(
       libraryDependencies ++= Seq(
         library.log4j2Api,
@@ -36,7 +35,7 @@ lazy val `file-system-exercise` =
         library.scalaCheck % Test,
         library.specs2 % Test
       ),
-      version in Docker := "0.1.0-SNAPSHOT"
+      Docker / version := "0.1.0-SNAPSHOT"
     )
 
 // *****************************************************************************

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/FileSystem.scala

@@ -1,22 +1,5 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs
@@ -40,4 +23,5 @@ object FileSystem {
       state = Command.from(scanner.nextLine()).apply(state)
     }
   }
+
 }

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/State.scala

@@ -1,22 +1,5 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs
@@ -36,6 +19,5 @@ class State(val root: Directory, val workingDir: Directory, val output: String)
 object State {
   val SHELL_PROMPT = "$ "
 
-  def apply(root: Directory, workingDir: Directory, output: String = ""): State =
-    new State(root, workingDir, output)
+  def apply(root: Directory, workingDir: Directory, output: String = ""): State = new State(root, workingDir, output)
 }

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/commands/Cat.scala

@@ -1,29 +1,13 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs.commands
 
 import com.codingmaniacs.scala.exercises.fs.State
 
 class Cat(filename: String) extends Command {
+
   override def apply(state: State): State = {
     val wd = state.workingDir
     val dirEntry = wd.findEntry(filename)
@@ -33,4 +17,5 @@ class Cat(filename: String) extends Command {
       state.setMessage(dirEntry.asFile.contents)
     }
   }
+
 }

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/commands/Cd.scala

@@ -1,25 +1,9 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs.commands
+
 import com.codingmaniacs.scala.exercises.fs.State
 import com.codingmaniacs.scala.exercises.fs.directories.{ DirEntry, Directory }
 
@@ -72,16 +56,19 @@ class Cd(dir: String) extends Command {
     @tailrec
     def collapseTokensRec(tokens: List[String], res: List[String]): List[String] =
       tokens match {
-        case List() => res
+        case List()                     => res
+        case List(a) => res :+ a
         case h :: tail if h.equals(".") => collapseTokensRec(tail, res)
         case h :: tail if h.equals("..") =>
           res match {
-            case List() => null
+            case List()    => null
             case init :+ _ => collapseTokensRec(tail, init)
+            case lst @ List(_)    => lst
           }
         case h :: tail => collapseTokensRec(tail, res :+ h)
       }
 
     collapseTokensRec(tokens, List())
   }
+
 }

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/commands/Command.scala

@@ -1,22 +1,5 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs.commands
@@ -38,14 +21,15 @@ object Command {
   val ECHO = "echo"
   val CAT = "cat"
 
-  def emptyCommand: Command = new Command {
-    override def apply(state: State): State = state
-  }
+  def emptyCommand: Command =
+    new Command {
+      override def apply(state: State): State = state
+    }
 
-  def incompleteCommand(name: String): Command = new Command {
-    override def apply(state: State): State =
-      state.setMessage(s"$name is an incomplete command")
-  }
+  def incompleteCommand(name: String): Command =
+    new Command {
+      override def apply(state: State): State = state.setMessage(s"$name is an incomplete command")
+    }
 
   def from(input: String): Command = {
     val tokens = input.split(" ")
@@ -95,4 +79,5 @@ object Command {
       new UnknownCommand
     }
   }
+
 }

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/commands/CreateEntry.scala

@@ -1,22 +1,5 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs.commands
@@ -47,8 +30,7 @@ abstract class CreateEntry(name: String) extends Command {
     }
   }
 
-  def checkIllegal(name: String): Boolean =
-    name.contains(".")
+  def checkIllegal(name: String): Boolean = name.contains(".")
 
   def doCreateEntry(state: State): State = {
     val wd = state.workingDir

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/commands/Echo.scala

@@ -1,22 +1,5 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs.commands
@@ -35,7 +18,7 @@ class Echo(items: Array[String]) extends Command {
     def createContentRec(currIdx: Int, acc: String): String =
       currIdx match {
         case i if i >= topIndex => acc
-        case i => createContentRec(i + 1, acc + items(currIdx))
+        case i                  => createContentRec(i + 1, acc + items(currIdx))
       }
 
     createContentRec(0, "")
@@ -107,4 +90,5 @@ class Echo(items: Array[String]) extends Command {
         state.setMessage(createContent(items, items.length))
       }
     }
+
 }

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/commands/Ls.scala

@@ -1,29 +1,14 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs.commands
+
 import com.codingmaniacs.scala.exercises.fs.State
 import com.codingmaniacs.scala.exercises.fs.directories.DirEntry
 
 class Ls extends Command {
+
   override def apply(state: State): State = {
     val contents = state.workingDir.contents
     val outputString = createOutputString(contents)
@@ -36,4 +21,5 @@ class Ls extends Command {
       val entry = contents.head
       s"${entry.name} [${entry.getType}]\n${createOutputString(contents.tail)}"
     }
+
 }

filesystem/src/main/scala/com/codingmaniacs/scala/exercises/fs/commands/MkDir.scala

@@ -1,29 +1,12 @@
 /*
- * Copyright (c) 2019 Geektimus
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright (c) Geektimus <https://github.com/geektimus>
  */
 
 package com.codingmaniacs.scala.exercises.fs.commands
+
 import com.codingmaniacs.scala.exercises.fs.State
 import com.codingmaniacs.scala.exercises.fs.directories.{ DirEntry, Directory }
 
 class MkDir(name: String) extends CreateEntry(name) {
-  override def createSpecificEntry(state: State): DirEntry =
-    Directory.empty(state.workingDir.path, name)
+  override def createSpecificEntry(state: State): DirEntry = Directory.empty(state.workingDir.path, name)
 }