diru 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 219a5cfad5fd59f2f1aa82dab6a0b6852f3c2d3d
-  data.tar.gz: d667bdc791f15c6f70843c1e9071413d073681b5
+SHA256:
+  metadata.gz: fa98c65075bc77ba9cc6236b44d746307be8093f4209fca37012fd5838039182
+  data.tar.gz: c6a1bb20486d300b6cb8f1f02ca392ccf8d29b69ef7ecce7178e509296012306
 SHA512:
-  metadata.gz: 0347fad965cdbf03f6282e2ea3b5d1376ddb0d7ddc9c2cdc5f2731f434eff37f2dd5b762929322256a3bca0a46f39abb97497f1e972cad237e9c38b33a2be133
-  data.tar.gz: 13435d7c840fbeaf8e9a50cbf51ecc541be007368c21222afc4bc6ee185e0bc4d59f2c9e52b9c722d7e2ab5864afebf981633165147ebfcbb7b4638b405dd8ea
+  metadata.gz: 1a6380ad8a79db5adce05913b296bebb0e69b578f979ecb745cbc2d1f4a51ad252e163390f358062e37ff1f024dd84ba37a227cf11bad36a43dda0376dee8051
+  data.tar.gz: fe44d2598ed43e88774fff50ce480b21b8d79dfe773db27e260f2224d468260536f1a1a6a8c9b8609eef5735abedcfcfb21ac9bf1657390dd9630f1ff283010a

data/CHANGELOG.rdoc

@@ -1,5 +1,8 @@
 = Version history
 
+[0.1.0] Fast startup after server start.
+        Support for JSON options format.
+
 [0.0.8] Check that YAML-conf if valid.
 
 [0.0.7] Registers for Scratch Pad.

data/README.rdoc

@@ -73,10 +73,12 @@ 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
-".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 and DIRU_ROOT environment variable is not used, an
-error is issued.
+".diru.[json|yml]" file is found from current dir or some dir above,
+the dir containing either of the files will become the Project
+root. Json format is selected by defining the DIRU_OPTS_FORMAT
+environment variable as "json". The default is "yml". 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
@@ -225,9 +227,10 @@ provides thereby backup values for non-specified command line info.
 * DIRU_HUB_PORT    - Hub Port, if nothing, 41114 is used.
 * DIRU_PORT        - Server Port, if nothing, ~/.diru.prt is used
                      (Port File).
-* DIRU_OPTS        - options file, if nothing, ~/.diru.yml is used.
+* DIRU_OPTS        - Options file, if nothing, ~/.diru.[json|yml] is used.
 * DIRU_ROOT        - Project root, used if ".diru_root_dir" and
-                     ".diru.yml" are missing.
+                     ".diru.[json|yml]" are missing.
+* DIRU_OPTS_FORMAT - Options file format: yml or json. Default is yml.
 
 If Hub is started without "--hport" option, Diru checks if
 DIRU_HUB_PORT is defined. If not, port 41114 is used.
@@ -239,13 +242,14 @@ not work if no port info is given.
 If Server is started in a directory where (or above) a file called
 ".diru_root_dir" is found, then Project root is the directory
 containing ".diru_root_dir". If ".diru_root_dir" is not found, but
-".diru.yml" is found, then Project root is the directory containing
-".diru.yml", and Options for Project are taken from that file. Last
-resort for defining Project root, is DIRU_ROOT definition.
+".diru.[json|yml]" is found, then Project root is the directory
+containing ".diru.[json|yml]", and Options for Project are taken from
+that file. Last resort for defining Project root, is DIRU_ROOT
+definition.
 
 If ".diru_root_dir" or DIRU_ROOT is used to define Project root, then
 DIRU_OPTS is used to define Options File. However, if not defined,
-then "~/.diru.yml" is used for options.
+then "~/.diru.[json|yml]" is used for options.
 
 An example Options file can be displayed with:
 
@@ -280,8 +284,8 @@ Project. Depending on the usage pattern, user might as well want to
 use the Port File.
 
 Each Project could benefit from specific Options File, and hence user
-can mark the Project Root with ".diru.yml" and specify the Project
-setup there.
+can mark the Project Root with ".diru.[json|yml]" and specify the
+Project setup there.
 
 Server caches all Project directory entries from disk to memory. This
 means that Client can quickly jump to any directory, even deep in the

data/bin/diru

@@ -29,8 +29,6 @@
 # updated.
 #
 # Perform:
-#   shell> dr @ doc
-#     or
 #   shell> dr i
 #
 # for some documentation.
@@ -62,6 +60,7 @@
 require 'como'
 include Como
 require 'drb'
+require 'json'
 require 'yaml'
 require 'fileutils'
 
@@ -98,23 +97,10 @@ module Diru
     # Default port.
     DIRU_HUB_PORT = ENV['DIRU_HUB_PORT'] || 41114
 
-    # Load yaml configuration file (if exists).
-    def Diru.load_conf( conf_file )
-        conf = nil
-        if File.exist?( conf_file )
-            begin
-                conf = YAML.load( File.read( conf_file ) )
-            rescue
-                STDERR.puts "Diru Error: Broken YAML, please fix: \"#{conf_file}\"..."
-            end
-        end
-        conf
-    end
-
 
     # See: Diru.load_conf
     def load_conf( conf_file )
-        @conf = Diru.load_conf( conf_file )
+        @conf = conf_file.load
     end
 
 
@@ -169,24 +155,87 @@ module Diru
         end
     end
 
-    def Diru.get_opts_file( file = nil )
+
+    def Diru.opts_filename
+        if ENV['DIRU_OPTS_FORMAT']
+            ".diru.#{ENV['DIRU_OPTS_FORMAT']}"
+        else
+            ".diru.yml"
+        end
+    end
+
+end
+
+
+# Diru configuration file.
+class DiruConf
+
+    def DiruConf.deploy( filename = nil )
+        dc_file = DiruConf.find( filename )
+        DiruConf.use( dc_file )
+    end
+
+    def DiruConf.find( filename = nil )
         opts_file = nil
         if Opt['options'].given
             opts_file = Opt['options'].value
-        elsif file
-            opts_file = file
+        elsif filename
+            opts_file = filename
         elsif ENV['DIRU_OPTS']
             opts_file = ENV['DIRU_OPTS']
         else
-            opts_file = "#{ENV['HOME']}/.diru.yml"
+            opts_file = "#{ENV['HOME']}/#{Diru.opts_filename}"
         end
 
         opts_file
     end
 
+    def DiruConf.use( filename )
+        case File.extname( filename )
+        when ".json"; DiruConfJson.new( filename )
+        when ".yml"; DiruConfYaml.new( filename )
+        else raise RuntimeError, "Wrong Diru configuration file format (i.e. not json or yaml)!"
+        end
+    end
+
+    def initialize( filename )
+        @filename = filename
+    end
+
+end
+
+
+# Diru configuration file in JSON.
+class DiruConfJson < DiruConf
+
+    def load
+        if File.exist?( @filename )
+            JSON.parse( File.read( @filename ), :symbolize_names => true )
+        else
+            STDERR.puts "Diru Error: Broken JSON, please fix: \"#{@filename}\"..."
+            nil
+        end
+    end
+
 end
 
 
+# Diru configuration file in YAML.
+class DiruConfYaml < DiruConf
+
+    def load
+        if File.exist?( @filename )
+            YAML.load( File.read( @filename ) )
+        else
+            STDERR.puts "Diru Error: Broken YAML, please fix: \"#{@filename}\"..."
+            nil
+        end
+    end
+
+end
+
+
+
 # Diru Server State.
 class Search
 
@@ -592,10 +641,11 @@ class Search
     def start_th_data
         unless @dsync == 0
             @th_data = Thread.new do
+                sleep 1
                 loop do
                     # puts "data update..."
-                    sleep @dsync
                     update_data_sync
+                    sleep @dsync
                 end
             end
         end
@@ -612,9 +662,10 @@ class Search
     # Start opts thread.
     def start_th_opts
         @th_opts = Thread.new do
+            sleep 1
             loop do
-                sleep @sync
                 update_opts_sync
+                sleep @sync
             end
         end
     end
@@ -931,18 +982,20 @@ if Opt['server'].given
         end
 
         unless root
-            # Next search for .diru.yml file.
+
+            # Next search for .diru.[json|yml] file.
             begin
-                yml_file = Diru.find_upper_file( '.diru.yml' )
-                root = File.dirname( yml_file )
-                opts_file = yml_file
+                file = Diru.find_upper_file( Diru.opts_filename )
+                root = File.dirname( file )
+                opts_file = file
             rescue
                 Diru.error "Could not find user directory root!"
             end
         end
     end
 
-    opts_file = Diru.get_opts_file( opts_file )
+    # opts_file = Diru.get_opts_file( opts_file )
+    opts_file = DiruConf.deploy( opts_file )
 
     if Opt['server'].value.any?
         user = Opt['server'].value[0]

data/lib/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: diru
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Tero Isannainen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2019-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: como
@@ -105,9 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Diru is a Change Directory (cd) utility.
 test_files: []
-has_rdoc: