Improve variable names again

Author: minhqdao

src/fpm/dependency.f90

@@ -614,7 +614,7 @@ subroutine get_from_registry(self, target_dir, global_settings, error, downloade
     !> Downloader instance.
     class(downloader_t), optional, intent(in) :: downloader_
 
-    character(:), allocatable :: cache_path, target_url, tmp_pkg_data_path, tmp_pkg_data_file
+    character(:), allocatable :: cache_path, target_url, tmp_pkg_path, tmp_pkg_file
     type(version_t) :: version
     integer :: stat, unit
     type(json_object) :: json
@@ -644,17 +644,17 @@ subroutine get_from_registry(self, target_dir, global_settings, error, downloade
     end if
 
     ! Define location of the temporary folder and file.
-    tmp_pkg_data_path = join_path(global_settings%path_to_config_folder, 'tmp')
-    tmp_pkg_data_file = join_path(tmp_pkg_data_path, 'package_data.tmp')
-    if (.not. exists(tmp_pkg_data_path)) call mkdir(tmp_pkg_data_path)
-    open (newunit=unit, file=tmp_pkg_data_file, action='readwrite', iostat=stat)
+    tmp_pkg_path = join_path(global_settings%path_to_config_folder, 'tmp')
+    tmp_pkg_file = join_path(tmp_pkg_path, 'package_data.tmp')
+    if (.not. exists(tmp_pkg_path)) call mkdir(tmp_pkg_path)
+    open (newunit=unit, file=tmp_pkg_file, action='readwrite', iostat=stat)
     if (stat /= 0) then
       call fatal_error(error, "Error creating temporary file for downloading package '"//self%name//"'."); return
     end if
 
     ! Include namespace and package name in the target url and download package data.
     target_url = global_settings%registry_settings%url//'/packages/'//self%namespace//'/'//self%name
-    call downloader%get_pkg_data(target_url, self%requested_version, tmp_pkg_data_file, json, error)
+    call downloader%get_pkg_data(target_url, self%requested_version, tmp_pkg_file, json, error)
     close (unit, status='delete')
     if (allocated(error)) return
 
@@ -663,7 +663,7 @@ subroutine get_from_registry(self, target_dir, global_settings, error, downloade
     if (allocated(error)) return
 
     ! Open new tmp file for downloading the actual package.
-    open (newunit=unit, file=tmp_pkg_data_file, action='readwrite', iostat=stat)
+    open (newunit=unit, file=tmp_pkg_file, action='readwrite', iostat=stat)
     if (stat /= 0) then
       call fatal_error(error, "Error creating temporary file for downloading package '"//self%name//"'."); return
     end if
@@ -675,13 +675,13 @@ subroutine get_from_registry(self, target_dir, global_settings, error, downloade
       call mkdir(cache_path)
 
       print *, "Downloading '"//join_path(self%namespace, self%name, version%s())//"' ..."
-      call downloader%get_file(target_url, tmp_pkg_data_file, error)
+      call downloader%get_file(target_url, tmp_pkg_file, error)
       if (allocated(error)) then
         close (unit, status='delete'); return
       end if
 
       ! Unpack the downloaded package to the final location.
-      call downloader%unpack(tmp_pkg_data_file, cache_path, error)
+      call downloader%unpack(tmp_pkg_file, cache_path, error)
       close (unit, status='delete')
       if (allocated(error)) return
     end if
@@ -1082,7 +1082,7 @@ subroutine dump_to_unit(self, unit, error)
     table = toml_table()
     call self%dump(table, error)
 
-    write(unit, '(a)') toml_serialize(table)
+    write (unit, '(a)') toml_serialize(table)
 
   end subroutine dump_to_unit
 

src/fpm/downloader.f90

@@ -18,10 +18,10 @@ module fpm_downloader
 contains
 
   !> Perform an http get request and save output to file.
-  subroutine get_pkg_data(url, version, tmp_pkg_data_file, json, error)
+  subroutine get_pkg_data(url, version, tmp_pkg_file, json, error)
     character(*), intent(in) :: url
     type(version_t), allocatable, intent(in) :: version
-    character(*), intent(in) :: tmp_pkg_data_file
+    character(*), intent(in) :: tmp_pkg_file
     type(json_object), intent(out) :: json
     type(error_t), allocatable, intent(out) :: error
 
@@ -31,14 +31,14 @@ subroutine get_pkg_data(url, version, tmp_pkg_data_file, json, error)
 
     if (allocated(version)) then
       ! Request specific version.
-      call get_file(url//'/'//version%s(), tmp_pkg_data_file, error)
+      call get_file(url//'/'//version%s(), tmp_pkg_file, error)
     else
       ! Request latest version.
-      call get_file(url, tmp_pkg_data_file, error)
+      call get_file(url, tmp_pkg_file, error)
     end if
     if (allocated(error)) return
 
-    call json_load(j_value, tmp_pkg_data_file, error=j_error)
+    call json_load(j_value, tmp_pkg_file, error=j_error)
     if (allocated(j_error)) then
       allocate (error); call move_alloc(j_error%message, error%message); call json%destroy(); return
     end if
@@ -51,19 +51,19 @@ subroutine get_pkg_data(url, version, tmp_pkg_data_file, json, error)
     json = ptr
   end
 
-  subroutine get_file(url, tmp_pkg_data_file, error)
+  subroutine get_file(url, tmp_pkg_file, error)
     character(*), intent(in) :: url
-    character(*), intent(in) :: tmp_pkg_data_file
+    character(*), intent(in) :: tmp_pkg_file
     type(error_t), allocatable, intent(out) :: error
 
     integer :: stat
 
     if (which('curl') /= '') then
       print *, "Downloading package data from '"//url//"' ..."
-      call execute_command_line('curl '//url//' -s -o '//tmp_pkg_data_file, exitstat=stat)
+      call execute_command_line('curl '//url//' -s -o '//tmp_pkg_file, exitstat=stat)
     else if (which('wget') /= '') then
       print *, "Downloading package data from '"//url//"' ..."
-      call execute_command_line('wget '//url//' -q -O '//tmp_pkg_data_file, exitstat=stat)
+      call execute_command_line('wget '//url//' -q -O '//tmp_pkg_file, exitstat=stat)
     else
       call fatal_error(error, "Neither 'curl' nor 'wget' installed."); return
     end if
@@ -73,8 +73,9 @@ subroutine get_file(url, tmp_pkg_data_file, error)
     end if
   end
 
-  subroutine unpack(tmp_file, destination, error)
-    character(*), intent(in) :: tmp_file
+  !> Unpack a tarball to a destination.
+  subroutine unpack(tmp_pkg_file, destination, error)
+    character(*), intent(in) :: tmp_pkg_file
     character(*), intent(in) :: destination
     type(error_t), allocatable, intent(out) :: error
 
@@ -84,11 +85,11 @@ subroutine unpack(tmp_file, destination, error)
       call fatal_error(error, "'tar' not installed."); return
     end if
 
-    print *, "Unpacking '"//tmp_file//"' to '"//destination//"' ..."
-    call execute_command_line('tar -zxf '//tmp_file//' -C '//destination, exitstat=stat)
+    print *, "Unpacking '"//tmp_pkg_file//"' to '"//destination//"' ..."
+    call execute_command_line('tar -zxf '//tmp_pkg_file//' -C '//destination, exitstat=stat)
 
     if (stat /= 0) then
-      call fatal_error(error, "Error unpacking '"//tmp_file//"'."); return
+      call fatal_error(error, "Error unpacking '"//tmp_pkg_file//"'."); return
     end if
   end
 end

test/fpm_test/test_package_dependencies.f90

@@ -1350,10 +1350,10 @@ subroutine setup_global_settings(global_settings, error)
     global_settings%config_file_name = config_file_name
   end
 
-  subroutine get_pkg_data(url, version, tmp_file, json, error)
+  subroutine get_pkg_data(url, version, tmp_pkg_file, json, error)
     character(*), intent(in) :: url
     type(version_t), allocatable, intent(in) :: version
-    character(*), intent(in) :: tmp_file
+    character(*), intent(in) :: tmp_pkg_file
     type(json_object), intent(out) :: json
     type(error_t), allocatable, intent(out) :: error
 
@@ -1372,20 +1372,20 @@ subroutine get_pkg_data(url, version, tmp_file, json, error)
     json = cast_to_object(j_value)
   end
 
-  subroutine get_file(url, tmp_file, error)
+  subroutine get_file(url, tmp_pkg_file, error)
     character(*), intent(in) :: url
-    character(*), intent(in) :: tmp_file
+    character(*), intent(in) :: tmp_pkg_file
     type(error_t), allocatable, intent(out) :: error
   end
 
-  subroutine unpack_mock_package(tmp_file, destination, error)
-    character(*), intent(in) :: tmp_file
+  subroutine unpack_mock_package(tmp_pkg_file, destination, error)
+    character(*), intent(in) :: tmp_pkg_file
     character(*), intent(in) :: destination
     type(error_t), allocatable, intent(out) :: error
 
     integer :: stat
 
-    call execute_command_line('cp '//tmp_file//' '//destination, exitstat=stat)
+    call execute_command_line('cp '//tmp_pkg_file//' '//destination, exitstat=stat)
 
     if (stat /= 0) then
       call test_failed(error, "Failed to create mock package"); return