rabbitmq-definition 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9558cc90dbc35ad6da73cf4ee370d9c4e482806b
-  data.tar.gz: 8e4385f1ce830292e5862e2caeac4100029581f6
+  metadata.gz: 2346e336b95759186f990ce466977d975559d2d0
+  data.tar.gz: da0e4f48f31ba586e9b8b7a234d8fb11c4228c77
 SHA512:
-  metadata.gz: 5adaf811cb71f0be656b08e666f7ff69e0e2f7af59c4d3b84609326c0bfc00df835b8cdf50b8fd4871439b53b6fa06a7585d63de03477da925cdcc7d0294b839
-  data.tar.gz: 5a0476d06491279a45f5c2f1abc86457b11bc142b4c93c011f341bb97bca3accdf03b48316b13f291a1e1648f7575ec5be718840ec04bcb11dfd4454a5d740df
+  metadata.gz: 464144aa22549140f8af197b00b3683c26244414581996cb6bccc18fa96e903ec6157e2524b2dab83b9b5441b84f43705b9355058c746d7671a9ffbb68d2fee7
+  data.tar.gz: 282a2f61ebf894b167162a86cacade76317db3a4184c78b81f0e709f8c0c3c2beea879c4831664d0aff5686e2cf05b8f67409522030c84b162a4f49d903f7b97

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rabbitmq-definition (0.1.0)
+    rabbitmq-definition (0.1.2)
       colorize (~> 0.7)
       highline (~> 1.7)
       json (~> 1.8)
-      rabbitmq_http_api_client (>= 1.6)
+      rabbitmq_http_api_client (~> 1.6)
       rails (~> 4.0)
-      rake (~> 10.4)
+      rake (~> 10.0)
 
 GEM
   remote: http://rubygems.org/

data/lib/rabbitmq_definition/dump.rb

@@ -6,7 +6,7 @@ module RabbitMQ::Definition
     end
 
     def execute
-      FileDefinition.new(filtered_list_definition).tap do |definition|
+      FileDefinition.new(filter_and_order_list_definition).tap do |definition|
         Logger.info definition.to_json if verbose
         Logger.progress "Saving definition..."
         definition.save
@@ -16,23 +16,30 @@ module RabbitMQ::Definition
 
     private
 
-    def filtered_list_definition
+    def filter_and_order_list_definition
       client.list_definitions.reduce({}) do |result, (key, value)|
-        if key.to_s == "vhosts"
-          value = @vhosts.map {|name| {'name' => name} }
-        elsif value.is_a?(Array)
-          value = filter_vhost_items(value)
+        value = case key
+        when "vhosts"
+          @vhosts.sort.map {|name| {'name' => name} }
+        when "queues", "exchanges"
+          filter_vhosts(value).sort do |a, b|
+            [a["vhost"], a["name"]] <=> [b["vhost"], b["name"]]
+          end
+        when "bindings"
+          filter_vhosts(value).sort do |a, b|
+            [a["vhost"], a["source"], a["destination"], a["routing_key"]] <=> [b["vhost"], b["source"], b["destination"], b["routing_key"]]
+          end
+        else
+          value
         end
         result[key] = value
         result
       end
     end
 
-    def filter_vhost_items(items)
+    def filter_vhosts(items)
       items.reduce([]) do |array, item|
-        if !item.has_key?("vhost") || @vhosts.include?(item["vhost"])
-          array.push(item)
-        end
+        array.push(item) if @vhosts.include?(item["vhost"])
         array
       end
     end

data/lib/rabbitmq_definition/version.rb

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

data/spec/rabbitmq_definition/dump_spec.rb

@@ -5,7 +5,16 @@ describe RabbitMQ::Definition::Dump do
       'vhosts' => [{'name' => '/'}, 'name' => '/other-vhost'],
       'queues' => [
         {
-          "name" => "my-queue",
+          "name" => "my-b-queue",
+          "vhost" => "/",
+          "durable" => true,
+          "auto_delete" => false,
+          "arguments" => {
+            "x-dead-letter-exchange" => "dead"
+          }
+        },
+        {
+          "name" => "my-a-queue",
           "vhost" => "/",
           "durable" => true,
           "auto_delete" => false,
@@ -20,7 +29,17 @@ describe RabbitMQ::Definition::Dump do
       ],
       'exchanges' => [
         {
-          "name" => "my-exchange",
+          "name" => "my-b-exchange",
+          "vhost" => "/",
+          "type" => "topic",
+          "durable" => true,
+          "auto_delete" => false,
+          "internal" => false,
+          "arguments" => {
+          }
+        },
+        {
+          "name" => "my-a-exchange",
           "vhost" => "/",
           "type" => "topic",
           "durable" => true,
@@ -42,9 +61,9 @@ describe RabbitMQ::Definition::Dump do
       ],
       'bindings' => [
         {
-          "source" => "my-exchange",
+          "source" => "my-a-exchange",
           "vhost" => "/",
-          "destination" => "my-queue",
+          "destination" => "my-a-queue",
           "destination_type" => "queue",
           "routing_key" => "my-routing-key.#",
           "arguments" => {
@@ -70,7 +89,16 @@ describe RabbitMQ::Definition::Dump do
       ],
       'queues' => [
         {
-          "name" => "my-queue",
+          "name" => "my-a-queue",
+          "vhost" => "/",
+          "durable" => true,
+          "auto_delete" => false,
+          "arguments" => {
+            "x-dead-letter-exchange" => "dead"
+          }
+        },
+        {
+          "name" => "my-b-queue",
           "vhost" => "/",
           "durable" => true,
           "auto_delete" => false,
@@ -81,7 +109,17 @@ describe RabbitMQ::Definition::Dump do
       ],
       'exchanges' => [
         {
-          "name" => "my-exchange",
+          "name" => "my-a-exchange",
+          "vhost" => "/",
+          "type" => "topic",
+          "durable" => true,
+          "auto_delete" => false,
+          "internal" => false,
+          "arguments" => {
+          }
+        },
+        {
+          "name" => "my-b-exchange",
           "vhost" => "/",
           "type" => "topic",
           "durable" => true,
@@ -93,9 +131,9 @@ describe RabbitMQ::Definition::Dump do
       ],
       'bindings' => [
         {
-          "source" => "my-exchange",
+          "source" => "my-a-exchange",
           "vhost" => "/",
-          "destination" => "my-queue",
+          "destination" => "my-a-queue",
           "destination_type" => "queue",
           "routing_key" => "my-routing-key.#",
           "arguments" => {
@@ -136,7 +174,7 @@ describe RabbitMQ::Definition::Dump do
     described_class.run(client, false, ['/'])
   end
 
-  it "generates the file definition with the filtered list definitions taking vhosts from files" do
+  it "generates the file definition with the filtered list definitions taking vhosts from files and sorting arrays by name / source" do
     original_definition = double(:vhosts => [{'name' => '/'}])
     expect(RabbitMQ::Definition::FileDefinition).to receive(:read).and_return(original_definition)
     definition = double("Definition")

metadata

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