lucadeal 0.5.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa7bf6bd03335ca54d5bf0a1bf2b3e525677ef21e0ea20b009530ba73b310fc9
-  data.tar.gz: 7791dbb5b32566b52ae2bc4209382ca59f1eb95b3f284990f16bd0427f7302ae
+  metadata.gz: 010b355d37f7fdd2fa49fa9000923fbaac7791bbda971760b8c862daa4ab2664
+  data.tar.gz: e6a2cc3bbef17ee547ba669b22f1390782e6567b753da98288a760106fb31215
 SHA512:
-  metadata.gz: a1b16a74bfdb56bdbda22f1f5003e24f9f5361d361b38c0875a6d8289607328f670a0f10756dc41af7df92b12c1d3b162f15bf9fa68069d175815e13af70bd74
-  data.tar.gz: fce3bf80a9cf60ac5b904e7c51bd7fa83911cd1b5d59377cfb5cdfcaa49adc63fef2d6fdc2fbb8c8d6f0443cd9434ce0dd9eddd8012694439bc0554c818771f2
+  metadata.gz: beb6f9aa0a2c02f4726faab2b7aa9d398c1256dd106a5c5595ce1f48da757c9699577661be6fb2de5bab8b19da9a147716000cae4400c0f004e90375bf371801
+  data.tar.gz: ad20fd6cdc1c2f056206398a4266a89b7523be8aabed79c2a80d53f001205d23e3830c55b4baf8e5db186cf86dce04236aea296fd07c511658af90e3ec06ff26

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## LucaDeal 0.5.2
+
+* Fix: Setup project dir for `luca-deal invoice mail`
+
+## LucaDeal 0.5.1
+
+* Refine `luca-deal customer list` output: Limit columns to name, address and id.
+* Reworked global constants w/LucaRecord v0.7
+* Removed bundler from test suite avoiding casual native build
+* add `luca-deal version` subcommand
+
 ## LucaDeal 0.5.0
 
 * `luca-deal` command now searches valid sub directory.

data/exe/luca-deal

@@ -1,19 +1,12 @@
 #!/usr/bin/ruby
 # frozen_string_literal: true
 
-unless Dir.exist?('data') || ARGV[0] == 'new'
-  target = 'customers'
-  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='customers'
 
 require 'date'
 require 'optparse'
 require 'luca_deal'
+require 'luca_cmd'
 
 class LucaCmd
   class Customer < LucaCmd
@@ -67,6 +60,7 @@ class LucaCmd
     end
 
     def self.list(args = nil, params = {})
+      params[:col_order] = %w(name address id)
       render(LucaDeal::Customer.new.list_name, params)
     end
   end
@@ -284,7 +278,7 @@ class LucaCmd
     when 'json'
       puts JSON.dump(dat)
     when 'nu'
-      LucaSupport::View.nushell(dat, :expand)
+      LucaSupport::View.nushell(dat, :expand, params[:col_order] || [])
     when 'explore'
       LucaSupport::View.nushell(dat, :explore)
     when 'csv'
@@ -303,7 +297,6 @@ def new_pj(args = nil, params = {})
   LucaDeal::Setup.create_project args[0]
 end
 
-LucaRecord::Base.valid_project?
 cmd = ARGV.shift
 params = {}
 
@@ -315,7 +308,9 @@ when /customers?/
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal customers create CustomerName'
       args = opt.parse(ARGV)
