luca-jp 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca379cda7bf415ef81ed4c7c72da443f1565f6b34e1bfad2e93c842aa71c011f
-  data.tar.gz: 8b5143397b416820bce2337169f4ff90b936bb712477b28bf3e5b2c457347471
+  metadata.gz: 4a6dbb648afd83fd8f7240fcda13d1ab94f7cbff8d3499edfd3dba0641a94ab6
+  data.tar.gz: '087559b7426943953b6ece1cfc8e25b3dfed1da12a0047fbc6367884751e1bb9'
 SHA512:
-  metadata.gz: 8e3812b030abf84a467eb10689c6dd9bd15b5265cbfcbf4ba2993a258b0c5a55454c276b69f95e23bdd07be93336d107d2de8360a4c6169559eded86eaecb502
-  data.tar.gz: 82f9f7fee16b38b1dbb63980a5a30e1ea9499bedb55608d93c3a759dd2e872df080e0c1a5ac3f776fa201cddc463c4af3fff88ccad3423311870a4591567c170
+  metadata.gz: 290000091d4b1fcbff40cbd11ed97d477d4a3c6144bc668cc93ad4d40568869ad1ad69bf0bdad3df1301dcc76c3c4322eff30bb4f602ede1d120f579801af8da
+  data.tar.gz: 1fc13e4658ed8735f80abdb087cfae9f3abbc18dfed81709d9174b0e70a10ceb0bb11ec535e690ca4c1ea414b4c6d183c6ef5dae25dd71b49cb1af4a1cee63e4

data/exe/luca-jp

@@ -4,6 +4,8 @@
 require 'optparse'
 require 'luca/jp'
 require 'luca_salary/jp_payreport'
+require 'luca_cmd'
+require 'luca_support/const'
 
 class LucaCmd
   def self.syouhizei(args, params)
@@ -54,6 +56,26 @@ 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
@@ -64,7 +86,7 @@ module LucaSalaryCmd
   end
 end
 
-LucaRecord::Base.valid_project?
+#LucaRecord::Base.valid_project?
 cmd = ARGV.shift
 params = {}
 
@@ -75,7 +97,9 @@ 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.houjinzei(args, params)
+    LucaCmd.check_dir_jp('journals') do
+      LucaCmd.houjinzei(args, params)
+    end
   end
 when 's', /s[yh]ou?hizei/
     OptionParser.new do |opt|
@@ -83,7 +107,9 @@ 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.syouhizei(args, params)
+      LucaCmd.check_dir_jp('journals') do
+        LucaCmd.syouhizei(args, params)
+      end
     end
 when 'c', /chihou?zei/
   OptionParser.new do |opt|
@@ -91,7 +117,9 @@ 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.chihouzei(args, params)
+    LucaCmd.check_dir_jp('journals') do
+      LucaCmd.chihouzei(args, params)
+    end
   end
 when /urikake/
   OptionParser.new do |opt|
@@ -99,14 +127,21 @@ 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.urikake(args, params)
+    LucaCmd.check_dir_jp('invoices') do
+      LucaCmd.urikake(args, params)
+    end
   end
 when 'k', 'kyuyo', 'salary'
   OptionParser.new do |opt|
     opt.banner = 'Usage: luca-jp kyuyo [--export] year'
     args = opt.parse(ARGV)
-    LucaSalaryCmd::Export.payreport(args)
+    LucaCmd.check_dir_jp('profiles') do
+      LucaSalaryCmd::Export.payreport(args)
+    end
   end
+when 'version'
+  puts "luca-jp: version #{Luca::Jp::VERSION}"
+  exit 0
 else
   puts 'Proper subcommand needed.'
   puts

data/lib/luca/jp/aoiro.rb

@@ -5,7 +5,6 @@ require 'cgi/escape'
 require 'luca_book'
 require 'luca_support'
 require 'luca_record/dict'
-require 'luca_support/config'
 require 'luca/jp'
 
 module Luca

data/lib/luca/jp/chihouzei.rb

