luca-jp 0.16.2 → 0.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a2439c73cf61040d39604aba50f3765abd94a42ca9a6a3f531864993856e2c6
-  data.tar.gz: 6ecf8ad72b8fe7c6ac1a68c04360f0a5dc4f7c5ec754291c728d4a172319c6fe
+  metadata.gz: fa9b6007a2a529b1d17eaca40694c831f8c1be63343571c5c3d7e926b7f52949
+  data.tar.gz: cb198bc844cc2d905ac9aab9c6bb35693f0b16de1d57331aac58c31c5f5a2300
 SHA512:
-  metadata.gz: d9983fbb9704f1867813024e0da0653d2079443190673c62964074d4c81cac6d92a5a8a6a86c1c8b4988b6f1e0db7d974ba9ed504ff0c35176961dd8e755c63f
-  data.tar.gz: 7e0303ee440175e577d7ef1c563f06278edf4f48e42a4e9c4a930c92cd353f9e7a511dcea715491c37e6f31af72b46dc687b3f31ff08949bc7cca9c12e9bd64b
+  metadata.gz: ef9754c6618cfe2eaeb27f0e14a0a6f3b302853e73f4138128a23b1e688a33a715a11cef549ac98f942e759430ea11f0af2e134875590bcea4aba497a0a23f36
+  data.tar.gz: 56827cd19f691db069c42503ee2175477763f164abcdfbc46dea99ae3f942cc025c47aed8abf28b9f7f546a2f7bec709e915f10bebecefbb17df7a23895093ea

data/exe/luca-jp

@@ -7,6 +7,8 @@ require 'luca_salary/jp_payreport'
 require 'luca_cmd'
 require 'luca_support/const'
 
+EXT_CONF = 'config-lucajp.yml'
+
 class LucaCmd
   def self.syouhizei(args, params)
     if params[:export]
@@ -56,26 +58,6 @@ class LucaCmd
       [r[0].year, r[0].month, r[1].year, r[1].month]
     end
   end
-
-  def self.check_dir_jp(target)
-    check_dir(target) do
-      begin
-        ex_conf = YAML.safe_load(
-          File.read(Pathname(LucaSupport::CONST.pjdir) / 'config-lucajp.yml'),
-          permitted_classes: [Date]
-        )
-        if ex_conf
-          LucaSupport::CONST.set_config(
-            LucaSupport::CONST.config.merge(ex_conf)
-          )
-        end
-      rescue Errno::ENOENT
-        nil
-      end
-
-      yield
-    end
-  end
 end
 
 module LucaSalaryCmd
@@ -97,7 +79,7 @@ when 'h', /hou?jinzei/
     opt.on('--export', 'export json') { |_v| params[:export] = true }
     opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
     args = opt.parse!(ARGV)
-    LucaCmd.check_dir_jp('journals') do
+    LucaCmd.check_dir('journals', ext_conf: EXT_CONF) do
       LucaCmd.houjinzei(args, params)
     end
   end
@@ -107,7 +89,7 @@ when 's', /s[yh]ou?hizei/
       opt.on('--export', 'export json') { |_v| params[:export] = true }
       opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
       args = opt.parse!(ARGV)
-      LucaCmd.check_dir_jp('journals') do
+      LucaCmd.check_dir('journals', ext_conf: EXT_CONF) do
         LucaCmd.syouhizei(args, params)
       end
     end
@@ -117,7 +99,7 @@ when 'c', /chihou?zei/
     opt.on('--export', 'export json') { |_v| params[:export] = true }
     opt.on('--lastyear', 'report on last Financial year') { |_v| params[:lastyear] = true }
     args = opt.parse!(ARGV)
-    LucaCmd.check_dir_jp('journals') do
+    LucaCmd.check_dir('journals', ext_conf: EXT_CONF) do
       LucaCmd.chihouzei(args, params)
     end
   end
@@ -127,7 +109,7 @@ when /urikake/
     opt.on('--total VAL', '売掛金総額') { |v| params[:total] = v&.to_i }
     opt.on('--utf8', 'UTF-8でファイル生成') { |_v| params[:encode] = 'UTF-8' }
     args = opt.parse!(ARGV)
-    LucaCmd.check_dir_jp('invoices') do
+    LucaCmd.check_dir('invoices', ext_conf: EXT_CONF) do
       LucaCmd.urikake(args, params)
     end
   end
@@ -135,7 +117,7 @@ when 'k', 'kyuyo', 'salary'
   OptionParser.new do |opt|
     opt.banner = 'Usage: luca-jp kyuyo [--export] year'
     args = opt.parse(ARGV)
-    LucaCmd.check_dir_jp('profiles') do
+    LucaCmd.check_dir('profiles', ext_conf: EXT_CONF) do
       LucaSalaryCmd::Export.payreport(args)
     end
   end

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.16.2'
+    VERSION = '0.16.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luca-jp
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.16.3
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-10 00:00:00.000000000 Z
+date: 2024-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucabook
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: jp-national-tax
   requirement: !ruby/object:Gem::Requirement