Always replace when download

Author: minhqdao

src/fpm/dependency.f90

@@ -56,9 +56,9 @@
 !> Currenly ignored. First come, first serve.
 module fpm_dependency
   use, intrinsic :: iso_fortran_env, only: output_unit
-  use fpm_environment, only: get_os_type, OS_WINDOWS
+  use fpm_environment, only: get_os_type, OS_WINDOWS, os_is_unix
   use fpm_error, only: error_t, fatal_error
-  use fpm_filesystem, only: exists, join_path, mkdir, canon_path, windows_path, list_files, is_dir, basename
+  use fpm_filesystem, only: exists, join_path, mkdir, canon_path, windows_path, list_files, is_dir, basename, os_delete_dir
   use fpm_git, only: git_target_revision, git_target_default, git_revision
   use fpm_manifest, only: package_config_t, dependency_config_t, &
                           get_package_data
@@ -562,10 +562,11 @@ subroutine get_from_registry(self, target_dir, global_settings, error, downloade
       call fatal_error(error, "Error creating temporary file for downloading package '"//self%name//"'."); return
     end if
 
-    ! Include version number in the cache path. In no cached version exists, download it.
+    ! Include version number in the cache path. If no cached version exists, download it.
     cache_path = join_path(cache_path, version%s())
     if (.not. exists(join_path(cache_path, 'fpm.toml'))) then
-      if (.not. exists(cache_path)) call mkdir(cache_path)
+      if (is_dir(cache_path)) call os_delete_dir(os_is_unix(), cache_path)
+      call mkdir(cache_path)
 
       print *, "Downloading '"//join_path(self%namespace, self%name, version%s())//"' ..."
       call downloader%get_file(target_url, tmp_file, error)

test/fpm_test/test_package_dependencies.f90

@@ -55,9 +55,10 @@ subroutine collect_package_dependencies(tests)
         & new_unittest("local-registry-unspecified-has-manifest", local_registry_unspecified_has_manifest), &
         & new_unittest("cache-specified-version-found", cache_specified_version_found), &
         & new_unittest("specified-version-not-found-in-cache", registry_specified_version_not_found_in_cache), &
-        & new_unittest("registry-specified-version-not-exists-anywhere", registry_specified_version_not_exists_anywhere, should_fail=.true.), &
+        & new_unittest("registry-specified-version-not-exists", registry_specified_version_not_exists, should_fail=.true.), &
         & new_unittest("registry-specified-version-other-versions-exist", registry_specified_version_other_versions_exist), &
         & new_unittest("registry-unspecified-version", registry_unspecified_version), &
+        & new_unittest("registry-unspecified-version_exists_in_cache", registry_unspecified_version_exists_in_cache), &
         & new_unittest("pkg-data-no-code", pkg_data_no_code, should_fail=.true.), &
         & new_unittest("pkg-data-corrupt-code", pkg_data_corrupt_code, should_fail=.true.), &
         & new_unittest("pkg-data-missing-error-message", pkg_data_missing_error_msg, should_fail=.true.), &
@@ -795,7 +796,7 @@ subroutine registry_specified_version_not_found_in_cache(error)
   end subroutine registry_specified_version_not_found_in_cache
 
   !> Version specified in manifest, but not found in cache or registry.
-  subroutine registry_specified_version_not_exists_anywhere(error)
+  subroutine registry_specified_version_not_exists(error)
     type(error_t), allocatable, intent(out) :: error
 
     type(toml_table) :: table
@@ -836,7 +837,7 @@ subroutine registry_specified_version_not_exists_anywhere(error)
 
     call delete_tmp_folder
 
-  end subroutine registry_specified_version_not_exists_anywhere
+  end subroutine registry_specified_version_not_exists
 
   subroutine registry_specified_version_other_versions_exist(error)
     type(error_t), allocatable, intent(out) :: error
@@ -935,6 +936,63 @@ subroutine registry_unspecified_version(error)
 
   end subroutine registry_unspecified_version
 
+  !> No version specified, therefore load package data from the registry. Find out that there is a cached version of
+  !> the latest package.
+  subroutine registry_unspecified_version_exists_in_cache(error)
+    type(error_t), allocatable, intent(out) :: error
+
+    type(toml_table) :: table
+    type(dependency_node_t) :: node
+    type(fpm_global_settings) :: global_settings
+    character(len=:), allocatable :: target_dir, cwd
+    type(toml_table), pointer :: child
+    type(mock_downloader_t) :: mock_downloader
+
+    call new_table(table)
+    table%key = 'test-dep'
+    call set_value(table, 'namespace', 'test-org')
+
+    call new_dependency(node%dependency_config_t, table, error=error)
+    if (allocated(error)) return
+
+    call delete_tmp_folder
+    call mkdir(join_path(tmp_folder, 'cache', 'test-org', 'test-dep', '0.0.0'))
+    call mkdir(join_path(tmp_folder, 'cache', 'test-org', 'test-dep', '0.1.0'))
+    call filewrite(join_path(join_path(tmp_folder, 'cache', 'test-org', 'test-dep', '0.1.0'), 'fpm.toml'), [''])
+    call mkdir(join_path(tmp_folder, 'cache', 'test-org', 'test-dep', '1.2.1'))
+
+    call new_table(table)
+    call add_table(table, 'registry', child)
+
+    call setup_global_settings(global_settings, error)
+    if (allocated(error)) then
+      call delete_tmp_folder; return
+    end if
+
+    call get_registry_settings(child, global_settings, error)
+    if (allocated(error)) then
+      call delete_tmp_folder; return
+    end if
+
+    call node%get_from_registry(target_dir, global_settings, error, mock_downloader)
+    if (allocated(error)) then
+      call delete_tmp_folder; return
+    end if
+
+    call get_current_directory(cwd, error)
+    if (allocated(error)) then
+      call delete_tmp_folder; return
+    end if
+
+    if (target_dir /= join_path(cwd, join_path(tmp_folder, 'dependencies', 'test-org', 'test-dep', '0.1.0'))) then
+      call test_failed(error, "Target directory not set correctly: '"//target_dir//"'")
+      call delete_tmp_folder; return
+    end if
+
+    call delete_tmp_folder
+
+  end subroutine registry_unspecified_version_exists_in_cache
+
   !> Package data returned from the registry does not contain a code field.
   subroutine pkg_data_no_code(error)
     type(error_t), allocatable, intent(out) :: error