euston-rabbitmq 1.0.3 → 1.0.4

data/euston-rabbitmq.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'euston-rabbitmq'
-  s.version     = '1.0.3'
+  s.version     = '1.0.4'
   s.platform    = RUBY_PLATFORM.to_s == 'java' ? 'java' : Gem::Platform::RUBY
   s.authors     = ['Lee Henson', 'Guy Boertje']
   s.email       = ['lee.m.henson@gmail.com', 'guyboertje@gmail.com']
@@ -38,7 +38,6 @@ Gem::Specification.new do |s|
     spec/spec_helper.rb
     spec/support/filters.rb
     spec/support/queue_subscription_thread_harness.rb
-    spec/support/rabbitmqadmin.rb
   ]
   # = MANIFEST =
 
@@ -59,7 +58,8 @@ Gem::Specification.new do |s|
     s.add_dependency 'jessica',                   '~> 1.0.0'
   end
 
-  s.add_development_dependency 'awesome_print',   '~> 0.4.0'
-  s.add_development_dependency 'fuubar',          '~> 0.0.0'
-  s.add_development_dependency 'rspec',           '~> 2.6.0'
+  s.add_development_dependency 'awesome_print',     '~> 0.4.0'
+  s.add_development_dependency 'fuubar',            '~> 0.0.0'
+  s.add_development_dependency 'rabbitmqadmin-cli', '~> 1.0.0'
+  s.add_development_dependency 'rspec',             '~> 2.6.0'
 end

data/lib/euston-rabbitmq/version.rb

@@ -1,5 +1,5 @@
 module Euston
   module RabbitMq
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'ap'
+require 'rabbitmqadmin-cli'
 require 'euston-rabbitmq'
 
 def jruby?

data/spec/support/filters.rb

@@ -4,7 +4,7 @@ def initialize_amqp
 end
 
 def initialize_rabbitmq
-  @rabbitmqadmin = RabbitMqAdmin.new
+  @rabbitmqadmin = RabbitMqAdminCli.new
   @rabbitmqadmin.initialize_vhost AMQP_OPTS[:vhost]
   @rabbitmqadmin.initialize_user  AMQP_OPTS[:vhost], AMQP_OPTS[:user], AMQP_OPTS[:pass]
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: euston-rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-27 00:00:00.000000000 Z
+date: 2011-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &74672560 !ruby/object:Gem::Requirement
+  requirement: &73298000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.10
   type: :runtime
   prerelease: false
-  version_requirements: *74672560
+  version_requirements: *73298000
 - !ruby/object:Gem::Dependency
   name: euston
-  requirement: &74671900 !ruby/object:Gem::Requirement
+  requirement: &73297310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *74671900
+  version_requirements: *73297310
 - !ruby/object:Gem::Dependency
   name: euston-eventstore
-  requirement: &74890560 !ruby/object:Gem::Requirement
+  requirement: &73515570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *74890560
+  version_requirements: *73515570
 - !ruby/object:Gem::Dependency
   name: hash-keys
-  requirement: &74889250 !ruby/object:Gem::Requirement
+  requirement: &73514180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *74889250
+  version_requirements: *73514180
 - !ruby/object:Gem::Dependency
   name: hollywood
-  requirement: &74886290 !ruby/object:Gem::Requirement
+  requirement: &73511360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *74886290
+  version_requirements: *73511360
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &74884640 !ruby/object:Gem::Requirement
+  requirement: &73509800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *74884640
+  version_requirements: *73509800
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &74946470 !ruby/object:Gem::Requirement
+  requirement: &73572160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *74946470
+  version_requirements: *73572160
 - !ruby/object:Gem::Dependency
   name: robustthread
-  requirement: &74945930 !ruby/object:Gem::Requirement
+  requirement: &73571580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: 0.5.2
   type: :runtime
   prerelease: false
-  version_requirements: *74945930
+  version_requirements: *73571580
 - !ruby/object:Gem::Dependency
   name: safely
-  requirement: &74945210 !ruby/object:Gem::Requirement
+  requirement: &73570910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *74945210
+  version_requirements: *73570910
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &74944050 !ruby/object:Gem::Requirement
+  requirement: &73569740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *74944050
+  version_requirements: *73569740
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &74943300 !ruby/object:Gem::Requirement
+  requirement: &73568940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,21 @@ dependencies:
         version: 0.0.0
   type: :development
   prerelease: false
-  version_requirements: *74943300
+  version_requirements: *73568940
+- !ruby/object:Gem::Dependency
+  name: rabbitmqadmin-cli
+  requirement: &73568080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *73568080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &74942380 !ruby/object:Gem::Requirement
+  requirement: &73567470 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -143,7 +154,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *74942380
+  version_requirements: *73567470
 description: JRuby RabbitMq bindings
 email:
 - lee.m.henson@gmail.com
@@ -180,7 +191,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/filters.rb
 - spec/support/queue_subscription_thread_harness.rb
-- spec/support/rabbitmqadmin.rb
 homepage: http://github.com/leemhenson/euston-rabbitmq
 licenses: []
 post_install_message: 

data/spec/support/rabbitmqadmin.rb

@@ -1,74 +0,0 @@
-class RabbitMqAdmin
-  def initialize admin_user = 'guest', admin_password = 'guest'
-    @admin_user     = admin_user
-    @admin_password = admin_password
-  end
-
-  def delete_exchanges
-    list_exchanges.each { |exchange| `#{run vhost} delete exchange name=#{exchange[:name]}` }
-  end
-
-  def delete_queues
-    list_queues.each { |queue| `#{run vhost} delete queue name=#{queue[:name]}` }
-  end
-
-  def initialize_user vhost, user, password, tags = ''
-    `#{run} delete user name=#{user}` if user_exists? user
-    `#{run} declare user name=#{user} password=#{password} tags=#{tags}`
-    add_user_to_vhost vhost, user
-  end
-
-  def initialize_vhost vhost
-    `#{run} delete vhost name=#{vhost}` if vhost_exists? vhost
-    `#{run} declare vhost name=#{vhost}`
-    add_user_to_vhost vhost, @admin_user
-  end
-
-  def run vhost = nil
-    vhost_arg = vhost.nil? ? '' : "-V #{vhost}"
-
-    "rabbitmqadmin -u #{@admin_user} -p #{@admin_password} -f raw_json #{vhost_arg}"
-  end
-
-  def list_bindings vhost
-    parse `#{run vhost} list bindings`
-  end
-
-  def list_exchanges vhost
-    parse `#{run vhost} list exchanges`
-  end
-
-  def list_queues vhost
-    parse `#{run vhost} list queues`
-  end
-
-  def list_users
-    parse `#{run} list users`
-  end
-
-  def list_vhosts
-    parse `#{run} list vhosts`
-  end
-
-  def purge_queues
-    list_queues.each { |queue| `#{run vhost} purge queue name=#{queue[:name]}` }
-  end
-
-  def user_exists? user
-    list_users.any? { |u| u[:name] == user }
-  end
-
-  def vhost_exists? vhost
-    list_vhosts.any? { |h| h[:name] == vhost }
-  end
-
-  private
-
-  def parse json
-    JSON.parse json, :symbolize_names => true
-  end
-
-  def add_user_to_vhost vhost, user
-    `#{run} -V #{vhost} declare permission vhost=#{vhost} user=#{user} configure=\"\.\*\" write=\"\.\*\" read=\"\.\*\"`
-  end
-end