trash_lib 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a95f6070a2a39e218dff3d06852dbb0f784bf613d5648a616bc39e7104892a74
-  data.tar.gz: 7542becd9922251f1bc6fb42079ad5296d1e9af5b611c07816fbe7de338217cc
+  metadata.gz: a6e39776a6ccc6111fb404ecc529058d92896221e9c806357978e092969cff85
+  data.tar.gz: 7cef4b83bcd07f86ebb5c0ce34dc58941210700a975ae4e22a679c90ef184879
 SHA512:
-  metadata.gz: a54b265683be7bf27b888a3853188cb49b48fc470cea83fe5497aa0091b396640356fe534aec999733565bb01e0aab44304e3f52c1732c11a21fa511b840858f
-  data.tar.gz: 825344d5b5c066b83af8bbc7762e0c46a143d0905053f5b77abe5fdc88d393e0e241f2c6e26511b9c6f92f2cda4390e18932f1920b956a84a7e81af19da03009
+  metadata.gz: 14b5aac37a5841ab9a930cf59d1d55cd9e2e0335bc785bbcf3709059ac9ba694ad50cf9e6b0666ecd400e2f270ad2664ec9789be6725fef2a716660ec65562d2
+  data.tar.gz: e554d14771f0e76b5eae1a366efa947d5ffcca70954bf89f5f92ce7e735844931a66a928ad1780d2f6e57f98ffdf2d2cdf5dfd3ed4112b4f25bddac904e790ad

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [1.0.2] - 2023-08-16
+
+- Hot fixed `Trash::Entry#restore` and `Trash::Entry#delete`.
+
 ## [1.0.1] - 2023-08-16
 
 - Hot fixed `Trash::put`.

data/lib/trash/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Trash
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/trash.rb

@@ -25,7 +25,7 @@ module Trash
 
     # Restore file to original path.
     def restore
-      FileUtils.move(path, origin, secure: true) # FIXME
+      FileUtils.move(trash_path, origin, secure: true)
       delete_info
 
       nil
@@ -33,7 +33,7 @@ module Trash
 
     # Permanently delete the file.
     def delete
-      FileUtils.remove_entry_secure(path, force: true)
+      FileUtils.rm_rf(trash_path, secure: true)
       delete_info
 
       nil
@@ -41,6 +41,10 @@ module Trash
 
     private
 
+    def trash_path
+      File.join(TRASH_FILE_PATH, path)
+    end
+
     def info
       File.file?(info_path) ? File.read(info_path) : ''
     end
@@ -50,7 +54,7 @@ module Trash
     end
 
     def delete_info
-      FileUtils.remove_entry_secure(info_path, force: true)
+      FileUtils.rm_rf(info_path, secure: true)
     end
   end
 
@@ -75,18 +79,17 @@ module Trash
         FileUtils.move(path, trash_path, secure: true)
         make_trash_info(path, trash_name)
 
-        Entry.new trash_path
+        Dir.chdir TRASH_FILE_PATH do
+          Entry.new(File.basename(trash_path))
+        end
       end
     end
 
     # Empty the trash.
     def empty
+      FileUtils.rm_rf([TRASH_FILE_PATH, TRASH_INFO_PATH], secure: true)
       make_trash_paths
 
-      [TRASH_FILE_PATH, TRASH_INFO_PATH]
-        .map { Dir.children _1 }.flatten
-        .each { FileUtils.remove_entry_secure _1, force: true }
-
       nil
     end
 
@@ -109,13 +112,14 @@ module Trash
     end
 
     def make_trash_info(path, trash_name)
-      File.open(File.join(TRASH_INFO_PATH, "#{trash_name}.trashinfo"), 'w') do |file|
-        file.write <<~TRASH_INFO
+      File.write(
+        File.join(TRASH_INFO_PATH, "#{trash_name}.trashinfo"),
+        <<~TRASH_INFO
           [Trash Info]
           Path=#{File.absolute_path path}
           DeletionDate=#{Time.now.strftime '%Y-%m-%dT%T'}
         TRASH_INFO
-      end
+      )
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trash_lib
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - NNB
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-15 00:00:00.000000000 Z
+date: 2023-08-16 00:00:00.000000000 Z
 dependencies: []
 description: This is a library for system file's trash in FreeDesktop Trash compliant
   environments.