gerouter 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9a9ac7f22e95228f7b7cea01cb7af229e061ae
-  data.tar.gz: 673a7070d651f672bfd7840c79bc8075f8009c10
+  metadata.gz: b01a42a377006d4daaf42773d939651f36bba5a5
+  data.tar.gz: 1fb063d559c84e3748983fa6faa52cd789a403b7
 SHA512:
-  metadata.gz: 3ec5f2cb41c73a4bb94041ae9ec35b5e5625a999970750f63219a4ae6cc91f72a03993fe40ebc5a23ab94d4e1dd2d3d3de86237628a428dd342b43ef5a1e89f5
-  data.tar.gz: c680bdf4b81588ab05c7220beb444d35984b6009d2833b1fee31cd68418f9d188270f73e30049d4b0b00134e7cf8cef9ab086240cc71a77c24f454804075de85
+  metadata.gz: 9eacfc8e71abe6139aec05bfc477aea431b1a9678e57ff19f11ea885346abd8bb80a1523c9f08ca3c93fea2ae408b922978e738ca6e68f246f040cee789a4f26
+  data.tar.gz: 8eaa503b333b1563c4b4a2c097743ffe800e676beb3bd7a512a641ee6a987ef796f020a06724474e35bccd1468d372a08b6b8968d7dea89b3c5297e02dc30283

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gerouter (0.1.0)
+    gerouter (0.1.1)
       amqp
       em-ssh
       eventmachine
@@ -9,19 +9,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    amq-client (1.0.2)
-      amq-protocol (>= 1.2.0)
+    amq-protocol (1.9.2)
+    amqp (1.2.0)
+      amq-protocol (>= 1.9.2)
       eventmachine
-    amq-protocol (1.6.0)
-    amqp (1.0.2)
-      amq-client (~> 1.0.2)
-      amq-protocol (>= 1.3.0)
-      eventmachine
-    em-ssh (0.6.2)
+    em-ssh (0.6.5)
       eventmachine
       net-ssh
     eventmachine (1.0.3)
-    net-ssh (2.6.8)
+    net-ssh (2.7.0)
 
 PLATFORMS
   ruby

data/README.md

@@ -114,6 +114,22 @@ app_id: gerouter
 
 You can change app_id to your own id using `-i` option.
 
+And, `headers`property is added as below.
+
+```json
+{
+  "headers": {
+    "gerrit-name":"<gerrit name in config>",
+    "gerrit-host":"<gerrit host>",
+    "gerrit-port":"<gerrit port>",
+    "gerrit-scheme":"ssh",
+    "gerrit-front-url":"<gerrit frontend url>",
+    "gerrit-version":"<gerrit version>",
+    "event_id":"<SHA256 message digest (generated from origin event)>"
+  }
+}
+```
+
 Additional attribute in Gerrit event
 ---------------------------
 
@@ -125,7 +141,7 @@ As below, gerouter adds `provider` attribute into Gerrit event then send to brok
     "name":"<gerrit name in config>",
     "host":"<gerrit host>",
     "port":"<gerrit port>",
-    "proto":"ssh",
+    "scheme":"ssh",
     "url":"<gerrit frontend url>",
     "version":"<gerrit version>",
     "event_id":"<SHA256 message digest (generated from origin event)>"

data/lib/ger/broker/amqp.rb

@@ -21,7 +21,8 @@ module GerritEventRouter
         super(broker)
         @headers = {
           :content_type => 'application/json',
-          :app_id => GER::NAME.downcase
+          :app_id => GER::NAME.downcase,
+          :persistent => true
         }
         uri = URI.parse(@broker.uri)
         @headers[:user_id] = uri.user if uri.user
@@ -66,7 +67,7 @@ module GerritEventRouter
 
       def generate_channel(connection = nil)
         conn = connection || @connection
-        channel = ::AMQP::Channel.new(conn, ::AMQP::Channel.next_channel_id)
+        channel = ::AMQP::Channel.new(conn)
         channel.auto_recovery = true
         channel.on_error do |ch, channel_close|
           raise channel_close.reply_text
@@ -74,7 +75,9 @@ module GerritEventRouter
 
         @exchange = ::AMQP::Exchange.new(channel,
                                          @broker.exchange['type'].to_sym,
-                                         @broker.exchange['name'])
+                                         @broker.exchange['name'],
+                                         :durable => true,
+                                         :auto_delete => false)
       end
 
       def conn_failure(err)

data/lib/ger/router.rb

@@ -18,6 +18,18 @@ module GerritEventRouter
       end
     end
 
+    def header(provider)
+        headers = {
+          "gerrit-name" => provider["name"],
+          "gerrit-host" => provider["host"],
+          "gerrit-scheme" => provider["scheme"],
+          "gerrit-port" => provider["port"],
+          "gerrit-front-url" => provider["url"],
+          "gerrit-version" => provider["version"]
+        }
+        return headers
+    end
+
     def start
       raise "Router still not be configured" unless @configured
 
@@ -56,7 +68,7 @@ module GerritEventRouter
           "name" => @gerrit.name,
           "host" => uri.host,
           "port" => uri.port.to_s,
-          "proto" => "ssh",
+          "scheme" => "ssh",
           "url" => @gerrit.weburl
         }
 
@@ -92,7 +104,7 @@ module GerritEventRouter
                       json["provider"] = provider
                       str = JSON.generate(json)
                     end
-                    broker.send(str, :app_id => @appid, :routing_key => @gerrit.routing_key)
+                    broker.send(str, :app_id => @appid, :routing_key => @gerrit.routing_key, :headers => header(provider))
                   end
                 end
               end

data/lib/ger/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gerouter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - rinrinne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine