combi 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8d52d86d25a8990c1034e0acfaadb4417164c07
-  data.tar.gz: 90ae51a9bf47ce6a2ff6fcfe13ea95fb076a8ba6
+  metadata.gz: 929a53569645c090a360edc9fdfdb0a96ba436b9
+  data.tar.gz: 4557b6eb644fb82dda359e1cd12fd4298b570e28
 SHA512:
-  metadata.gz: 67235e10e87a924be9c053eead194bf0f6f30f47682a3c13a204d0f77d01354810841664116b2791ae2ade902103d0f9a1c2fe31ca8e6bf6771aa6c7b68b829e
-  data.tar.gz: 0d5f694d3db7fc22d18a01cc40d64474a296e4811bf40ac9084347e7c89ae17cc824165c3a7729cc0430a034d6a1e2bcf84aa7d91666bae54917d4f16caeb5ac
+  metadata.gz: f9060e9b6d9eda5dea793471870156502765b0f105b20f026af987491db76e97fca336ce6773df9c00f86a078897ebf7aa8e1e7b1ed09e937e1bfd09734da3ae
+  data.tar.gz: 9e7d357112557849289c2438cc76d8502f18ac487c95c274a5632269d7c5e25a582af7559817c0f7058bfa3cf00ee8d281ba9c57e82ea9e89e11b28e9f4e8f6c

data/lib/combi.rb

@@ -1,2 +1,34 @@
+require 'logger'
+
+module Combi
+  def self.logger
+    @logger ||= create_logger
+  end
+
+  def self.logger_class
+    @logger_class ||= Logger
+  end
+
+  def self.logger_class=(custom_class)
+    @logger_class = custom_class
+  end
+
+  protected
+
+  def self.create_logger
+    if ENV['LOG_LEVEL'] and Logger::Severity.const_defined?(ENV['LOG_LEVEL'])
+      severity = Logger::Severity.const_get(ENV['LOG_LEVEL'])
+    elsif ENV['LOG_LEVEL'] == 'NONE'
+      severity = Logger::Severity::UNKNOWN
+    elsif ENV['DEBUG'] == 'true'
+      severity = Logger::Severity::DEBUG
+    else
+      severity = Logger::Severity::INFO
+    end
+    logger = logger_class.new(STDOUT)
+    logger.level = severity
+    return logger
+  end
+end
 require 'combi/version'
 require 'combi/service_bus'

data/lib/combi/buses/bus.rb

@@ -55,11 +55,6 @@ module Combi
       end
     end
 
-    def log(message)
-      return unless @debug_mode ||= ENV['DEBUG'] == 'true'
-      puts "#{Time.now.to_f} #{self.class.name} #{message}"
-    end
-
     protected
 
     def make_service_instance(service_definition)
@@ -98,7 +93,7 @@ module Combi
 
     def add_route_for(service_name, action_name, service_instance)
       path = [service_name, action_name].join('/')
-      puts "New route: #{path} :: #{service_instance}"
+      Combi.logger.info {"New route: #{path} :: #{service_instance}"}
       @routes[path] = service_instance
     end
 
@@ -112,8 +107,8 @@ module Combi
     def resolve_route(service_name, kind)
       path = [service_name, kind].join('/')
       return @routes[path] if @routes[path]
-      log "[WARNING] Service Path #{path} not found"
-      log "[WARNING] routes: #{@routes.keys.inspect}"
+      Combi.logger.warn {"Service Path #{path} not found"}
+      Combi.logger.warn {"routes: #{@routes.keys.inspect}"}
       raise UnknownStop.new(path)
     end
 
@@ -128,14 +123,14 @@ module Combi
       deferrable.errback &log_service_invocation(false, t0, path)
       deferrable
     rescue StandardError => e
-      # TODO: report in a more effective way (I will not read server logs to find this)
-      require 'yaml'
-      puts " *** ERROR INVOKING SERVICE ***"
-      puts "   - #{e.inspect}"
-      puts "   - #{service_name} #{service_instance.class.ancestors.join ' > '}"
-      puts "   - #{action}"
-      puts "   - #{params.to_yaml.split("\n").join("\n\t")}"
-      # FIXME: strings because is what in_process tests expects
+      Combi.logger.error do
+        require 'yaml'
+        msg = " *** ERROR INVOKING SERVICE ***" +
+              "   - #{e.inspect}" +
+              "   - #{service_name} #{service_instance.class.ancestors.join ' > '}" +
+              "   - #{action}" +
+              "   - #{params.to_yaml.split("\n").join("\n\t")}"
+      end
       return sync_to_async error: { klass: e.class.name, message: e.message, backtrace: e.backtrace }
     end
 
@@ -152,11 +147,13 @@ module Combi
 
     def log_service_invocation(success, t0, path)
       Proc.new do |response|
-        result = success ? 'OK' : 'KO'
-        time = '%10.6fs' % (Time.now - t0)
-        base_msg = "#{result}\t#{time}\t#{path}"
-        base_msg += "\t#{response.inspect}" if success == false
-        puts base_msg
+        Combi.logger.info do
+          result = success ? 'OK' : 'KO'
+          time = '%10.6fs' % (Time.now - t0)
+          base_msg = "#{result}\t#{time}\t#{path}"
+          base_msg += "\t#{response.inspect}" if success == false
+          base_msg
+        end
       end
     end
 

data/lib/combi/buses/queue.rb

@@ -31,13 +31,13 @@ module Combi
     end
 
     def create_queue_for_service(service_name)
-      log "creating queue #{service_name}"
+      Combi.logger.debug {"creating queue #{service_name}"}
       queue_options = {}
       subscription_options = {}
       subscription_options[:ack] = true
       queue_service.ready do
         queue_service.queue(service_name.to_s, queue_options) do |queue|
-          log "subscribing to queue #{service_name.to_s}"
+          Combi.logger.debug {"subscribing to queue #{service_name.to_s}"}
           queue.subscribe(subscription_options) do |delivery_info, payload|
             process_queue_message service_name, payload, delivery_info
             queue_service.acknowledge delivery_info
@@ -47,7 +47,7 @@ module Combi
     end
 
     def request(name, kind, message, timeout: RPC_DEFAULT_TIMEOUT, fast: false)
-      log "Preparing request: #{name}.#{kind} #{message.inspect[0..500]}\t|| timeout: #{timeout} fast: #{fast}"
+      Combi.logger.debug {"Preparing request: #{name}.#{kind} #{message.inspect[0..500]}\t|| timeout: #{timeout} fast: #{fast}"}
       options = {
         timeout: timeout,
         routing_key: name.to_s
@@ -60,7 +60,7 @@ module Combi
         waiter = @response_store.wait_for correlation_id, timeout
       end
       queue_service.next_ready_only do
-        log "Making request: #{name}.#{kind} #{message.inspect[0..500]}\t|| #{options.inspect[0..500]}"
+        Combi.logger.debug {"Making request: #{name}.#{kind} #{message.inspect[0..500]}\t|| #{options.inspect[0..500]}"}
         queue_service.publish_request(kind, message, options)
       end
       waiter

data/lib/combi/buses/web_socket.rb

@@ -18,12 +18,12 @@ module Combi
       end
 
       def on_open(ws, handler)
-        @bus.log "ON OPEN #{handler.inspect}"
+        Combi.logger.debug { "ON OPEN #{handler.inspect}" }
         handler.new_session(ws)
       end
 
       def on_message(ws, session, raw_message)
-        @bus.log "WS SERVER ON MESSAGE #{raw_message[0..500]}"
+        Combi.logger.debug {"WS SERVER ON MESSAGE #{raw_message[0..500]}"}
         message = Yajl::Parser.parse raw_message, symbolize_keys: true
         @bus.on_message(ws, message, session)
       end
@@ -49,7 +49,7 @@ module Combi
 
       def stop!
         ws && ws.close
-        @bus.log "stop requested"
+        Combi.logger.debug {"stop requested"}
       end
 
       def restart!
@@ -58,29 +58,28 @@ module Combi
       end
 
       def open_websocket
-        @bus.log  @remote_api
+        Combi.logger.debug { "Remote API #{@remote_api}" }
         @ws = ws = Faye::WebSocket::Client.new(@remote_api)
         ws.on :open do |event|
-          @bus.log "OPEN"
-          @bus.log "HANDLER #{@handler.inspect}"
+          Combi.logger.debug {"OPEN WITH HANDLER #{@handler.inspect}"}
           @handler.on_open if @handler.respond_to?(:on_open)
           @bus.ready.succeed
         end
 
         ws.on :message do |event|
-          @bus.log "ON MESSAGE: #{event.data[0..500]}"
+          Combi.logger.debug {"ON MESSAGE: #{event.data[0..500]}"}
           message = Yajl::Parser.parse event.data, symbolize_keys: true
           @bus.on_message(ws, message)
         end
 
         ws.on :close do |event|
-          @bus.log  "close #{event.code}: #{event.reason}"
+          Combi.logger.debug {"close #{event.code}: #{event.reason}"}
           @handler.on_close if @handler.respond_to?(:on_close)
           @ws = ws = nil
         end
 
         ws.on :error do |event|
-          @bus.log  "received error: #{event.inspect}"
+          Combi.logger.debug {"received error: #{event.inspect}"}
           stop!
         end
       end
@@ -157,7 +156,7 @@ module Combi
     def on_message(ws, message, session = nil)
       if message[:correlation_id] && message.has_key?(:result)
         @response_store.handle_rpc_response(message)
-        log "Handled response with correlation_id #{message[:correlation_id]} - #{message.inspect[0..500]}"
+        Combi.logger.debug {"Handled response with correlation_id #{message[:correlation_id]} - #{message.inspect[0..500]}"}
         return
       end
       service_name = message[:service]
@@ -207,7 +206,7 @@ module Combi
         web_socket = @machine.respond_to?(:ws) ? @machine.ws : ws
         unless web_socket.nil?
           serialized = Yajl::Encoder.encode msg
-          log "sending request #{serialized}"
+          Combi.logger.debug {"sending request #{serialized}"}
           web_socket.send serialized
         end
       end

data/lib/combi/queue_service.rb

@@ -1,129 +1,122 @@
 require 'amqp'
 require 'amqp/utilities/event_loop_helper'
 
-module Combi
-  class QueueService
+class Combi::QueueService
 
-    attr_accessor :rpc_callback
+  attr_accessor :rpc_callback
 
-    def initialize(config, options)
-      @config = config
-      @options = options
-      @rpc_queue = nil
-      @ready_defer = EventMachine::DefaultDeferrable.new
-      @ready_callbacks = []
-    end
-
-    def ready(&block)
-      @ready_callbacks << block
-      @ready_defer.callback &block
-    end
+  def initialize(config, options)
+    @config = config
+    @options = options
+    @rpc_queue = nil
+    @ready_defer = EventMachine::DefaultDeferrable.new
+    @ready_callbacks = []
+  end
 
-    def next_ready_only(&block)
-      @ready_defer.callback &block
-    end
+  def ready(&block)
+    @ready_callbacks << block
+    @ready_defer.callback &block
+  end
 
-    def status
-      @amqp_conn && @amqp_conn.status
-    end
+  def next_ready_only(&block)
+    @ready_defer.callback &block
+  end
 
-    def log(message)
-      return unless @debug_mode ||= ENV['DEBUG'] == 'true'
-      puts "#{Time.now.to_f} #{self.class.name} #{message}"
-    end
+  def status
+    @amqp_conn && @amqp_conn.status
+  end
 
-    def start
-      @config[:reconnect_period] ||= 4
-      reconnection_proc = Proc.new { EM.add_timer(@config[:reconnect_period] * rand) { start } }
-      @config[:on_tcp_connection_failure] = reconnection_proc
-      @config[:on_possible_authentication_failure] = reconnection_proc
-      connect @config do
-        if @options[:rpc] == :enabled
-          create_rpc_queue
-        else
-          @ready_defer.succeed
-        end
+  def start
+    @config[:reconnect_period] ||= 4
+    reconnection_proc = Proc.new { EM.add_timer(@config[:reconnect_period] * rand) { start } }
+    @config[:on_tcp_connection_failure] = reconnection_proc
+    @config[:on_possible_authentication_failure] = reconnection_proc
+    connect @config do
+      if @options[:rpc] == :enabled
+        create_rpc_queue
+      else
+        @ready_defer.succeed
       end
     end
+  end
 
-    def connect(config, &after_connect)
-      puts "[INFO] trying to connect to queue server"
-      @amqp_conn = AMQP.connect(config) do |connection, open_ok|
-        @channel = AMQP::Channel.new @amqp_conn
-        @channel.auto_recovery = true
-        @exchange = @channel.direct ''
-        after_connect.call
-        connection.on_error do |conn, connection_close|
-          puts "[amqp connection.close] Reply code = #{connection_close.reply_code}, reply text = #{connection_close.reply_text}"
-          if connection_close.reply_code == 320
-            puts "[amqp connection.close] Setting up a periodic reconnection timer..."
-            reconnect
-          end
-        end
-        connection.on_tcp_connection_loss do |conn, settings|
-          puts "[ERROR] Connection failed, resetting for reconnect"
+  def connect(config, &after_connect)
+    Combi.logger.info {"trying to connect to queue server"}
+    @amqp_conn = AMQP.connect(config) do |connection, open_ok|
+      @channel = AMQP::Channel.new @amqp_conn
+      @channel.auto_recovery = true
+      @exchange = @channel.direct ''
+      after_connect.call
+      connection.on_error do |conn, connection_close|
+        Combi.logger.info {"[amqp connection.close] Reply code = #{connection_close.reply_code}, reply text = #{connection_close.reply_text}"}
+        if connection_close.reply_code == 320
+          Combi.logger.info {"[amqp connection.close] Setting up a periodic reconnection timer..."}
           reconnect
         end
       end
-    end
-
-    def reconnect
-      @ready_defer = EventMachine::DefaultDeferrable.new
-      @ready_callbacks.each do |callback|
-        @ready_defer.callback &callback
+      connection.on_tcp_connection_loss do |conn, settings|
+        Combi.logger.error {"Connection failed, resetting for reconnect"}
+        reconnect
       end
-      start
     end
+  end
 
-    def disconnect
-      @amqp_conn.close
+  def reconnect
+    @ready_defer = EventMachine::DefaultDeferrable.new
+    @ready_callbacks.each do |callback|
+      @ready_defer.callback &callback
     end
+    start
+  end
 
-    def publish(*args, &block)
-      @exchange.publish *args do
-        block.call if block_given?
-      end
-    end
+  def disconnect
+    @amqp_conn.close
+  end
 
-    def queue(name, options = {}, &block)
-      @channel.queue(name, options, &block)
+  def publish(*args, &block)
+    @exchange.publish *args do
+      block.call if block_given?
     end
+  end
 
-    def acknowledge(delivery_info)
-      @channel.acknowledge(delivery_info.delivery_tag, false)
-    end
+  def queue(name, options = {}, &block)
+    @channel.queue(name, options, &block)
+  end
 
-    def respond(response, delivery_info)
-      serialized = Yajl::Encoder.encode response
-      publish serialized, routing_key: delivery_info.reply_to, correlation_id: delivery_info.correlation_id
-    end
+  def acknowledge(delivery_info)
+    @channel.acknowledge(delivery_info.delivery_tag, false)
+  end
 
-    def create_rpc_queue
-      @rpc_queue.unsubscribe unless @rpc_queue.nil?
-      @rpc_queue = queue('', exclusive: true, auto_delete: true) do |rpc_queue|
-        log "\tRPC QUEUE: #{@rpc_queue.name}"
-        rpc_queue.subscribe do |metadata, response|
-          parsed_response = Yajl::Parser.parse response, symbolize_keys: true
-          message = {
-            correlation_id: metadata.correlation_id,
-            response: parsed_response
-          }
-          rpc_callback.call(message) unless rpc_callback.nil?
-        end
-        @ready_defer.succeed
-      end
-    end
+  def respond(response, delivery_info)
+    serialized = Yajl::Encoder.encode response
+    publish serialized, routing_key: delivery_info.reply_to, correlation_id: delivery_info.correlation_id
+  end
 
-    def publish_request(kind, message, options = {})
-      if options.has_key? :correlation_id
-        # wants a response
-        options[:reply_to] = @rpc_queue.name
+  def create_rpc_queue
+    @rpc_queue.unsubscribe unless @rpc_queue.nil?
+    @rpc_queue = queue('', exclusive: true, auto_delete: true) do |rpc_queue|
+      Combi.logger.debug {"\tRPC QUEUE: #{@rpc_queue.name}"}
+      rpc_queue.subscribe do |metadata, response|
+        parsed_response = Yajl::Parser.parse response, symbolize_keys: true
+        message = {
+          correlation_id: metadata.correlation_id,
+          response: parsed_response
+        }
+        rpc_callback.call(message) unless rpc_callback.nil?
       end
-      options[:expiration] = ((options[:timeout] || RPC_DEFAULT_TIMEOUT) * 1000).to_i
-      log "sending request #{kind} #{message.inspect[0..500]} with options #{options.inspect}"
-      request = Yajl::Encoder.encode kind: kind, payload: message, options: {}
-      publish request, options
+      @ready_defer.succeed
     end
+  end
 
+  def publish_request(kind, message, options = {})
+    if options.has_key? :correlation_id
+      # wants a response
+      options[:reply_to] = @rpc_queue.name
+    end
+    options[:expiration] = ((options[:timeout] || RPC_DEFAULT_TIMEOUT) * 1000).to_i
+    Combi.logger.debug {"sending request #{kind} #{message.inspect[0..500]} with options #{options.inspect}"}
+    request = Yajl::Encoder.encode kind: kind, payload: message, options: {}
+    publish request, options
   end
+
 end

data/lib/combi/reactor.rb

@@ -1,47 +1,40 @@
 require 'eventmachine'
 
-module Combi
-  class Reactor
-    def self.start(&block)
-      EM::error_handler do |error|
-        STDERR << "ERROR IN EM\n"
-        STDERR << "\t#{error.inspect}"
-        STDERR << "\t#{error.backtrace.join("\t\n")}" << "\n"
-      end
-      log "-EM.start- the reactor is running: #{EM::reactor_running?}"
-      raise "EM did not shut down" if EM::reactor_running?
-      @@reactor_thread = Thread.new do
-        begin
-          log "------- starting EM reactor"
-          EM::run do
-            log "------- reactor started"
-            block.call unless block.nil?
-          end
-        ensure
-          puts "------- reactor stopped"
-        end
-      end
-      30.times do
-        sleep 0.1 unless EM::reactor_running?
-      end
+class Combi::Reactor
+  def self.start(&block)
+    EM::error_handler do |error|
+      STDERR << "ERROR IN EM\n"
+      STDERR << "\t#{error.inspect}"
+      STDERR << "\t#{error.backtrace.join("\t\n")}" << "\n"
     end
-
-    def self.stop
-      log "-EM.stop- the reactor is running: #{EM::reactor_running?}"
-      EM::stop_event_loop if EM::reactor_running?
-      50.times do
-        sleep 0.3 if EM::reactor_running?
+    Combi.logger.info {"-EM.start- the reactor is running: #{EM::reactor_running?}"}
+    raise "EM did not shut down" if EM::reactor_running?
+    @@reactor_thread = Thread.new do
+      begin
+        Combi.logger.debug {"------- starting EM reactor"}
+        EM::run do
+          Combi.logger.debug {"------- reactor started"}
+          block.call unless block.nil?
+        end
+      ensure
+        Combi.logger.info {"------- reactor stopped"}
       end
     end
-
-    def self.join_thread
-      @@reactor_thread.join if @@reactor_thread
+    30.times do
+      sleep 0.1 unless EM::reactor_running?
     end
+  end
 
-    def self.log(message)
-      return unless @debug_mode ||= ENV['DEBUG'] == 'true'
-      puts "#{object_id} #{self.class.name} #{message}"
+  def self.stop
+    Combi.logger.debug {"-EM.stop- the reactor is running: #{EM::reactor_running?}"}
+    EM::stop_event_loop if EM::reactor_running?
+    50.times do
+      sleep 0.3 if EM::reactor_running?
     end
+  end
 
+  def self.join_thread
+    @@reactor_thread.join if @@reactor_thread
   end
+
 end

data/lib/combi/response_store.rb

@@ -1,41 +1,39 @@
 require 'eventmachine'
 
-module Combi
-  class ResponseStore
-    def initialize()
-      @waiters = {}
-    end
+class Combi::ResponseStore
+  def initialize()
+    @waiters = {}
+  end
 
-    # Returns an EM::Deferrable
-    def wait_for(correlation_id, timeout)
-      waiter = EM::DefaultDeferrable.new
-      add_waiter correlation_id, waiter
-      waiter.timeout timeout, error: 'Timeout::Error'
-    end
+  # Returns an EM::Deferrable
+  def wait_for(correlation_id, timeout)
+    waiter = EM::DefaultDeferrable.new
+    add_waiter correlation_id, waiter
+    waiter.timeout timeout, error: 'Timeout::Error'
+  end
 
-    def handle_rpc_response(response)
-      correlation_id = response[:correlation_id]
-      waiter = @waiters[correlation_id]
-      return unless waiter
-      response = response[:response] #Yajl::Parser.parse response[:response], sybolize_keys: true
-      if response.respond_to?(:keys) and response[:error]
-        waiter.fail response
-      else
-        waiter.succeed response
-      end
+  def handle_rpc_response(response)
+    correlation_id = response[:correlation_id]
+    waiter = @waiters[correlation_id]
+    return unless waiter
+    response = response[:response] #Yajl::Parser.parse response[:response], sybolize_keys: true
+    if response.respond_to?(:keys) and response[:error]
+      waiter.fail response
+    else
+      waiter.succeed response
     end
+  end
 
-    protected
+  protected
 
-    def add_waiter(correlation_id, waiter)
-      @waiters[correlation_id] = waiter
-      waiter.callback { |r| remove_waiter correlation_id }
-      waiter.errback  { |r| remove_waiter correlation_id }
-      waiter
-    end
+  def add_waiter(correlation_id, waiter)
+    @waiters[correlation_id] = waiter
+    waiter.callback { |r| remove_waiter correlation_id }
+    waiter.errback  { |r| remove_waiter correlation_id }
+    waiter
+  end
 
-    def remove_waiter(correlation_id)
-      @waiters.delete correlation_id
-    end
+  def remove_waiter(correlation_id)
+    @waiters.delete correlation_id
   end
 end

data/lib/combi/service.rb

@@ -1,54 +1,50 @@
-module Combi
-  module Service
-
-    def setup(service_bus, context)
-      context ||= {}
-      context[:service_bus] = service_bus
-      setup_context(context)
-      setup_services
-      self
-    end
+module Combi::Service
+  def setup(service_bus, context)
+    context ||= {}
+    context[:service_bus] = service_bus
+    setup_context(context)
+    setup_services
+    self
+  end
 
-    def setup_context(context)
-      @context = context
-      @context.keys.each do |context_var|
-        define_singleton_method context_var do
-          @context[context_var]
-        end
+  def setup_context(context)
+    @context = context
+    @context.keys.each do |context_var|
+      define_singleton_method context_var do
+        @context[context_var]
       end
     end
+  end
 
-    def setup_services
-    end
-
-    def no_response
-      nil
-    end
+  def setup_services
+  end
 
-    def async_response(&block)
-      lambda &block
-    end
+  def no_response
+    nil
+  end
 
-    def actions
-      []
-    end
+  def async_response(&block)
+    lambda &block
+  end
 
-    def remote_methods
-      @_REMOTE_METHODS ||= public_methods(false) - Combi::Service.public_instance_methods
-    end
+  def actions
+    []
+  end
 
-    def service_bus
-      @service_bus
-    end
+  def remote_methods
+    @_REMOTE_METHODS ||= public_methods(false) - Combi::Service.public_instance_methods
+  end
 
-    def enable(*services, &block)
-      service_bus.enable(services)
-      yield block if block_given?
-    end
+  def service_bus
+    @service_bus
+  end
 
-    def to_s
-      @_TO_S ||= "#{self.class.name}"
-    end
+  def enable(*services, &block)
+    service_bus.enable(services)
+    yield block if block_given?
+  end
 
+  def to_s
+    @_TO_S ||= "#{self.class.name}"
   end
 end

data/lib/combi/service_bus.rb

@@ -1,31 +1,28 @@
-module Combi
-  class ServiceBus
-    class << self
-      @@buses = {}
+class Combi::ServiceBus
+  class << self
+    @@buses = {}
 
-      def for(kind, options = {})
-        @@buses[kind] ||= init_for(kind, options)
-      end
+    def for(kind, options = {})
+      @@buses[kind] ||= init_for(kind, options)
+    end
 
-      def init_for(kind, options)
-        require 'combi/buses/bus'
+    def init_for(kind, options)
+      require 'combi/buses/bus'
 
-        case kind
-        when :in_process
-          require 'combi/buses/in_process'
-          Combi::InProcess.new(options)
-        when :queue
-          require 'combi/buses/queue'
-          Combi::Queue.new(options)
-        when :web_socket
-          require 'combi/buses/web_socket'
-          Combi::WebSocket.new(options)
-        when :http
-          require 'combi/buses/http'
-          Combi::Http.new(options)
-        end
+      case kind
+      when :in_process
+        require 'combi/buses/in_process'
+        Combi::InProcess.new(options)
+      when :queue
+        require 'combi/buses/queue'
+        Combi::Queue.new(options)
+      when :web_socket
+        require 'combi/buses/web_socket'
+        Combi::WebSocket.new(options)
+      when :http
+        require 'combi/buses/http'
+        Combi::Http.new(options)
       end
     end
-
   end
 end

data/lib/combi/version.rb

@@ -1,3 +1,3 @@
 module Combi
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/spec/lib/combi/buses/bus_spec.rb

@@ -28,11 +28,7 @@ describe 'Combi::Bus' do
         end
       end
       Given(:path) { 'module/remote' }
-      When { bus.add_service service_definition
-        puts bus.routes.inspect
-        puts bus.routes[path].inspect
-        puts bus.routes.keys.inspect
-      }
+      When { bus.add_service service_definition }
       Then { bus.routes.keys.length == 1 }
       And  { bus.routes[path].is_a? service_definition }
     end

data/spec/lib/combi/buses/queue_spec.rb

@@ -68,7 +68,7 @@ describe 'Combi::Queue' do
   end
 
   context "it resist a reconnection" do
-    puts "VERY UNSTABLE TEST"
+    Given!("notice") { puts "VERY UNSTABLE TEST" }
     When(:service) { provider.add_service null_service }
     Then do
       em do

data/spec/support/rabbitmq_server.rb

@@ -1,6 +1,7 @@
 require 'singleton'
 require 'socket'
 require 'timeout'
+require 'combi'
 # Uses docker to start a server
 class RabbitmqServer
   include Singleton
@@ -11,9 +12,9 @@ class RabbitmqServer
   def start!
     needs_to_start = !container_running?
     if needs_to_start
-      puts "Starting new Rabbitmq container"
+      Combi.logger.debug {"Starting new Rabbitmq container"}
       system "docker run -d -P -e RABBITMQ_PASS=#{PASSWORD} --name #{NAME} tutum/rabbitmq"
-      puts "RABBITMQ STARTING"
+      Combi.logger.debug {"RABBITMQ STARTING"}
     end
     start_forwarder!
     is_port_open?('localhost', port)
@@ -32,11 +33,11 @@ class RabbitmqServer
     return if @_command_running ||= `ps`.include?(command)
     @forwarder_pid = Process.spawn command
     #Process.detach @forwarder_pid
-    puts "starting forwarder pid: #{@forwarder_pid}"
+    Combi.logger.debug {"starting forwarder pid: #{@forwarder_pid}"}
   end
 
   def stop_forwarder!
-    puts "stopping forwarder pid #{@forwarder_pid}"
+    Combi.logger.debug {"stopping forwarder pid #{@forwarder_pid}"}
     Process.kill 'TERM', @forwarder_pid if @forwarder_pid
   rescue Error::ESRCH => e
     # the forwarder process has already died
@@ -48,7 +49,7 @@ class RabbitmqServer
     if port_match
       return port_match[1].to_i
     else
-      puts "Container not running yet, sleeping"
+      Combi.logger.info {"Container not running yet, sleeping"}
       sleep 0.2
       port
     end
@@ -63,14 +64,13 @@ class RabbitmqServer
           s.close
           return true
         rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-          puts "conn error to #{service}"
           sleep 1
-          puts "\tretrying connection to #{service}"
+          Combi.logger.info {"\tretrying connection to #{service}"}
           retry
         end
       end
     rescue Timeout::Error
-      puts "Cannot connect to RABBIT server after #{timeout} seconds"
+      Combi.logger.error {"Cannot connect to RABBIT server after #{timeout} seconds"}
     end
 
     return false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: combi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - German Del Zotto
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby