bbmb 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b33b06bdc40e8e375f2cb467bad60696906bd5
-  data.tar.gz: 24fe53d831147f6efdc76eb012bd105c8ef3b780
+  metadata.gz: 41dc6c1f01a081082be4b1fd376e41b1faa8be13
+  data.tar.gz: f5398f218f446f20d18795888f830b0569db1460
 SHA512:
-  metadata.gz: 936dbe0717e852eb213a1b7f2d8c71f03c832b73958be9ded5205461478efc391675018aafbe538b00e243262ee38d804cb8bec1d821b21acf50ced53783b755
-  data.tar.gz: 44ca2e4e4488f7fa689198e8a9e5246e93afe7105d6abc648f75fe7089a0e1a99abc4279a91525a6a6ce1e54bce0dd37d27dd9cfc68bfe5628a3093b3db7dc45
+  metadata.gz: c86e7a2e7dc6918767f3d8c2d7954b38b5e38b24a4d44efd9ed8cb5d894beb808d00cb922a3fca18e7c79b8ff7c0527e322a62a20b031eaf151a944caea7c709
+  data.tar.gz: 8386ea2ab6179c50f185d6ff9f6220af27edfa559de024bb9bca8c862d90106c9fcd257a090d7765333ed55284ba9c4c5e9d8a108c1170b58b2552cc45079ba9

data/History.txt

@@ -1,3 +1,8 @@
+=== 2.2.1 / upcoming
+
+* Remove bin/bbmbd. It is replaced by config.ru to start the rack process
+* Made bin/bbmb_admin work again
+
 === 2.2.1 / 17.05.2017
 
 * Fix logout. Uses app

data/bbmb.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ydbd-pg", '>= 0.5.2'
   spec.add_dependency "ydbi",    '>= 0.5.3'
   spec.add_dependency "json"
-  spec.add_dependency "sbsm",    '>= 1.3.9'
+  spec.add_dependency "sbsm",    '>= 1.4.0'
   spec.add_dependency "htmlgrid"
   spec.add_dependency "ydim",    '>= 0.5.1'
   spec.add_dependency "syck"

data/bin/bbmb_admin

@@ -1,11 +1,10 @@
 #!/usr/bin/env ruby
-# Admin -- bbmb -- 09.07.2003 -- hwyss@ywesee.com 
+# Admin -- bbmb -- 09.07.2003 -- hwyss@ywesee.com
 
 require 'drb'
-require 'sbsm/drb'
 require 'bbmb'
-require 'bbmb/config'
-require 'bbmb/util/invoicer'
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+require 'bbmb/util/app'
 require 'readline'
 include Readline
 
@@ -39,7 +38,7 @@ while(line = readline(prompt, true))
     break
   when 'bt', 'backtrace'
     if last_error.respond_to?(:backtrace)
-      $stdout.puts last_error.backtrace 
+      $stdout.puts last_error.backtrace
     else
       $stdout.puts 'No Error'
     end
@@ -49,7 +48,7 @@ while(line = readline(prompt, true))
     rescue StandardError, SyntaxError => last_error
       $stdout.puts last_error
     end
-  when /sp\s+(-?\d+)/, /set_priority\s+(-?\d+)/ 
+  when /sp\s+(-?\d+)/, /set_priority\s+(-?\d+)/
     priority = $~[1].to_i
     $stdout.puts "setting Priority to #{priority}"
   else

data/lib/bbmb/util/app.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Util::Server -- de.bbmb.org -- 01.09.2006 -- hwyss@ywesee.com
-
 require 'bbmb/config'
+require 'ydim/invoice'
 require 'bbmb/html/util/known_user'
 require 'bbmb/html/util/session'
 require 'bbmb/html/util/validator'
@@ -34,11 +34,9 @@ module BBMB
           BBMB.persistence = BBMB::Persistence::ODBA
         end
         BBMB.auth = DRb::DRbObject.new(nil, BBMB.config.auth_url)
-        puts "installed BBMB.auth for #{BBMB.config.auth_url}"
         BBMB.server = BBMB::Util::Server.new(BBMB.persistence, self)
         BBMB.server.extend(DRbUndumped)
         BBMB.server = BBMB.server
