ecs_compose 0.1.0.pre3 → 0.1.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fbbe54755b0b5dec1afb9e69c2ac60f9596bfb5
-  data.tar.gz: 7af5f4efec236b452d48cd59459b110c52ad54b2
+  metadata.gz: 03ed8e188cb8fa565118d8c2c16ba0356598cd7b
+  data.tar.gz: a415fe0ad3bfcaea20c8b099d9c912287c9c2050
 SHA512:
-  metadata.gz: ce8958805db591750f41d0e1df666928ccd08a89b19f48ba550e3971819624b96b7364a021593fc5968fe09f159069eb164df097145dd94282907cc109e20f1f
-  data.tar.gz: 2ad1d9684ebda80d7f77d24a4b41eac61d22a3b8f4c695b76198939b4a1d232e8028e1e344e659a8e3736aa75f9899f51ea5fb92cb2a47c46f1014ffdca2b1df
+  metadata.gz: eabf75635023f1d8cf4b4d040c181d46cb65e3086e00af95056f3efa14115902f418e15741e87431a3cf654f0c9ea5ba3a87eaa77e5bf89a00e8c703e97ad7f3
+  data.tar.gz: 1e718e40e5eed1a37a1c01c33652cbc4f5d030fbd715d6cc53016b3dd5e8f73b434ce160611d01b3b43150de1aac87c419de0137b0db70a32cc0b5345ea6bf15

data/README.md

@@ -27,10 +27,13 @@ Or install it yourself as:
 Using the Amazon Web Services console, create a new ECS cluster and define a service `my-service`.  Describe your service using a standard `docker-compose.yml` file.  Then run:
 
 ```sh
-ecs-compose up my-service docker-compose.yml
+ecs-compose -i service:my-service up
 ```
 
-This will update the task definition `my-service`, and then update the running copy of `my-service` to the new task definition.
+This will update the task definition `my-service`, and then update the running copy of `my-service` to the new task definition.  The `-i` argument specifies the ECS task type (a one-shot `task`, or a persistent `service`, as well as a value to use as the task definiton name and family name on ECS.
+
+There's also a "manifest" mode that allows you to work with multiple
+`docker-compose.yml` files, each defining a different service or task.
 
 ## Development
 

data/lib/ecs_compose/cli.rb

@@ -4,33 +4,116 @@ require "thor"
 module EcsCompose
   # Our basic command-line interface.
   class CLI < Thor
-    class_option(:services, type: :string,
-                 desc: "A comma-separated list of containers to include. Defaults to all.")
-
-    desc("conv FAMILY [YAML_FILE]",
-         "Convert docker-compose.yml to ECS JSON format")
-    def jsonify(family, yaml_file="docker-compose.yml")
-      yaml = File.read(yaml_file)
-      puts EcsCompose::JsonGenerator.new(family, yaml, services: services).json
+    DEFAULT_FILE = "docker-compose.yml"
+    DEFAULT_MANIFEST = "deploy/DEPLOY-MANIFEST.yml"
+
+    class_option(:manifest, type: :string,
+                 aliases: %w(-m),
+                 desc: "Manifest describing a set of tasks and services (takes precedence over --file) [default: #{DEFAULT_MANIFEST}]")
+    class_option(:file, type: :string,
+                 aliases: %w(-f),
+                 desc: "File describing a single task or service [default: #{DEFAULT_FILE}]")
+    class_option(:file_info, type: :string,
+                 aliases: %w(-i),
+                 desc: "Type and name for use with --file [ex: 'service:hello' or 'task:migrate']")
+
+    desc("up [SERVICES...]", "Register ECS task definitions and update services")
+    def up(*services)
+      available = manifest.task_definitions.select {|td| td.type == :service }
+      chosen = all_or_specified(available, services)
+
+      chosen.each do |service|
+        json = EcsCompose::JsonGenerator.new(service.name, service.yaml).json
+        EcsCompose::Ecs.update_service_with_json(service.name, json)
+      end
     end
 
-    desc("up SERVICE [YAML_FILE]",
-         "Update an ECS service to match YAML_FILE")
-    def up(service, yaml_file="docker-compose.yml")
-      yaml = File.read(yaml_file)
-      json = EcsCompose::JsonGenerator.new(service, yaml, services: services).json
-      EcsCompose::Ecs.update_service_with_json(service, json)
+    desc("register [TASK_DEFINITIONS...]", "Register ECS task definitions")
+    def register(*task_definitions)
+      available = manifest.task_definitions
+      chosen = all_or_specified(available, task_definitions)
+
+      chosen.each do |td|
+        json = EcsCompose::JsonGenerator.new(td.name, td.yaml).json
+        EcsCompose::Ecs.register_task_definition(json)
+      end
+    end
+
+    desc("json [TASK_DEFINITION]",
+         "Convert a task definition to ECS JSON format")
+    def json(task_definition=nil)
+      if task_definition.nil?
+        choices = manifest.task_definitions.map {|td| td.name }
+        case choices.length
+        when 0
+          fatal_err("Please supply a manifest with at least one task definition")
+        when 1
+          task_definition = choices.first
+        else
+          fatal_err("Please choose one of: #{choices.join(', ')}")
+        end
+      end
+
+      found = manifest.task_definitions.find {|td| td.name } or
+        fatal_err("Can't find task definition: #{task_definition}")
+      puts EcsCompose::JsonGenerator.new(found.name, found.yaml).json
     end
 
     protected
 
-    # Parse our `services` option.
-    def services
-      if options[:services]
-        options[:services].split(',')
+    # Choose either all items in `available`, or just those with the
+    # specified `names`.
+    def all_or_specified(available, names)
+      if names.empty?
+        available
       else
-        nil
-      end
+        available.select {|td| names.include?(td.name) }
+      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
+      @mode ||=
+        if options.manifest
+          :manifest
+        elsif options.file
+          :file
+        elsif File.exist?(DEFAULT_MANIFEST)
+          :manifest
+        elsif File.exist?(DEFAULT_FILE)
+          :file
+        else
+          fatal_err("Unable to find either #{DEFAULT_FILE} or #{DEFAULT_MANIFEST}")
+        end
+    end
+
+    # Create a manifest, either by reading it in, or synthesizing it from a
+    # `docker-compose.yml` file and some extra arguments.
+    def manifest
+      @manifest ||=
+        case mode
+        when :manifest
+          Manifest.read_from_manifest(options.manifest || DEFAULT_MANIFEST)
+        when :file
+          info = options.file_info
+          if info.nil?
+            fatal_err("Must pass -i option when using docker-compose.yml")
+          end
+          unless info =~ /\A(service|task):[-_A-Za-z0-9\z]/
+            fatal_err("Incorrectly formatted -i option")
+          end
+          Manifest.read_from_file(options.file || DEFAULT_FILE,
+                                  type.to_sym, name)
+        else raise "Unknown mode: #{mode}"
+        end
+    end
+
+    # Print an error and quit.
+    def fatal_err(msg)
+      STDERR.puts(msg.red)
+      exit(1)
     end
   end
 end

data/lib/ecs_compose/json_generator.rb

@@ -11,10 +11,9 @@ module EcsCompose
 
     # Create a new generator, specifying the family name to use, and the
     # raw YAML input.
-    def initialize(family, yaml_text, services: nil)
+    def initialize(family, yaml_text)
       @family = family
       @yaml = Psych.load(yaml_text)
-      @services = services
     end
 
     # Generate an ECS task definition as a raw Ruby hash.
@@ -51,11 +50,6 @@ module EcsCompose
         end
       end
 
-      # Prune our services against a list if requested.
-      if @services
-        containers.select! {|c| @services.include?(c["name"]) }
-      end
-
       {
         "family" => @family,
         "containerDefinitions" => containers,

data/lib/ecs_compose/manifest.rb

@@ -0,0 +1,30 @@
+require 'psych'
+
+module EcsCompose
+
+  # A collection of multiple task definitions, including names and types.
+  class Manifest
+    # Build a manifest from a single `docker-compose.yml` file, using the
+    # supplied type and name.
+    def self.read_from_file(path, type, name)
+      new([TaskDefinition.new(type, name, File.read(path))])
+    end
+
+    # Read in a complete manifest.
+    def self.read_from_manifest(path)
+      dir = File.dirname(path)
+      defs = Psych.load_file(path)['task_definitions'].map do |name, info|
+        TaskDefinition.new(info['type'].to_sym,
+                           name,
+                           File.read(File.join(dir, info['path'])))
+      end
+      new(defs)
+    end
+
+    attr_reader :task_definitions
+
+    def initialize(task_definitions)
+      @task_definitions = task_definitions
+    end
+  end
+end

data/lib/ecs_compose/task_definition.rb

@@ -0,0 +1,13 @@
+module EcsCompose
+
+  # Information required to create an ECS task definition.
+  class TaskDefinition
+    attr_reader :type, :name, :yaml
+
+    def initialize(type, name, yaml)
+      @name = name
+      @type = type
+      @yaml = yaml
+    end
+  end
+end

data/lib/ecs_compose.rb

@@ -1,6 +1,8 @@
 require "ecs_compose/version"
 require "ecs_compose/json_generator"
 require "ecs_compose/ecs"
+require "ecs_compose/task_definition"
+require "ecs_compose/manifest"
 
 module EcsCompose
   # Your code goes here...

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs_compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre3
+  version: 0.1.0.pre4
 platform: ruby
 authors:
 - Eric Kidd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -107,6 +107,8 @@ files:
 - lib/ecs_compose/cli.rb
 - lib/ecs_compose/ecs.rb
 - lib/ecs_compose/json_generator.rb
+- lib/ecs_compose/manifest.rb
+- lib/ecs_compose/task_definition.rb
 - lib/ecs_compose/version.rb
 - publish.sh
 homepage: https://github.com/faradayio/ecs_compose