ecs_compose 0.1.0.pre34 → 0.1.0.pre35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e53ba48d1b6bf3d23dcccfddad36405ff5e72104
-  data.tar.gz: d37288d632cd3741327c525259813cb6d7224024
+  metadata.gz: 7bb09918be5f55c4f0a05e995f8cf86d68ff5b03
+  data.tar.gz: 2d83241f8d2554fee75f124d89c601fbceea1a9e
 SHA512:
-  metadata.gz: a83f90f37847dd28dbb201a8d786aed7f52cca8a922eef6879f17b0baf1f869ea318650a057fc6167e5e38ed0134ef5b332a1a4003f3ef07b93a56cedc175c55
-  data.tar.gz: a2293736fd99d92a546a1b92b68605ddf85a41b95bfd12563310610aac1ae95c2f078f677776e682864a81784776d2e07533139c23bbf46db802f7a2e7263944
+  metadata.gz: 87c4afe23b5a89d5d876414247bafc9a86a20bdd49a25f77c0cf58aff445faddb58cc27a922e0b0d64ae8204cdad6942360787bc37a56bf70366af3191402e91
+  data.tar.gz: 953e9df937866505b1bd718e6fe376d3ca96f81923a72a3adc76af588c36ace2ce0813da2a0335b202cc7bbc8e663c80c85a4a270b4fe42627a656fd45e60491

data/exe/ecs-compose

@@ -18,6 +18,10 @@ Usage:
 Options:
   -h, --help          Show this help message
   --version           Print the version of this program
+  -c, --cage-export <export>
+                      A directory of `docker-compose.yml` files exported
+                      from cage (defaults to export/, takes precedence over
+                      --file)
   -m, --manifest <manifest>
                       Path to an ecs-compose manifest (defaults to
                       deploy/DEPLOY-MANIFEST.yml, takes precedence over --file)
@@ -54,6 +58,7 @@ DOCOPT
 class App
   include EcsCompose
 
+  DEFAULT_CAGE_EXPORT = "export"
   DEFAULT_FILE = "docker-compose.yml"
   DEFAULT_MANIFEST = "deploy/DEPLOY-MANIFEST.yml"
 
@@ -110,7 +115,7 @@ class App
       fatal_err("Cannot find task '#{task_name}'")
 
     env = options.fetch('-e').flatten.inject({}) do |hsh, e_opt|
-      e_opt =~ /\A([^=]+)=(.*)/ or 
+      e_opt =~ /\A([^=]+)=(.*)/ or
         fatal_err "Can't parse '-e #{e_opt}'"
       hsh[$1] = $2
       hsh
@@ -166,7 +171,7 @@ class App
       end
     end
 
-    found = manifest.task_definitions.find {|td| td.name } or
+    found = manifest.task_definitions.find {|td| td.name == task_definition } or
       fatal_err("Can't find task definition: #{task_definition}")
     puts found.to_json
   end
@@ -178,17 +183,21 @@ class App
       available
     else
       available.select {|td| names.include?(td.name) }
-    end      
+    end
   end
 
   # Figure out whether we have a manifest or a docker-compose.yml.  We
   # check supplied flags first, then defaults, and we prefer manifests
   # when there's a tie.
   def mode
-    if options.fetch('--manifest')
+    if options.fetch('--cage-export')
+      :cage_export
+    elsif options.fetch('--manifest')
       :manifest
     elsif options.fetch('--file')
       :file
+    elsif Dir.exist?(DEFAULT_CAGE_EXPORT)
+      :cage_export
     elsif File.exist?(DEFAULT_MANIFEST)
       :manifest
     elsif File.exist?(DEFAULT_FILE)
@@ -203,6 +212,10 @@ class App
   def load_manifest
     project_name = options.fetch("--project-name") || nil
     case mode
+    when :cage_export
+      Manifest.read_from_cage_export(options.fetch('--cage-export') ||
+                                       DEFAULT_CAGE_EXPORT,
+                                     project_name)
     when :manifest
       Manifest.read_from_manifest(options.fetch('--manifest') || DEFAULT_MANIFEST,
                                   project_name)

data/lib/ecs_compose/json_generator.rb

@@ -19,6 +19,10 @@ module EcsCompose
 
     # Generate an ECS task definition as a raw Ruby hash.
     def generate
+      if @yaml.has_key?("version")
+        @yaml = @yaml.fetch("services")
+      end
+
       # Generate JSON for our containers.
       containers = @yaml.map do |name, fields|
         # Skip this service if we've been given a list to emit, and

data/lib/ecs_compose/manifest.rb

@@ -25,6 +25,23 @@ module EcsCompose
         new(defs)
       end
 
+      def read_from_cage_export(path, project_name)
+        defs = []
+        for file in Dir.glob(File.join(path, "*.yml"))
+          name = File.basename(file, ".yml")
+          defs << TaskDefinition.new(:service,
+                                     compound_name(project_name, name),
+                                     File.read(file))
+        end
+        for file in Dir.glob(File.join(path, "tasks/*.yml"))
+          name = File.basename(file, ".yml")
+          defs << TaskDefinition.new(:task,
+                                     compound_name(project_name, name),
+                                     File.read(file))
+        end
+        new(defs)
+      end
+
       private
 
       # If we've been supplied with a `project_name`, build a compound name.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre34
+  version: 0.1.0.pre35
 platform: ruby
 authors:
 - Eric Kidd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt