Merge pull request #4 from davidanthoff/julia-0.7

Update to julia 0.7

Author: rofinn

.travis.yml

@@ -5,15 +5,11 @@ os:
   - osx
 julia:
   - 0.6
+  - 0.7
   - nightly
 notifications:
   email: false
 matrix:
   fast_finish: true
-  allow_failures:
-    - julia: nightly
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.init(); Pkg.clone(pwd()); Pkg.test("FilePathsBase"; coverage=true)'
 after_success:
   - julia -e 'cd(Pkg.dir("FilePathsBase")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

REQUIRE

@@ -1,2 +1,2 @@
 julia 0.6
-Compat 0.17.0
+Compat 1.0.0

appveyor.yml

@@ -1,7 +1,18 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - julia_version: 0.6
+  - julia_version: 0.7
+  - julia_version: latest
+
+platform:
+  - x86
+  - x64
+
+## uncomment the following lines to allow failures on nightly julia
+## (tests will run but not make your overall status red)
+#matrix:
+#  allow_failures:
+#  - julia_version: latest
 
 branches:
   only:
@@ -15,21 +26,12 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/master/bin/install.ps1'))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "Pkg.clone(pwd(), \"FilePathsBase\"); versioninfo(); Pkg.build(\"FilePathsBase\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia --check-bounds=yes -e "Pkg.test(\"FilePathsBase\", coverage=true)"
-
-after_test:
-  - C:\projects\julia\bin\julia -e "cd(Pkg.dir(\"FilePathsBase\")); Pkg.add(\"Coverage\"); using Coverage; Codecov.submit(Codecov.process_folder())"
+  - echo "%JL_TEST_SCRIPT%"
+  - julia -e "%JL_TEST_SCRIPT%"

src/FilePathsBase.jl

@@ -4,6 +4,8 @@ module FilePathsBase
 
 using Compat
 
+using Compat.Printf, Compat.LinearAlgebra, Compat.Dates
+
 import Base: ==
 export
     # Types
@@ -60,11 +62,16 @@ else
     export isexecutable
 end
 
-@compat abstract type AbstractPath <: AbstractString end
+abstract type AbstractPath <: AbstractString end
 
 # Required methods for subtype of AbstractString
-Base.endof(p::AbstractPath) = endof(String(p))
-Base.next(p::AbstractPath, i::Int) = next(String(p), i)
+Compat.lastindex(p::AbstractPath) = lastindex(String(p))
+if VERSION >= v"0.7-"
+    Base.iterate(p::AbstractPath) = iterate(String(p))
+    Base.iterate(p::AbstractPath, state::Int) = iterate(String(p), state)
+else
+    Base.next(p::AbstractPath, i::Int) = next(String(p), i)
+end
 
 # The following should be implemented in the concrete types
 Base.String(path::AbstractPath) = error("`String not implemented")

src/libc.jl

@@ -1,5 +1,5 @@
-@static if is_apple()
-    immutable Cpasswd
+@static if Compat.Sys.isapple()
+    struct Cpasswd
         pw_name::Cstring
         pw_passwd::Cstring
         pw_uid::Cint
@@ -12,8 +12,8 @@
         pw_expire::Cint
         pw_fields::Cint
     end
-elseif is_linux()
-    immutable Cpasswd
+elseif Compat.Sys.islinux()
+    struct Cpasswd
        pw_name::Cstring
        pw_passwd::Cstring
        pw_uid::Cint
@@ -23,7 +23,7 @@ elseif is_linux()
        pw_shell::Cstring
     end
 else
-    immutable Cpasswd
+    struct Cpasswd
         pw_name::Cstring
         pw_uid::Cint
         pw_gid::Cint
@@ -34,15 +34,15 @@ else
     Cpasswd() = Cpasswd(pointer("NA"), 0, 0, pointer("NA"), pointer("NA"))
 end
 
-immutable Cgroup
+struct Cgroup
     gr_name::Cstring
     gr_passwd::Cstring
     gr_gid::Cint
 end
 
 Cgroup() = Cgroup(pointer("NA"), pointer("NA"), 0)
 
-immutable User
+struct User
     name::String
     uid::UInt64
     gid::UInt64
@@ -67,8 +67,8 @@ function Base.show(io::IO, user::User)
 end
 
 function User(name::String)
-    ps = @static if is_unix()
-        ccall((:getpwnam, "libc"), Ptr{Cpasswd}, (Ptr{UInt8},), name)
+    ps = @static if Compat.Sys.isunix()
+        ccall(:getpwnam, Ptr{Cpasswd}, (Ptr{UInt8},), name)
     else
         Cpasswd()
     end
@@ -77,8 +77,8 @@ function User(name::String)
 end
 
 function User(uid::UInt)
-    ps = @static if is_unix()
-        ccall((:getpwuid, "libc"), Ptr{Cpasswd}, (UInt64,), uid)
+    ps = @static if Compat.Sys.isunix()
+        ccall(:getpwuid, Ptr{Cpasswd}, (UInt64,), uid)
     else
         Cpasswd()
     end
