diru 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4270a80d34a955821dbaa758b659a69c38ea72d
-  data.tar.gz: 20e891d382e3aba4deac68ad5f482d9dcf20282f
+  metadata.gz: 98c77992c8442b0030204aaa25ec19998e00a27b
+  data.tar.gz: 53fcbf64b69f57b62028be1d1c4adc01d8484b4f
 SHA512:
-  metadata.gz: 7513d88c4fb717def21e88fb28fb305910824095f8c775086b8cf4116909038be704476b36403d69fc384d56c4056e2d0e3edc23e94612d47867a12d00cb3972
-  data.tar.gz: fc809c28767ad797d55d63e4ed7fe4ccbe19bd93d570af90cad94bb5aababdfce7f815af3bc42e067ddaba1b8fea811389a5ceaaa2a8a6874ab94fde86c7ff9c
+  metadata.gz: 3fec1c06357e15b0128ceb7301ee54825205a36b056af0e5f48881d747b0b1156198e856c7c9ba37dd0ccb9af91775d11f7bdbd3258fc1bf70a99dbd20a5b4cb
+  data.tar.gz: 635d80fe66b08b5bae9697c0616f32719111284363e87400ae6195015a8bb5fa38db56e0a38ab12d0062a201e8444e131a1ac8eb323e39b40c80d68c8994e61b

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 = Version history
 
