rbfind 1.12 → 1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5b34b291fdb3dcfd8ee289b1885bbd0ff848a3f46192f0ffdd174b19d6542f
-  data.tar.gz: 66be0c062a8d7d00d42f5535c3aefa958676ffaacfb6f50e0d3d0f90eb9aeaa5
+  metadata.gz: b2e088901eba3d900228dba6ffb052866b3ffcf282622838625bbeb7ebfbf3b9
+  data.tar.gz: 7651789fed1a8d3963210d8c9efcc131c08840f94e00dcec518c7daae4072fc8
 SHA512:
-  metadata.gz: 986974e1493ece3aac8896a8c262412bbf2e14687d6ff0f39647d4b1f7c324fbd7f263598049883b631c6bccc137cee982de52c5d170a9454c143738a7ee4a95
-  data.tar.gz: d477bafd992ed7387d7cc4614a55650576f0414bab2fdcfc77981cbf69ca1b9eb068252fcbe75dda520fc2b6989b040c2face8d9d1c258f1f9a728178156ac1e
+  metadata.gz: 170d599e93cd82d128f3ea4541b6d4c92f04d21b79e15cd09a7c1de1f18d5a3bf4862b56bfa2ab2ccfb8229eef6e428135591f59f84b6b59266f129bb2e932be
+  data.tar.gz: 2f3dba6cca4000d736d77f054962bb0265a22414a3db2fc837d97bd2c68d17cb7e8d1c94f30e22725ead2d974fefec34e4acfc46df893a46c3df541c6ffa03aa

data/lib/rbfind.rb

@@ -164,6 +164,8 @@ Derivated from stat:
     In case you did not call RbFind.colors, the environment variables
     RBFIND_COLORS and RBFIND_COLOURS are looked up. If neither is given
     but LSCOLORS is set, the fields 2-13 default to that.
+    A Gnu LS_COLOR-style string may also be given, though glob patterns will
+    not be unregarded. If LS_COLORS is set, the colors default to that.
 
     The letters mean:
       a = black, b = red, c = green, d = brown, e = blue,
@@ -269,7 +271,7 @@ Sort without case sensitivity and preceding dot:
 
 class RbFind
 
-  VERSION = "1.12".freeze
+  VERSION = "1.13".freeze
 
   class <<self
     private :new
@@ -494,25 +496,35 @@ class RbFind
   class <<self
 
     def colors str
-      @cols = []
-      str.scan /(.)(.)/i do
-        fg, bg = $~.captures.map { |x| x.downcase.ord - ?a.ord }
-        a = []
-        case fg
-          when 0..7 then a.push 30 + fg
-        end
-        a.push 1 if $1 == $1.upcase
-        case bg
-          when 0..7 then a.push 40 + bg
+      if str =~ /:/ then
+        h = {}
+        (str.split ":").each { |a|
+          t, c = a.split "="
+          h[  t] = c
+        }
+        %w(rs or di ln so pi ex bd cd su sg tw ow - -).map { |t| h[ t] }
+      else
+        cols = []
+        str.scan /(.)(.)/i do
+          fg, bg = $~.captures.map { |x| x.downcase.ord - ?a.ord }
+          a = []
+          case fg
+            when 0..7 then a.push 30 + fg
+          end
+          a.push 1 if $1 == $1.upcase
+          case bg
+            when 0..7 then a.push 40 + bg
+          end
+          e = a.join ";"
+          cols.push e
         end
-        e = a.join ";"
-        @cols.push e
+        cols
       end
     end
     alias colours colors
 
     def colored arg, num
-      @cols or colors col_str
+      @cols ||= colors col_str
       "\e[#{@cols[num]}m#{arg}\e[m"
     end
     alias coloured colored
@@ -520,7 +532,7 @@ class RbFind
     private
 
     def col_str
-      ENV[ "RBFIND_COLORS"] || ENV[ "RBFIND_COLOURS"] || (
+      ENV[ "RBFIND_COLORS"] || ENV[ "RBFIND_COLOURS"] || ENV[ "LS_COLORS"] || (
         env = DEFAULT_COLORS.dup
         els = ENV[ "LSCOLORS"]
         if els then

metadata

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