ecs_compose 0.1.0.pre28 → 0.1.0.pre29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62436596ba3a020cb588f41c9feb3c2c91327e5e
-  data.tar.gz: 1211be0c76536e59e7b0c84393a35c863740f50d
+  metadata.gz: 57302424cdae84d0c6fae6f1cf6d1253bef38c96
+  data.tar.gz: 2695f370bd65f84d9cd89c28a1f6b32f4fd7f7fc
 SHA512:
-  metadata.gz: d32532baf40f46b339999f47815300bda1cea9dcb5af5dfeb9428fd6ce4b40d1913c8e0dcccc1d211b010e7c7892c3b5f862fda0903742760fb3d7aba11d7d48
-  data.tar.gz: 1998e1cefc8b7a262d7d1c7098554604fbf8037a17c27ba45a90edd69f82adaa96a1819efb2e7c38cb8fcf2690bdbb134f74283d796c220e226aed026ed5d11b
+  metadata.gz: 6b091ab6dcd83216f5975bcac26434ae06dc89508c6b77ab2e6168855a6e036b7d3f2151ef1b8e33967e827ba202d2a5d35f140581688aeefda8b9cd9c87397a
+  data.tar.gz: 17104e01a5490a75ddb6e37248f882a55a83f48162f9d32b72cbf9b73a97058f5f942ddc99106142de941ddaf312f4b2fd17fd671d032d27ab1b1bf126698972

data/lib/ecs_compose/compare.rb

@@ -2,22 +2,59 @@ module EcsCompose
   # Utilities for comparing ECS task definition JSON, which we need to do
   # to determine whether or not a running service needs to be deployed.
   module Compare
+    # :nodoc: An internal table providing a sort order for data types.
+    CLASS_ORDINAL = {
+      String => 1,
+      # These can all be compared against each other.
+      Fixnum => 2, Float => 2, Bignum => 2,
+      Hash => 3,
+      Array => 4,
+      FalseClass => 5,
+      TrueClass => 6,
+      NilClass => 7,
+    }
+
+    # Compare two legal JSON values, and do our best to always return a
+    # result.
+    def self.compare_any(a, b)
+      # First sort by type.
+      class_order =
+        CLASS_ORDINAL.fetch(a.class) <=> CLASS_ORDINAL.fetch(b.class)
+      return class_order unless class_order == 0
+
+      # Then sort by value.
+      case a
+      when Hash
+        # Convert the hashes to arrays, sort them to normalize hash key
+        # order, and compare them.
+        compare_any(a.to_a.sort {|a1, b1| compare_any(a1, b1) },
+                    b.to_a.sort {|a1, b1| compare_any(a1, b1) })
+      when Array
+        # Do a full array comparison so that we can slip in our comparison
+        # function.
+        for i in 0...([a.length, b.length].max)
+          if i >= a.length
+            return -1
+          elsif i >= b.length
+            return 1
+          else
+            elem_order = compare_any(a[i], b[i])
+            return elem_order unless elem_order == 0
+          end
+        end
+        0
+      else
+        a <=> b
+      end
+    end
 
     # Recursively sort all arrays contained in `val`, in order to normalize
     # things like environment variables in different orders.
     def self.sort_recursively(val)
       case val
       when Array
-        val.sort_by do |item|
-          if item.instance_of?(Hash)
-            item.to_a.sort
-          elsif item.instance_of?(Array)
-            # for an array of arrays, just return 1
-            1
-          else 
-            item
-          end
-        end.map {|item| sort_recursively(item) }
+        val.map {|item| sort_recursively(item) }
+          .sort {|a1, b1| compare_any(a1, b1) }
       when Hash
         newval = {}
         val.each do |k, v|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre28
+  version: 0.1.0.pre29
 platform: ruby
 authors:
 - Eric Kidd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt