Merge pull request #425 from svilupp/js/fix-tofile-path

Update path splitting rule in Dagger.File / Dagger.tofile

Author: jpsamaroo

src/file-io.jl

@@ -30,11 +30,9 @@ function File(path::AbstractString;
         # FIXME: Once MemPool better propagates errors, this check won't be necessary
         throw(ArgumentError("`Dagger.File` expected file to exist at \"$path\""))
     end
-    if isabspath(path)
-        dir, file = dirname(path), basename(path)
-    else
-        dir, file = pwd(), basename(path)
-    end
+    dir, file = dirname(path), basename(path)
+    # if dir is empty, use the current working directory
+    dir = isempty(dir) ? pwd() : dir
     Tdevice = GenericFileDevice{serialize, deserialize, use_io, mmap}
     device = Tdevice(dir)
     leaf_tag = MemPool.Tag(Tdevice=>file)
@@ -61,11 +59,9 @@ function tofile(@nospecialize(data), path::AbstractString;
                 deserialize::Base.Callable=deserialize,
                 use_io::Bool=true,
                 mmap::Bool=false)
-    if isabspath(path)
-        dir, file = dirname(path), basename(path)
-    else
-        dir, file = pwd(), basename(path)
-    end
+    dir, file = dirname(path), basename(path)
+    # if dir is empty, use the current working directory
+    dir = isempty(dir) ? pwd() : dir
     Tdevice = GenericFileDevice{serialize, deserialize, use_io, mmap}
     device = Tdevice(dir)
     chunk = Dagger.tochunk(data, OSProc(), ProcessScope();

test/file-io.jl

@@ -3,31 +3,41 @@ using Serialization
 @testset "File IO" begin
     @testset "File" begin
         data = [1,2,3]
-        data_path = joinpath(tempdir(), "jl_" * join(rand('a':'z', 8)) * ".jls")
-        atexit() do
-            @assert isfile(data_path)
-            rm(data_path)
-        end
-        serialize(data_path, data)
+        # test both absolute and relative paths
+        dir_abs = tempdir()
+        dir_rel = splitpath(mktempdir(pwd()))[end]
+        for dir in [dir_abs, dir_rel]
+            data_path = joinpath(dir, "jl_" * join(rand('a':'z', 8)) * ".jls")
+            atexit() do
+                @assert isfile(data_path)
+                rm(data_path)
+            end
+            serialize(data_path, data)
 
-        data_c = Dagger.File(data_path)::Dagger.File
-        @test fetch(data_c) == data
-        @test fetch(Dagger.@spawn identity(data_c)) == data
+            data_c = Dagger.File(data_path)::Dagger.File
+            @test fetch(data_c) == data
+            @test fetch(Dagger.@spawn identity(data_c)) == data
 
-        @test isfile(data_path)
+            @test isfile(data_path)
+        end
     end
     @testset "tofile" begin
         data = [4,5,6]
-        data_path = joinpath(tempdir(), "jl_" * join(rand('a':'z', 8)) * ".jls")
-        atexit() do
-            @assert isfile(data_path)
-            rm(data_path)
-        end
+        # test both absolute and relative paths
+        dir_abs = tempdir()
+        dir_rel = splitpath(mktempdir(pwd()))[end]
+        for dir in [dir_abs, dir_rel]
+            data_path = joinpath(dir, "jl_" * join(rand('a':'z', 8)) * ".jls")
+            atexit() do
+                @assert isfile(data_path)
+                rm(data_path)
+            end
 
-        data_c = Dagger.tofile(data, data_path)::Dagger.File
-        @test fetch(data_c) == data
-        @test fetch(Dagger.@spawn identity(data_c)) == data
+            data_c = Dagger.tofile(data, data_path)::Dagger.File
+            @test fetch(data_c) == data
+            @test fetch(Dagger.@spawn identity(data_c)) == data
 
-        @test isfile(data_path)
+            @test isfile(data_path)
+        end
     end
 end