diru 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a28f4c905f25bd1b2d3bdec8d38caf27d55fbd45
-  data.tar.gz: 8e8a7210c8e50f1537aa314a97a86f91b373e26c
+  metadata.gz: c4270a80d34a955821dbaa758b659a69c38ea72d
+  data.tar.gz: 20e891d382e3aba4deac68ad5f482d9dcf20282f
 SHA512:
-  metadata.gz: 247e190660aedee8dff49ae2d36fd906aa5c413ece5b13b86fa007adb4be771ad3e97ef8e21494ced2cfb9c4677eaa54c1a87707706adf7ef8be71a551eb6c5f
-  data.tar.gz: 0ef5b4473de0f18d9473413736c4435e5313237f2e6aac4bb4827c41b082f3f5fa7f2b2c4c2ab71155930fe019976e48a95d7a7e9037e700583e49f23a69d94b
+  metadata.gz: 7513d88c4fb717def21e88fb28fb305910824095f8c775086b8cf4116909038be704476b36403d69fc384d56c4056e2d0e3edc23e94612d47867a12d00cb3972
+  data.tar.gz: fc809c28767ad797d55d63e4ed7fe4ccbe19bd93d570af90cad94bb5aababdfce7f815af3bc42e067ddaba1b8fea811389a5ceaaa2a8a6874ab94fde86c7ff9c

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = Version history
 
+[0.0.4] Default matching is glob (fnmatch) based.
+        Separate command for regex based search ('e').
+        Fixed wrong display of paths when Project dir was '/'.
+
 [0.0.3] Mkdir and rmdir commands, direct server update.
 
 [0.0.2] Separate refresh for Options File and Project dirs.

data/README.rdoc

@@ -28,8 +28,8 @@ Diru features:
 * Support for multiple concurrent Projects.
 * User and Project specific options (configuration).
 * Jump to Project root.
-* Find and jump to dir under Project root (regexp search).
-* Find and jump to dir under current dir (regexp search).
+* Find and jump to dir under Project root (glob and regex search).
+* Find and jump to dir under current dir (glob search).
 * Fast directory search since Server maintains a memory image of
   directories.
 * Favorite directories in options (configuration), for permanent
@@ -110,7 +110,7 @@ If we want to jump to a subdir called "dir_0_0" (under root), we do:
 
 Note that "dir_0_0" does not have to be directly under Project root,
 the directory is searched from the complete tree of directories under
-Project root using regexp matching.
+Project root using glob (fnmatch) matching.
 
 Now that we have changed directory for a couple of times, we can look
 at the directory change history:
@@ -131,8 +131,11 @@ info from Server.
 Search commands:
 
 * "dr r" - change to Project root dir.
-* "dr r <dir>" - change to <dir> (somewhere) under Project root dir.
-* "dr t <dir>" - change to <dir> (somewhere) under current dir.
+* "dr r <dir>" - change to <dir> (somewhere) under Project root dir
+  (glob).
+* "dr t <dir>" - change to <dir> (somewhere) under current dir (glob).
+* "dr e <dir>" - change to <dir> (somewhere) under Project root dir
+  (regexp).
 
 Search can match to multiple directories. First match is used and the
 rest (Left-overs) are displayed to the user. Left-overs are also
@@ -143,6 +146,11 @@ Search pattern can also be constructed from multiple pieces.
 
     shell> dr r dir 1_0_1
 
+The pieces are joined with '*' for glob (fnmatch) based searches and
+with '.*' for regexp based searches. Glob based searches are
+additionally prefixed with '*' and postfixed with '*', since glob does
+not automatically match to the middle of the string, however regexp does.
+
 See "dr i" for alternatives for single letter commands. For example
 "r" can be replaced with "/".
 

data/bin/diru

@@ -189,6 +189,11 @@ class Search
 
         # Server root.
         @root = root
+        if @root == '/'
+            @rootpart = ''
+        else
+            @rootpart = @root
+        end
 
         # Change directory to DIRU root.
         Dir.chdir( @root )
@@ -238,6 +243,7 @@ class Search
         @datalock = Mutex.new
         @optslock = Mutex.new
 
+
         # Initial data update.
         update_conf
         update_data
@@ -334,7 +340,7 @@ class Search
 
     # Get (and update) favorite.
     def gfav( tag )
-        "#{@root}/#{@fav[ tag ]}"
+        "#{@rootpart}/#{@fav[ tag ]}"
     end
 
 
@@ -397,7 +403,7 @@ class Search
         if path == @root
             ''
         else
-            rem = "#{@root}/"
+            rem = "#{@rootpart}/"
             rel = path.dup
             rel[rem] = ''
             rel
@@ -405,10 +411,41 @@ class Search
     end
 
 
-    # Match dir/pattern from DB.
+    # Match dir/pattern with glob (fnmatch) from DB.
     def match( dir, pattern )
         list = []
 