-        puts "installed BBMB.server #{BBMB.server}"
         if(BBMB.config.update?)
           BBMB.server.run_updater
         end
@@ -50,16 +48,16 @@ module BBMB
         DRb.start_service(url, BBMB.server)
         $SAFE = 1
         $0 = BBMB.config.name
-        SBSM.logger.info('start') { sprintf("starting bbmb-server on %s", url) }
+        SBSM.logger.info("started bbmb-server on #{url}")
         DRb.thread.join
         SBSM.logger.info('finished') { sprintf("starting bbmb-server on %s", url) }
       rescue Exception => error
-        SBSM.logger.error('fatal') { error }
+        SBSM.logger.error('fatal')
         raise
       end
       def initialize
           super
-          puts "Starting Rack-Service #{self.class} and service #{BBMB.config.server_url}"
+          SBSM.logger.info "Starting Rack-Service #{self.class} and service #{BBMB.config.server_url}"
           Thread.new {
               start_service
           }

data/lib/bbmb/util/server.rb

@@ -18,16 +18,18 @@ require 'bbmb/model/customer'
 require 'bbmb/model/quota'
 require 'bbmb/model/product'
 require 'bbmb/model/promotion'
+require 'sbsm/admin_server'
 
 module BBMB
   def self.persistence
     @@persistence ||= BBMB::Persistence::ODBA
   end
   module Util
-    class Server
+    class Server < SBSM::AdminServer
       def initialize(persistence, app)
         @persistence = persistence
         @app = app
+        super(app: app)
       end
       def invoice(range)
         SBSM.info "invoice started at #{Time.now} for #{range}"

data/lib/bbmb/version.rb

@@ -1,3 +1,3 @@
 module BBMB
-  VERSION = '2.2.1'
+  VERSION = '2.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bbmb
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Masaomi Hatakeyama, Zeno R.R. Davatz, Niklaus Giger
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: htmlgrid
   requirement: !ruby/object:Gem::Requirement
@@ -336,7 +336,6 @@ description: A Ruby gem for browser based orders of approved medical drugs in Sw
 email: mhatakeyama@ywesee.com, zdavatz@ywesee.com, ngiger@ywesee.com
 executables:
 - bbmb_admin
-- bbmbd
 - update_articles_and_products
 extensions: []
 extra_rdoc_files: []
@@ -352,7 +351,6 @@ files:
 - bbmb.gemspec
 - bbmb.jpeg
 - bin/bbmb_admin
-- bin/bbmbd
 - bin/update_articles_and_products
 - lib/bbmb.rb
 - lib/bbmb/config.rb

data/bin/bbmbd

@@ -1,58 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.expand_path('../lib', File.dirname(__FILE__))
-
-require 'drb'
-require 'logger'
-require 'ydim/invoice'
-require 'bbmb/config'
-require 'bbmb/util/server'
-require 'mail'
-
-module BBMB
-  @config.load_files.each { |local|
-    require local
-  }
-  require File.join('bbmb', 'persistence', @config.persistence)
-  case @config.persistence
-  when 'odba'
-    DRb.install_id_conv ODBA::DRbIdConv.new
-    @persistence = BBMB::Persistence::ODBA
-  end
-
-  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)
-  @logger.debug('config') { @config.pretty_inspect }
-
-  VERSION = `git rev-parse HEAD`
-
-  @auth = DRb::DRbObject.new(nil, @config.auth_url)
-
-  begin
-    @server = BBMB::Util::Server.new(@persistence)
-    @server.extend(DRbUndumped)
-    if(@config.update?)
-      @server.run_updater
-    end
-    if(@config.invoice?)
-      @server.run_invoicer
-    end
-
-    url = @config.server_url
-    url.untaint
-    DRb.start_service(url, @server)
-    $SAFE = 1
-    $0 = @config.name
-    @logger.info('start') { sprintf("starting bbmb-server on %s", url) }
-    DRb.thread.join
-  rescue Exception => error
-    @logger.error('fatal') { error }
-    raise
-  end
-end