madvertise-ext 0.2.2 → 0.3.0

data/.rvmrc

@@ -1 +1 @@
-rvm use --create ruby-1.9.3-p125@madvertise-ext
+rvm use --create ruby-1.9.3-p327@madvertise-ext

data/lib/madvertise/ext/array.rb

@@ -0,0 +1,23 @@
+class Array
+
+  def pick(n=1)
+    Array.new(n) { self[Kernel::rand(size)-1] }
+  end
+
+  def pick_one
+    self[Kernel::rand(size)-1]
+  end
+
+  def to_h(&block)
+    Hash[*self.map { |v| [v, block.call(v)] }.flatten]
+  end
+
+  def / parts
+    inject([[]]) do |ary, x|
+      ary << [] if [*ary.last].nitems == length / parts
+      ary.last << x
+      ary
+    end
+  end
+
+end

data/lib/madvertise/ext/config.rb

@@ -1,5 +1,8 @@
 require 'yaml'
+require 'set'
+
 require 'madvertise/ext/hash'
+require 'madvertise/ext/environment'
 
 ##
 # A {Configuration} consists of one or more Sections. A section is a hash-like
@@ -12,14 +15,24 @@ require 'madvertise/ext/hash'
 #   => 1
 #
 class Section < Hash
+
   class << self
 
+    # How to handle nil values in the configuration?
+    #
+    # Possible values are:
+    #  - :nil, nil  (return nil)
+    #  - :raise  (raise an exception)
+    #  - :section  (return a NilSection which can be chained)
+    #
+    attr_accessor :nil_action
+
     # Create a new section from the given hash-like object.
     #
     # @param [Hash] hsh  The hash to convert into a section.
     # @return [Section]  The new {Section} object.
     def from_hash(hsh)
-      result = new.tap do |result|
+      new.tap do |result|
         hsh.each do |key, value|
           result[key.to_sym] = from_value(value)
         end
@@ -42,28 +55,7 @@ class Section < Hash
         value
       end
     end
-  end
 
-  # Mixin a configuration snippet into the current section.
-  #
-  # @param [Hash, String] value  A hash to merge into the current
-  #                              configuration. If a string is given a filename
-  #                              is assumed and the given file is expected to
-  #                              contain a YAML hash.
-  # @return [void]
-  def mixin(value)
-    unless value.is_a?(Hash)
-      value = Section.from_hash(YAML.load(File.read(value)))
-    end
-
-    self.deep_merge!(value[:default]) if value.has_key?(:default)
-    self.deep_merge!(value[:generic]) if value.has_key?(:generic)
-
-    if value.has_key?(@mode)
-      self.deep_merge!(value[@mode])
-    else
-      self.deep_merge!(value)
-    end
   end
 
   # Build the call chain including NilSections.
@@ -75,7 +67,20 @@ class Section < Hash
     else
       value = self[name]
       value = value.call if value.is_a?(Proc)
-      value = NilSection.new if value.nil?
+
+      if value.nil?
+        case self.class.nil_action
+        when :nil, nil
+          # do nothing
+        when :raise
+          raise "value is nil for key #{name}"
+        when :section
+          value = NilSection.new if value.nil?
+        else
+          raise "unknown nil handling: #{self.class.nil_action}"
+        end
+      end
+
       self[name] = value
     end
   end
@@ -92,8 +97,9 @@ class Configuration < Section
   # @param [Symbol] mode  The mode to load from the configurtion file
   #                       (production, development, etc)
   # @yield [config]  The new configuration object.
-  def initialize(mode = :development)
-    @mode = mode
+  def initialize
+    @mixins = Set.new
+    @callbacks = []
     yield self if block_given?
   end
 
@@ -110,25 +116,52 @@ class Configuration < Section
     end
   end
 
-  ##
-  # The {Helpers} module can be included in all classes that wish to load
-  # configuration file(s). In order to load custom configuration files the
-  # including class needs to set the +@config_file+ instance variable.
+  # Mixin a configuration snippet into the current section.
   #
-  module Helpers
+  # @param [Hash, String] value  A hash to merge into the current
+  #                              configuration. If a string is given a filename
+  #                              is assumed and the given file is expected to
+  #                              contain a YAML hash.
+  # @return [void]
+  def mixin(value)
+    if value.is_a?(String)
+      @mixins << value
+      value = YAML.load(File.read(value))
+    end
 
