X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Ftype%2Frabbitmq_queue.rb;fp=3rdparty%2Fmodules%2Frabbitmq%2Flib%2Fpuppet%2Ftype%2Frabbitmq_queue.rb;h=464a2ca6e70d18ec688be9d1519c2672ab6cc412;hb=24caa46729f80fbba4be8b9b26ebcb3acc4cb0fb;hp=63fc19ba514052922a048a4f8454406c2e6d9dd8;hpb=c7e7bcc28cc5dc48a7e284a3c82f33df27d1f57d;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_queue.rb b/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_queue.rb
index 63fc19ba5..464a2ca6e 100644
--- a/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_queue.rb
+++ b/3rdparty/modules/rabbitmq/lib/puppet/type/rabbitmq_queue.rb
@@ -1,20 +1,5 @@
 Puppet::Type.newtype(:rabbitmq_queue) do
-  desc <<-DESC
-Native type for managing rabbitmq queue
-
-@example Create a rabbitmq_queue
- rabbitmq_queue { 'myqueue@myvhost':
-   ensure      => present,
-   user        => 'dan',
-   password    => 'bar',
-   durable     => true,
-   auto_delete => false,
-   arguments   => {
-     x-message-ttl          => 123,
-     x-dead-letter-exchange => 'other'
-   },
- }
-DESC
+  desc 'Native type for managing rabbitmq queue'
 
   ensurable do
     defaultto(:present)
@@ -26,20 +11,20 @@ DESC
     end
   end
 
-  newparam(:name, namevar: true) do
+  newparam(:name, :namevar => true) do
     desc 'Name of queue'
-    newvalues(%r{^\S*@\S+$})
+    newvalues(/^\S*@\S+$/)
   end
 
   newparam(:durable) do
     desc 'Queue is durable'
-    newvalues(%r{true|false})
+    newvalues(/true|false/)
     defaultto('true')
   end
-
+  
   newparam(:auto_delete) do
     desc 'Queue will be auto deleted'
-    newvalues(%r{true|false})
+    newvalues(/true|false/)
     defaultto('false')
   end
 
@@ -54,13 +39,13 @@ DESC
   newparam(:user) do
     desc 'The user to use to connect to rabbitmq'
     defaultto('guest')
-    newvalues(%r{^\S+$})
+    newvalues(/^\S+$/)
   end
 
   newparam(:password) do
     desc 'The password to use to connect to rabbitmq'
     defaultto('guest')
-    newvalues(%r{\S+})
+    newvalues(/\S+/)
   end
 
   autorequire(:rabbitmq_vhost) do
@@ -76,6 +61,8 @@ DESC
   end
 
   def validate_argument(argument)
-    raise ArgumentError, 'Invalid argument' unless [Hash].include?(argument.class)
+    unless [Hash].include?(argument.class)
+      raise ArgumentError, "Invalid argument"
+    end
   end
 end