dockerploy 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmJiMDlmMDFkMmE1MzVjZWUwNTU0NWM2NDU5MDkxMWVkMjI5NzFiZg==
+    N2YyODBjNmEwZGZhMmY5MDZjNDMyZGUxZGQ0MmVkYmY0M2I0YWJlZg==
   data.tar.gz: !binary |-
-    NzhlOGFiMDYwNzFmN2VjNmE3MDIyOWIzYzM5ZjAxOWI3ZTkyNWEyZg==
+    NDYyMTM0MDVlZGJkNTA2OTA4YTk2YzZiMmRkMmEzMzdmMTVjYjk4Mg==
 SHA512:
   metadata.gz: !binary |-
-    NDA0ODIwNGQwNTMzODg0NGYwOTRiNGI1NTBjZTExYzBhMGY4NTIyYjUxNmMz
-    YjVlNWVjNDczNmNiOTVmN2RjNzQzYTBlYmUzYTg4MDRjNmM0NTU3MzBkYmJk
-    ZDY2ZmNlN2UzOTI4MmM3OTEyNGJlNjljYzUyZjVhOTFkNmI1NjA=
+    N2ZmMGM1YTg5MjBmMWEzYzQxNzdhOGUzZjE5YmQ1ODBmMjYzNmIwZGQzMjYz
+    Mjg0MTM2OWRkODA5ZWE1OWJjMzkxZGQwNjJmMDBmMTdiMjBiMGNlMWY0OTdi
+    NWVjYWUyMTA4YTEzMTlmYjI4YTg3N2E3NjI1MzhiNjE2YWZiOWE=
   data.tar.gz: !binary |-
-    MGQyNGMzYzQwNmU2OWNkN2QwMmI3OWE1MDRkNjM0MDg3MGE4NjhkNGMxNzIw
-    M2QxYzAwYWM3MjI5NjIwZTJhODI2NTViMjFhY2FkOGE5Yzg0MWQyYzQyZjcz
-    OGU0MDU3N2MwN2IzMmYxYjVjY2JlNjM0Zjc2Yjc5MmRiMjgzNjc=
+    Njc1YjZiNTRkYjNmNzg1YzVjODYyZDY2ODBkNDlhNTEwMTJjOTkzMzc3NDkx
+    MGVjZDA3ODY2NDk1NDdkNzcxMjJkNjgyZTQ4NGUzZDZkODM4ZmU5ZGE1NzRm
+    MjAyN2E3MTIwMThjMjk2NjQ3ZGM3OGE5Zjc5ODE2YTNkM2UwOGM=

data/lib/dockerploy/deploy.rb

@@ -20,6 +20,8 @@ module Dockerploy
       command << option_delimiter + port_option(server)
       command << option_delimiter + volume_option
       command << option_delimiter + environment_variables_option
+      custom_variables = custom_environment_variables_option(server)
+      command << option_delimiter + custom_variables if custom_variables.length > 0
       command << option_delimiter + image_name
       ssh_client.command(command)
     end
@@ -87,6 +89,17 @@ module Dockerploy
       result.strip
     end
 
+    def custom_environment_variables_option(server)
+      result = ''
+      variables = server[:custom_variables]
+      if variables
+        variables.each_pair do |key, value|
+          result << sprintf("-e %s='%s' ", key.upcase, value)
+        end
+      end
+      result.strip
+    end
+
     def port_option(server)
       container_config = server[:container]
       result = ''

data/lib/dockerploy/version.rb

@@ -1,4 +1,4 @@
 module Dockerploy
   # Version of Dockerploy
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/spec/fixtures/config_with_custom_env.yml

@@ -0,0 +1,28 @@
+image_name: docker/image
+docker_username: dockeruser
+docker_host: tcp://test.host:4243
+application_name: app
+test:
+  branch: master
+  env_file: spec/fixtures/test.yml
+  servers:
+    - host: server.host
+      username: server_user
+      password: server_pass
+      port: 2000
+      custom_variables:
+        role: web_role
+      container:
+        host: container.host1
+        ssh_port: 1022
+        http_port: 8080
+    - host: server.host
+      username: server_user
+      password: server_pass
+      port: 2000
+      custom_variables:
+        role: worker_role
+      container:
+        host: container.host2
+        ssh_port: 1022
+        http_port: 8080

data/spec/lib/dockerploy/deploy_spec.rb

@@ -59,6 +59,28 @@ docker run -d --name app_8080 --hostname app \
         end
       end
 
+      context 'custom variables exist' do
+        let(:fixture_path) { 'spec/fixtures/config_with_custom_env.yml' }
+
+        it 'creates a container with custom environment variables' do
+          expected_command1 = <<-SHELL
+docker run -d --name app_8080 --hostname app \
+-p container.host1:1022:22 -p container.host1:8080:80  \
+-e BRANCH='master' -e APP_ENV='test' -e ROLE='web_role' docker/image
+          SHELL
+          expected_command2 = <<-SHELL
+docker run -d --name app_8080 --hostname app \
+-p container.host2:1022:22 -p container.host2:8080:80  \
+-e BRANCH='master' -e APP_ENV='test' -e ROLE='worker_role' docker/image
+          SHELL
+          expected_command1.chomp!
+          expected_command2.chomp!
+          expect(ssh_client).to receive(:command).with(expected_command1)
+          expect(ssh_client).to receive(:command).with(expected_command2)
+          subject.deploy
+        end
+      end
+
       context 'volumes exists' do
         let(:fixture_path) { 'spec/fixtures/config_with_volumes.yml' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerploy
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Sunjin Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -140,6 +140,7 @@ files:
 - lib/dockerploy/templates/config.yml.erb
 - lib/dockerploy/version.rb
 - spec/fixtures/config.yml
+- spec/fixtures/config_with_custom_env.yml
 - spec/fixtures/config_with_env_file.yml
 - spec/fixtures/config_with_hooks.yml
 - spec/fixtures/config_with_hooks_for_each_env.yml
@@ -177,6 +178,7 @@ specification_version: 4
 summary: Deploy dockerized an application
 test_files:
 - spec/fixtures/config.yml
+- spec/fixtures/config_with_custom_env.yml
 - spec/fixtures/config_with_env_file.yml
 - spec/fixtures/config_with_hooks.yml
 - spec/fixtures/config_with_hooks_for_each_env.yml