madvertise-ext 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfb2ba16be20b65a7bd6da90d6867ad716e5911e
-  data.tar.gz: e70850ea6aaa3cbcbe0f7aa05758daf168577621
+  metadata.gz: 8cd41360246e68223bdd822e98e2758f54165895
+  data.tar.gz: 8e76405d044d13156271215b70024b83c6e63579
 SHA512:
-  metadata.gz: b1661b6fe44eb3c56d18ea00604190f8a733fc546d36a596ce6b8aee4412d25842ea96e4eb3862f8fa97f364b533f0ede5fd2a9bad67985df2d59d03ff176dd4
-  data.tar.gz: 0d16d02f9bc46a29d1597802a924ec387086500615a740faf59b81e20a6a9d00cfebe7b19941f5158384c8a6f8ca9dee322a014f056303fc4b544ce276ec05ee
+  metadata.gz: 34d3feabee69cf24924f6c4533e708710c5a9eede18c11a306921fa0d0f7262bf8a6ca86836f0227abc639c09fd89949bdcafab28e56f985ce20a9c98343b08e
+  data.tar.gz: 35896c2a5f376717252570d9a630f9a087e3ec943d93a2d8de3a27101d4f51b7585fb44840a2f923f80da47245403e2f1c5716c53250f3dff16260482da30c4f

data/Gemfile

@@ -1,3 +1,14 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :development, :test do
+  gem "awesome_print"
+  gem "brice"
+  gem "fuubar"
+  gem "rake"
+  gem "reek"
+  gem "rspec"
+  gem "simplecov"
+  gem "yard"
+end

data/Rakefile

@@ -1,5 +1,2 @@
-#!/usr/bin/env rake
-
-require "bundler/setup"
 require "bundler/gem_tasks"
 require "madvertise/tasks"

data/lib/madvertise/boot.rb

@@ -1,5 +1,11 @@
 # encoding: utf-8
 
+begin
+  require 'jbundler'
+rescue LoadError
+  # do nothing
+end
+
 # load a bunch of common classes here, so we don't have to track and repeat it
 # everywhere
 require 'active_support/all'
@@ -14,16 +20,26 @@ Dir[File.join(File.dirname(__FILE__), 'ext', '*.rb')].each do |f|
   require f
 end
 
+blacklist = [
+  'tasks.rb',
+  'gc_stats.rb',
+  'sysconf.rb',
+  'proc_stat.rb',
+]
+
 Dir[File.join(File.dirname(__FILE__), '*.rb')].each do |f|
-  require f
+  require f unless blacklist.include?(f)
 end
 
 require 'madvertise/logging' # dedicated gem
 
-# initialize configuration and logger with hardcoded defaults
+# load default configuration
 $conf = Conf = Configuration.new
+
+# callback for madvertise-logging
 $conf.callback 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

data/lib/madvertise/cli.rb

@@ -33,7 +33,7 @@ class CLI
     :description => "Enable debug output",
     :boolean => true,
     :default => false,
-    :proc => ->(value) { $conf.mixin(log_level: :debug) }
+    :proc => ->(value) { $conf.mixin(log_level: value ? :debug : :info); value }
 
   option :help,
     :short => '-h',
@@ -67,12 +67,16 @@ class CLI
     $log.info("cli:initialize", cli.config)
     $conf.reload!
 
+    # infer some variables
     opts = cli.config.merge({
-      interval: 1,
-      logger: $log,
+      fqdn: Socket.gethostbyname(Socket.gethostname).first
     })
 
-    cls.new(opts)
+    # sneak in opts without subclassing
+    cls.allocate.tap do |obj|
+      obj.define_singleton_method(:opts) { opts }
+      obj.send(:initialize)
+    end
   end
 
 end

data/lib/madvertise/configuration.rb

@@ -82,6 +82,7 @@ class Configuration < Section
     log_backend: :stdout,
     log_caller: false,
     log_format: "%{time} %{progname}(%{pid}) [%{severity}] %{msg}\n",
+    log4j_format: "%d %c(%t) [%p] %m%n",
     log_level: :info,
   }
 

data/lib/madvertise/ext/signal.rb

@@ -1,8 +1,8 @@
 module Signal
   def self.register_shutdown_handler(&block)
