centurion 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03c6b6730357fe18ad3c5ba0da07c985f2beb83d
-  data.tar.gz: ca13d8ee3ae197a28f74332ecba32215afc3234e
+  metadata.gz: 369271bc0ce536e622fa0f0af79033e644fabd73
+  data.tar.gz: 0a6212a1a65e3c2d5d24dfdc5aee9d41c4144993
 SHA512:
-  metadata.gz: 7ef770e7477c372180ea27ce21b1ef76f37745da94513d76ca9a34ab43efa0ad8cd35cf544f82758c636d3c25fd8bbbf9ed8400ac1e78f49730842e3c9b0f964
-  data.tar.gz: 2d73c5575ad77bc907c58a798e19d42f85e42731d67bd1ef36a9a13d9d45261045432600f8385e1cfad78c2e43724c43815a2b26ba4e897f03e8c8a7da92a03a
+  metadata.gz: 1b48a1ff8e0da6f5a2b942ba7a5dbbbd377200c2c0f45c7d763fc99cfa2936a1c3c135f5b6bff84feabe10f813e8e7d18f3e23c1e50b674e96733ea7c1f3aa66
+  data.tar.gz: 80a0fdae74711b67cd80cb732a0bf14bfefb56c69bafa0302b07a8b6449dc96873b2552cfc11fbf6a7db4590d0e272fe894ae6eefdffd5f7ccd694b3b697981b

data/lib/centurion/deploy.rb

@@ -7,8 +7,11 @@ module Centurion::Deploy
   FAILED_CONTAINER_VALIDATION = 100
 
   def stop_containers(target_server, service, timeout = 30)
-    old_containers = target_server.find_containers_by_name(service.name) || 
-                     target_server.find_containers_by_public_port(service.public_ports.first)
+    old_containers = if service.public_ports.nil? || service.public_ports.empty?
+      target_server.find_containers_by_name(service.name)
+    else
+      target_server.find_containers_by_public_port(service.public_ports.first)
+    end
 
     info "Stopping container(s): #{old_containers.inspect}"
 

data/lib/centurion/deploy_dsl.rb

@@ -75,9 +75,12 @@ module Centurion::DeployDSL
   end
 
   def public_port_for(port_bindings)
-    # {'80/tcp'=>[{'HostIp'=>'0.0.0.0', 'HostPort'=>'80'}]}
-    first_port_binding = port_bindings.values.first
-    first_port_binding.first['HostPort']
+    # port_bindings = [#<struct Centurion::Service::PortBinding
+    #   host_port=17090,
+    #   container_port=80,
+    #   type="tcp",
+    #   host_ip=nil>]
+    port_bindings.first.host_port
   end
 
   def host_volume(volume, options)

data/lib/centurion/docker_server.rb

@@ -16,7 +16,7 @@ class Centurion::DockerServer
   def_delegators :docker_via_api, :create_container, :inspect_container,
                  :inspect_image, :ps, :start_container, :stop_container,
                  :remove_container, :restart_container
-  def_delegators :docker_via_cli, :pull, :tail, :attach
+  def_delegators :docker_via_cli, :pull, :tail, :attach, :exec
 
   def initialize(host, docker_path, tls_params = {})
     @docker_path = docker_path

data/lib/centurion/docker_via_cli.rb

@@ -27,6 +27,10 @@ class Centurion::DockerViaCli
     Centurion::Shell.echo(build_command(:attach, container_id))
   end
 
+  def exec(container_id, commandline)
+    Centurion::Shell.echo(build_command(:exec, "#{container_id} #{commandline}"))
+  end
+
   private
 
   def self.tls_keys
@@ -61,6 +65,7 @@ class Centurion::DockerViaCli
                when :pull then ' pull '
                when :logs then ' logs -f '
                when :attach then ' attach '
+               when :exec then ' exec '
                end
     command << destination
     command

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.3'
+  VERSION = '1.8.4'
 end

data/spec/deploy_spec.rb

@@ -120,11 +120,25 @@ describe Centurion::Deploy do
   end
 
   describe '#stop_containers' do
-    it 'calls stop_container on the right containers' do
+    it 'calls stop_container on the right containers when ports are mapped' do
       service = Centurion::Service.new(:centurion)
       service.add_port_bindings(80, 80)
 
+      second_container = container.dup.tap { |c| c['Id'] = c['Id'].sub(/49494/, '55555') }
+      containers = [ container, second_container ]
+
+      expect(server).to receive(:find_containers_by_public_port).with(80).and_return(containers)
+      expect(server).to receive(:stop_container).with(container['Id'], 30).once
+      expect(server).to receive(:stop_container).with(second_container['Id'], 30).once
+
+      test_deploy.stop_containers(server, service)
+    end
+
+    it 'calls stop_container on the right containers when ports are not mapped' do
+      service = Centurion::Service.new(:centurion)
+
       second_container = container.dup
+      second_container = container.dup.tap { |c| c['Id'] = c['Id'].sub(/49494/, '55555') }
       containers = [ container, second_container ]
 
       expect(server).to receive(:find_containers_by_name).with(:centurion).and_return(containers)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Nic Benders
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-04 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop