rbfind 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 280a77034256c49e824e1f17d34f4203ba674928
-  data.tar.gz: 88f8c7ba6ccdef27cc598b0d8a0886791ea8f6ec
+  metadata.gz: c046a612c3da3a05daa0de7853ebf36891dea0da
+  data.tar.gz: 279bdbadfef3185b025c02d6d1f84d7ddc9bda35
 SHA512:
-  metadata.gz: 829dfbb87533f8042ad9ed3b663d032858bd13e9987855b253a9745859c441dca8944d8df67d9f113589bdc06fe285f59c304817479ec78df3ca65cc1d60c2d1
-  data.tar.gz: 6f920a815b6710ef37c9d2e169cebbc7b9208cf6cb68b870aead72b1983ed905237d2b99ecdc408270100d8f430a9e73535bf6363ba93d1bbe9698819fd9d24e
+  metadata.gz: c1cc146111ab1bd02e9978bbede94b063c61675f013ba72219385f04312b8a1a7641225e6a04c8bc4996d3516b17a503f11dc1c08b41da24601a75281541bea0
+  data.tar.gz: a887cfd06d7a547d881e450284a94d2f9079d4a802cfa10be1efc334391c05bd0266e7a8bbbae6a26aca09872da5f58d4573e08ac5541357a018f45bb100d2e6

data/bin/rbfind

@@ -35,6 +35,7 @@ OPTIONS = [
   [ %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)"],
+  [ %w(--slash     -/), nil,  "append a slash to directory names"],
   [ %w(--lines     -l), :blk, "surround block by 'lines { |$_,$.| ... }'"],
   [ %w(--reallines -L), :blk, "same as -l but stop at any null character"],
   [ %w(--grep      -g), :blk, "grep files (implies -pL)"],
@@ -268,6 +269,8 @@ end
 
 @params = {}
 
+envopts = ENV[ "RBFIND_OPTIONS"]
+$*.unshift *envopts.split if envopts
 opts = GetoptLong.new *OPTIONS.map { |(long,short),arg,|
   [long,short,(arg ? GetoptLong::REQUIRED_ARGUMENT : GetoptLong::NO_ARGUMENT)]
 }
@@ -294,6 +297,7 @@ begin
       when '--puts-path' then @puts = true
       when '--ls-l'      then @puts = true ; @wd = 6
       when '--wider'     then @wd = @wd ? @wd.succ : 4
+      when '--slash'     then @slash = true
       when '--lines'     then @lines = :plain ;                 @block = arg
       when '--reallines' then @lines = :plain ; @real = true ;  @block = arg
       when '--grep'      then @lines = :grep  ;                 @block = arg
@@ -373,6 +377,7 @@ error_handle do
 
   co = color_on $stdout
   opath = co ? "cpath" : "path"
+  @slash and opath << "!"
   case @lines
     when :plain then
       @puts and @block = "( #@block ) and colsep #{opath}, num, line"

data/lib/rbfind.rb

@@ -63,6 +63,8 @@ In Ruby programs, you may call:
   f.name          # file name (*)
   f.path          # file path relative to working directory (*)
   f.fullpath      # full file path (*)
+  f.path!         # directories with a slash appended (*)
+  f.fullpath!     # directories with a slash appended (*)
   f.dirname       # dirname of path
   f.ext           # file name extension
   f.without_ext   # file name without extension
@@ -153,7 +155,9 @@ Derivated from stat:
 
     f.cname       # colorized name
     f.cpath       # colorized path
+    f.cpath!      # colorized path!
     f.cfullpath   # colorized fullpath
+    f.cfullpath!  # colorized fullpath!
     f.creadlink   # colored symlink pointer
     f.carrow      # colored "-> symlink" suffix
 
@@ -249,7 +253,7 @@ Sort without case sensitivity and preceding dot:
 
 class RbFind
 
-  VERSION = "1.5".freeze
+  VERSION = "1.6".freeze
 
   class <<self
     private :new
@@ -305,9 +309,17 @@ class RbFind
     end
   end
 
-  def name     ; @levels.last ; end
-  def path     ; @path        ; end
-  def fullpath ; @fullpath    ; end
+  private
+
+  def append_slash s ; (File.directory? s) ? (File.join s, "") : s ; end
+
+  public
+
+  def name      ; @levels.last ; end
+  def path      ; @path        ; end
+  def fullpath  ; @fullpath    ; end
+  def path!     ; append_slash @path     ; end
+  def fullpath! ; append_slash @fullpath ; end
 
   def dirname
     d = File.dirname @fullpath
@@ -446,9 +458,11 @@ class RbFind
   end
 
 
-  def cname     ; color name     ; end
-  def cpath     ; color path     ; end
-  def cfullpath ; color fullpath ; end
+  def cname      ; color name      ; end
+  def cpath      ; color path      ; end
+  def cfullpath  ; color fullpath  ; end
+  def cpath!     ; color path!     ; end
+  def cfullpath! ; color fullpath! ; end
 
   def color arg
     col_stat arg, stat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbfind
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Bertram Scharpf