+        if dir
+            begin
+                dir = abs2rel( dir )
+            rescue
+                return []
+            end
+            r = dir + '*' + pattern
+        else
+            r = pattern
+        end
+
+        @datalock.synchronize do
+            @data.each do |i|
+                if File.fnmatch( r, i )
+                    list.push "#{@rootpart}/#{i}"
+                end
+            end
+        end
+
+        # Update old list.
+        @old = list.rotate
+
+        list
+    end
+
+
+
+    # Match dir/pattern with regex from DB.
+    def rematch( dir, pattern )
+        list = []
+
         if dir
             begin
                 dir = abs2rel( dir )
@@ -423,7 +460,7 @@ class Search
         @datalock.synchronize do
             @data.each do |i|
                 if i.match( r )
-                    list.push "#{@root}/#{i}"
+                    list.push "#{@rootpart}/#{i}"
                 end
             end
         end
@@ -914,7 +951,7 @@ class Client
             cmd = input[0]
             arg = input[1..-1]
 
-            # Shell specials chars to prevent:
+            # Shell special chars to avoid:
             #   * ? [ ] ' " \ $ ; & ( ) | ^ < >
 
             # Thus allowed:
@@ -929,10 +966,12 @@ class Client
                 if arg.empty?
                     disp @search.root
                 else
-                    disp @search.match( nil, arg.join('.*') )
+                    disp @search.match( nil, "*"+arg.join('*')+"*" )
                 end
 
-            when ':', 't'; disp @search.match( Dir.pwd, arg.join('.*') )
+            when ':', 't'; disp @search.match( Dir.pwd, "*"+arg.join('*')+"*" )
+
+            when 'e'; disp @search.rematch( nil, arg.join('.*') )
 
             when '.', 'b';
                 if arg[0] == nil
@@ -1094,6 +1133,7 @@ class Client
         STDERR.puts "
     r /   - search from root (or to root)
     t :   - search from this (current)
+    e     - search from root (with regexp)
     b .   - bookmark access
     h ,   - history access
     s _   - scratch pad access

data/lib/version.rb

@@ -1,5 +1,5 @@
 module Diru
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
     def Diru.version
         Diru::VERSION
     end

data/test/golden.log

@@ -31,7 +31,19 @@
  1: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
  0: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
 /home/tero/prog/gem/diru/test
-/home/tero/prog/gem/diru/test
+/home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_1
+/home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_2
+/home/tero/prog/gem/diru/test/dir_1/dir_1_2/dir_1_2_0
+/home/tero/prog/gem/diru/test/dir_1/dir_1_2/dir_1_2_1
+/home/tero/prog/gem/diru/test/dir_1/dir_1_2/dir_1_2_2
+/home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
+/home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_1
+/home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_2
+/home/tero/prog/gem/diru/test/dir_1/dir_1_2/dir_1_2_0
+/home/tero/prog/gem/diru/test/dir_1/dir_1_2/dir_1_2_1
+/home/tero/prog/gem/diru/test/dir_1/dir_1_2/dir_1_2_2
+/home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
+/home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
 /home/tero/prog/gem/diru/test/dir_0/dir_0_0
@@ -105,13 +117,14 @@
  0: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
 /home/tero/prog/gem/diru/test
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-12: /home/tero/prog/gem/diru/test
-11: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
-10: /home/tero/prog/gem/diru/test/dir_1
- 9: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
- 8: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
- 7: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
- 6: /home/tero/prog/gem/diru/test
+13: /home/tero/prog/gem/diru/test
+12: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
+11: /home/tero/prog/gem/diru/test/dir_1
+10: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
+ 9: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+ 8: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+ 7: /home/tero/prog/gem/diru/test
+ 6: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
  5: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
  4: /home/tero/prog/gem/diru/test/dir_0
  3: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
@@ -143,13 +156,14 @@ f      dir_0/dir_0_4/dir_0_4_0
 g      dir_1/dir_1_2
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_1
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
-26: /home/tero/prog/gem/diru/test
-25: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
-24: /home/tero/prog/gem/diru/test/dir_1
-23: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
-22: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
-21: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-20: /home/tero/prog/gem/diru/test
+27: /home/tero/prog/gem/diru/test
+26: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
+25: /home/tero/prog/gem/diru/test/dir_1
+24: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
+23: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+22: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+21: /home/tero/prog/gem/diru/test
+20: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
 19: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
 18: /home/tero/prog/gem/diru/test/dir_0
 17: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
@@ -192,13 +206,14 @@ g      dir_1/dir_1_2
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_1
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_2
-31: /home/tero/prog/gem/diru/test
-30: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
-29: /home/tero/prog/gem/diru/test/dir_1
-28: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
-27: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
-26: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-25: /home/tero/prog/gem/diru/test
+32: /home/tero/prog/gem/diru/test
+31: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
+30: /home/tero/prog/gem/diru/test/dir_1
+29: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
+28: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+27: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+26: /home/tero/prog/gem/diru/test
+25: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
 24: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
 23: /home/tero/prog/gem/diru/test/dir_0
 22: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2

data/test/test_diru.sh

@@ -14,6 +14,8 @@ dr ..
 dr dir_1_1_2
 dr r
 dr h
+dr r "dir_?_2_?"
+dr e "dir_._2_."
 
 dr b
 dr r dir_1_1_2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diru
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tero Isannainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: como