-    # Load the configuration. The default configuration is located at
-    # +lib/ganymed/config.yml+ inside the Ganymed source tree.
-    #
-    # @return [Configuration]  The configuration object. See madvertise-ext gem
-    #                          for details.
-    def config
-      @config ||= Configuration.new(Env.mode) do |config|
-        config.mixin(@default_config_file) if @default_config_file
-        config.mixin(@config_file) if @config_file
-      end
+    value = Section.from_hash(value)
+
+    self.deep_merge!(value[:default]) if value.has_key?(:default)
+    self.deep_merge!(value[:generic]) if value.has_key?(:generic)
+
+    if value.has_key?(Env.to_sym)
+      self.deep_merge!(value[Env.to_sym])
+    else
+      self.deep_merge!(value)
+    end
+
+    @callbacks.each do |callback|
+      callback.call
     end
   end
+
+  # Reload all mixins.
+  #
+  # @return [void]
+  def reload!
+    self.clear
+    @mixins.each do |file|
+      self.mixin(file)
+    end
+  end
+
+  # Register a callback for config mixins.
+  #
+  # @return [void]
+  def callback(&block)
+    @callbacks << block
+  end
+
 end
 
 ##

data/lib/madvertise/ext/hash.rb

@@ -12,9 +12,20 @@ class Hash
     end
   end
 
-  # Recursively merge and replace +other_hash+ into +self.
+  # Recursively merge and replace +other_hash+ into +self+.
   def deep_merge!(other_hash)
     replace(deep_merge(other_hash))
   end
 
+  # accumulate existing keys from +other_hash+ into +self+.
+  def delta_merge!(other_hash)
+    other_hash.each do |k,v|
+      if self.has_key?(k)
+        self[k] += v
+      else
+        self[k] = v
+      end
+    end
+  end
+
 end

data/lib/madvertise/ext/logging.rb

@@ -1,40 +1,26 @@
-require 'active_support/core_ext/module/attribute_accessors'
+# encoding: utf-8
+
 require 'madvertise/ext/environment'
 require 'madvertise-logging'
 
-##
-# The {Logging} module provides a global container for the logger object.
-#
-module Logging
-  mattr_accessor :logger
-  self.logger = nil
+def init_logger(progname=$0, filename=nil)
+  progname = File.basename(progname)
+  filename ||= "#{Env.mode}.log"
 
-  # @private
-  def self.create_logger
-    if Env.prod?
-      Madvertise::Logging::ImprovedLogger.new(:syslog, $0)
-    else
-      Madvertise::Logging::ImprovedLogger.new(STDERR, $0)
-    end.tap do |logger|
-      logger.level = :info
-    end
+  MultiLogger.new.tap do |logger|
+    init_multi_logger(logger, progname, filename)
   end
+end
 
-  ##
-  # The {Logging::Helpers} module is mixed into the Object class to make the
-  # logger available to every object in the system.
-  #
-  module Helpers
-
-    # Retreive and possibly create the global logger object.
-    #
-    # @return [Logger]  The logger object.
-    def log
-      ::Logging.logger ||= ::Logging.create_logger
-    end
+def init_multi_logger(logger, progname=$0, filename=nil)
+  if Env.dev? or Env.test?
+    logger.attach(ImprovedLogger.new(STDERR, progname))
+  else
+    logger.attach(ImprovedLogger.new(:syslog, progname))
   end
-end
 
-class ::Object
-  include ::Logging::Helpers
+  # default log level
+  logger.level = Logger::INFO
 end
+
+$log = init_logger

data/lib/madvertise/ext/nil.rb

@@ -0,0 +1,5 @@
+class NilClass
+  def empty?
+    true
+  end
+end

data/lib/madvertise/ext/string.rb

@@ -0,0 +1,3 @@
+class String
+  alias each each_line
+end

data/lib/madvertise/ext/version.rb

