rabbitmq-definition 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2346e336b95759186f990ce466977d975559d2d0
-  data.tar.gz: da0e4f48f31ba586e9b8b7a234d8fb11c4228c77
+  metadata.gz: 5e5b2d64905691e862ce14c01418eff57785970f
+  data.tar.gz: 14c2cc91b17fc496429f7bb6f1b6f155bf5a9377
 SHA512:
-  metadata.gz: 464144aa22549140f8af197b00b3683c26244414581996cb6bccc18fa96e903ec6157e2524b2dab83b9b5441b84f43705b9355058c746d7671a9ffbb68d2fee7
-  data.tar.gz: 282a2f61ebf894b167162a86cacade76317db3a4184c78b81f0e709f8c0c3c2beea879c4831664d0aff5686e2cf05b8f67409522030c84b162a4f49d903f7b97
+  metadata.gz: 72d3c1ba953f095709d5de11c3a9d4b293efe89d484bcab92c03545debf4c381ee099b4c608bed0d8b724f408771432a67c5aa0389c5548565aa5258ee22a84a
+  data.tar.gz: 8b0e9a1183745a7cc6843dca0626de824f58c4b68ac478217ac5b9ff787dc39d668325f3ad145b1d7d4994f45c00d3bd9fcd5155132a8bcac5180480c027002d

data/README.md

@@ -21,9 +21,9 @@ RABBITMQ_MANAGEMENT_URL=http://guest:guest@localhost:15672
 
 Create a new vhost and definition for your application. It will create the vhosts of your choice and add permissions to the user in the environment variable to those vhosts.
 ```ruby
-  bundle exec rake rabbitmq:create          # It will ask you what vhosts to create the definition with
+  bundle exec rake rabbitmq:create             # It will ask you what vhosts to create the definition with
   # or
-  bundle exec rake rabbitmq:create[/hats] # It will directly create a vhost named '/hats' 
+  bundle exec rake rabbitmq:create VHOSTS=hats # It will directly create a vhost named '/hats' 
 ```
 
 ### Drop definition
@@ -36,9 +36,9 @@ Drop the vhosts in from your RabbitMQ instance and remove the file:
 ### Dump definition
 Dump the definition of the vhosts in your RabbitMQ instance into definition file:
 ```ruby
-  bundle exec rake rabbitmq:dump           # To dump the vhosts specificed in the existing definition file
+  bundle exec rake rabbitmq:dump             # It will dump the vhosts specificed in the existing definition file
   # or 
-  bundle exec rake rabbitmq:dump[/hats] # To dump the specified vhost in a new definition few
+  bundle exec rake rabbitmq:dump VHOSTS=hats # It will dump the specified vhost in a new definition few
 ```
 
 ### Load definition

data/lib/rabbitmq_definition/command.rb

@@ -22,7 +22,15 @@ module RabbitMQ::Definition
     end
 
     def user
-      @uri ||= uri_endpoint.user
+      uri_endpoint.user
+    end
+
+    def add_permissions_for_vhost(vhost)
+      client.update_permissions_of(vhost, user, {
+        :configure => ".*",
+        :write     => ".*",
+        :read       => ".*"
+      })
     end
   end
 end

data/lib/rabbitmq_definition/create.rb

@@ -16,20 +16,10 @@ module RabbitMQ::Definition
           Logger.progress "Creating vhost '#{vhost}'" if verbose
           client.create_vhost(vhost)
           Logger.progress "Adding permissions for '#{user}' to vhost '#{vhost}'" if verbose
-          client.update_permissions_of(vhost, user, all_permissions)
+          add_permissions_for_vhost(vhost)
         end
         Dump.run(client, false, @vhosts)
       end
     end
-
-    private
-
-    def all_permissions
-      {
-        :configure => ".*",
-        :write     => ".*",
-        :read       => ".*"
-      }
-    end
   end
 end

data/lib/rabbitmq_definition/load.rb

@@ -7,8 +7,17 @@ module RabbitMQ::Definition
         definition = FileDefinition.read
         Logger.progress "Uploading definition..."
         client.upload_definitions(definition.to_json)
+        ensure_permissions(definition)
         Logger.success "Done"
       end
     end
+
+    private
+
+    def ensure_permissions(definition)
+      definition.vhosts.each do |vhost|
+        add_permissions_for_vhost(vhost['name'])
+      end
+    end
   end
 end

data/lib/rabbitmq_definition/rabbitmq-definition.rake

@@ -1,7 +1,11 @@
 namespace :rabbitmq do
+  def retrieve_vhosts
+    ENV["VHOSTS"] ? ENV["VHOSTS"].split(",") : nil
+  end
+
   desc "Create a RabbitMQ schema for a vhost (comma separated vhosts)"
-  task :create, [:vhosts] do |t, args|
-    RabbitMQ::Definition.create(args[:vhosts])
+  task :create do |t, args|
+    RabbitMQ::Definition.create(retrieve_vhosts)
   end
 
   desc "Drop all RabbitMQ queues/exchanges/bindings"
@@ -10,8 +14,8 @@ namespace :rabbitmq do
   end
 
   desc "Dump RabbitMQ JSON structure (from defined vhosts or supplied comma separated vhosts) "
-  task :dump, [:vhosts] do |t, args|
-    RabbitMQ::Definition.dump(args[:vhosts])
+  task :dump do |t, args|
+    RabbitMQ::Definition.dump(retrieve_vhosts)
   end
 
   desc "Load RabbitMQ JSON structure"

data/lib/rabbitmq_definition/version.rb

@@ -1,5 +1,5 @@
 module RabbitMQ
   module Definition
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/spec/rabbitmq_definition/load_spec.rb

@@ -3,10 +3,19 @@ describe RabbitMQ::Definition::Load do
     double(
       "client",
       :upload_definitions => nil,
+      :endpoint => ENV['RABBITMQ_MANAGEMENT_URL'],
+      :update_permissions_of => nil
     )
   end
+  let(:all_permissions) do
+    {
+      :configure => ".*",
+      :write     => ".*",
+      :read       => ".*"
+    }
+  end
 
-   context "when a definition file does NOT exist" do
+  context "when a definition file does NOT exist" do
     before { allow(RabbitMQ::Definition::FileDefinition).to receive(:exists?).and_return(false) }
 
     it "notifies about error" do
@@ -18,8 +27,9 @@ describe RabbitMQ::Definition::Load do
   context "when a definition file does NOT exist" do
     let(:json) { '{"definitions": "json"}' }
     before do
-      allow(RabbitMQ::Definition::FileDefinition).to receive(:exists?).and_return(true) 
-      expect(RabbitMQ::Definition::FileDefinition).to receive(:read).and_return(double(:to_json => json))
+      definition = double(:to_json => json, :vhosts => [{'name' => '/'}])
+      allow(RabbitMQ::Definition::FileDefinition).to receive(:exists?).and_return(true)
+      expect(RabbitMQ::Definition::FileDefinition).to receive(:read).and_return(definition)
     end
 
     it "notifies progress" do
@@ -32,6 +42,11 @@ describe RabbitMQ::Definition::Load do
       described_class.run(client, true)
     end
 
+    it "ensures the user has granted permissions for the definition vhosts" do
+      expect(client).to receive(:update_permissions_of).with('/', 'guest', all_permissions).once
+      described_class.run(client, false)
+    end
+
     it "uploads the json definition to the client " do
       expect(client).to receive(:upload_definitions).with(json).once
       described_class.run(client, false)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbitmq-definition
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Pol Miro