diru 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c23e4327dec6a0eaae3ea4c5c06f2fc15b4f2df
-  data.tar.gz: cecf0ff254e79974d0c869af0d8728d2d1e955e4
+  metadata.gz: ad4bef4225164f4f624c7cfb45a35ebdddfd4387
+  data.tar.gz: 25e55545ed8cf75ff14c4e1b3a7d3752674a5cce
 SHA512:
-  metadata.gz: f08708b3e339cd373ede6fe3bb53190e0c3effc8aee658f17e35766f52a3e1da9ed648013d519cd5b5e7d26f4071ecb865d1efe19f7cc9d166d0b327ce06b489
-  data.tar.gz: 84c60360b2271037a8204dfefc490fca6a9d1d0a86ee37a830f3bb3ab534605a7297366ad4e32c30bf79038e8d3189cdfae95153b767b373b34304697586f99d
+  metadata.gz: 71b61ec8e8d5beb6911d1c42026273f3ef607e6bcab6a08b299e6b9e4268b4147aa1c48063e80d7f794f05aa8d951556933a3a1c82152d160ad6f875917bd5b7
+  data.tar.gz: a83631b6ca5162d9086ec26eceb3a3de8be3d285095eaf2c3eaac22bea7f0c07d9c41be4da76843b68bfa4267c951eb706c5d05fde7dfad6ba1607f3342bd072

data/CHANGELOG.rdoc

@@ -1,7 +1,10 @@
 = Version history
 
+[0.0.7] Registers for Scratch Pad.
+        Display and clear for Scratch Pad.
+
 [0.0.6] Bookmarks stored newest first.
-        Allow sequence of commands ("+").
+        Allow sequence of commands (",").
         Improved README doc.
         Document option.
         Removed character based commands.

data/README.rdoc

@@ -37,7 +37,7 @@ Diru features:
   favorites.
 * Bookmark saving and referencing, for current favorites.
 * Directory change history and history referencing.
-* Scratch Pad for directory copy/paste.
+* Scratch Pad (with named regs) for directory copy/paste.
 * Peer directory jumping, i.e. peer of current (regexp match).
 * Online help.
 
@@ -144,10 +144,10 @@ Search commands:
 
 * "dr r"           - change to Project root dir.
 * "dr r <dir>"     - change to <dir> (somewhere) under Project root dir
-  (glob).
+                     (glob).
 * "dr t <dir>"     - change to <dir> (somewhere) under current dir (glob).
 * "dr e <dir>"     - change to <dir> (somewhere) under Project root dir
