lucarecord 0.7.4 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab8d42ca9b608b1523b0cf5cdf85ace0795c2852c0e7abb840c7ab63c6cf10d8
-  data.tar.gz: 7fbd74937cbcacf501a5be5296eaa586162a3646817cd46d6f973fe6740db93e
+  metadata.gz: 43e4eb24c71ea14be0af8bcaa20ff15806b3f13fde5d9b0766f4554c725354e0
+  data.tar.gz: 76a9001610ac76dcb2904c500bce4283ce57612e6f7ac0d42da76f818eadf05a
 SHA512:
-  metadata.gz: cef169faf34676d409b44d1b40ac5ae671f9e53ff0f4900ce42734a04ba98573ae906eb51cd95798bed89e2d74a4c5189e032b60ae390fdb442130572451278d
-  data.tar.gz: 61b8f6864ae81c2f7b90540e019be72f3be41b835274cca6fe84c9014d00126167b8d7d5b7fb08aa445fc5562fd4edf61a3fe359218d1e24b1a72b17133a9b3d
+  metadata.gz: 493c82233012f4db8e001a04c65d8b010979835e61d04d6f6c0659de6b0557fef8085efa433748f63fdb02548943020a6574caaca24a2663d58eee8e5cad5235
+  data.tar.gz: 458ebf81b4639ec305e6b99cd0ebbfe3617d46538487a9cf781cdb32f3ca483b02b9c90de746457ddfc26d80e26a4169e688796beb0367b788df532d465d36e7

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## LucaRecord 0.8.1
+
+* Merge config in parent directory, when the parent is git repo root.
+* initial mTLS support for SMTP.
+* change deprecated nushell option `--ignore-errors` -> `--optional`.
+
+## LucaRecord 0.8.0
+
+* Expand SMTP options aligning with mail gem.
+
+## LucaRecord 0.7.5
+
+* `LucaSupport::Code.parse_current() / take_current()` now accepts Date object.
+
 ## LucaRecord 0.7.4
 
 * `LucaSupport::ENC.encrypt() / decrypt()` use env `LUCA_ENC_PASSWORD` for automation.

data/lib/luca_record/dict.rb

@@ -78,7 +78,7 @@ module LucaRecord
       end
     end
 
-    # generate dictionary from TSV file. Minimum assumption is as bellows:
+    # generate dictionary from TSV file. Minimum assumption is:
     # 1st row is converted symbol.
     #
     # * row[0] is 'code'. Converted hash keys

data/lib/luca_record/io.rb

@@ -297,25 +297,7 @@ module LucaRecord # :nodoc:
         config = {
           'decimal_separator' => '.',
           'thousands_separator' => ','
-        }
-        begin
-          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
-        end
+        }.merge!(load_config(CONST.configdir, ext_conf: ext_conf))
         config['decimal_num'] ||= config['country'] == 'jp' ? 0 : 2
         CONST.set_config(config)
       end
@@ -341,6 +323,62 @@ module LucaRecord # :nodoc:
         digest
       end
 
+      def load_config(path = nil, ext_conf: nil)
+        dir, file = if (filepath = Pathname(path)).file?
+                      [filepath.dirname, filepath]
+                    elsif filepath.directory?
+                      [filepath, filepath / 'config.yml']
+                    else
+                      nil
+                    end
+        return {} if dir.nil?
+
+        {}.tap do |config|
+          begin
+            if ! dir.join('.git').exist? \
+               && (parent = dir.parent).join('.git/objects').directory? \
+               && (parent_config = parent.join('config.yml')).file?
+              config.merge!(YAML.safe_load(
+                              parent_config.read,
+                              permitted_classes: [Date]
+                            ))
+            end
+          end
+          begin
+            part = YAML.safe_load(
+              file.read,
+              permitted_classes: [Date]
+            )
+            config.merge!(part) do |_k, v_self, v_new|
+              if v_self.is_a? Hash
+                v_self.merge(v_new)
+              else
+                v_new
+              end
+            end
+          rescue Errno::ENOENT
+            STDERR.puts "INFO: #{file} not found. Continue with default settings."
+          end
+          if ext_conf
+            begin
+              part = YAML.safe_load(
+                (Pathname(CONST.configdir) / ext_conf).read,
+                permitted_classes: [Date]
+              )
+              config.merge!(part) do |_k, v_self, v_new|
+                if v_self.is_a? Hash
+                  v_self.merge(v_new)
+                else
+                  v_new
+                end
+              rescue Errno::ENOENT
+                STDERR.puts "WARN: #{ext_conf} not found. Extended options are not effective."
+              end
+            end
+          end
+        end
+      end
+
       private
 
       # define new transaction ID & write data at once
@@ -372,7 +410,7 @@ module LucaRecord # :nodoc:
       #   '2020': All month of 2020
       #   '2020[FG]': June & July of 2020
       #
-      # Block will receive code fragments as 2nd parameter. Array format is as bellows:
+      # Block will receive code fragments as 2nd parameter. Array format is:
       # 1. encoded month
       # 2. encoded day + record number of the day
       # 3. codes. More than 3 are all code set except first 2 parameters.
@@ -532,14 +570,5 @@ module LucaRecord # :nodoc:
         end
       end
     end
-
-    def load_config(path = nil)
-      path = path.to_s
-      if File.exist?(path)
-        YAML.safe_load(File.read(path), permitted_classes: [Date])
-      else
-        {}
-      end
-    end
   end
 end

data/lib/luca_record/version.rb

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

