very_safe_rm 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 022a223eeb6885bae20e56962b06358c041f130a
-  data.tar.gz: 8253a54c8e105cdfd72bcc796f23b1bbec27b60d
+  metadata.gz: 792ea87c0f1f38eb3dd06d48d1997c2645d01c6a
+  data.tar.gz: 8868266655e70d1bc33fec575fa43a395157c27b
 SHA512:
-  metadata.gz: 20b869a70a4f9caacc2b646597068dfe51a6ad95d02b78ea2a38ff330bd97b201f0fd7c7a1b2985d2e78e747f41f99aefa16759d0c60b90c8e2eb2b8efc74009
-  data.tar.gz: 5351867517f862208b4427489bd8c3be7e553d9cfc9949a872c292ae316d67cef741908873f1939e1b477e96f2c3f66c53f8732ee44a3ad3b41009cdba9a1017
+  metadata.gz: 5f1e5a90a2194ac0ef5cbd749af09374d5a9fab204327a10ad627d5d274a585ae96147f57c50c6eb7948fe417b1e974fafd9e6c1bdcf5e52470362bad60901c4
+  data.tar.gz: f92d232e00ef46830ccaa7be3a3e1b318ad4532c9afc61995934d83c70aa042097b99a5ec4a49b4e8224f208d777b6b9b8c2749662dceceb99dd567a09831b43

data/exe/very_safe_rm

@@ -20,6 +20,7 @@ end
 if args.include?('-r') || args.include?('-R') || args.include?('--recursive')
   STDERR.print 'Did you really want to delete directory? [y/N] '
   exit unless STDIN.gets.chomp =~ /^y(es)?$/i
+  args << '-f'
 end
 
 VerySafeRm.run file, args

data/lib/very_safe_rm/rm_one.rb

@@ -1,21 +1,33 @@
 module VerySafeRm
   # TODO
   module RM
+    def self.rm(file, args)
+      system "rm #{args.join ' '} -- #{file}"
+    end
+
     def self.do_rm(file, args)
       return if RM.check_bang file
       sleep 2
-      system "rm #{args.join ' '} #{file}"
+      RM.rm file, args
     end
 
     def self.rm_one(file, args)
       filesystem = `stat -fc %T #{file}`
-      if filesystem == 'nilfs' then RM.do_rm file, ['-rvf']
-      elsif Dir.empty? file then RM.do_rm file, ['-rfv']
-      elsif File.empty? file then RM.do_rm file, ['-fv']
-      else RM.do_rm file, ['-iv', *args]
+      if filesystem == 'nilfs' then RM.rm file, ['-r', '-v', '-f']
+      elsif Dir.empty? file then RM.rm file, ['-r', '-f', '-v']
+      elsif File.empty? file then RM.rm file, ['-f', '-v']
+      elsif RM.check_force_rm? file then RM.rm file, ['-v', *args]
+      else RM.do_rm file, ['-i', '-v', *args]
       end
     end
 
+    def self.check_force_rm(file)
+      return false unless File.exist? \
+        File.expand_path("-#{file}.rm", File.dirname(file))
+      RM.rm "-#{file}.rm", ['-r', '-f']
+      true
+    end
+
     def self.check_bang(file)
       file.reverse.each_char do |char|
         return false unless char == '!'

data/lib/very_safe_rm/version.rb

@@ -1,3 +1,3 @@
 module VerySafeRm
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: very_safe_rm
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - 71e6fd52
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler