madvertise-ext 0.6.2 → 0.6.3

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - jruby-head

data/lib/madvertise/boot.rb

@@ -14,6 +14,7 @@ require 'date'
 require 'json'
 require 'servolux'
 require 'socket'
+require 'madvertise-logging'
 
 # load all madvertise extensions
 Dir[File.join(File.dirname(__FILE__), 'ext', '*.rb')].each do |f|
@@ -31,20 +32,38 @@ Dir[File.join(File.dirname(__FILE__), '*.rb')].each do |f|
   require f unless blacklist.include?(File.basename(f))
 end
 
-require 'madvertise/logging' # dedicated gem
-
 # load default configuration
 $conf = Configuration.new
 
-# callback for madvertise-logging
-$conf.callback do
-  ImprovedLogger::Formatter.format = $conf.log_format
-  ImprovedLogger::Formatter.log4j_format = $conf.log4j_format
+# configuration-reloading callbacks
+reload_logger = ->(conf) do
+  ImprovedLogger::Formatter.format = conf.log_format
+  ImprovedLogger::Formatter.log4j_format = conf.log4j_format
+
   $log = MultiLogger.new
-  $log.attach(ImprovedLogger.new($conf.log_backend.to_sym, File.basename($0)))
-  $log.level = $conf.log_level.downcase.to_sym
-  $log.log_caller = $conf.log_caller
+  $log.attach(ImprovedLogger.new(conf.log_backend.to_sym, File.basename($0)))
+  $log.level = conf.log_level.downcase.to_sym
+  $log.log_caller = conf.log_caller
 end
 
-# trigger log callback with defaults
+reload_mixins = ->(conf) do
+  if defined?(ROOT)
+    config_yml = File.join(ROOT, 'config.yml')
+    conf.mixin(config_yml)
+
+    dot_user = File.join(ROOT, '.user')
+
+    if File.exists?(dot_user)
+      File.readlines(dot_user).each do |line|
+        user_yml = File.join(ROOT, 'config', 'mixins', "#{line.chomp}.yml")
+        conf.mixin(user_yml)
+      end
+    end
+  end
+end
+
+# reload configuration, trigger callbacks
+$conf.callback(&reload_logger)
+$conf.callback(&reload_mixins)
+
 $conf.reload!

data/lib/madvertise/configuration.rb

@@ -131,7 +131,7 @@ class Configuration < Section
     end
 
     @callbacks.each do |callback|
-      callback.call
+      callback.call(self)
     end
   end
 

data/lib/madvertise/ext/signal.rb

@@ -1,8 +1,13 @@
 module Signal
   def self.register_shutdown_handler(&block)
-    at_exit(&block)
-    %w(INT TERM).each do |sig|
-      trap(sig) { exit(-1) }
+    signals = %w(INT TERM)
+
+    # The signal QUIT is in use by the JVM itself
+    signals << 'QUIT' unless RUBY_PLATFORM == 'java'
+
+    signals.each do |sig|
+      old = trap(sig) {}
+      trap(sig) { block.call; old.call }
     end
   end
 end

data/madvertise-ext.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "madvertise-ext"
-  spec.version       = "0.6.2"
+  spec.version       = "0.6.3"
   spec.authors       = ["madvertise Mobile Advertising GmbH"]
   spec.email         = ["tech@madvertise.com"]
   spec.description   = %q{Ruby core extensions and helper libraries}

metadata

@@ -1,97 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-ext
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
+  prerelease: 
 platform: ruby
 authors:
 - madvertise Mobile Advertising GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: metriks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: servolux
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby core extensions and helper libraries
@@ -135,26 +148,27 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/madvertise/ext
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Ruby core extensions and helper libraries
 test_files:
 - spec/enumerable_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2d8a8fc5d4d8b7a61286626081c60fba0a8f2e84
-  data.tar.gz: 71b809ca13bb507e2779d07f03d1c26ed81b8bc3
-SHA512:
-  metadata.gz: ff6afcde5fa681be79a5ed8de65ce5436125aea3415fb5ea6f609f0bacd7956b25a243d290d33a3cdea51ee4274eb3d28a582278a82e2a0811598d6509f7051b
-  data.tar.gz: a159976d44a3a9e1b2a2885dcbbeecdd557911e3b4c0033f8c8812c9017a742275b00380fc8652b5b5bdb5f02f90806c5f0840d758bff4f23b27aadca2430397