docker-armada 2.10.0 → 2.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07425522f5d4155dc279065cd10bafbf58810e80
-  data.tar.gz: f3280a0c6fa4810e80fad1ca8ccc191df15e48da
+  metadata.gz: e0bc7638f849276cf9ce0ca28a8809184026e82f
+  data.tar.gz: 48d9abd7825dbdc77d2f8744ecc69cb6bfa8895e
 SHA512:
-  metadata.gz: 4d473688aa84861851f092f92b94842515bd0d9104061e59ef8c3cd6b8315c75c85e042bba84491955dcb1980427949255c004b80007100bb0ffa5902f0eb118
-  data.tar.gz: 631387c0304361e2362c2db99ebb8469d91113f462c88c50206ed835a193ce35a2e3dde68ba3684a0aabea3edea4c2ae79faefd1bf85ea7b0345a0f25565d443
+  metadata.gz: 682da6b088a024e8016f7d58c313cdb981ca8057ea65d98cf0b1f809e341f36db0a76da420a28d08bc7de793435809b5285ad2a426449a73c865a8098f1b713e
+  data.tar.gz: eaf1fee5f6449ee42e359d6bfb45d567286a5c7d113f93e3bdd858b3aa0501bc793ae3ecd09ac65893f6a374e0b763208fd401e6db78fe2285f92930620b4fdc

data/lib/armada/deploy/parallel.rb

@@ -10,11 +10,14 @@ module Armada
       end
 
       def run
-        Armada.ui.info "Deploying the following image [#{@options[:image]}:#{@options[:tag]}] to these host(s) #{@options[:hosts].join(', ')} in PARALLEL"
+        Armada.ui.info "Deploying the following image [#{@options[:image]}:#{@options[:tag]}] in PARALLEL"
 
         begin
           @options[:hosts].each_in_parallel do |host|
-            docker_host = Armada::Host.create(host, options)
+            docker_host_connect_string = host[:docker_host] || host
+            health_check_host = host[:health_check_host] || host
+
+            docker_host = Armada::Host.create(docker_host_connect_string, options)
             image = docker_host.get_image @options[:image], @options[:tag], @options
             image.pull
 
@@ -36,7 +39,7 @@ module Armada
               end
 
               health_check = Armada::Connection::HealthCheck.new(
-                host,
+                health_check_host,
                 health_check_port,
                 @options[:health_check_endpoint],
                 @options[:health_check_delay],
@@ -45,7 +48,7 @@ module Armada
                 @options[:ssh_gateway_user]
               )
 
-              raise "Health check failed! - #{host}" unless health_check.run
+              raise "Health check failed! - #{health_check_host}" unless health_check.run
             end
           end
         rescue Exception => e

data/lib/armada/deploy/rolling.rb

@@ -10,15 +10,18 @@ module Armada
       end
 
       def run
-        Armada.ui.info "Deploying the following image [#{@options[:image]}:#{@options[:tag]}] to these host(s) #{@options[:hosts].join(', ')}"
+        Armada.ui.info "Deploying the following image [#{@options[:image]}:#{@options[:tag]}]"
         begin
           @options[:hosts].each_in_parallel do |host|
-            docker_host = Armada::Host.create(host, options)
+            docker_host_connect_string = host[:docker_host] || host
+            docker_host = Armada::Host.create(docker_host_connect_string, options)
             docker_host.get_image(@options[:image], @options[:tag], @options).pull
           end
 
           @options[:hosts].each do |host|
-            docker_host = Armada::Host.create(host, options)
+            docker_host_connect_string = host[:docker_host] || host
+            health_check_host = host[:health_check_host] || host
+            docker_host = Armada::Host.create(docker_host_connect_string, options)
             image = docker_host.get_image @options[:image], @options[:tag], @options
             container = Armada::Container.new(image, docker_host, @options)
             container.stop
@@ -38,7 +41,7 @@ module Armada
               end
 
               health_check = Armada::Connection::HealthCheck.new(
-                host,
+                health_check_host,
                 health_check_port,
                 @options[:health_check_endpoint],
                 @options[:health_check_delay],
@@ -47,7 +50,7 @@ module Armada
                 @options[:ssh_gateway_user]
               )
 
-              raise "Health check failed! - #{host}" unless health_check.run
+              raise "Health check failed! - #{health_check_host}" unless health_check.run
             end
           end
         rescue Exception => e

data/lib/armada/deploy_dsl.rb

@@ -81,6 +81,15 @@ module Armada::DeployDSL
 
   def host(hostname)
     current = fetch(:hosts, [])
+
+    if hostname.is_a? Hash
+      if not hostname.has_key? :docker_host or not hostname.has_key? :health_check_host
+        raise ArgumentError.new("Host must contain :docker_host and :health_check_host if supplied as a hash")
+      end
+    elsif not hostname.is_a? String
+        raise ArgumentError.new("Host must be a String or a Hash containing the :docker_host and :health_check_host keys")
+    end
+
     current << hostname
     set(:hosts, current)
   end

data/spec/deploy_dsl_spec.rb

@@ -23,6 +23,18 @@ describe Armada::DeployDSL do
     expect(DeployDSLTest.fetch(:hosts)).to include("host1", "host2")
   end
 
+  it 'supports adding hosts via hash' do
+    DeployDSLTest.set(:hosts, ['my-other-host'])
+    DeployDSLTest.host({:docker_host => 'host1', :health_check_host => 'host2'})
+    expect(DeployDSLTest.fetch(:hosts)).to include('my-other-host', {:docker_host => 'host1', :health_check_host => 'host2'})
+  end
+
+  it 'should raise an argumenterror if the host argument is incorrect' do
+    expect { DeployDSLTest.host({:docker_host => 'host1'}) }.to raise_error(ArgumentError)
+    expect { DeployDSLTest.host({:health_check_host => 'host1'}) }.to raise_error(ArgumentError)
+    expect { DeployDSLTest.host(1) }.to raise_error(ArgumentError)
+  end
+
   it 'adds the restart policy' do
     DeployDSLTest.restart_policy({:foo => "bar"})
     expect(DeployDSLTest.fetch(:restart_policy)).to eq({:foo => "bar"})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-armada
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
 platform: ruby
 authors:
 - Jonathan Chauncey