@@ -87,11 +87,11 @@ function User(uid::UInt)
 end
 
 function User()
-    uid = @static is_unix() ? ccall((:geteuid, "libc"), Cint, ()) : 0
+    uid = @static Compat.Sys.isunix() ? ccall(:geteuid, Cint, ()) : 0
     User(UInt64(uid))
 end
 
-immutable Group
+struct Group
     name::String
     gid::UInt64
 
@@ -105,8 +105,8 @@ function Base.show(io::IO, group::Group)
 end
 
 function Group(name::String)
-    ps = @static if is_unix()
-        ccall((:getgrnam, "libc"), Ptr{Cgroup}, (Ptr{UInt8},), name)
+    ps = @static if Compat.Sys.isunix()
+        ccall(:getgrnam, Ptr{Cgroup}, (Ptr{UInt8},), name)
     else
         Cgroup()
     end
@@ -115,8 +115,8 @@ function Group(name::String)
 end
 
 function Group(gid::UInt)
-    gr = @static if is_unix()
-        ccall((:getgrgid, "libc"), Ptr{Cgroup}, (UInt64,), gid)
+    gr = @static if Compat.Sys.isunix()
+        ccall(:getgrgid, Ptr{Cgroup}, (UInt64,), gid)
     else
         Cgroup()
     end
@@ -125,6 +125,6 @@ function Group(gid::UInt)
 end
 
 function Group()
-    gid = @static is_unix() ? ccall((:getegid, "libc"), Cint, ()) : 0
+    gid = @static Compat.Sys.isunix() ? ccall(:getegid, Cint, ()) : 0
     Group(UInt64(gid))
 end

src/mode.jl

@@ -9,7 +9,7 @@ constants have been translated from cpython's Lib/stat.py file.
 
 https://github.com/python/cpython/blob/master/Lib/stat.py
 """
-immutable Mode
+struct Mode
     m::UInt64
 end
 

src/path.jl

@@ -7,10 +7,10 @@
 Responsible for creating the appropriate platform specific path
 (e.g., `PosixPath` and `WindowsPath` for Unix and Windows systems respectively)
 """
-Path() = @static is_unix() ? PosixPath() : WindowsPath()
+Path() = @static Compat.Sys.isunix() ? PosixPath() : WindowsPath()
 Path(path::AbstractPath) = path
-Path(pieces::Tuple) = @static is_unix() ? PosixPath(pieces) : WindowsPath(pieces)
-Path(str::AbstractString) = @static is_unix() ? PosixPath(str) : WindowsPath(str)
+Path(pieces::Tuple) = @static Compat.Sys.isunix() ? PosixPath(pieces) : WindowsPath(pieces)
+Path(str::AbstractString) = @static Compat.Sys.isunix() ? PosixPath(str) : WindowsPath(str)
 
 """
     @p_str -> Path
@@ -35,7 +35,12 @@ of the file containing the macro. Returns an empty Path if run from a REPL or
 if evaluated by julia -e <expr>.
 """
 macro __PATH__()
-    :(Path(@__DIR__()===nothing ? Path() : @__DIR__))
+    if VERSION >= v"0.7-"
+        p = Path(dirname(string(__source__.file)))
+        return p===nothing ? :(Path()) : :($p)
+    else
+        return :(Path(@__DIR__()===nothing ? Path() : @__DIR__))
+    end
 end
 
 """
@@ -46,7 +51,12 @@ containing the macro. Returns an empty Path if run from a REPL or if
 evaluated by julia -e <expr>.
 """
 macro __FILEPATH__()
-    :(Path(@__FILE__()===nothing ? Path() : @__FILE__))
+    if VERSION >= v"0.7-"
+        p = Path(string(__source__.file))
+        return p===nothing ? :(Path()) : :($p)
+    else
+        return :(Path(@__FILE__()===nothing ? Path() : @__FILE__))
+    end
 end
 
 """
@@ -56,7 +66,12 @@ Construct an absolute path to `filespec` relative to the source file
 containing the macro call.
 """
 macro LOCAL(filespec)
-    :(join(@__PATH__, Path($(esc(filespec)))))
+    if VERSION >= v"0.7-"
+        p = join(Path(dirname(string(__source__.file))), Path(filespec))
+        return :($p)
+    else
+        return :(join(@__PATH__, Path($(esc(filespec)))))
+    end
 end
 
 #=
@@ -103,7 +118,7 @@ julia> parents(p"~/.julia/v0.6/REQUIRE")
 # Throws
 * `ErrorException`: if `path` doesn't have a parent
 """
-function parents{T<:AbstractPath}(path::T)
+function parents(path::T) where {T <: AbstractPath}
     if hasparent(path)
         return map(1:length(parts(path))-1) do i
             T(parts(path)[1:i])
@@ -228,7 +243,7 @@ Base.real(path::AbstractPath) = Path(realpath(String(path)))
 
 Normalizes a path by removing "." and ".." entries.
 """
-function Base.norm{T<:AbstractPath}(path::T)
+function Compat.LinearAlgebra.norm(path::T) where {T <: AbstractPath}
     p = parts(path)
     result = String[]
     rem = length(p)
@@ -275,7 +290,7 @@ end
 
 Creates a relative path from either the current directory or an arbitrary start directory.
 """
-function relative{T<:AbstractPath}(path::T, start::T=T("."))
+function relative(path::T, start::T=T(".")) where {T <: AbstractPath}
     curdir = "."
     pardir = ".."
 
@@ -287,7 +302,7 @@ function relative{T<:AbstractPath}(path::T, start::T=T("."))
     i = 0
     while i < min(length(p), length(s))
         i += 1
-        @static if is_windows()
+        @static if Compat.Sys.iswindows()
             if lowercase(p[i]) != lowercase(s[i])
                 i -= 1
                 break
@@ -450,7 +465,7 @@ function Base.mkdir(path::AbstractPath; mode=0o777, recursive=false, exist_ok=fa
         !exist_ok && error("$path already exists.")
     else
         if !hasparent(path) || exists(parent(path))
-            mkdir(String(path), mode)
+            VERSION >= v"0.7-" ? mkdir(String(path), mode=mode) : mkdir(String(path), mode)
         elseif hasparent(path) && !exists(parent(path)) && recursive
             mkdir(parent(path); mode=mode, recursive=recursive, exist_ok=exist_ok)
         else
@@ -522,8 +537,8 @@ function move(src::AbstractPath, dest::AbstractPath; recursive=false, exist_ok=f
     end
 end
 
-function Base.cp(src::AbstractPath, dest::AbstractPath; remove_destination::Bool=false, follow_symlinks::Bool=false)
-    cp(String(src), String(dest); remove_destination=remove_destination, follow_symlinks=follow_symlinks)
+function Base.cp(src::AbstractPath, dest::AbstractPath; force::Bool=false, follow_symlinks::Bool=false)
+    Compat.cp(String(src), String(dest); force=force, follow_symlinks=follow_symlinks)
 end
 
 remove(path::AbstractPath; recursive=false) = rm(String(path); recursive=recursive)
@@ -564,7 +579,7 @@ end
 Change the `user` and `group` of the `path`.
 """
 function Base.chown(path::AbstractPath, user::AbstractString, group::AbstractString; recursive=false)
-    @static if is_unix()
+    @static if Compat.Sys.isunix()
         chown_cmd = String["chown"]
         if recursive
             push!(chown_cmd, "-R")

src/posix.jl

@@ -1,4 +1,4 @@
-immutable PosixPath <: AbstractPath
+struct PosixPath <: AbstractPath
     parts::Tuple
 end
 

src/status.jl

@@ -1,8 +1,8 @@
-using Base.Dates
+using Compat.Dates
 
 import Base.Filesystem: StatStruct
 
-immutable Status
+struct Status
     device::UInt64
     inode::UInt64
     mode::Mode

src/windows.jl

@@ -1,4 +1,4 @@
-immutable WindowsPath <: AbstractPath
+struct WindowsPath <: AbstractPath
     parts::Tuple{Vararg{String}}
     drive::String
     root::String
@@ -14,7 +14,7 @@ WindowsPath() = WindowsPath(tuple(), "", "")
 function WindowsPath(parts::Tuple)
     if parts[1]==WIN_PATH_SEPARATOR
         return WindowsPath(parts, "", WIN_PATH_SEPARATOR)
-    elseif contains(parts[1], ":")
+    elseif occursin(":", parts[1])
         l_drive, l_path = _win_splitdrive(parts[1])
         return WindowsPath(parts, l_drive, l_path)
     else
@@ -31,15 +31,15 @@ function WindowsPath(str::AbstractString)
         error("The \\\\?\\ prefix is currently not supported.")
     end
 
-    str = replace(str, POSIX_PATH_SEPARATOR, WIN_PATH_SEPARATOR)
+    str = replace(str, POSIX_PATH_SEPARATOR => WIN_PATH_SEPARATOR)
 
     if startswith(str, "\\\\")
         error("UNC paths are currently not supported.")
     elseif startswith(str, "\\")
         tokenized = split(str, WIN_PATH_SEPARATOR)
 
         return WindowsPath(tuple(WIN_PATH_SEPARATOR, String.(tokenized[2:end])...), "", WIN_PATH_SEPARATOR)
-    elseif contains(str, ":")
+    elseif occursin(":", str)
         l_drive, l_path = _win_splitdrive(str)
 
         tokenized = split(l_path, WIN_PATH_SEPARATOR)
@@ -75,7 +75,7 @@ root(path::WindowsPath) = path.root
 function Base.show(io::IO, path::WindowsPath)
     print(io, "p\"")
     if isabs(path)
-        print(io, replace(anchor(path), "\\", "/"))
+        print(io, replace(anchor(path), "\\" => "/"))
         print(io, join(parts(path)[2:end], "/"))
     else
         print(io, join(parts(path), "/"))