docker_deploy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2c1ca6ba03a922837423fefa9c35e93dd9aa553
-  data.tar.gz: 0c0e6536e1b5e84576cc4c110fcff28cdf02a53e
+  metadata.gz: 1c87bef033c84edc20c5374e3db7e1dd4529134a
+  data.tar.gz: 4d1d410a0943d2f588fd77c391996d75886286d5
 SHA512:
-  metadata.gz: df1ddf8e1380db78c3e42950a29c03817bc9fbfe13500b0f1a0dec38519452b41619461eaf4003bc815570f4d451eb66a37a3a6e5c3de0b01fafa509258eaa6a
-  data.tar.gz: ef8faaffd025f8132db1383748c8a1fe959aaefad28033a9d88a9ddd8c94cdbf59bf9903523302f3cfb026af1ba45b20dac358928adcaf9355bc58c8130cd25c
+  metadata.gz: ad82a948cb2860c0ced2e2088a16610f14e37c8abebf07b9a6906a796a32a4654d65255b3b042f094ebcfbe78edf164401c9633682df0c89206d21a319639f51
+  data.tar.gz: 00c4c938679942f75f5accb4bb0ce7d0b3ec75b2bb77f6ae4578b32a433b267f8ce5e264e0fc33f8af6337722e4aa3e596bd24e0bc621b4f35f6b646e73bdf24

data/lib/docker_deploy/context.rb

@@ -1,9 +1,10 @@
 module DockerDeploy
   class Context
-    attr_reader :stages, :variables, :ports, :links
+    attr_reader :stages, :variables, :ports, :links, :env_files
 
     def initialize
       @stages = []
+      @env_files = []
       @variables = {}
       @ports = {}
       @links = {}
@@ -21,6 +22,10 @@ module DockerDeploy
       @links.merge!(links)
     end
 
+    def env_file(env_file)
+      @env_files.push(env_file)
+    end
+
     def image(name = nil)
       @image = name if name
       @image

data/lib/docker_deploy/stage.rb

@@ -1,11 +1,12 @@
 module DockerDeploy
   class Stage
-    attr_reader :name, :servers, :variables, :links
+    attr_reader :name, :servers, :variables, :links, :env_files
 
     def initialize(context, name)
       @context = context
       @name = name
       @servers = []
+      @env_files = []
       @variables = {}
       @ports = {}
       @links = {}
@@ -24,6 +25,10 @@ module DockerDeploy
       @links.merge!(links)
     end
 
+    def env_file(env_file)
+      @env_files.push(env_file)
+    end
+
     def deploy(sequence = nil)
       @deploy = sequence if sequence
       @deploy
@@ -39,21 +44,25 @@ module DockerDeploy
     end
 
     def link_mappings
-      @context.links.merge(@links).each_with_object("") do |(from, to), s|
-        s << " --link %s:%s " % [from, to]
-      end
+      format_params("--link %s:%s", @context.links.merge(@links))
     end
 
     def port_mappings
-      @context.ports.merge(@ports).each_with_object("") do |(from, to), s|
-        s << " -p %d:%d " % [from, to]
-      end
+      format_params("-p %s:%s", @context.ports.merge(@ports))
     end
 
     def options
-      @context.variables.merge(@variables).each_with_object("") do |(k, v), s|
-        s << " -e %s=%s " % [Shellwords.escape(k), Shellwords.escape(v)] if v.present?
-      end
+      format_params("--env-file %s", @context.env_files + @env_files) + " " +
+      format_params("-e %s=%s", @context.variables.merge(@variables))
+    end
+
+  private
+
+    def format_params(pattern, enumerable)
+      enumerable.map do |args|
+        args = [args].flatten.map { |v| Shellwords.escape(v) }
+        pattern % args
+      end.join(" ")
     end
   end
 end

data/lib/docker_deploy/version.rb

@@ -1,3 +1,3 @@
 module DockerDeploy
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_deploy
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2014-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit