ydim 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70fddd3a98f0a72afb88a5a077c8c87a8ece2dd43fe3f931770cc4cf93c68f5b
-  data.tar.gz: 95b0da6a7782c62cc2b6092c00e98959e11e24cff49e24183eb33c1ca3268459
+  metadata.gz: 669770fe5a8004f1698fa1c421d49d4f35a414d5159f1c1732b82c16fffa9452
+  data.tar.gz: 8e764d6b080742a06c580cca2533a2c8f6df9498b86e69382ce435aee662996a
 SHA512:
-  metadata.gz: ccc6c17ba86f5cd5f5a0fd22e6a102e5653b085a17e32a520bf7926a2eba536a62db1768fad08ca0da1a4a2f0faaa2fb57b9717de8fd8ac91e20dfd022c5bab5
-  data.tar.gz: '0018900fa6e3a092df34f1a58389773f86f9d73cb0ef01aa4e8be276c7a74279302257d05027f55d4dcb95a3d2042243b8706ce3f703d25329597d62d6170ce3'
+  metadata.gz: ad881091d075cd0374f2b83ad2bb47d8b96e274581463bf96aa17011bb5e0ee470c267f92b9c627bc3f8a0827716ec86731adab73c101253aeac686b2ea80a29
+  data.tar.gz: 7bed78d992d39f73c9edeeff169ab8bee441326afaaaa19c947a844e59315e904fb81d0859e78a80a553a697e8546c822130635c1631eb3c57b3e1446b13623c

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.1.4/ 21.01.2023
+
+* Read configuration values only from /etc/ydim
+
 === 1.1.1/ 23.01.2018
 
 * Update to ydbi 0.5.6 to avoid error with PGconn

data/lib/ydim/server_config.rb

@@ -7,9 +7,8 @@ require 'rclconf'
 
 module YDIM
 	class Server
-    ydim_default_dir = File.join(ENV['HOME'], '.ydim')
+    ydim_default_dir = '/etc/ydim'
     default_config_files = [
-      File.join(ydim_default_dir, 'ydimd.yml'),
       '/etc/ydim/ydimd.yml',
     ]
     defaults = {

data/lib/ydim/version.rb

@@ -1,3 +1,3 @@
 module YDIM
-  VERSION = '1.1.2'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ydim
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-smtp
@@ -337,7 +337,6 @@ email: mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
 - ydim-edit
 - ydim-inject
-- ydimd
 extensions: []
 extra_rdoc_files: []
 files:
@@ -352,7 +351,6 @@ files:
 - Rakefile
 - bin/ydim-edit
 - bin/ydim-inject
-- bin/ydimd
 - get_db_ydim
 - install.rb
 - lib/pdfinvoice/config.rb
@@ -416,7 +414,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.4
 signing_key: 
 specification_version: 4
 summary: ywesee distributed invoice manager

data/bin/ydimd

@@ -1,61 +0,0 @@
-#!/usr/bin/env ruby231
-# ypdmd -- ydim -- 12.01.2005 -- hwyss@ywesee.com
-
-require 'yaml'
-require 'syck'
-
-require 'ydim/server'
-require 'ydim/odba'
-require 'logger'
-require 'rclconf'
-require 'drb'
-require 'fileutils'
-require 'odba/connection_pool'
-require 'odba/drbwrapper'
-require 'pg'
-require 'dbi'
-require 'dbi/version'
-require 'dbd/Pg'
-
-$0 = __FILE__
-
-config = YDIM::Server.config
-config.load(config.config)
-
-ODBA.storage.dbi = ODBA::ConnectionPool.new(config.db_driver_url, 
-	config.db_user, config.db_auth, :client_encoding => 'LATIN1')
-ODBA.cache.setup
-
-DRb.install_id_conv ODBA::DRbIdConv.new
-
-log_file = config.log_file
-if(log_file.is_a?(String))
-	FileUtils.mkdir_p(File.dirname(log_file))
-	log_file = File.open(log_file, 'a')
-	at_exit { log_file.close }
-end
-logger = Logger.new(log_file)
-logger.level = Logger.const_get(config.log_level)
-
-server = YDIM::Server.new(config, logger)
-server.extend(DRbUndumped)
-
-if(config.detach)
-	pidfile = '/var/run/ydimd.pid'
-	File.open(pidfile, 'w') { |fh| fh.puts $$ }
-	at_exit { File.unlink(pidfile) }
-	Process.fork and exit!(0)
-end
-
-begin
-	url = config.server_url
-	DRb.start_service(url, server)
-	$SAFE = 1
-	logger.info('start') { 
-		sprintf("starting ydim-server on %s", config.server_url) }
-	DRb.thread.join
-rescue Exception => error
-	logger.error('fatal') { error }
-	raise
-end
-