haredo 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: 25ee3694c7e587feb59fd2dc3c7f465de5b39bd4
-  data.tar.gz: 612008a826cbcecd3aab6a79cadda24b5e9225c0
-!binary "U0hBNTEy":
-  metadata.gz: 5e8caf0ddeab879b29927252c7fde06868c9027263893d401a6d4edaaf818161ab418b095a89da110664a10cead03d2a77ca8d69005a42d5e06a5d5bdef9f3ee
-  data.tar.gz: 104ed2490ba2369605c54b03d78d6535b274efdafb63795565d5835ea7366084a717e11bbf2da01a29640448ef13daa3a562a353acc00b46746ff45810c92ba3
+SHA1:
+  metadata.gz: a2cff8b9e4c6d2df39d29382b3cc6d1ad1cdf653
+  data.tar.gz: b51c600b77eadf34286f5a10ac7664f7814c7105
+SHA512:
+  metadata.gz: 1fa6921a853aa13fb1bdae3e3712eca4366d22ecd4039034aa2a6fea77976e70427eefcb6af0b0c49d0562668df48d6597330733ea8e78736f75a6b2b2de073a
+  data.tar.gz: 96a79dcc5cce9d2d91f3ba198a4940903e3d11409fb98b0ed5e1340a43da1bdaf4dfbc1390be4f3e691becaa3c4c5fbd6aab1786db98fcd110351650b07e0306

data/src/lib/haredo/peer.rb

@@ -195,20 +195,33 @@ class Peer
       #'x-message-ttl' => 1000
     }
 
-    user        = args[:user]     || 'guest'
-    password    = args[:password] || 'guest'
-    host        = args[:host]     || 'localhost'
-    port        = args[:port]     || '5672'
-    vhost       = args[:vhost]    || ''
-    queue_props = args[:queue]    || queue_args
-    ssl        = ''
+    user         = args[:user]       || 'guest'
+    password     = args[:password]   || 'guest'
+    host         = args[:host]       || 'localhost'
+    port         = args[:port]       || '5672'
+    vhost        = args[:vhost]      || ''
+    queue_props  = args[:queue]      || queue_args
+    ssl          = args[:ssl]        || {}
+    tls_cert     = ssl['tls_cert']   || ''
+    tls_key      = ssl['tls_key']    || ''
+    tls_ca_certs = [ssl['tls_ca']]
     
-    if args[:ssl] == true
-      ssl = 's'
+    use_ssl = false
+    if ssl.size > 0 and ssl['enable'] == true
+      use_ssl = true
+      port = ssl['port'] || '5671'
     end
 
     begin
-      @cnx = Bunny.new("amqp#{ssl}://#{user}:#{password}@#{host}:#{port}#{vhost}")
+      if use_ssl == true
+        @cnx = Bunny.new( "amqps://#{user}:#{password}@#{host}:#{port}#{vhost}",
+                          :tls_cert => tls_cert,
+                          :tls_key => tls_key,
+                          :tls_ca_certificates => tls_ca_certs)
+      else
+        @cnx = Bunny.new("amqp://#{user}:#{password}@#{host}:#{port}#{vhost}")
+      end
+
       @cnx.start()
     rescue Bunny::TCPConnectionFailed => e
       return false

data/src/lib/haredo/plugins/example.rb

@@ -0,0 +1,17 @@
+require 'json'
+require 'haredo/plugin'
+
+class Plugin < HareDo::Plugin
+
+  UUID = 'example'
+
+  def initialize(service, config)
+    super UUID, service, config 
+  end
+
+  def process(msg)
+    # Send back configuration
+    @peer.reply(msg, :data=>JSON::pretty_generate(@config))
+  end
+
+end # class Plugin

data/src/lib/haredo/version.rb

@@ -4,8 +4,8 @@ module HareDo
 VERSION_MAJ  = '2'
 VERSION_MIN  = '0'
 VERSION_CL   = ''
-VERSION_PL   = '5'
-VERSION      = '2.0.5-1'
-RELEASE_DATE = 'Sat, 12 Oct 2013 17:24:34 -0500'
+VERSION_PL   = '6'
+VERSION      = '2.0.6-1'
+RELEASE_DATE = 'Tue, 15 Oct 2013 13:03:56 -0500'
 
 end # module HareDo

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: haredo
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Mike Owens
 autorequire: 
 bindir: src/bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A P2P framework over RabbitMQ
@@ -38,6 +38,7 @@ files:
 - src/lib/haredo/peer.rb
 - src/lib/haredo/plugin.rb
 - src/lib/haredo/plugins/echo.rb
+- src/lib/haredo/plugins/example.rb
 - src/lib/haredo/plugins/status.rb
 - src/lib/haredo/service/admin/daemon.rb
 - src/lib/haredo/service/config.rb
@@ -55,17 +56,17 @@ require_paths:
 - src/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple client/server framework using RabbitMQ