lucarecord 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75aa7ba67a42741a9b533dcdbd83a52a3a9d4d113b8bdb558d894d39cdab453b
-  data.tar.gz: 1f80272124518bfdf0f8f2461e8e5f24a2d60ca5bffa1c4f06e386b5f5b966d3
+  metadata.gz: 69e3e577310289d8d99054cbfa806d62650fa25263fc3f832381cae085af123e
+  data.tar.gz: 933a159f84ef1118223297727a028e15db9ca1d82dc40b2410051f05edf44977
 SHA512:
-  metadata.gz: b18fe1bb5b4094d76330adb36445c673941f4b75987657029c72fb987bbc1b64dd405623bb6b4a1636288c7f3054bf02cdb0e77a1161b761d6b7e5e4510e8663
-  data.tar.gz: 0eb7fda772606eec3019b08fcaccc89c99b17fb9d52169c7c31b529ac70fbd16c18a6b305dc95acc29dfee04f22f14381ee8302b081c4e26d4f3c352c45df87e
+  metadata.gz: e2bcd328ef856b99970549f9405ea5b0c89f91a5ecfa4877b7304180bd9096f4e5c5595f0fe0b94e5b4ac67e904f830157f5678ce95442e89df7220ad6c52939
+  data.tar.gz: c2caec75adf8894cb97fcb5eec66474f6235ead40666d214c24471b21e9b89aea9c94898df17e72e8cdbb397f6af0fb5458ac2c926f6297a038fe1de33d6f2ae

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## LucaRecord 0.7.3
+
+* 'config/' inside the project data dir is now used as a primary configuration dir.
+* Without config files, it continues to work with warnings instead of aborts.
+
+## LucaRecord 0.7.2
+
+* `LucaCmd.check_dir()` accepts optional `ext_conf:` keyword.
+
 ## LucaRecord 0.7.1
 
 * `LucaRecord::IO.load_project()` supports optional `ext_conf:` keyword for an extra config file.

data/lib/luca_cmd.rb

@@ -1,18 +1,27 @@
 # frozen_string_literal: true
 require 'luca_record'
+require 'pathname'
 
 class LucaCmd
-  def self.check_dir(target)
+  # Search app specific dir from pwd either in direct or monorepo configuration.
+  # 'config/' subdir has priority for consolidating shared config between apps.
+  #
+  def self.check_dir(essential_dir, ext_conf: nil)
+    if Dir.exist?('config')
+      LucaRecord::CONST.set_configdir(Pathname(Dir.pwd) / 'config')
+    end
     unless Dir.exist?('data')
       Dir.glob('*').reject { |f| File.symlink?(f) }
-        .find { |f| File.directory?("#{f}/data/#{target}") }.tap do |d|
-          abort "No valid data directory, exit..." if d.nil?
+        .find { |f| File.directory?("#{f}/data/#{essential_dir}") }.tap do |d|
+        abort "No valid data directory, exit..." if d.nil?
 
-          Dir.chdir(d)
+        Dir.chdir(d)
+        if Dir.exist?('config')
+          LucaRecord::CONST.set_configdir(Pathname(Dir.pwd) / 'config')
         end
+      end
     end
-    LucaRecord::Base.load_project(Dir.pwd)
-    LucaRecord::Base.valid_project?
+    LucaRecord::Base.load_project(Dir.pwd, ext_conf: ext_conf)
     yield
   end
 end

data/lib/luca_record/io.rb

@@ -294,29 +294,36 @@ module LucaRecord # :nodoc:
 
       def load_project(path, ext_conf: nil)
         CONST.set_pjdir(path)
+        config = {
+          'decimal_separator' => '.',
+          'thousands_separator' => ','
+        }
         begin
-          config = {
-            'decimal_separator' => '.',
-            'thousands_separator' => ','
-          }.merge(YAML.safe_load(
-              File.read(Pathname(CONST.pjdir) / 'config.yml'),
-              permitted_classes: [Date]
-            ))
-          config['decimal_num'] ||= config['country'] == 'jp' ? 0 : 2
-          if ext_conf
-            config.merge(YAML.safe_load(
-              File.read(Pathname(CONST.pjdir) / ext_conf),
+          config.merge!(YAML.safe_load(
+          File.read(Pathname(CONST.configdir) / 'config.yml'),
+            permitted_classes: [Date]
+          ))
+        rescue Errno::ENOENT
+          STDERR.puts "INFO: config.yml not found. Continue with default settings."
+        end
+        if ext_conf
+          begin
+            config.merge!(YAML.safe_load(
+              File.read(Pathname(CONST.configdir) / ext_conf),
               permitted_classes: [Date]
             ))
+          rescue Errno::ENOENT
+            STDERR.puts "WARN: #{ext_conf} not found. Extended options are not effective."
           end
-          CONST.set_config(config)
         end
+        config['decimal_num'] ||= config['country'] == 'jp' ? 0 : 2
+        CONST.set_config(config)
       end
 
       # test if having required dirs/files under exec path
       def valid_project?(path = CONST.pjdir)
         project_dir = Pathname(path)
-        FileTest.file?((project_dir + 'config.yml').to_s) and FileTest.directory?( (project_dir + 'data').to_s)
+        FileTest.directory?( (project_dir / 'data').to_s)
       end
 
       def new_record_id(basedir, date_obj)

data/lib/luca_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaRecord
-  VERSION = '0.7.1'
+  VERSION = '0.7.3'
 end

data/lib/luca_support/const.rb

@@ -5,10 +5,11 @@ require 'singleton'
 module LucaSupport
   class ConstantHolder
     include Singleton
-    attr_reader :config, :pjdir
+    attr_reader :config, :configdir, :pjdir
 
     def initialize
       @pjdir = ENV['LUCA_TEST_DIR']
+      @configdir = ENV['LUCA_TEST_DIR']
       @config = {
         'decimal_separator' => '.',
         'decimal_num' => 2,
@@ -18,6 +19,11 @@ module LucaSupport
 
     def set_pjdir(path)
       @pjdir ||= path
+      @configdir ||= path
+    end
+
+    def set_configdir(path)
+      @configdir = path
     end
 
     def set_config(config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucarecord
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.3
 platform: ruby
 authors:
 - Chuma Takahiro