Merge pull request #171 from awvwgk/manifest-testing

Increase test coverage of fpm manifest

Author: milancurcic

fpm/fpm.toml

@@ -8,7 +8,7 @@ copyright = "2020 fpm contributors"
 [dependencies]
 [dependencies.toml-f]
 git = "https://github.com/toml-f/toml-f"
-rev = "290ba87671ab593e7bd51599e1d80ea736b3cd36"
+tag = "v0.2"
 
 [[test]]
 name = "fpm-test"

fpm/src/fpm/manifest/dependency.f90

@@ -94,7 +94,7 @@ subroutine new_dependency(self, table, error)
             end if
 
             if (.not.allocated(self%git)) then
-                call get_value(table, "revision", obj)
+                call get_value(table, "rev", obj)
                 if (allocated(obj)) then
                     self%git = git_target_revision(url, obj)
                 end if
@@ -120,9 +120,10 @@ subroutine check(table, error)
 
         character(len=:), allocatable :: name
         type(toml_key), allocatable :: list(:)
-        logical :: url_present, git_target_present
+        logical :: url_present, git_target_present, has_path
         integer :: ikey
 
+        has_path = .false.
         url_present = .false.
         git_target_present = .false.
 
@@ -146,6 +147,7 @@ subroutine check(table, error)
                     exit
                 end if
                 url_present = .true.
+                has_path = list(ikey)%key == 'path'
 
             case("branch", "rev", "tag")
                 if (git_target_present) then
@@ -163,7 +165,7 @@ subroutine check(table, error)
             return
         end if
 
-        if (.not.url_present .and. git_target_present) then
+        if (has_path .and. git_target_present) then
             call syntax_error(error, "Dependency "//name//" uses a local path, therefore no git identifiers are allowed")
         end if
 
@@ -182,7 +184,7 @@ subroutine new_dependencies(deps, table, error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        class(toml_table), pointer :: node
+        type(toml_table), pointer :: node
         type(toml_key), allocatable :: list(:)
         integer :: idep, stat
 

fpm/src/fpm/manifest/executable.f90

@@ -57,7 +57,7 @@ subroutine new_executable(self, table, error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        class(toml_table), pointer :: child
+        type(toml_table), pointer :: child
 
         call check(table, error)
         if (allocated(error)) return
@@ -104,7 +104,7 @@ subroutine check(table, error)
         do ikey = 1, size(list)
             select case(list(ikey)%key)
             case default
-                call syntax_error(error, "Key "//list(ikey)%key//" is not allowed executable entry")
+                call syntax_error(error, "Key "//list(ikey)%key//" is not allowed as executable entry")
                 exit
 
             case("name")
@@ -115,6 +115,7 @@ subroutine check(table, error)
 
             end select
         end do
+        if (allocated(error)) return
 
         if (.not.name_present) then
             call syntax_error(error, "Executable name is not provided, please add a name entry")

fpm/src/fpm/manifest/library.f90

@@ -77,7 +77,7 @@ subroutine check(table, error)
         do ikey = 1, size(list)
             select case(list(ikey)%key)
             case default
-                call syntax_error(error, "Key "//list(ikey)%key//" is not allowed in package file")
+                call syntax_error(error, "Key "//list(ikey)%key//" is not allowed in library")
                 exit
 
             case("source-dir", "build-script")

fpm/src/fpm/manifest/package.f90

@@ -85,8 +85,8 @@ subroutine new_package(self, table, error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        class(toml_table), pointer :: child, node
-        class(toml_array), pointer :: children
+        type(toml_table), pointer :: child, node
+        type(toml_array), pointer :: children
         integer :: ii, nn, stat
 
         call check(table, error)
@@ -184,6 +184,7 @@ subroutine check(table, error)
                 name_present = .true.
 
             case("version", "license", "author", "maintainer", "copyright", &
+                    & "description", "keywords", "categories", "homepage", &
                     & "dependencies", "dev-dependencies", "test", "executable", &
                     & "library")
                 continue

fpm/src/fpm/manifest/test.f90

@@ -50,7 +50,7 @@ subroutine new_test(self, table, error)
         !> Error handling
         type(error_t), allocatable, intent(out) :: error
 
-        class(toml_table), pointer :: child
+        type(toml_table), pointer :: child
 
         call check(table, error)
         if (allocated(error)) return
@@ -108,6 +108,7 @@ subroutine check(table, error)
 
             end select
         end do
+        if (allocated(error)) return
 
         if (.not.name_present) then
             call syntax_error(error, "Test name is not provided, please add a name entry")

fpm/src/fpm/toml.f90

@@ -14,14 +14,13 @@
 module fpm_toml
     use fpm_error, only : error_t, fatal_error, file_not_found_error
     use tomlf, only : toml_table, toml_array, toml_key, toml_stat, get_value, &
-        & toml_parse, toml_error
-    use tomlf_type, only : new_table, len
+        & set_value, toml_parse, toml_error, new_table, add_table, add_array, len
     implicit none
     private
 
     public :: read_package_file
-    public :: toml_table, toml_array, toml_key, toml_stat, get_value
-    public :: new_table, len
+    public :: toml_table, toml_array, toml_key, toml_stat, get_value, set_value
+    public :: new_table, add_table, add_array, len
 
 
 contains