@@ -1,6 +1,6 @@
 # @private
 module Madvertise
   module Ext
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/lib/servolux/cli.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+
+require 'madvertise/ext/environment'
+require 'mixlib/cli'
+require 'servolux'
+
+module Servolux
+  class BaseCLI
+    include Mixlib::CLI
+
+    def self.inherited(subclass)
+      subclass.option :environment,
+        :short => '-e ENVIRONMENT',
+        :long => '--environment ENVIRONMENT',
+        :description => "Set the daemon environment",
+        :default => "development",
+        :proc => ->(value) { Env.set(value) }
+
+      subclass.option :debug,
+        :short => '-D',
+        :long => '--debug',
+        :description => "Enable debug output",
+        :boolean => true,
+        :default => false
+
+      subclass.option :help,
+        :short => '-h',
+        :long => '--help',
+        :description => "Show this message",
+        :on => :tail,
+        :boolean => true,
+        :show_options => true,
+        :exit => 0
+    end
+
+    def self.parse_options
+      new.tap do |cli|
+        cli.parse_options
+      end.config
+    end
+  end
+
+  class CLI < BaseCLI
+  end
+
+  class DaemonCLI < BaseCLI
+    option :name,
+      :short => '-n NAME',
+      :long => '--name NAME',
+      :description => 'Process name',
+      :default => $0,
+      :proc => ->(value) { $0 = value }
+
+    option :pidfile,
+      :short => '-p PIDFILE',
+      :long => '--pidfile PIDFILE',
+      :description => "The daemon pidfile",
+      :default => "#{$0}.pid"
+
+    option :daemonize,
+      :short => '-d',
+      :long => '--daemonize',
+      :description => "Daemonize the server process",
+      :boolean => true,
+      :default => false
+
+    option :kill,
+      :short => '-k',
+      :long => '--kill',
+      :description => "Kill the currently running daemon instance",
+      :boolean => true
+  end
+end

data/lib/servolux/wrapper.rb

@@ -0,0 +1,51 @@
+# encoding: utf-8
+
+require 'madvertise/ext/logging'
+require 'servolux'
+require 'servolux/cli'
+
+module Servolux
+  def self.init_config(cli_class)
+    config = cli_class.parse_options
+
+    # CLI.parse_options may have changed $0
+    # so we reload the logger for good measure
+    $log = init_logger
+    $log.level = config[:debug] ? :debug : :info
+
+    return config
+  end
+
+  def self.wrap(server_class)
+    config = self.init_config(Servolux::CLI)
+    server_class.new(config).run
+  rescue => e
+    $log.exception(e)
+    raise e
+  end
+
+  def self.wrap_daemon(server_class)
+    config = self.init_config(Servolux::DaemonCLI)
+
+    server = server_class.new(config[:name], config.merge({
+      interval: 1,
+      logger: $log,
+      pid_file: config[:pidfile]
+    }))
+
+    if config[:daemonize] or config[:kill]
+      daemon = Servolux::Daemon.new(:server => server)
+
+      if config[:kill]
+        daemon.shutdown
+      else
+        daemon.startup
+      end
+    else
+      server.startup
+    end
+  rescue => e
+    $log.exception(e)
+    raise e
+  end
+end

data/madvertise-ext.gemspec

@@ -11,6 +11,8 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/madvertise/ext"
 
   gem.add_dependency "madvertise-logging"
+  gem.add_dependency "mixlib-cli"
+  gem.add_dependency "servolux"
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madvertise-ext
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2013-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: madvertise-logging
-  requirement: &20013940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,44 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *20013940
+  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 extensions
 email:
 - benedikt.boehm@madvertise.com
@@ -37,14 +74,19 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/madvertise/ext/array.rb
 - lib/madvertise/ext/config.rb
 - lib/madvertise/ext/enumerable.rb
 - lib/madvertise/ext/environment.rb
 - lib/madvertise/ext/hash.rb
 - lib/madvertise/ext/logging.rb
 - lib/madvertise/ext/mask.reek
+- lib/madvertise/ext/nil.rb
+- lib/madvertise/ext/string.rb
 - lib/madvertise/ext/transaction_id.rb
 - lib/madvertise/ext/version.rb
+- lib/servolux/cli.rb
+- lib/servolux/wrapper.rb
 - madvertise-ext.gemspec
 - spec/enumerable_spec.rb
 - spec/spec.opts
@@ -66,7 +108,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2902116166702293423
+      hash: -2076914703053798103
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -75,10 +117,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2902116166702293423
+      hash: -2076914703053798103
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Ruby extensions