rbfind 2.0.2 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37699eab678876b60d10d42b360d2a3bdb4f1b47d950ee28077d2087d5f35d15
-  data.tar.gz: 575d2eaeb4208087545448ae9627a9dbf8c652e068e88c3caad3707897a3a4da
+  metadata.gz: 8ccb45a241d65a9dadc83c1ba5a72515f2165d18bf84564e15fad687010221a8
+  data.tar.gz: aef115794fdd548ba799413611e39964eca2c9ce9dc10d7ee355e95c52af1ff9
 SHA512:
-  metadata.gz: 9027e94322984970d2aba116bd3e135395ab5fab025d36bc78796b7038057398e4fe10cc2917fd1872391be8250e609559d9c6d53c8af7cc2de6a664c4ad885c
-  data.tar.gz: 9cc76b09a38a3212a67ddbf5d590247b672f1ed80fbfa36e9d4dfd5874f07119c57f0e76ee3c780cfe882eec02aa9d54c2567c5e2742aae12c27d88d5e6bfbbe
+  metadata.gz: 95c622fbc6cadf9b86eafa357c1a3dadbdb9ca8df85a83569e2855254c38bc219c11fc4e6a2c59dbeb730ff0f7e6b3133e8e5827158821c8d7ad9d6e3b03be04
+  data.tar.gz: f7d5151eb5402104aa7cedc31e932ec9471b0d73df230a1b7943c664ba3d2be98c8bf340624c9c6779330776eefea64241b0cdf449dd61d5ecea70c8625dd4a2

data/bin/rbfind

@@ -37,7 +37,6 @@ module RbFind
       [ %w(--sort-by   -s), :str, "sort expression ('n' is name)"],
       [ %w(--reverse   -R), :str, "reverse sort"],
       [ %w(--require   -r), :rb,  "require library"],
-      [ %w(--fileutils -U), nil,  "include FileUtils module"],
       [ %w(--puts-path -p), nil,  "do 'puts path/cpath' on true block"],
       [ %w(--ls-l      -P), nil,  "do 'ls -l' style output on true block"],
       [ %w(--wider     -+), nil,  "widen fields in long output format (--ls-l)"],
@@ -85,7 +84,6 @@ module RbFind
           when '--sort-by'   then @params[ :sort] = instance_eval "proc { |n| #{arg} }"
           when '--reverse'   then @params[ :reverse] = true
           when '--require'   then require arg
-          when '--fileutils' then require "fileutils" ; include FileUtils
           when '--puts-path' then @puts = true
           when '--ls-l'      then @puts = true ; @wd = 6
           when '--wider'     then @wd = @wd ? @wd.succ : 4

data/lib/rbfind.rb

@@ -8,7 +8,7 @@ require "rbfind/csv"
 
 module RbFind
 
-  VERSION = "2.0.2".freeze
+  VERSION = "2.1".freeze
 
 =begin rdoc
 
@@ -119,6 +119,8 @@ Derivated from stat:
     csv sep, path, ... # separate by user-defined separator
 
     rename newname   # rename, but leave it in the same directory
+    mv newname       # dto.
+    rm               # remove
 
 
 == Color support
@@ -374,16 +376,22 @@ Sort without case sensitivity and preceding dot:
         begin
           e.instance_eval &@block
         rescue Done
-        ensure
-          if !(e.name.equal? @levels.last) && e.name != @levels.last then
-            p = @path
+        end
+        if !(e.name.equal? @levels.last) && e.name != @levels.last then
+          if e.name then
             e.name == (File.basename e.name) or
               raise "#{self.class}: rename to `#{e.name}' may not be a path."
             e.name.freeze
             @levels.pop
             @levels.push e.name
-            @path = join_path
+            p, @path = @path, join_path
             File.rename p, @path
+          else
+            if e.dir? then
+              Dir.rmdir @path
+            else
+              File.unlink @path
+            end
           end
         end
         true
@@ -682,7 +690,9 @@ Sort without case sensitivity and preceding dot:
 
 
     def rename newname ; @name = newname ; end
+    alias mv rename
 
+    def rm ; @name = nil ; end
 
 
     def cname      ; color name      ; end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: '2.1'
 platform: ruby
 authors:
 - Bertram Scharpf
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-14 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies: []
 description: |
   A replacement for the standard UNIX command find.