ecs_compose 0.1.0.pre20 → 0.1.0.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f69d1d6f4f1d2529604e03ab2ceae49643304be
-  data.tar.gz: 925b5817f4ba8ae75030e6fb9be06d77d9d06174
+  metadata.gz: 55d8fcc5850ff69d5a1e58e11aa5a8f2833fd88a
+  data.tar.gz: 60e180a4221b945ef1e5751c77c5c17b8a8b9482
 SHA512:
-  metadata.gz: 5e8f426785be843d9ebd8162250fe90e4a8c1afc32ad48b80965b5f6c511d8fcebcf0eeb20fb1dfb509287471a0369de4fe5143f32ca71482eac3b96a0543333
-  data.tar.gz: 69e45ae4c4772f5bc3a561c04fd06045adc81e7e806353d7891caab42451c92a65d56b59722c5b7975ee23b45f1254d4585ce4d5d8802ebc1c121ba19582344c
+  metadata.gz: e15686e4f614e94e2016b2eb2575f44801b7440ad1bca95b77293270eef9009ca88aec87a5c0d55787e1af6b0f08d1e1954605350143bc19b95a77a46829673e
+  data.tar.gz: 2de5e884c78d17fedadea416f98debad47e17ee05ed8c25432a80f6693646fb84a68d5aef0d13c9ef79f8126ceabdd793c95173f4121de7c27248a93701d615a

data/exe/ecs-compose

@@ -26,6 +26,12 @@ Options:
   -i, --file-info (task:<name> | service:<name>)
                       Specify the task type and task name for a
                       docker-compose.yml file
+  -p, --project-name <project-name>
+                      Will be prepended to the names of task definitions
+                      and services, to permit running multiple versions of
+                      an app on a single cluster.  If your task name is
+                      "foo", and your project name is "staging", then it
+                      will be registered and run as "staging-foo".
   --cluster <cluster> ECS cluster to use [default: default]
   -e <name>=<value>   Set an environment variable
   --entrypoint <entrypoint>
@@ -195,9 +201,11 @@ class App
   # Create a manifest, either by reading it in, or synthesizing it from a
   # `docker-compose.yml` file and some extra arguments.
   def load_manifest
+    project_name = options.fetch("--project-name") || nil
     case mode
     when :manifest
-      Manifest.read_from_manifest(options.fetch('--manifest') || DEFAULT_MANIFEST)
+      Manifest.read_from_manifest(options.fetch('--manifest') || DEFAULT_MANIFEST,
+                                  project_name)
     when :file
       info = options.fetch('--file-info')
       if info.nil?
@@ -208,7 +216,7 @@ class App
       end
       type, name = $1, $2
       Manifest.read_from_file(options.fetch('--file') || DEFAULT_FILE,
-                              type.to_sym, name)
+                              project_name, type.to_sym, name)
     else raise "Unknown mode: #{mode}"
     end
   end

data/lib/ecs_compose/manifest.rb

@@ -4,22 +4,37 @@ 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
+    class << self
+      # Build a manifest from a single `docker-compose.yml` file, using the
+      # supplied type and name.
+      def read_from_file(path, project_name, type, name)
+        new([TaskDefinition.new(type,
+                                compound_name(project_name, name),
+                                File.read(path))])
+      end
+
+      # Read in a complete manifest.
+      def read_from_manifest(path, project_name)
+        dir = File.dirname(path)
+        yaml = Psych.load_file(path)
+        defs = yaml.fetch('task_definitions').map do |name, info|
+          TaskDefinition.new(info.fetch('type').to_sym,
+                             compound_name(project_name, name),
+                             File.read(File.join(dir, info.fetch('path'))))
+        end
+        new(defs)
+      end
+
+      private
 
-    # Read in a complete manifest.
-    def self.read_from_manifest(path)
-      dir = File.dirname(path)
-      yaml = Psych.load_file(path)
-      defs = yaml.fetch('task_definitions').map do |name, info|
-        TaskDefinition.new(info.fetch('type').to_sym,
-                           name,
-                           File.read(File.join(dir, info.fetch('path'))))
+      # If we've been supplied with a `project_name`, build a compound name.
+      def compound_name(project_name, name)
+        if project_name.nil?
+          name
+        else
+          "#{project_name}-#{name}"
+        end
       end
-      new(defs)
     end
 
     attr_reader :task_definitions

metadata

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