ecs_compose 0.1.0.pre6 → 0.1.0.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda22daa866666c5439a1ecfebba1cdf3b6e9a18
-  data.tar.gz: 78c9d8d6272f972507ae05e2840e1b5fb1bca14a
+  metadata.gz: 0ae0188dc62e80cc71af5875294462deda6c5edd
+  data.tar.gz: 8e6f777891d855a5199eb117370be12596a4fb5a
 SHA512:
-  metadata.gz: 2143cdc284706c09f0617679c3eed643e8717149ad58fd67abcc50de42cc63972e7e9818d0be1e640e4dcc9cd46f9e1045af1a569ce2c556b00a9e871c4d442f
-  data.tar.gz: 26b764aa62f737096c8962cc74adfada14d9787339096a375e6b6b7c51736aaaf95e28704f7e08adfc296486085e3372ffc2f29c1a64b463df6037f3e24bd972
+  metadata.gz: e14d979474af2e9a368b1a6973fff7b0571480c55da159fad7bdee7fc0b4cf311f8a720e8dfea12196c4a5c553ddf39804d08f503270997aaacce325c117fb59
+  data.tar.gz: e880db7381c14d238fd36c12d86f42704c552e540fab0088b018375bfd1d5bcf745d1842fb590bd7bd08081a58bfa4ee5eb60a54603b294f855dd8bf334bbedd

data/lib/ecs_compose/json_generator.rb

@@ -1,5 +1,6 @@
-require 'psych'
+require 'digest/sha1'
 require 'json'
+require 'psych'
 
 module EcsCompose
   class ContainerKeyError < KeyError
@@ -18,10 +19,20 @@ module EcsCompose
 
     # Generate an ECS task definition as a raw Ruby hash.
     def generate
+      # Generate JSON for our containers.
       containers = @yaml.map do |name, fields|
         # Skip this service if we've been given a list to emit, and
         # this service isn't on the list.
         begin
+          mount_points = (fields["volumes"] || []).map do |v|
+            host, container, ro = v.split(':')
+            {
+              "sourceVolume" => path_to_vol_name(host),
+              "containerPath" => container,
+              "readOnly" => (ro == "ro")
+            }
+          end
+
           json = {
             "name" => name,
             "image" => fields.fetch("image"),
@@ -33,7 +44,7 @@ module EcsCompose
               (fields["ports"] || []).map {|pm| port_mapping(pm) },
             "essential" => true,
             "environment" => environment(fields["environment"] || {}),
-            "mountPoints" => [],
+            "mountPoints" => mount_points,
             "volumesFrom" => [],
           }
           if fields.has_key?("entrypoint")
@@ -50,10 +61,21 @@ module EcsCompose
         end
       end
 
+      # Generate our top-level volume declarations.
+      volumes = @yaml.map do |name, fields|
+        (fields["volumes"] || []).map {|v| v.split(':')[0] }
+      end.flatten.sort.uniq.map do |host_path|
+        {
+          "name" => path_to_vol_name(host_path),
+          "host" => { "sourcePath" => host_path }
+        }
+      end
+
+      # Return our final JSON.
       {
         "family" => @family,
         "containerDefinitions" => containers,
-        "volumes" => []
+        "volumes" => volumes
       }
     end
 
@@ -108,5 +130,14 @@ module EcsCompose
       # We need to force string values to keep ECS happy.
       env.map {|k, v| { "name" => k, "value" => v.to_s } }
     end
+
+    # Convert a Unix path into a valid volume name.
+    def path_to_vol_name(path)
+      # Ensure (extremely high probability of) uniqueness by hashing the
+      # pathname, and then include a simplified version of the path for
+      # readability.  This might fail, but the odds are the same as a
+      # failure of git's content-based addressing.
+      Digest::SHA1.hexdigest(path) + path.gsub(/[\/.]/, '_')
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre6
+  version: 0.1.0.pre7
 platform: ruby
 authors:
 - Eric Kidd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor