hako 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4f272b12fda08e6fef5e8f28413f35320747a70
-  data.tar.gz: e632e91834a590ec1e22e3a656d2e18d182e2639
+  metadata.gz: d549e8298f55d8041ba2145b1c998e4d79599b00
+  data.tar.gz: 0146d1c6afb1656392c10ae228642ce377d67535
 SHA512:
-  metadata.gz: 2e0bae90082a189252c38c9840791d8fbea6acf1efc6559ebc8b213ce8618f6bef42a290a5b30968b825691407619d9950efff0fcfe0897ef0755c672203a52b
-  data.tar.gz: c5e09e51d46695484ef68ad02504f8a4ec0f1879c74b289b6b85f40a145f1638f0dc32b8fa9c68f6c71347c70b37232f2b7d79f17e197548acf9b1aaf6e037f6
+  metadata.gz: 9f9a58886928803eb03e7e8a496a4185aca24c6a08a4c02bffb093704e2149d2206476294310509072c26402388ffcf945be07cb3b9cb098717ca3fcbb315fc1
+  data.tar.gz: 8ade6928c0b2e7b017cb7fd8b8e03d26290f43a619f7e6892e56d17e881b65e35a36924dc1f2b472c4530604cef353e6de0e1a17ff1e6997f55bffe99fa78d87

data/lib/hako/schedulers/ecs_definition_comparator.rb

@@ -18,31 +18,15 @@ module Hako
         if different_members?(@expected_container, actual_container, CONTAINER_KEYS)
           return true
         end
-        if @expected_container[:port_mappings].size != actual_container.port_mappings.size
+        if different_array?(@expected_container, actual_container, :port_mappings, PORT_MAPPING_KEYS)
           return true
         end
-        @expected_container[:port_mappings].zip(actual_container.port_mappings) do |e, a|
-          if different_members?(e, a, PORT_MAPPING_KEYS)
-            return true
-          end
-        end
-        if @expected_container[:environment].size != actual_container.environment.size
+        if different_array?(@expected_container, actual_container, :environment, ENVIRONMENT_KEYS)
           return true
         end
-        @expected_container[:environment].zip(actual_container.environment) do |e, a|
-          if different_members?(e, a, ENVIRONMENT_KEYS)
-            return true
-          end
-        end
-
-        if @expected_container[:mount_points].size != actual_container.mount_points.size
+        if different_array?(@expected_container, actual_container, :mount_points, MOUNT_POINT_KEYS)
           return true
         end
-        @expected_container[:mount_points].zip(actual_container.mount_points) do |e, a|
-          if different_members?(e, a, MOUNT_POINT_KEYS)
-            return true
-          end
-        end
 
         false
       end
@@ -57,6 +41,20 @@ module Hako
         end
         false
       end
+
+      def different_array?(expected, actual, key, keys)
+        if expected[key].size != actual.public_send(key).size
+          return true
+        end
+        sorted_expected = expected[key].sort_by { |e| keys.map { |k| e[k] }.join('') }
+        sorted_actual = actual.public_send(key).sort_by { |a| keys.map { |k| a.public_send(k) }.join('') }
+        sorted_expected.zip(sorted_actual) do |e, a|
+          if different_members?(e, a, keys)
+            return true
+          end
+        end
+        false
+      end
     end
   end
 end

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.11.1'
+  VERSION = '0.11.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk