diru 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 661a13ca67725be1a3bfd0346e7cf0181c143c45
-  data.tar.gz: 8e2275fadcb18e0c545e58456f2370a354bb1af2
+  metadata.gz: a28f4c905f25bd1b2d3bdec8d38caf27d55fbd45
+  data.tar.gz: 8e8a7210c8e50f1537aa314a97a86f91b373e26c
 SHA512:
-  metadata.gz: 2e16248f4b28add940c1085a51f379a416923236d96b71bddb6b111307fb76bc52efb140aca5a0287abf0a65d17ae719778619aa9654188cd48593dbe71409c3
-  data.tar.gz: ac8d58f8815ea2b9697a6446c1d8688a7b1a60f59f74b2e8ad687f81da291c750aa244e571b4a770a4795f18aa33e1fee64cf102c6efce85a764647223fbbc92
+  metadata.gz: 247e190660aedee8dff49ae2d36fd906aa5c413ece5b13b86fa007adb4be771ad3e97ef8e21494ced2cfb9c4677eaa54c1a87707706adf7ef8be71a551eb6c5f
+  data.tar.gz: 0ef5b4473de0f18d9473413736c4435e5313237f2e6aac4bb4827c41b082f3f5fa7f2b2c4c2ab71155930fe019976e48a95d7a7e9037e700583e49f23a69d94b

data/CHANGELOG.rdoc

@@ -1,5 +1,7 @@
 = Version history
 
+[0.0.3] Mkdir and rmdir commands, direct server update.
+
 [0.0.2] Separate refresh for Options File and Project dirs.
         Manual refresh for Options File and Project dirs.
 

data/README.rdoc

@@ -67,10 +67,12 @@ at will. Complete list of running Servers can be seen with:
     shell> diru --hport 42323 -l
 
 When Server starts, it will detect the Project root. It can be a file
-or defined as environment variable. If ".diru_root_dir" file or a
+or defined as environment variable. Environment variable DIRU_ROOT has
+higher precedence than the files. If ".diru_root_dir" file or a
 ".diru.yml" file is found from current dir or some dir above, the dir
-containing either of the files will become the Project root. If no files
-are found, then DIRU_ROOT environment variable is used.
+containing either of the files will become the Project root. If no
+files are found and DIRU_ROOT environment variable is not used, an
+error is issued.
 
 Client communicates with the Server in order to get and save directory
 info. As mentioned above, Diru is more or less useless unless user has
@@ -175,6 +177,8 @@ Misc commands:
 * "dr c <cmd>" - issue RPC command to server (reset etc., see below).
 * "dr f" - list favorites dirs (from options).
 * "dr f <dir>" - change dir to favorite <dir>.
+* "dr d m <dir>" - make directory.
+* "dr d r <dir>" - remove directory.
 * "dr i" - show command info.
 * "dr <dir>" - change to given dir (must be under current).
 * "dr" - change to next "Left-over" directory.

data/bin/diru

@@ -63,6 +63,7 @@ require 'como'
 include Como
 require 'drb'
 require 'yaml'
+require 'fileutils'
 
 # require 'byebug'
 
@@ -119,6 +120,12 @@ module Diru
     end
 
 
+    # Warning message display.
+    def Diru.warn( msg )
+        STDERR.puts "Diru Warning: #{msg}"
+    end
+
+
     # List the dir content (default: pwd).
     def Diru.list( dir = '.', glob = '*' )
         Dir.glob( "#{dir}/#{glob}" )
@@ -386,14 +393,25 @@ class Search
     end
 
 
+    def abs2rel( path )
+        if path == @root
+            ''
+        else
+            rem = "#{@root}/"
+            rel = path.dup
+            rel[rem] = ''
+            rel
+        end
+    end
+
+
     # Match dir/pattern from DB.
     def match( dir, pattern )
         list = []
 
         if dir
-            rem = "#{@root}/"
             begin
-                dir[rem] = ''
+                dir = abs2rel( dir )
             rescue
                 return []
             end
@@ -425,7 +443,48 @@ class Search
     end
 
 
+    # Make directory.
+    def mk_dir( dir )
+        rel = abs2rel( dir )
+        unless @data.index( rel )
+            @data = @data.push( rel ).sort
+            FileUtils.mkdir_p dir
+        end
+    end
+
+
+    # Make directory in sync.
+    def mk_dir_sync( dir )
+        @datalock.synchronize do
+            mk_dir dir
+        end
+    end
+
+
+    # Remove directory.
+    def rm_dir( dir )
+        rel = abs2rel( dir )
+        if @data.index( rel )
+            @data.delete( rel )
+            FileUtils.rmdir dir
+        end
+    end
+
+
+    # Remove directory in sync.
+    def rm_dir_sync( dir )
+        @datalock.synchronize do
+            rm_dir dir
+        end
+    end
+
+
     # Update directory DB.