-    %w(QUIT INT TERM).each do |sig|
-      old = trap(sig) {}
-      trap(sig) { block.call; old.call }
+    at_exit(&block)
+    %w(INT TERM).each do |sig|
+      trap(sig) { exit(-1) }
     end
   end
 end

data/lib/madvertise/gc_stats.rb

@@ -38,7 +38,7 @@ class GCStats
     end
   end
 
-  if RUBY_VERSION =~ /^1\.9/
+  if RUBY_ENGINE == 'ruby' and RUBY_VERSION =~ /^1\.9/
     extend Yarv
   end
 

data/lib/madvertise/tasks/protoc.rake

@@ -0,0 +1,6 @@
+desc "build all protocol buffer schemas"
+task :protoc do
+  Dir["**/*.proto"].each do |file|
+    sh "ruby-protoc #{file}"
+  end
+end

data/lib/madvertise/tasks/reek.rake

@@ -4,5 +4,4 @@ begin
     t.fail_on_error = false
   end
 rescue LoadError
-  STDERR.puts "failed to load reek. please add gem 'reek' to your Gemfile in order to use reek"
 end

data/lib/madvertise/tasks/rspec.rake

@@ -14,5 +14,4 @@ begin
 
   task :default => [:spec]
 rescue LoadError
-  STDERR.puts "failed to load rspec. please add gem 'rspec' to your Gemfile in order to use rspec"
 end

data/lib/madvertise/tasks/yard.rake

@@ -5,5 +5,4 @@ begin
     t.files = ['lib/**/*.rb', 'README.rdoc']
   end
 rescue LoadError
-  STDERR.puts "failed to load yard. please add gem 'yard' to your Gemfile in order to use yard"
 end

data/madvertise-ext.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "madvertise-ext"
-  spec.version       = "0.5.3"
+  spec.version       = "0.6.0"
   spec.authors       = ["madvertise Mobile Advertising GmbH"]
   spec.email         = ["tech@madvertise.com"]
   spec.description   = %q{Ruby core extensions and helper libraries}
@@ -17,15 +17,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "ffi"
   spec.add_dependency "madvertise-logging"
+  spec.add_dependency "metriks"
   spec.add_dependency "mixlib-cli"
   spec.add_dependency "servolux"
-
-  spec.add_development_dependency "awesome_print"
-  spec.add_development_dependency "brice"
-  spec.add_development_dependency "fuubar"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "reek"
-  spec.add_development_dependency "rspec"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "yard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-ext
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - madvertise Mobile Advertising GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-28 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mixlib-cli
+  name: metriks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: servolux
+  name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -81,111 +81,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: brice
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
+  name: servolux
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -223,11 +125,11 @@ files:
 - lib/madvertise/proc_stat.rb
 - lib/madvertise/sysconf.rb
 - lib/madvertise/tasks.rb
+- lib/madvertise/tasks/protoc.rake
 - lib/madvertise/tasks/reek.rake
 - lib/madvertise/tasks/rspec.rake
 - lib/madvertise/tasks/yard.rake
 - lib/madvertise/transaction_id.rb
-- lib/servolux/eventmachine.rb
 - madvertise-ext.gemspec
 - spec/enumerable_spec.rb
 - spec/spec_helper.rb

data/lib/servolux/eventmachine.rb

@@ -1,39 +0,0 @@
-# encoding: utf-8
-
-require 'eventmachine'
-require 'servolux'
-require 'thread'
-
-module Servolux
-  class EventMachineServer < Server
-
-    def initialize(name, opts = {})
-      super
-      EventMachine.error_handler do |e|
-        $log.exception(e)
-        raise e
-      end
-    end
-
-    def before_starting
-      @reactor = Thread.new do
-        begin
-          EventMachine.run { boot if respond_to?(:boot) }
-        rescue => e
-          $log.exception(e)
-        end
-      end
-    end
-
-    def after_stopping
-      $log.debug("eventmachine stop")
-      EventMachine.stop_event_loop if EventMachine.reactor_running?
-      @reactor.kill
-      @reactor.join if @reactor.is_a?(Thread)
-    end
-
-    def run
-    end
-
-  end
-end