-  (regexp).
+                     (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
@@ -179,14 +179,19 @@ History commands:
 * "dr h"           - display history.
 * "dr h ."         - add current dir to history.
 * "dr h !"         - reset (clear) history.
-* "dr h ,"         - reference last history item.
+* "dr h 0"         - reference latest history item.
 * "dr h <num>"     - change dir to history <num>.
 
 Scratch Pad commands:
 
-* "dr s ."         - store current dir to Scratch Pad.
-* "dr s <dir>"     - store <dir> to Scratch Pad.
-* "dr s"           - change dir to Scratch Pad dir.
+* "dr s ."         - store current dir to Default Scratch Pad.
+* "dr s . <reg>"   - store current dir to <reg> in Scratch Pad.
+* "dr s <dir>"     - store <dir> to Default Scratch Pad.
+* "dr s <d> <r>"   - store <dir> to <reg> in Scratch Pad.
+* "dr s"           - change dir to Default Scratch Pad.
+* "dr s <reg>"     - change dir to <reg> from Scratch Pad.
+* "dr s ="         - display Scratch Pad content.
+* "dr s !"         - reset (clear) Scratch Pad.
 
 Misc commands:
 
@@ -209,6 +214,7 @@ RPC (Remote Procedure Call) commands:
 * "doc"   - Show command documentation.
 * "dsync" - Synchronize Project dir content data with Server cache.
 * "sync"  - Synchronize Options File content to Server.
+* "lregs" - List Scratch Pad registers.
 
 
 = Configuration

data/bin/diru

@@ -229,7 +229,7 @@ class Search
         @opts_file = opts_file
 
         # Temporary storage (scratch pad).
-        @scratch = nil
+        @scratch = {}
 
         # Glob pattern for DB build.
         @glob = "**/*"
@@ -400,13 +400,25 @@ class Search
 
 
     # Set scratch dir.
-    def settmp( dir )
-        @scratch = dir
+    def settmp( dir, reg = nil )
+        @scratch[ reg ] = dir
     end
 
 
     # Get scratch dir.
-    def gettmp
+    def gettmp( reg = nil )
+        @scratch[ reg ]
+    end
+
+
+    # Reset scratch dir.
+    def rtmp
+        @scratch = {}
+    end
+
+
+    # Get all scratch regs.
+    def scratch
         @scratch
     end
 
@@ -802,10 +814,10 @@ Search commands:
 
 * "dr r"           - change to Project root dir.
 * "dr r <dir>"     - change to <dir> (somewhere) under Project root dir
-  (glob).
+                     (glob).
 * "dr t <dir>"     - change to <dir> (somewhere) under current dir (glob).
 * "dr e <dir>"     - change to <dir> (somewhere) under Project root dir
-  (regexp).
+                     (regexp).
 
 Bookmark commands:
 
@@ -822,14 +834,19 @@ History commands:
 * "dr h"           - display history.
 * "dr h ."         - add current dir to history.
 * "dr h !"         - reset (clear) history.
-* "dr h ,"         - reference last history item.
+* "dr h 0"         - reference latest history item.
 * "dr h <num>"     - change dir to history <num>.
 
 Scratch Pad commands:
 
-* "dr s ."         - store current dir to Scratch Pad.
-* "dr s <dir>"     - store <dir> to Scratch Pad.
-* "dr s"           - change dir to Scratch Pad dir.
+* "dr s ."         - store current dir to Default Scratch Pad.
+* "dr s . <reg>"   - store current dir to <reg> in Scratch Pad.
+* "dr s <dir>"     - store <dir> to Default Scratch Pad.
+* "dr s <d> <r>"   - store <dir> to <reg> in Scratch Pad.
+* "dr s"           - change dir to Default Scratch Pad.
+* "dr s <reg>"     - change dir to <reg> from Scratch Pad.
+* "dr s ="         - display Scratch Pad content.
+* "dr s !"         - reset (clear) Scratch Pad.
 
 Misc commands:
 
@@ -1106,17 +1123,36 @@ class Client
 
             when 's';
                 if arg[0] == nil
+                    # Change: "dr s"
                     disp @search.gettmp
-                elsif arg[0]
+                else
                     if arg[0] == '.'
+                        # Store: "dr s ."
+                        #    OR: "dr s . <reg>"
+                        reg = nil
                         dir = @pwd
+                        if arg[1] && arg[1].length == 1
+                            reg = arg[1]
+                        end
+                        disp @search.settmp( dir, reg )
+                        no_cd
+                    elsif arg[0] == '='
+                        lregs( @search.scratch )
+                        no_cd
+                    elsif arg[0] == '!'
+                        @search.rtmp
+                        no_cd
+                    elsif arg[0].length == 1
+                        # Change: "dr s <reg>"
+                        disp @search.gettmp( arg[0] )
                     else
-                        dir = arg[0]
+                        # Store: "dr s <dir>"
+                        #    OR: "dr s <dir> <reg>"
+                        reg = nil
+                        reg = arg[1] if arg[1]
+                        disp @search.settmp( arg[0], reg )
+                        no_cd
                     end
-                    disp @search.settmp( dir )
-                    no_cd
-                else
-                    no_cd
                 end
 
             when 'p'; disp peer
@@ -1126,7 +1162,7 @@ class Client
             when 'f';
                 if arg[0] == nil
                     @search.fav.each do |k,v|
-                        STDERR.puts format( "%-6s %s", k, v )
+                        STDERR.puts format( "  %-6s %s", k, v )
                     end
                     no_cd
                 else
@@ -1264,6 +1300,14 @@ class Client
     end
 
 
+    # List registers (key,value).
+    def lregs( regs )
+        regs.each do |k,v|
+            STDERR.puts format( "  %-2s: %s", k, v )
+        end
+    end
+
+
     # Remove Procedure Call towards server.
     #
     # Example:
@@ -1276,8 +1320,9 @@ class Client
         when 'lbook'; lbook( @search.book )
         when 'rbook'; @search.rbook
         when 'doc'; doc
-        when 'sync'; @search.update_opts_sync
         when 'dsync'; @search.update_data_sync
+        when 'sync';  @search.update_opts_sync
+        when 'lregs'; @search.update_data_sync
         else return no_cd
         end
         no_cd

data/lib/version.rb

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

data/test/golden.log

@@ -1,4 +1,6 @@
+# CMD: dr r dir_0_4_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
+# CMD: dr r dir_1
 /home/tero/prog/gem/diru/test/dir_1/dir_1_0
 /home/tero/prog/gem/diru/test/dir_1/dir_1_0/dir_1_0_0
 /home/tero/prog/gem/diru/test/dir_1/dir_1_0/dir_1_0_1
@@ -20,10 +22,15 @@
 /home/tero/prog/gem/diru/test/dir_1/dir_1_4/dir_1_4_1
 /home/tero/prog/gem/diru/test/dir_1/dir_1_4/dir_1_4_2
 /home/tero/prog/gem/diru/test/dir_1
+# CMD: dr t dir_1_1_0
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
+# CMD: dr ..
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr dir_1_1_2
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr h
  5: /home/tero/prog/gem/diru/test
  4: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
  3: /home/tero/prog/gem/diru/test/dir_1
@@ -31,21 +38,27 @@
  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
+# CMD: dr r dir_?_2_?
 /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
+# CMD: dr e dir_._2_.
 /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
+# CMD: dr b
 /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
+# CMD: dr r dir_1_1_2
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr b .
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr r dir_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_0/dir_0_0_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_0/dir_0_0_1
@@ -67,21 +80,33 @@
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_1
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_2
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b .
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b
  1: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
  0: /home/tero/prog/gem/diru/test/dir_0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b d 1
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b
  0: /home/tero/prog/gem/diru/test/dir_0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b d 1
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b
  0: /home/tero/prog/gem/diru/test/dir_0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b d 0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr r dir_1_1_2
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr b .
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr r dir_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_0/dir_0_0_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_0/dir_0_0_1
@@ -103,20 +128,31 @@
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_1
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_2
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b .
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b
  1: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
  0: /home/tero/prog/gem/diru/test/dir_0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr b 0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr b s test_bookmarks.txt
 /home/tero/prog/gem/diru/test
+# CMD: dr b !
 /home/tero/prog/gem/diru/test
+# CMD: dr b
 /home/tero/prog/gem/diru/test
+# CMD: dr b l test_bookmarks.txt
 /home/tero/prog/gem/diru/test
+# CMD: dr b
  1: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
  0: /home/tero/prog/gem/diru/test/dir_0
 /home/tero/prog/gem/diru/test
+# CMD: dr b 0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr h
 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
@@ -131,99 +167,154 @@
  1: /home/tero/prog/gem/diru/test/dir_0
  0: /home/tero/prog/gem/diru/test
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr h .
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr h 0
 /home/tero/prog/gem/diru/test/dir_0
+# CMD: dr h 6
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr s .
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr s
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr t dir_0_0
 Diru Warning: Dir not found!
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr s /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
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr s
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr s . a
 /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr s . b
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr ..
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr s /home/tero/prog/gem/diru/test/dir_1/dir_1_1 c
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr s =
+    : /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+  a : /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+  b : /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+  c : /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr s a
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+# CMD: dr s c
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr s !
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr s a
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr p
+/home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr r dir_0_2_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
+# CMD: dr p
 /home/tero/prog/gem/diru/test/dir_0/dir_0_2
+# CMD: dr r dir_0_1_0
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_0
+# CMD: dr p
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_1
-f      dir_0/dir_0_4/dir_0_4_0
-g      dir_1/dir_1_2
+# CMD: dr f
+  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
+# CMD: dr f f
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
-25: /home/tero/prog/gem/diru/test
-24: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
-23: /home/tero/prog/gem/diru/test/dir_1
-22: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
-21: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr h
+28: /home/tero/prog/gem/diru/test
+27: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
+26: /home/tero/prog/gem/diru/test/dir_1
+25: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
+24: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+23: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+22: /home/tero/prog/gem/diru/test
+21: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
 20: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-19: /home/tero/prog/gem/diru/test
-18: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
-17: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-16: /home/tero/prog/gem/diru/test/dir_0
-15: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-14: /home/tero/prog/gem/diru/test/dir_0
-13: /home/tero/prog/gem/diru/test
-12: /home/tero/prog/gem/diru/test/dir_0
+19: /home/tero/prog/gem/diru/test/dir_0
+18: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+17: /home/tero/prog/gem/diru/test/dir_0
+16: /home/tero/prog/gem/diru/test
+15: /home/tero/prog/gem/diru/test/dir_0
+14: /home/tero/prog/gem/diru/test
+13: /home/tero/prog/gem/diru/test/dir_0
+12: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
 11: /home/tero/prog/gem/diru/test
-10: /home/tero/prog/gem/diru/test/dir_0
- 9: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
- 8: /home/tero/prog/gem/diru/test
- 7: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
- 6: /home/tero/prog/gem/diru/test
- 5: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+10: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+ 9: /home/tero/prog/gem/diru/test
+ 8: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+ 7: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+ 6: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+ 5: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
  4: /home/tero/prog/gem/diru/test
  3: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
  2: /home/tero/prog/gem/diru/test/dir_0/dir_0_2
  1: /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_0
  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_4/dir_0_4_0
+# CMD: dr i
 
-    r /   - search from root (or to root)
-    t :   - search from this (current)
-    e     - search from root (with regexp)
-    q     - query from root (with regexp)
-    b .   - bookmark access
-    h ,   - history access
-    s _   - scratch pad access
-    p =   - peer of current
-    c @   - command (reset, doc etc.)
-    f     - favorites
-    d     - directory mutation
-    i     - short info
+    r - search from root (or to root)
+    t - search from this (current)
+    e - search from root (with regexp)
+    q - query from root (with regexp)
+    b - bookmark access
+    h - history access
+    s - scratch pad access
+    p - peer of current
+    c - command (reset, doc etc.)
+    f - favorites
+    d - directory mutation
+    i - short info
     
 /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr r dir_0_1
 /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
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1
+# CMD: dr
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_0
+# CMD: dr
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_1
+# CMD: dr
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_2
-30: /home/tero/prog/gem/diru/test
-29: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
-28: /home/tero/prog/gem/diru/test/dir_1
-27: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
-26: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+# CMD: dr h
+33: /home/tero/prog/gem/diru/test
+32: /home/tero/prog/gem/diru/test/dir_0/dir_0_4/dir_0_4_0
+31: /home/tero/prog/gem/diru/test/dir_1
+30: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_0
+29: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+28: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+27: /home/tero/prog/gem/diru/test
+26: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
 25: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-24: /home/tero/prog/gem/diru/test
-23: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
-22: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-21: /home/tero/prog/gem/diru/test/dir_0
-20: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-19: /home/tero/prog/gem/diru/test/dir_0
-18: /home/tero/prog/gem/diru/test
-17: /home/tero/prog/gem/diru/test/dir_0
+24: /home/tero/prog/gem/diru/test/dir_0
+23: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+22: /home/tero/prog/gem/diru/test/dir_0
+21: /home/tero/prog/gem/diru/test
+20: /home/tero/prog/gem/diru/test/dir_0
+19: /home/tero/prog/gem/diru/test
+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
 16: /home/tero/prog/gem/diru/test
-15: /home/tero/prog/gem/diru/test/dir_0
-14: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-13: /home/tero/prog/gem/diru/test
-12: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
-11: /home/tero/prog/gem/diru/test
-10: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+15: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+14: /home/tero/prog/gem/diru/test
+13: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+12: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
+11: /home/tero/prog/gem/diru/test/dir_1/dir_1_1/dir_1_1_2
+10: /home/tero/prog/gem/diru/test/dir_1/dir_1_1
  9: /home/tero/prog/gem/diru/test
  8: /home/tero/prog/gem/diru/test/dir_0/dir_0_2/dir_0_2_0
  7: /home/tero/prog/gem/diru/test/dir_0/dir_0_2
@@ -235,34 +326,47 @@ g      dir_1/dir_1_2
  1: /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_0
  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
+# CMD: dr c reset
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_2
+# CMD: dr h
 /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_2
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr h
  0: /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_2
 /home/tero/prog/gem/diru/test
+# CMD: dr c doc
 
-    r /   - search from root (or to root)
-    t :   - search from this (current)
-    e     - search from root (with regexp)
-    q     - query from root (with regexp)
-    b .   - bookmark access
-    h ,   - history access
-    s _   - scratch pad access
-    p =   - peer of current
-    c @   - command (reset, doc etc.)
-    f     - favorites
-    d     - directory mutation
-    i     - short info
+    r - search from root (or to root)
+    t - search from this (current)
+    e - search from root (with regexp)
+    q - query from root (with regexp)
+    b - bookmark access
+    h - history access
+    s - scratch pad access
+    p - peer of current
+    c - command (reset, doc etc.)
+    f - favorites
+    d - directory mutation
+    i - short info
     
 /home/tero/prog/gem/diru/test
+# CMD: dr d m dir_2
 /home/tero/prog/gem/diru/test
+# CMD: dr d m dir_2/foobar
 /home/tero/prog/gem/diru/test
+# CMD: dr r foobar
 /home/tero/prog/gem/diru/test/dir_2/foobar
+# CMD: dr r
 /home/tero/prog/gem/diru/test
+# CMD: dr d r dir_2/foobar
 /home/tero/prog/gem/diru/test
+# CMD: dr r foobar
 Diru Warning: Dir not found!
 /home/tero/prog/gem/diru/test
+# CMD: dr d r dir_2
 /home/tero/prog/gem/diru/test
+# CMD: dr h
  2: /home/tero/prog/gem/diru/test/dir_0/dir_0_1/dir_0_1_2
  1: /home/tero/prog/gem/diru/test
  0: /home/tero/prog/gem/diru/test/dir_2/foobar

data/test/test_diru.sh

@@ -1,6 +1,13 @@
+diru=`pwd`/../bin/diru
+
+# Hub and server setup
+# shell> ${diru} --hport 43114 --hub
+# shell> ${diru} --hport 43114 -s
+
 dr()
 {
-    ret=`diru -p 43115 -c $*`
+    echo "# CMD:" dr $*
+    ret=`${diru} -p 43115 -c $*`
     if test $? -eq 0; then
         cd $ret
     fi
@@ -49,7 +56,7 @@ dr b 0
 dr h
 dr h .
 dr r
-dr h ,
+dr h 0
 dr h 6
 
 dr s .
@@ -59,6 +66,15 @@ dr t dir_0_0
 dr s `pwd`
 dr r
 dr s
+dr s . a
+dr s . b
+dr ..
+dr s `pwd` c
+dr s =
+dr s a
+dr s c
+dr s !
+dr s a
 
 dr p
 dr r

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diru
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Tero Isannainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-27 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: como