+[0.0.5] Query only command.
+        User (ID) based server separation.
+
 [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 '/'.

data/README.rdoc

@@ -66,6 +66,9 @@ at will. Complete list of running Servers can be seen with:
 
     shell> diru --hport 42323 -l
 
+Servers are identified per user. This facilitates team use of shared
+Hub.
+
 When Server starts, it will detect the Project root. It can be a file
 or defined as environment variable. Environment variable DIRU_ROOT has
 higher precedence than the files. If ".diru_root_dir" file or a
@@ -169,7 +172,7 @@ History commands:
 
 * "dr h" - display history.
 * "dr h ." - add current dir to history.
-* "dr h !" - reset (clear) historys.
+* "dr h !" - reset (clear) history.
 * "dr h ," - reference last history item.
 * "dr h <num>" - change dir to history <num>.
 
@@ -193,12 +196,12 @@ Misc commands:
 
 RPC (Remote Procedure Call) commands:
 
-* "reset" - Reset Server state, i.e. History, Boorkmarks, Left-overs.
+* "reset" - Reset Server state, i.e. History, Bookmarks, Left-overs.
 * "abook" - Add current dir to Bookmarks.
 * "lbook" - List Bookmarks.
 * "rbook" - Reset Bookmarks.
 * "doc"   - Show command documentation.
-* "dsync" - Synchronize Projecr dir content data with Server cache.
+* "dsync" - Synchronize Project dir content data with Server cache.
 * "sync"  - Synchronize Options File content to Server.
 
 
@@ -243,7 +246,7 @@ Available options in Options File:
 * :dsync - Project directory hierarchy refresh period. This overrides
   ":sync" for Project updates (only). If value is 0, then no updates
   are done after initial update when Server starts. User might want to
-  use 0, if the directory hierarhcy is big and/or does not change
+  use 0, if the directory hierarchy is big and/or does not change
   (often).
 * :hist - number of entries in history (max).
 * :favs - tagged favorite dirs.
@@ -267,7 +270,7 @@ Server caches all Project directory entries from disk to memory. This
 means that Client can quickly jump to any directory, even deep in the
 hierarchy. The target dir should be fairly accurately identified,
 otherwise the search results in too many Left-overs, which is
-impractical. Server updates the cache either peridically or only at
+impractical. Server updates the cache either periodically or only at
 start-up. User might prefer no automatic update, if the hierarchy is
 very large and extra load on disk is to be avoided. Cache update can
 be performed at will with an RPC call, "dsync".

data/bin/diru

@@ -74,8 +74,8 @@ Spec.command( 'diru', 'Tero Isannainen', '2017',
         [ :opt_single,    'hport',    nil,    "H:   Hub port (default: DIRU_HUB_PORT or 41114)." ],
         [ :switch,        'hkill',    nil,    "H:   Kill hub." ],
         [ :switch,        'nodaemon', nil,    "H:   No daemon for server." ],
-        [ :switch,        'server',   '-s',   "S:   Open server for client." ],
-        [ :opt_single,    'kill',     '-k',   "S:   Close server for client." ],
+        [ :opt_any,       'server',   '-s',   "S:   Open server for user (default: $USER)." ],
+        [ :opt_single,    'kill',     '-k',   "S:   Close server." ],
         [ :switch,        'list',     '-l',   "S:   List servers." ],
         [ :opt_single,    'options',  '-o',   "SC:  Options File." ],
         [ :opt_single,    'port',     '-p',   "SC:  Server port for client (default: DIRU_PORT or ~/.diru.prt)." ],
@@ -185,7 +185,7 @@ class Search
 
     include Diru
 
-    def initialize( root, opts_file = nil )
+    def initialize( root, user, opts_file = nil )
 
         # Server root.
         @root = root
@@ -198,6 +198,9 @@ class Search
         # Change directory to DIRU root.
         Dir.chdir( @root )
 
+        # User of server.
+        @user = user
+
         # List of old matches.
         @old = []
 
@@ -253,6 +256,7 @@ class Search
     end
 
 
+    # Return opts_file.
     def opts_file
         @opts_file
     end
@@ -262,6 +266,11 @@ class Search
         @root
     end
 
+    # Return user.
+    def user
+        @user
+    end
+
 
     # Add bookmark (if not already).
     def abook( dir )
@@ -552,7 +561,7 @@ class Search
 
 
     # Reset dynamic state.
-    def reset 
+    def reset
         log "reset"
         @old = []
         @book = []
@@ -681,12 +690,12 @@ class Hub
 
 
     # Create new server and return port for the server.
-    def get_server( root, opts_file )
+    def get_server( root, user, opts_file )
 
         50.times do |i|
             if @@servers[ @port+1+i ] == nil
                 port = @port+1+i
-                s = Service.new( root, port, opts_file )
+                s = Service.new( root, user, port, opts_file )
                 @@servers[ port ] = s
                 return port
             end
@@ -698,7 +707,7 @@ class Hub
 
     # List all server ports.
     def list_servers
-        @@servers.keys.map{ |i| [ i, @@servers[i].root ] }
+        @@servers.keys.map{ |i| [ i, @@servers[i].root, @@servers[i].user ] }
     end
 
 
@@ -729,10 +738,12 @@ end
 class Service
 
     attr_reader :root
+    attr_reader :user
 
     # Initialize and start service.
-    def initialize( root, port, opts_file )
+    def initialize( root, user, port, opts_file )
         @root = root
+        @user = user
         @port = port
         @drb = nil
         @opts_file = opts_file
@@ -752,7 +763,7 @@ class Service
         @th = Thread.new do
 
             # Create "front" object.
-            @search = Search.new( @root, @opts_file )
+            @search = Search.new( @root, @user, @opts_file )
 
             # Start the service
             @drb = DRb::DRbServer.new( "druby://localhost:#{@port}", @search )
@@ -831,7 +842,7 @@ if Opt['server'].given
 
     root = nil
     opts_file = nil
-    
+
     if ENV['DIRU_ROOT']
         root = ENV['DIRU_ROOT']
     else
@@ -856,8 +867,14 @@ if Opt['server'].given
 
     opts_file = Diru.get_opts_file( opts_file )
 
+    if Opt['server'].value.any?
+        user = Opt['server'].value[0]
+    else
+        user = ENV['USER']
+    end
+
     begin
-        s_port = hub.get_server( root, opts_file )
+        s_port = hub.get_server( root, user, opts_file )
     rescue
         Diru.error "Access to Hub failed!"
     end
@@ -892,7 +909,7 @@ if Opt['list'].given
     hub = DRbObject.new( nil, "druby://localhost:#{hport}" )
     begin
         hub.list_servers.each do |i|
-            puts format( "%-12.d  %s", i[0], i[1] )
+            puts format( "%-12.d  %-12s %s", i[0], i[2], i[1] )
         end
     rescue
         Diru.error "Access to Hub failed!"
@@ -973,6 +990,8 @@ class Client
 
             when 'e'; disp @search.rematch( nil, arg.join('.*') )
 
+            when 'q'; disp @search.rematch( nil, arg.join('.*') )
+
             when '.', 'b';
                 if arg[0] == nil
                     lbook( @search.book )
@@ -1112,6 +1131,23 @@ class Client
     end
 
 
+    # Display directories without CD.
+    def show( resp )
+        if resp == nil
+            # NOP
+        elsif resp.kind_of? Array
+            if resp.any?
+                resp.each do |i|
+                    STDERR.puts i
+                end
+            end
+        else
+            STDERR.puts resp
+        end
+        no_cd
+    end
+
+
     # Get peer directory. Search list of re-pairs. Match either of the
     # pair, and switch to the pair dir.
     #
@@ -1134,6 +1170,7 @@ class Client
     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
@@ -1197,7 +1234,7 @@ elsif File.exist?( "#{ENV['HOME']}/.diru.prt" )
     port = File.read( "#{ENV['HOME']}/.diru.prt" ).to_i
 else
     Diru.error "Server port info missing..."
-end    
+end
 
 
 # User command content.
@@ -1208,7 +1245,7 @@ begin
 rescue
     Diru.error "Server not available!"
     exit( false )
-end    
+end
 
 ret = false
 begin

data/lib/version.rb

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

data/test/golden.log

@@ -188,6 +188,8 @@ g      dir_1/dir_1_2
 
     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
@@ -248,6 +250,8 @@ g      dir_1/dir_1_2
 
     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

metadata

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