data/lib/luca_support/code.rb

@@ -183,14 +183,14 @@ module LucaSupport # :nodoc:
     # convert effective/defunct data into current hash on @date.
     # not parse nested children.
     #
-    def parse_current(dat)
+    def parse_current(dat, date = @date)
       {}.tap do |processed|
-        dat.each { |k, _v| processed[k] = take_current(dat, k) }
+        dat.each { |k, _v| processed[k] = take_current(dat, k, date) }
       end
     end
 
     # return current value with effective/defunct on target @date
-    # For multiple attribues, return hash on other than 'val'. Examples are as bellows:
+    # For multiple attribues, return hash on other than 'val'. Examples:
     #
     #   - effective: 2020-1-1
     #     val: 3000
@@ -205,7 +205,7 @@ module LucaSupport # :nodoc:
     #     val: 3000
     #   => nil
     #
-    def take_current(dat, item)
+    def take_current(dat, item, date = @date)
       target = dat&.dig(item)
       return target unless target.is_a?(Array)
 
@@ -213,8 +213,8 @@ module LucaSupport # :nodoc:
       return target if !keys.include?('effective') && !keys.include?('defunct')
 
       latest = target
-                 .reject { |a| a['defunct'] && Date.parse(a['defunct'].to_s) < @date  }
-                 .filter { |a| a['effective'] && Date.parse(a['effective'].to_s) < @date }
+                 .reject { |a| a['defunct'] && Date.parse(a['defunct'].to_s) < date  }
+                 .filter { |a| a['effective'] && Date.parse(a['effective'].to_s) < date }
                  .max { |a, b| Date.parse(a['effective'].to_s) <=> Date.parse(b['effective'].to_s) }
 
       latest&.dig('val') || latest

data/lib/luca_support/mail.rb

@@ -1,4 +1,6 @@
 require "mail"
+require 'net/smtp'
+require 'openssl'
 require "pathname"
 require "luca_record/io"
 
@@ -8,7 +10,7 @@ module LucaSupport
 
     def initialize(mail=nil, pjdir=nil)
       @pjdir = pjdir || Dir.pwd
-      @config = load_config( Pathname(@pjdir) + "config.yml" )
+      @config = self.class.load_config(@pjdir)
       @mail = mail
       set_message_default
       @host = set_host
@@ -16,18 +18,26 @@ module LucaSupport
 
     def deliver
       # mail gem accepts hash for 2nd param, not keywords
-      @mail.delivery_method(:smtp, @host)
+      if conn = conn_with_tls
+        @mail.delivery_method(:smtp_connection, { connection: conn })
+      else
+        @mail.delivery_method(:smtp, @host)
+      end
       @mail.deliver
     end
 
     def set_host
       {
-        authentication: :plain,
         address: mail_config("address"),
         port: mail_config("port"),
-        doomain: mail_config("domain"),
+        domain: mail_config("domain"),
         user_name: mail_config("user_name"),
-        password: mail_config("password")
+        password: mail_config("password"),
+        authentication: mail_config("authentication"),
+        enable_starttls: mail_config("enable_starttls"),
+        openssl_verify_mode: mail_config("openssl_verify_mode"),
+        ssl: mail_config("ssl"),
+        tls: mail_config("tls"),
       }
     end
 
@@ -40,5 +50,28 @@ module LucaSupport
       @mail.from ||= @config.dig("mail", "from")
       @mail.cc ||= @config.dig("mail", "cc")
     end
+
+    private
+
+    def conn_with_tls
+      ca_file = mail_config("ca_file")
+      c_cert_path = mail_config("client_cert")
+      c_key_path = mail_config("client_key")
+      return nil if ca_file.nil? && c_cert_path.nil? && c_key_path.nil?
+
+      tls_ctx = OpenSSL::SSL::SSLContext.new
+      tls_ctx.cert = c_cert_path ?
+                       OpenSSL::X509::Certificate.new(File.read(c_cert_path)) : nil
+      tls_ctx.key = c_key_path ?
+                      OpenSSL::PKey::RSA.new(File.read(c_key_path)) : nil
+      tls_ctx.ca_file = ca_file
+      tls_ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER if ca_file || @host[:openssl_verify_mode]
+
+      conn = Net::SMTP.new(@host[:address], @host[:port])
+      conn.enable_tls(tls_ctx)
+      conn.start(helo: @host[:domain], user: @host[:user_name], password: @host[:password], authtype: @host[:authentication])
+      conn
+    end
+
   end
 end

data/lib/luca_support/view.rb

@@ -58,7 +58,7 @@ module LucaSupport
       select = if columns.empty?
                  ''
                else
-                 '| select --ignore-errors ' + columns.map { |col| col.gsub(/[^a-zA-Z0-9_-]/, '') }.join(' ')
+                 '| select --optional ' + columns.map { |col| col.gsub(/[^a-zA-Z0-9_-]/, '') }.join(' ')
                end
       render = case mode
                when :explore

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lucarecord
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.1
 platform: ruby
 authors:
 - Chuma Takahiro
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-13 00:00:00.000000000 Z
+date: 2025-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,7 @@ files:
 - lib/luca_support/view.rb
 homepage: https://github.com/chumaltd/luca/tree/master/lucarecord
 licenses:
-- GPL
+- GPL-3.0-or-later
 metadata:
   homepage_uri: https://github.com/chumaltd/luca/tree/master/lucarecord
   source_code_uri: https://github.com/chumaltd/luca/tree/master/lucarecord
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: ERP File operation framework