gerouter 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -9,13 +9,13 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    amq-client (0.9.11)
-      amq-protocol (>= 1.0.1)
+    amq-client (0.9.12)
+      amq-protocol (>= 1.2.0)
       eventmachine
     amq-protocol (1.2.0)
-    amqp (0.9.8)
-      amq-client (~> 0.9.5)
-      amq-protocol (>= 0.9.4)
+    amqp (0.9.9)
+      amq-client (~> 0.9.12)
+      amq-protocol (~> 1.2.0)
       eventmachine
     em-ssh (0.4.3)
       eventmachine

data/README.md

@@ -98,17 +98,19 @@ The above is also stored in [here][samples].
 * gerrits can share one broker 
 
 
-Stuffed Gerrit event
+Additional attribute in Gerrit event
 ---------------------------
 
-As below, gerouter stuffs Gerrit event with own object then send to broker.
+As below, gerouter adds `misc` attribute into Gerrit event then send to broker.
 
 ```json
 {
-"provider":"gerouter",
-"version":"1",
-"host":"gerrit hostname",
-"event":{"ORIGINAL EVENT"} 
+  "provider": {
+    "name":"gerrit name in config"
+    "host":"gerrit host",
+    "port":"gerrit port",
+    "version":"gerrit version"
+  }
 }
 ```
 

data/lib/ger/constants.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 module GerritEventRouter
   NAME = 'GEROUTER'
+  ORIGIN = 'gerrit'
   CONFIG_NAME = 'gerouter.conf'
   LOG_NORMAL  = ::Logger::INFO
   LOG_DEBUG   = ::Logger::DEBUG

data/lib/ger/gerrit.rb

@@ -6,6 +6,7 @@ module GerritEventRouter
     class Config < GerritEventRouter::Config::Base
       DEFAULT_PORT = 29418
       COMMAND = 'gerrit stream-events'
+      VERSION = 'gerrit version'
 
       def initialize(name, uri, ssh_keys, broker, routing_key)
         super(name, uri)
@@ -26,6 +27,10 @@ module GerritEventRouter
         COMMAND
       end
 
+      def version
+        VERSION
+      end
+
       def header
         Gerrit::HEADER
       end

data/lib/ger/router.rb

@@ -45,6 +45,8 @@ module GerritEventRouter
         ssh_options = { :port => uri.port }
         ssh_options[:keys] = @gerrit.ssh_keys if @gerrit.ssh_keys
 
+        provider = {"name" => @gerrit.name, "host" => uri.host, "port" => uri.port.to_s}
+
         EM.run do
           EM::Ssh.start(uri.host, uri.user, ssh_options) do |connection|
             connection.errback do |err|
@@ -59,12 +61,22 @@ module GerritEventRouter
                 GER.logger.info("#{@broker.header} connection established.")
                 GER.logger.debug("#{@broker.header} channel id = #{broker.channel.id}")
 
+                session.exec(@gerrit.version) do |channel, stream, data|
+                  if data then
+                    version = data.strip.delete("gerrit version")
+                    provider["version"] = version
+                    GER.logger.info("version: #{version}")
+                  end
+                end
+
                 session.exec(@gerrit.command) do |channel, stream, data|
                   channel.on_data do |ch, data|
                     if @broker.mode == "raw" then
                       str = %Q(#{data.strip})
                     else
-                      str = %Q({"provider":"#{GER::NAME.downcase}","version":"#{GER::SCHEMA_VERSION}","host":"#{uri.host}","event":#{data.strip}})
+                      json = JSON.parse(data.strip)
+                      json["provider"] = provider
+                      str = JSON.generate(json)
                     end
                     broker.send(str, :routing_key => @gerrit.routing_key)
                   end

data/lib/ger/version.rb

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 module GerritEventRouter
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ger.rb

@@ -4,6 +4,7 @@ $:.unshift File.dirname(File.expand_path(__FILE__))
 require 'logger'
 require 'yaml'
 require 'uri'
+require 'json'
 require 'ger/constants'
 require 'ger/config'
 require 'ger/router'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gerouter
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-15 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine