ydim 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 878732dac4f51ff26346c7392d8241feb891cf28
-  data.tar.gz: dccb435ce281b6174843f75530288557d45c30f3
+  metadata.gz: ec2b1bd1d980024b40189832831326166a908c42
+  data.tar.gz: 02d904fd678e0e801c16cef5f2c96a88c87ff6e9
 SHA512:
-  metadata.gz: 84c88d7a0921fec44fbed80751e077a26138b2d8260251a83aaf3ae5e7a2418eebd96b7187d7a1af228557fa4f44eded00848c80927e787fca94fcd68dad886f
-  data.tar.gz: 2cfe94ce46a6dcba53096d3a596b54fe1067ac5dae6d2d110292921228779c63a3814ab6dcb0327ec8a3b2cdb3ffbe183768e65255360fdc9bc116e76db5a3b0
+  metadata.gz: 38a217974af3e9b5127c95c34bcec04681aac241481bd8a7524d1cbc88c476e996ad47f7839acfca0cfea7b555af1157b8abe3531a7ac51b5232b7b54e2a55e3
+  data.tar.gz: cd853964aeaa71cffdf8ff274ccc85a6e1b5c9c4c2e97ae3a470e7388f7ee0572c9dcaa9e277238d678ede9274bd7b7e7233575578cfc183b849347d5b6bc495

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.0.5 / 08.03.2017
+
+* Fixed loading bin/ydimd
+
 === 1.0.4 / 08.03.2017
 
 * Using mail gem instead of rmail. Updated tests.

data/lib/ydim/mail.rb

@@ -1,17 +1,18 @@
 #!/usr/bin/env ruby
 
-require 'ydim/server' # to pick up the configuration
+require 'ydim/server_config' # to pick up the configuration
 require 'mail'
 
 module YDIM
   module Mail
+    config = YDIM::Server.config
     ::Mail.defaults do
       delivery_method :smtp, {
-        :address => Server.config.smtp_server,
-        :port => Server.config.smtp_port,
-        :domain => Server.config.smtp_domain,
-        :user_name => Server.config.smtp_user,
-        :password => Server.config.smtp_pass,
+        :address => config.smtp_server,
+        :port => config.smtp_port,
+        :domain => config.smtp_domain,
+        :user_name => config.smtp_user,
+        :password => config.smtp_pass,
       }
     end
     def Mail.body(config, debitor, invoice)

data/lib/ydim/server.rb

@@ -3,6 +3,7 @@
 # YDIM::Server -- ydim -- 09.12.2011 -- mhatakeyama@ywesee.com
 # YDIM::Server -- ydim -- 10.01.2006 -- hwyss@ywesee.com
 
+require 'ydim/server_config'
 require 'logger'
 require 'needle'
 require 'odba/id_server'
@@ -18,55 +19,7 @@ require 'odba/18_19_loading_compatibility'
 
 module YDIM
 	class Server
-    ydim_default_dir = File.join(ENV['HOME'], '.ydim')
-    default_config_files = [
-      File.join(ydim_default_dir, 'ydimd.yml'),
-      '/etc/ydim/ydimd.yml',
-    ]
-    defaults = {
-      'autoinvoice_hour'      => 1,
-      'config'                => default_config_files,
-      'conf_dir'              => File.join(ydim_default_dir, 'conf'),
-      'currencies'            => ['CHF', 'EUR', 'USD'],
-      'currency_update_hour'  => 2,
-      'data_dir'              => File.join(ydim_default_dir, 'data'),
-      'server_url'            => 'druby://localhost:12375',
-      'db_driver_url'         => 'DBI:Pg:ydim',
-      'db_user'               => 'ydim',
-      'db_auth'               => '',
-      'detach'                => false,
-      'home_country'          => 'Schweiz',
-      'invoice_number_start'  => 10000,
-      'log_level'             => 'INFO',
-      'log_file'              => STDOUT,
-      'mail_body'             => "%s %s\n%s",
-      'mail_charset'          => 'iso-8859-1',
-      'mail_from'             => '',
-      'mail_recipients'       => [],
-      'root_name'             => 'Root',
-      'root_email'            => '',
-      'root_key'              => 'root_dsa',
-      'salutation'            => {
-        ''                    =>  'Sehr geehrter Herr',
-        'Herr'                =>  'Sehr geehrter Herr',
-        'Frau'                =>  'Sehr geehrte Frau',
-      },
-      'smtp_from'             => '',
-      'smtp_authtype'         => :plain,
-      'smtp_domain'           => 'ywesee.com',
-      'smtp_pass'             => nil,
-      'smtp_port'             => 587,
-      'smtp_server'           => 'localhost',
-      'smtp_user'             => 'ydim@ywesee.com',
-      'vat_rate'              => 8.0,
-    }
-    config = RCLConf::RCLConf.new(ARGV, defaults)
-    config.load(config.config)
-    CONFIG = config
     SECONDS_IN_DAY = 24*60*60
-    def Server.config
-      CONFIG
-    end
 		def initialize(config, logger)
 			@serv = Needle::Registry.new
 			@serv.register(:auth_server) { 

data/lib/ydim/server_config.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# YDIM::Server -- ydim -- 09.12.2011 -- mhatakeyama@ywesee.com
+# YDIM::Server -- ydim -- 10.01.2006 -- hwyss@ywesee.com
+
+require 'rclconf'
+
+module YDIM
+	class Server
+    ydim_default_dir = File.join(ENV['HOME'], '.ydim')
+    default_config_files = [
+      File.join(ydim_default_dir, 'ydimd.yml'),
+      '/etc/ydim/ydimd.yml',
+    ]
+    defaults = {
+      'autoinvoice_hour'      => 1,
+      'config'                => default_config_files,
+      'conf_dir'              => File.join(ydim_default_dir, 'conf'),
+      'currencies'            => ['CHF', 'EUR', 'USD'],
+      'currency_update_hour'  => 2,
+      'data_dir'              => File.join(ydim_default_dir, 'data'),
+      'server_url'            => 'druby://localhost:12375',
+      'db_driver_url'         => 'DBI:Pg:ydim',
+      'db_user'               => 'ydim',
+      'db_auth'               => '',
+      'detach'                => false,
+      'home_country'          => 'Schweiz',
+      'invoice_number_start'  => 10000,
+      'log_level'             => 'INFO',
+      'log_file'              => STDOUT,
+      'mail_body'             => "%s %s\n%s",
+      'mail_charset'          => 'iso-8859-1',
+      'mail_from'             => '',
+      'mail_recipients'       => [],
+      'root_name'             => 'Root',
+      'root_email'            => '',
+      'root_key'              => 'root_dsa',
+      'salutation'            => {
+        ''                    =>  'Sehr geehrter Herr',
+        'Herr'                =>  'Sehr geehrter Herr',
+        'Frau'                =>  'Sehr geehrte Frau',
+      },
+      'smtp_from'             => '',
+      'smtp_authtype'         => :plain,
+      'smtp_domain'           => 'ywesee.com',
+      'smtp_pass'             => nil,
+      'smtp_port'             => 587,
+      'smtp_server'           => 'localhost',
+      'smtp_user'             => 'ydim@ywesee.com',
+      'vat_rate'              => 8.0,
+    }
+    CONFIG =  RCLConf::RCLConf.new(ARGV, defaults)
+    def Server.config
+      CONFIG
+    end
+  end
+end

data/lib/ydim/version.rb

@@ -1,3 +1,3 @@
 module YDIM
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ydim
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
@@ -300,6 +300,7 @@ files:
 - lib/ydim/root_session.rb
 - lib/ydim/root_user.rb
 - lib/ydim/server.rb
+- lib/ydim/server_config.rb
 - lib/ydim/util.rb
 - lib/ydim/version.rb
 - lib/ydim/ydim-edit