+    #
+    # Relative dir data under Project root.
+    #   test
+    #   test/dir_0
+    #   ...
     def update_data
         @data = Dir.glob( @glob ).select{|ent| File.directory?( ent )}
         @data = @data.sort
@@ -943,6 +1002,32 @@ class Client
                     fav_map( arg )
                 end
 
+            when 'd';
+                # Mkdir:
+                #   dr d m <dir>
+                # Rmdir:
+                #   dr d r <dir>
+                if arg.length == 2
+                    if arg[0] == 'm'
+                        abs = File.absolute_path( arg[1] )
+                        if abs.match( @search.root )
+                            # New subdir to Project.
+                            @search.mk_dir_sync( abs )
+                        else
+                            FileUtils.mkdir_p dir
+                        end
+                    elsif arg[0] == 'r'
+                        abs = File.absolute_path( arg[1] )
+                        if abs.match( @search.root )
+                            # New subdir to Project.
+                            @search.rm_dir_sync( abs )
+                        else
+                            FileUtils.rmdir dir
+                        end
+                    end
+                end
+                no_cd
+
             when 'i';
                 rpc( [ 'doc' ] )
 
@@ -969,13 +1054,18 @@ class Client
         if resp == nil
             no_cd
         elsif resp.kind_of? Array
-            puts resp[0]
-            if resp.length > 1
-                resp[1..-1].each do |i|
-                    STDERR.puts i
+            if resp.any?
+                puts resp[0]
+                if resp.length > 1
+                    resp[1..-1].each do |i|
+                        STDERR.puts i
+                    end
                 end
+                do_cd
+            else
+                Diru.warn "Dir not found!"
+                no_cd
             end
-            do_cd
         else
             puts resp
             do_cd
@@ -1010,6 +1100,7 @@ class Client
     p =   - peer of current
     c @   - command (reset, doc etc.)
     f     - favorites
+    d     - directory mutation
     i     - short info
     "
     end

data/lib/version.rb

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

data/test/golden.log

@@ -180,6 +180,7 @@ g      dir_1/dir_1_2
     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
@@ -238,6 +239,19 @@ g      dir_1/dir_1_2
     p =   - peer of current
     c @   - command (reset, doc etc.)
     f     - favorites
+    d     - directory mutation
     i     - short info
     
 /home/tero/prog/gem/diru/test
+/home/tero/prog/gem/diru/test
+/home/tero/prog/gem/diru/test
+/home/tero/prog/gem/diru/test/dir_2/foobar
+/home/tero/prog/gem/diru/test
+/home/tero/prog/gem/diru/test
+Diru Warning: Dir not found!
+/home/tero/prog/gem/diru/test
+/home/tero/prog/gem/diru/test
+ 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
+/home/tero/prog/gem/diru/test

data/test/test_diru.rb

@@ -11,8 +11,8 @@ Test::Unit.at_start do
     Dir.chdir( 'test' )
 
     $diru = "#{Dir.pwd}/../bin/diru"
-    system( "#{$diru} --hport 41114 --hub" )
-    system( "#{$diru} --hport 41114 -s" )
+    system( "#{$diru} --hport 43114 --hub" )
+    system( "#{$diru} --hport 43114 -s" )
 end
 
 Test::Unit.at_exit do
@@ -22,7 +22,7 @@ Test::Unit.at_exit do
     FileUtils.rm_f( "test_bookmarks.txt" )
     FileUtils.rm_f( "test_basic.log" ) unless TRAINING
 
-    system( "#{$diru} --hport 41114 --hkill" )
+    system( "#{$diru} --hport 43114 --hkill" )
 
     Dir.chdir( '..' )
 end

data/test/test_diru.sh

@@ -1,6 +1,6 @@
 dr()
 {
-    ret=`diru -p 41115 -c $*`
+    ret=`diru -p 43115 -c $*`
     if test $? -eq 0; then
         cd $ret
     fi
@@ -82,3 +82,12 @@ dr h
 dr r
 dr h
 dr c doc
+
+dr d m dir_2
+dr d m dir_2/foobar
+dr r foobar
+dr r
+dr d r dir_2/foobar
+dr r foobar
+dr d r dir_2
+dr h

metadata

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