bbmb 2.2.9 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2d183b03706d8559019ff4dc090b85e23a9b2a8
-  data.tar.gz: 077a75bd3d642ece584a5e422b570ad6c296b466
+  metadata.gz: 95bb9df5480ff6caed99262bd25c01f5294495fa
+  data.tar.gz: 1898c6f44136e99b25fda49015121c75e258536f
 SHA512:
-  metadata.gz: 97c91fb51fbabebd497ea2504831c913103dc84c122962ebea6b4549c8cc33f6670ed98b2be15fb071355b19698e976190cea871801b58f589eed11ec74d0e85
-  data.tar.gz: 68a820b5779f418636da8384352c5b0a9dabe96512544568a71063bf1db99995e04078c84be6b5e0171c938aa51f2b032ebeffea35f2190c7cf83933bc006694
+  metadata.gz: d45c865e1cc9e052a55bd8904d1cfd7a371e231c8f6815b7cdd52230545b316e58f30b7bb93cb4d480ae70680c6df20fc4ec5778dcf3fe21af88ecc593aff202
+  data.tar.gz: d707982da74212b859464803df9f7a96140fa38d409f52a0aa3fd59e32a0c9f8cb5d9ac2007d1609c19c9938b0005e83ca9daca711f30386e7e809e738f43e01

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.3.0 / 07.06.2017
+
+* Use by default only the etc/config.yml inside the current working directory
+
 === 2.2.9 / 01.06.2017
 
 * Work around order without customer and no positions

data/bin/bbmb_admin

@@ -54,7 +54,7 @@ while(line = readline(prompt, true))
   else
     begin
       bgflag = line.slice!(/\s*\&\s*$/)
-      $current = bbmb._admin(line, result, priority)
+      $current = BBMB.server._admin(line, result, priority)
       unless(bgflag)
         $current.join
       end

data/lib/bbmb/config.rb

@@ -5,31 +5,20 @@ require 'rclconf'
 require 'bbmb'
 
 module BBMB
-  default_dir = if(root =  ENV['DOCUMENT_ROOT'])
-                  File.expand_path('../etc', root)
-                elsif(home = ENV['HOME'])
-                  File.expand_path('.bbmb/etc', home)
-                else
-                  require 'tmpdir'
-                  Dir.tmpdir
-                end
-  default_config_files = [
-    File.join(default_dir, 'bbmb.yml'),
-    '/etc/bbmb/bbmb.yml',
-  ]
+  default_config_file = File.join(Dir.pwd, 'etc', 'config.yml')
   defaults = {
     'admin_address'                   => '',
     'admins'                          => [],
     'auth_domain'                     => 'ch.bbmb',
     'auth_url'                        => 'druby://localhost:12001',
-    'bbmb_dir'                        => File.expand_path('..', default_dir),
-    'config'			                    => default_config_files,
+    'bbmb_dir'                        => Dir.pwd,
+    'config'			                    => default_config_file,
     'confirm_error_body'              => 'Customer %s does not have an email address configured',
     'confirm_error_cc'                => [],
     'confirm_error_from'              => 'errors.test@bbmb.ch',
     'confirm_error_subject'           => 'Customer %s without email address',
     'confirm_error_to'                => nil,
-    'data_dir'                        => File.expand_path('../data', default_dir),
+    'data_dir'                        => File.join(Dir.pwd, 'data'),
     'db_name'                         => 'bbmb',
     'db_user'                         => 'bbmb',
     'db_auth'                         => 'bbmb',
@@ -79,7 +68,7 @@ module BBMB
     'order_destinations'              => [],
     'pagestep'                        => 20,
     'persistence'                     => 'odba',
-    'polling_file'                    => File.expand_path('polling.yml', default_dir),
+    'polling_file'                    => File.join(Dir.pwd, 'etc', 'polling.yml'),
     'scm_link'                        => 'https://github.com/zdavatz/bbmb',
     'server_url'                      => 'druby://localhost:12000',
     'session_timeout'                 => 3600,
@@ -107,6 +96,8 @@ module BBMB
   }
 
   config = RCLConf::RCLConf.new(ARGV, defaults)
+  raise "config file #{config.config} must exist" unless  File.exist?(config.config)
+  puts "Loading BBMB config from #{config.config}"
   config.load(config.config)
   @config = config
 end

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.2.9'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.2.9
+  version: 2.3.0
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: odba