@@ -5,7 +5,6 @@ require 'cgi/escape'
 require 'luca_book'
 require 'luca_support'
 require 'luca_record/dict'
-require 'luca_support/config'
 require 'luca/jp'
 
 module Luca

data/lib/luca/jp/it_part.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'luca_support'
-require 'luca_support/config'
 
 module Luca
   module Jp

data/lib/luca/jp/sonshitsu.rb

@@ -4,7 +4,7 @@ require 'date'
 require 'pathname'
 require 'yaml'
 require 'luca_book'
-require 'luca_support/config'
+require 'luca_support/const'
 
 module Luca
   module Jp
@@ -95,7 +95,7 @@ module Luca
       end
 
       def self.record_file
-        Pathname(LucaSupport::PJDIR) / 'data' / 'balance' / 'sonshitsu.yml'
+        Pathname(LucaSupport::CONST.pjdir) / 'data' / 'balance' / 'sonshitsu.yml'
       end
     end
   end

data/lib/luca/jp/syouhizei.rb

@@ -5,7 +5,6 @@ require 'cgi/escape'
 require 'luca_book'
 require 'luca_support'
 require 'luca_record/dict'
-require 'luca_support/config'
 require 'luca/jp/util'
 
 module Luca

data/lib/luca/jp/urikake.rb

@@ -4,7 +4,6 @@ require 'json'
 require 'cgi/escape'
 require 'luca_deal'
 require 'luca_support'
-require 'luca_support/config'
 require 'luca/jp'
 
 module Luca

data/lib/luca/jp/util.rb

@@ -64,7 +64,7 @@ module Luca
       end
 
       def config
-        EX_CONF.nil? ? LucaSupport::CONFIG : LucaSupport::CONFIG.merge(EX_CONF)
+        LucaSupport::CONST.config
       end
 
       def it_part_config(key)

data/lib/luca/jp/version.rb

@@ -2,6 +2,6 @@
 
 module Luca
   module Jp
-    VERSION = '0.16.0'
+    VERSION = '0.16.1'
   end
 end

data/lib/luca/jp.rb

@@ -2,7 +2,8 @@
 
 require 'date'
 require 'luca/jp/version'
-require 'luca_support/config'
+require 'luca_support/const'
+require 'yaml'
 
 module Luca
   module Jp
@@ -17,10 +18,4 @@ module Luca
     autoload :Uchiwake, 'luca/jp/uchiwake'
     autoload :Util, 'luca/jp/util'
   end
-
-  EX_CONF = begin
-              YAML.safe_load(File.read(Pathname(LucaSupport::PJDIR) / 'config-lucajp.yml'), permitted_classes: [Date])
-            rescue Errno::ENOENT
-              nil
-            end
 end

data/lib/luca_salary/jp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalaryJp
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/luca_salary/jp_payreport.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 require 'luca_salary'
-require 'luca_support/config'
+require 'luca_support/const'
 require 'csv'
 require 'open3'
 
@@ -24,11 +24,11 @@ module LucaSalary
       # TODO: extract effective field
       def self.set_company(year)
         {}.tap do |h|
-          h['name'] = CONFIG.dig('company', 'name')
-          h['address'] = CONFIG.dig('company', 'address')
-          h['address2'] = CONFIG.dig('company', 'address2')
-          h['tel'] = CONFIG.dig('company', 'tel')
-          h['tax_id'] = CONFIG.dig('company', 'tax_id')
+          h['name'] = LucaSupport::CONST.config.dig('company', 'name')
+          h['address'] = LucaSupport::CONST.config.dig('company', 'address')
+          h['address2'] = LucaSupport::CONST.config.dig('company', 'address2')
+          h['tel'] = LucaSupport::CONST.config.dig('company', 'tel')
+          h['tax_id'] = LucaSupport::CONST.config.dig('company', 'tax_id')
 
           raise "会社名、住所の設定は必須" if h['name'].nil? or h['address'].nil?
         end

metadata

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