lucasalary 0.5.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3d46b29fc75775cfd085328382e37a0ab39dc7b3894e6dc522e5432066528c6
-  data.tar.gz: 79b01908f796138a7b9a12f2db808602091c160aadb55d76951d1d0173bd1dc2
+  metadata.gz: c67611f8fd2fd2ae358b490cb0edf52bb7f3e2e67be665fa980d13d4867b84cc
+  data.tar.gz: 4f9549a73cda4e61e22e4fc32bf45e8449eac786570b8f476046399d3a151aed
 SHA512:
-  metadata.gz: 037ae90e0072d75746b3a3f0a063ff8c6fc1532eae086e247fedc7a985872134643dad43738e5cc674b5f2e1ab1d0d8e1ddb678cbf34f4c2e425005bfbc7023e
-  data.tar.gz: bbdc6a4a67c4e9bead499016efd3d5076ee1f8a09d99d9faa9218bde77d2b6120cdf083044090f7673ca29ee50056a3409443200abfd71e75286ab5aa2316021
+  metadata.gz: fb07bfd39efd6c6fd9c5d2bb309914f1a383f57b370ed28eded86ba1d008db0a1f8938c3a06a795a067e0d6d3298824c294b1bb0a19c12d7f55d2f21e15bac3f
+  data.tar.gz: 5c9cb0834e0e258743f854e233705275910e495490e007fc9cc1c1bcf57ff49b8cd8b95a293a51a61c6ddda50f5a1c10603640b9a920cb86bde133ddd14f8229

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## LucaSalary 0.6.1
+
+* Reworked global constants w/LucaRecord v0.7
+* Removed bundler from test suite avoiding casual native build
+* add `luca-salary version` subcommand
+
+## LucaSalary 0.6.0
+
+* BREAKING: monthly payment now passes calculation date to local modules.
+* BREAKING: year total calculation now passes profiles to local modules.
+
 ## LucaSalary 0.5.0
 
 * `luca-salary` command now searches valid sub directory.

data/exe/luca-salary

@@ -1,23 +1,16 @@
 #!/usr/bin/ruby
 # frozen_string_literal: true
 
-unless Dir.exist?('data') || ARGV[0] == 'new'
-  target = 'profiles'
-  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?
-
-    Dir.chdir(d)
-  end
-end
+REQUIRED_DIR='profiles'
 
 require 'json'
 require 'optparse'
 require 'luca_salary'
 require 'luca_salary/monthly'
 require 'luca_support' #TODO: test use only
+require 'luca_cmd'
 
-module LucaCmd
+class LucaCmd
   class Profile
     def self.create(args = nil, _params = nil)
       LucaSalary::Profile.gen_profile!(args.first)
@@ -79,7 +72,6 @@ module LucaCmd
   end
 end
 
-LucaRecord::Base.valid_project?
 cmd = ARGV.shift
 params = {}
 
@@ -91,7 +83,9 @@ when /profiles?/
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-salary profiles create Name'
       args = opt.parse(ARGV)
-      LucaCmd::Profile.create(args)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Profile.create(args)
+      end
     end
   else
     puts 'Proper subcommand needed.'
@@ -105,16 +99,22 @@ when 'enc', 'encrypt'
     opt.banner = 'Usage: luca-salary enc|encrypt'
     opt.on('--clean', 'remove plain directory') { |_v| params[:clean] = true }
     args = opt.parse(ARGV)
-    LucaSupport::Enc.encrypt("s_profiles", cleanup: params[:clean])
+    LucaCmd.check_dir(REQUIRED_DIR) do
+      LucaSupport::Enc.encrypt("s_profiles", cleanup: params[:clean])
+    end
   end
 when 'dec', 'decrypt'
   OptionParser.new do |opt|
     opt.banner = 'Usage: luca-salary dec|decrypt'
     args = opt.parse(ARGV)
-    LucaSupport::Enc.decrypt("s_profiles")
+    LucaCmd.check_dir(REQUIRED_DIR) do
+      LucaSupport::Enc.decrypt("s_profiles")
+    end
   end
 when 'export'
-  LucaCmd::Payment.export(ARGV)
+  LucaCmd.check_dir(REQUIRED_DIR) do
+    LucaCmd::Payment.export(ARGV)
+  end
 when 'pay', /payments?/
   subcmd = ARGV.shift
   case subcmd
@@ -122,7 +122,9 @@ when 'pay', /payments?/
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-salary payments create year month [date]'
       args = opt.parse(ARGV)
-      LucaCmd::Payment.create(args)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Payment.create(args)
+      end
     end
   when 'list'
     OptionParser.new do |opt|
@@ -131,21 +133,27 @@ when 'pay', /payments?/
       opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
       opt.on('--explore', 'explore table in nushell') { |_v| params[:output] = 'explore' }
       args = opt.parse(ARGV)
-      LucaCmd::Payment.list(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Payment.list(args, params)
+      end
     end
   when 'report'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-salary payments report [--nu] year month [year month]'
       opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
       args = opt.parse(ARGV)
-      LucaCmd::Payment.report(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Payment.report(args, params)
+      end
     end
   when 'total'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-salary payments total [--adjust] year [month]'
       opt.on('--adjust', 'Apply year total adjustment to payslip of year/month') { |_v| params['mode'] = 'adjust' }
       args = opt.parse(ARGV)
-      LucaCmd::Payment.total(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Payment.total(args, params)
+      end
     end
   else
     puts 'Proper subcommand needed.'
@@ -153,6 +161,9 @@ when 'pay', /payments?/
     puts 'Usage: luca-salary payment[s] (create|list) [--help|options]'
     exit 1
   end
+when 'version'
+  puts "luca-salary: version #{LucaSalary::VERSION}"
+  exit 0
 else
   puts 'Proper subcommand needed.'
   puts

data/lib/luca_salary/base.rb

@@ -54,11 +54,11 @@ module LucaSalary
     private
 
     def load_dict
-      LucaRecord::Dict.load_tsv_dict(Pathname(PJDIR) / 'dict' / 'code.tsv')
+      LucaRecord::Dict.load_tsv_dict(Pathname(LucaRecord::CONST.pjdir) / 'dict' / 'code.tsv')
     end
 
     def set_driver
-      code = CONFIG['country']
+      code = LucaRecord::CONST.config['country']
       if code
         require "luca_salary/#{code.downcase}"
         Kernel.const_get "LucaSalary::#{code.capitalize}"

data/lib/luca_salary/monthly.rb

@@ -14,7 +14,7 @@ module LucaSalary
 
     def initialize(date = nil)
       @date = date.nil? ? Date.today : Date.parse(date)
-      @pjdir = Pathname(LucaSupport::PJDIR)
+      @pjdir = Pathname(LucaRecord::CONST.pjdir)
       @config = load_config(@pjdir + 'config.yml')
       @driver = set_driver
     end
@@ -25,12 +25,12 @@ module LucaSalary
       country = @driver.new(@pjdir, @config, @date)
       # TODO: handle retirement
       LucaSalary::Profile.all do |profile|
-        current_profile = parse_current(profile)
+        current_profile = parse_current(Profile.find_secure(profile['id']))
         if self.class.search(@date.year, @date.month, @date.day, current_profile['id']).count > 0
           puts "payment record already exists: #{current_profile['id']}"
           return nil
         end
-        h = country.calc_payment(current_profile)
+        h = country.calc_payment(current_profile, @date)
         h['profile_id'] = current_profile['id']
         self.class.create(h, date: @date, codes: Array(current_profile['id']))
       end

data/lib/luca_salary/payment.rb

@@ -15,7 +15,7 @@ module LucaSalary
 
     def initialize(date = nil)
       @date = Date.parse(date)
-      @pjdir = Pathname(LucaSupport::PJDIR)
+      @pjdir = Pathname(LucaRecord::CONST.pjdir)
       @dict = LucaRecord::Dict.load_tsv_dict(@pjdir / 'dict' / 'code.tsv')
     end
 
@@ -51,8 +51,8 @@ module LucaSalary
     # `payment_term: 1` means payment on the next month of calculation target.
     #
     def export_json
-      accrual_date = if LucaSupport::CONFIG['payment_term']
-                       pt = LucaSupport::CONFIG['payment_term']
+      accrual_date = if LucaRecord::CONST.config['payment_term']
+                       pt = LucaRecord::CONST.config['payment_term']
                        Date.new(@date.prev_month(pt).year, @date.prev_month(pt).month, -1)
                      else
                        Date.new(@date.year, @date.month, -1)

data/lib/luca_salary/state.rb

@@ -14,7 +14,7 @@ module LucaSalary
       @count = count
       @start_date = start_d
       @end_date = end_d
-      @dict = LucaRecord::Dict.load_tsv_dict(Pathname(LucaSupport::PJDIR) / 'dict' / 'code.tsv')
+      @dict = LucaRecord::Dict.load_tsv_dict(Pathname(LucaRecord::CONST.pjdir) / 'dict' / 'code.tsv')
     end
 
     def self.range(from_year, from_month, to_year = from_year, to_month = from_month)

data/lib/luca_salary/total.rb

@@ -19,7 +19,7 @@ module LucaSalary
         slip['profile'] = parse_current(Profile.find_secure(slip['id']))
         slip
       end
-      @dict = LucaRecord::Dict.load_tsv_dict(Pathname(LucaSupport::PJDIR) / 'dict' / 'code.tsv')
+      @dict = LucaRecord::Dict.load_tsv_dict(Pathname(LucaRecord::CONST.pjdir) / 'dict' / 'code.tsv')
     end
 
     def self.accumulator(year)
@@ -29,17 +29,17 @@ module LucaSalary
         payment, _count = accumulate(slips)
         payment['id'] = id
         date = Date.new(year, 12, 31)
-        payment = local_convert(payment, date)
+        payment = local_convert(Profile.find_secure(id), payment, date)
         upsert(payment, basedir: "payments/total/#{year}#{LucaSupport::Code.encode_month(12)}")
       end
     end
 
-    def self.local_convert(payment, date)
-      return payment if CONFIG['country'].nil?
+    def self.local_convert(profile, payment, date)
+      return payment if LucaRecord::CONST.config['country'].nil?
 
-      require "luca_salary/#{CONFIG['country'].downcase}"
-      klass = Kernel.const_get("LucaSalary::#{CONFIG['country'].capitalize}")
-      klass.year_total(payment, date)
+      require "luca_salary/#{LucaRecord::CONST.config['country'].downcase}"
+      klass = Kernel.const_get("LucaSalary::#{LucaRecord::CONST.config['country'].capitalize}")
+      klass.year_total(profile, payment, date)
     rescue NameError
       return payment
     end

data/lib/luca_salary/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucaSalary
-  VERSION = '0.5.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucasalary
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lucarecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ metadata:
   homepage_uri: https://github.com/chumaltd/luca/tree/master/lucasalary
   source_code_uri: https://github.com/chumaltd/luca/tree/master/lucasalary
   changelog_uri: https://github.com/chumaltd/luca/tree/master/lucasalary/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Salary calculation framework
 test_files: []