-      LucaCmd::Customer.create(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Customer.create(args, params)
+      end
     end
   when 'list'
     OptionParser.new do |opt|
@@ -324,7 +319,9 @@ when /customers?/
       opt.on('--explore', 'explore table in nushell') { |_v| params[:output] = 'explore' }
       opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse(ARGV)
-      LucaCmd::Customer.list(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Customer.list(args, params)
+      end
     end
   when 'describe'
     OptionParser.new do |opt|
@@ -332,10 +329,14 @@ when /customers?/
       opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
       opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse(ARGV)
-      LucaCmd::Customer.describe(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Customer.describe(args, params)
+      end
     end
   when 'delete'
-    LucaCmd::Customer.delete(ARGV)
+    LucaCmd.check_dir(REQUIRED_DIR) do
+      LucaCmd::Customer.delete(ARGV)
+    end
   else
     puts 'Proper subcommand needed.'
     puts
@@ -356,7 +357,9 @@ when /contracts?/
         params['category'] = 'sales_fee'
       end
       args = opt.parse(ARGV)
-      LucaCmd::Contract.create(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Contract.create(args, params)
+      end
     end
   when 'describe'
     OptionParser.new do |opt|
@@ -364,10 +367,14 @@ when /contracts?/
       opt.on('--nu', 'show table in nushell') { |_v| params[:output] = 'nu' }
       opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       args = opt.parse(ARGV)
-      LucaCmd::Contract.describe(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Contract.describe(args, params)
+      end
     end
   when 'delete'
-    LucaCmd::Contract.delete(ARGV)
+    LucaCmd.check_dir(REQUIRED_DIR) do
+      LucaCmd::Contract.delete(ARGV)
+    end
   else
     puts 'Proper subcommand needed.'
     puts
@@ -378,7 +385,9 @@ when /contracts?/
     exit 1
   end
 when 'export'
-  LucaCmd::Invoice.export(ARGV)
+  LucaCmd.check_dir(REQUIRED_DIR) do
+    LucaCmd::Invoice.export(ARGV)
+  end
 when /invoices?/, 'i'
   subcmd = ARGV.shift
   case subcmd
@@ -389,10 +398,14 @@ when /invoices?/, 'i'
       opt.on('--monthly', 'generate monthly data') { |_v| params[:mode] = 'monthly' }
       opt.on('--with-fee', 'generate sales fee data after monthly invoice creation') { |_v| params[:fee] = true }
       args = opt.parse(ARGV)
-      LucaCmd::Invoice.create(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Invoice.create(args, params)
+      end
     end
   when 'delete'
-    LucaCmd::Invoice.delete(ARGV)
+    LucaCmd.check_dir(REQUIRED_DIR) do
+      LucaCmd::Invoice.delete(ARGV)
+    end
   when 'list'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal invoices list [options] year month [date]'
@@ -402,21 +415,27 @@ when /invoices?/, 'i'
       opt.on('--mail', 'send payment list by email') { |_v| params[:mail] = true }
       opt.on('--full', 'add settlement info') { |_v| params[:mode] = 'full' }
       args = opt.parse(ARGV)
-      LucaCmd::Invoice.list(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Invoice.list(args, params)
+      end
     end
   when 'mail'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal invoices mail [options] year month [date]'
       opt.on('--preview', 'send to preview user') { |_v| params['mode'] = 'preview' }
       args = opt.parse(ARGV)
-      LucaCmd::Invoice.mail(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Invoice.mail(args, params)
+      end
     end
   when 'print'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal invoices print [options] <invoice_id | year month>'
       opt.on('--pdf', 'output PDF invoices. wkhtmlpdf is required') { |_v| params[:output] = :pdf }
       args = opt.parse(ARGV)
-      LucaCmd::Invoice.print(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Invoice.print(args, params)
+      end
     end
   when 'settle'
     params[:term] = 1
@@ -424,7 +443,9 @@ when /invoices?/, 'i'
       opt.banner = 'Usage: luca-deal invoices settle [filepath]'
       opt.on('--search-term VAL', 'search invoice N months before payment date. default: 1') { |v| params[:term] = v.to_i }
       args = opt.parse(ARGV)
-      LucaCmd::Invoice.settle(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Invoice.settle(args, params)
+      end
     end
   else
     puts 'Proper subcommand needed.'
@@ -452,7 +473,9 @@ when /reports?/, 'r'
       opt.on('--detail', 'show detail info') { |_v| params[:detail] = true }
       opt.on('--force-due', 'respect due date over actual payment') { |_v| params[:due] = true }
       args = opt.parse(ARGV)
-      LucaCmd::Invoice.report(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Invoice.report(args, params)
+      end
     end
   else
     puts 'Proper subcommand needed.'
@@ -476,12 +499,18 @@ when /fee/
       opt.banner = 'Usage: luca-deal fee create [options] year month [date]'
       opt.on('--monthly', 'generate monthly data') { |_v| params[:mode] = 'monthly' }
       args = opt.parse(ARGV)
-      LucaCmd::Fee.create(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Fee.create(args, params)
+      end
     end
   when 'delete'
-    LucaCmd::Fee.delete(ARGV)
+    LucaCmd.check_dir(REQUIRED_DIR) do
+      LucaCmd::Fee.delete(ARGV)
+    end
   when 'export'
-    LucaCmd::Fee.export(ARGV)
+    LucaCmd.check_dir(REQUIRED_DIR) do
+      LucaCmd::Fee.export(ARGV)
+    end
   when 'list'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal fee list [options] year month [date]'
@@ -490,14 +519,18 @@ when /fee/
       opt.on('-o', '--output VAL', 'output serialized data') { |v| params[:output] = v }
       opt.on('--html', 'output html invoices') { |_v| params[:html] = 'monthly' }
       args = opt.parse(ARGV)
-      LucaCmd::Fee.list(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Fee.list(args, params)
+      end
     end
   when 'mail'
     OptionParser.new do |opt|
       opt.banner = 'Usage: luca-deal fee mail [options] year month [date]'
       opt.on('--preview', 'send to preview user') { |_v| params['mode'] = 'preview' }
       args = opt.parse(ARGV)
-      LucaCmd::Fee.mail(args, params)
+      LucaCmd.check_dir(REQUIRED_DIR) do
+        LucaCmd::Fee.mail(args, params)
+      end
     end
   else
     puts 'Proper subcommand needed.'
@@ -509,6 +542,9 @@ when /fee/
     puts '  mail: send mail with report'
     exit 1
   end
+when 'version'
+  puts "luca-deal: version #{LucaDeal::VERSION}"
+  exit 0
 else
   puts 'Proper subcommand needed.'
   puts

data/lib/luca_deal/fee.rb

@@ -5,7 +5,6 @@ require 'json'
 require 'yaml'
 require 'pathname'
 require 'bigdecimal'
-require 'luca_support/config'
 require 'luca_support/mail'
 require 'luca_deal'
 
@@ -67,7 +66,7 @@ module LucaDeal
     end
 
     def deliver_mail(attachment_type = nil, mode: nil, skip_no_item: true)
-      attachment_type = CONFIG.dig('fee', 'attachment') || :html
+      attachment_type = CONST.config.dig('fee', 'attachment') || :html
       fees = self.class.asof(@date.year, @date.month)
       raise "No report for #{@date.year}/#{@date.month}" if fees.count.zero?
 
@@ -76,7 +75,7 @@ module LucaDeal
         next if skip_no_item && dat['items'].empty?
 
         mail = compose_mail(dat, mode: mode, attachment: attachment_type.to_sym)
-        LucaSupport::Mail.new(mail, PJDIR).deliver
+        LucaSupport::Mail.new(mail, CONST.pjdir).deliver
         self.class.add_status!(path, 'mail_delivered') if mode.nil?
       end
     end
@@ -101,9 +100,9 @@ module LucaDeal
 
       mail = Mail.new
       mail.to = dat.dig('customer', 'to') if mode.nil?
-      mail.subject = CONFIG.dig('fee', 'mail_subject') || 'Your Report is available'
+      mail.subject = CONST.config.dig('fee', 'mail_subject') || 'Your Report is available'
       if mode == :preview
-        mail.cc = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')
+        mail.cc = CONST.config.dig('mail', 'preview') || CONST.config.dig('mail', 'from')
         mail.subject = '[preview] ' + mail.subject
       end
       mail.text_part = Mail::Part.new(body: render_erb(search_template('fee-report-mail.txt.erb')), charset: 'UTF-8')
@@ -224,10 +223,10 @@ module LucaDeal
       __dir__
     end
 
-    # TODO: load labels from CONFIG before country defaults
+    # TODO: load labels from CONST.config before country defaults
     #
     def export_labels
-      case CONFIG['country']
+      case CONST.confg['country']
       when 'jp'
         {
           debit: { fee: '支払手数料', tax: '支払手数料', deduction: '未払費用' },
@@ -245,9 +244,9 @@ module LucaDeal
     #
     def set_company
       {}.tap do |h|
-        h['name'] = CONFIG.dig('company', 'name')
-        h['address'] = CONFIG.dig('company', 'address')
-        h['address2'] = CONFIG.dig('company', 'address2')
+        h['name'] = CONST.config.dig('company', 'name')
+        h['address'] = CONST.config.dig('company', 'address')
+        h['address2'] = CONST.config.dig('company', 'address2')
       end
     end
 
@@ -281,9 +280,9 @@ module LucaDeal
     # load Tax Rate from config.
     #
     def load_tax_rate(name)
-      return 0 if CONFIG.dig('tax_rate', name).nil?
+      return 0 if CONST.config.dig('tax_rate', name).nil?
 
-      BigDecimal(take_current(CONFIG['tax_rate'], name).to_s)
+      BigDecimal(take_current(CONST.config['tax_rate'], name).to_s)
     end
 
     # Fees are unique contract_id in each month

data/lib/luca_deal/invoice.rb

@@ -6,7 +6,6 @@ require 'yaml'
 require 'pathname'
 require 'bigdecimal'
 require 'luca_support/code'
-require 'luca_support/config'
 require 'luca_support/mail'
 require 'luca_deal/contract'
 require 'luca_record'
@@ -69,9 +68,9 @@ module LucaDeal
 
       mail = Mail.new
       mail.to = dat.dig('customer', 'to') if mode.nil?
-      mail.subject = CONFIG.dig('invoice', 'mail_subject') || 'Your Invoice is available'
+      mail.subject = LucaRecord::CONST.config.dig('invoice', 'mail_subject') || 'Your Invoice is available'
       if mode == :preview
-        mail.cc = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')
+        mail.cc = LucaRecord::CONST.config.dig('mail', 'preview') || LucaRecord::CONST.config.dig('mail', 'from')
         mail.subject = '[preview] ' + mail.subject
       end
       mail.text_part = Mail::Part.new(body: render_erb(search_template('invoice-mail.txt.erb')), charset: 'UTF-8')
@@ -284,7 +283,7 @@ module LucaDeal
         end
         @invoices = res.values
       end
-      @company = CONFIG.dig('company', 'name')
+      @company = LucaRecord::CONST.config.dig('company', 'name')
       @legend = if mode == 'full'
                   '[S] Settled, [P] Partially settled, [O] Overpaid'
                 else
@@ -297,10 +296,10 @@ module LucaDeal
                    end
 
       mail = Mail.new
-      mail.to = CONFIG.dig('mail', 'preview') || CONFIG.dig('mail', 'from')
+      mail.to = LucaRecord::CONST.config.dig('mail', 'preview') || LucaRecord::CONST.config.dig('mail', 'from')
       mail.subject = 'Check monthly payment list'
       mail.html_part = Mail::Part.new(body: render_erb(search_template('monthly-payment-list.html.erb')), content_type: 'text/html; charset=UTF-8')
-      LucaSupport::Mail.new(mail, PJDIR).deliver
+      LucaSupport::Mail.new(mail, LucaRecord::CONST.pjdir).deliver
     end
 
     def export_json
@@ -421,9 +420,9 @@ module LucaDeal
     end
 
     def deliver_one(invoice, path, mode: nil, attachment_type: nil)
-      attachment_type ||= CONFIG.dig('invoice', 'attachment') || :html
+      attachment_type ||= LucaRecord::CONST.config.dig('invoice', 'attachment') || :html
       mail = compose_mail(invoice, mode: mode, attachment: attachment_type.to_sym)
-      LucaSupport::Mail.new(mail, PJDIR).deliver
+      LucaSupport::Mail.new(mail, LucaRecord::CONST.pjdir).deliver
       self.class.add_status!(path, 'mail_delivered') if mode.nil?
     end
 
@@ -431,10 +430,10 @@ module LucaDeal
       __dir__
     end
 
-    # TODO: load labels from CONFIG before country defaults
+    # TODO: load labels from LucaRecord::CONST.config before country defaults
     #
     def export_labels
-      case CONFIG['country']
+      case LucaRecord::CONST.config['country']
       when 'jp'
         {
           debit: { items: '売掛金', tax: '売掛金' },
@@ -452,9 +451,9 @@ module LucaDeal
     #
     def set_company
       {}.tap do |h|
-        h['name'] = CONFIG.dig('company', 'name')
-        h['address'] = CONFIG.dig('company', 'address')
-        h['address2'] = CONFIG.dig('company', 'address2')
+        h['name'] = LucaRecord::CONST.config.dig('company', 'name')
+        h['address'] = LucaRecord::CONST.config.dig('company', 'address')
+        h['address2'] = LucaRecord::CONST.config.dig('company', 'address2')
       end
     end
 
@@ -477,9 +476,9 @@ module LucaDeal
     # load Tax Rate from config.
     #
     def load_tax_rate(name)
-      return 0 if CONFIG.dig('tax_rate', name).nil?
+      return 0 if LucaRecord::CONST.config.dig('tax_rate', name).nil?
 
-      BigDecimal(take_current(CONFIG['tax_rate'], name).to_s)
+      BigDecimal(take_current(LucaRecord::CONST.config['tax_rate'], name).to_s)
     end
 
     def attachment_name(dat, type)

data/lib/luca_deal/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucadeal
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Chuma Takahiro
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-04-20 00:00:00.000000000 Z
+date: 2024-01-16 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
@@ -103,7 +103,7 @@ metadata:
   homepage_uri: https://github.com/chumaltd/luca/tree/master/lucadeal
   source_code_uri: https://github.com/chumaltd/luca/tree/master/lucadeal
   changelog_uri: https://github.com/chumaltd/luca/tree/master/lucadeal/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Deal with contracts
 test_files: []