Rename file patch (#32)

* added failing test for rename file

* fixed rename file command

* added test for rename file command without project param

* better naming for tests and update test coverage file

Author: Gien Verschatse

src/Forge.Core/FileHelper.fs

@@ -38,8 +38,7 @@ let deleteFile fileName =
     file.Delete ()
 
 /// Renames the file to the target file name.
-let renameFile target fileName = (FileInfo fileName).MoveTo target
-
+let renameFile fileName target = (FileInfo fileName).MoveTo (directory </> target)
 
 /// Renames the directory to the target directory name.
 let renameDir target dirName = (DirectoryInfo dirName).MoveTo target

src/Forge.Core/ProjectManager.fs

@@ -253,7 +253,11 @@ module Furnace =
             state
         else
             renameFile path newName
-            updateProj (FsProject.renameFile path newName)  state
+
+            let dir = getParentDir path
+            let name' = relative (directory </> path) ((directory </> dir |> Path.GetDirectoryName) + Path.DirectorySeparatorChar.ToString()  )
+            let newName' = relative (directory </> newName) ((directory </> dir |> Path.GetDirectoryName) + Path.DirectorySeparatorChar.ToString()  )
+            updateProj (FsProject.renameFile name' newName')  state
 
 
     let listSourceFiles (filter: string option) (state: ActiveState) =

src/Forge.ProjectSystem/ProjectSystem.fs

@@ -508,9 +508,9 @@ type SourceTree (files:SourceFile list) =
 
     /// Check if the target exists in the project file tree
     let hasTarget (target:string) =
-        let target = normalizeFileName target
-        if isDirectory target then tree.ContainsKey target
-        elif data.ContainsKey target then true else
+        let temp = normalizeFileName target
+        if isDirectory temp then tree.ContainsKey temp
+        elif data.ContainsKey temp then true else
         false
 
     let moveFile shift target =
@@ -617,24 +617,25 @@ type SourceTree (files:SourceFile list) =
         // TODO - check path & name for validity
         // TODO - if there's a .fs & .fsi pair rename both files
         if   not ^ hasTarget path then ()
-        elif not ^ checkFile newName "is not a valid file name" then () else
-        let path = normalizeFileName path
-        let dir  = getDirectory path
-        let file = Path.GetFileName path
-        // update the SourceFile record
-        if data.ContainsKey path then
-            let srcfile = {data.[path] with Include = dir+newName}
-            data.Remove path |> ignore
-            data.[dir+newName]  <- srcfile
-        // update the file position listing
-        if tree.ContainsKey dir then
-            let arr = tree.[dir]
-            printfn "%A" arr
-            let idx = ResizeArray.findIndex ((=) file) arr
-            arr.[idx] <- newName
-            tree.[dir] <- arr
-
-        // TODO add railway result/errors
+        elif not ^ checkFile newName "is not a valid file name" then () 
+        else
+            let path = normalizeFileName path
+            let dir  = getDirectory path
+            let file = Path.GetFileName path
+            // update the SourceFile record
+            if data.ContainsKey path then
+                let srcfile = {data.[path] with Include = newName}
+                data.Remove path |> ignore
+                data.[newName]  <- srcfile
+            // update the file position listing
+            if tree.ContainsKey dir then
+                let arr = tree.[dir]
+                printfn "%A" arr
+                let idx = ResizeArray.findIndex ((=) file) arr
+                arr.[idx] <- newName
+                tree.[dir] <- arr
+
+            // TODO add railway result/errors
 
 
     member __.RenameDir (dir:string) (newName:string) =

tests/Forge.IntegrationTests/Forge.IntegrationTests.fsproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Name>Forge.IntegrationTests</Name>
@@ -56,6 +56,7 @@
     <Compile Include="RemoveFileTests.fs" />
     <Compile Include="NewFileTests.fs" />
     <Compile Include="NewScaffoldTests.fs" />
+    <Compile Include="RenameFileTests.fs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Choose>

tests/Forge.IntegrationTests/RenameFileTests.fs

@@ -0,0 +1,35 @@
+[<NUnit.Framework.TestFixture>]
+[<NUnit.Framework.Category "Rename file">]
+module ``Rename File Tests``
+
+open NUnit.Framework
+open Assertions
+open FsUnit
+
+[<Test>]
+let ``Rename file changes name in fsproj`` () =
+    let dir = "rename_file"
+
+    ["new project -n Sample --dir src -t console"
+     "new file -n src/Sample/Test --project src/Sample/Sample.fsproj --template fs"
+     "rename file -n src/Sample/Test.fs -r src/Sample/Renamed.fs --project src/Sample/Sample.fsproj"
+    ]
+    |> initTest dir
+
+    let project = dir </> "src" </> "Sample" </> "Sample.fsproj" |> loadProject
+
+    project |> hasFile "Renamed.fs"
+
+[<Test>]
+let ``Rename file without project changes name in fsproj`` () =
+    let dir = "rename_file_no_project"
+
+    ["new project -n Sample --dir src -t console"
+     "new file -n src/Sample/Test --project src/Sample/Sample.fsproj --template fs"
+     "rename file -n src/Sample/Test.fs -r src/Sample/Renamed.fs"
+    ]
+    |> initTest dir
+
+    let project = dir </> "src" </> "Sample" </> "Sample.fsproj" |> loadProject
+
+    project |> hasFile "Renamed.fs"

tests/TestCoverage.md

@@ -20,7 +20,7 @@
 * [ ] Parse - add below (?)
 * [ ] Parse - add dir
 * [ ] Parse - remove dir
-* [ ] Parse - rename file
+* [x] Parse - rename file
 * [ ] Parse - rename directory
 * [ ] Path Helper - normalize file name
 * [ ] Path Helper - get root