centurion 1.1.0 → 1.1.1

data/lib/centurion/deploy.rb

@@ -5,14 +5,14 @@ module Centurion; end
 module Centurion::Deploy
   FAILED_CONTAINER_VALIDATION = 100
 
-  def stop_containers(target_server, port_bindings)
+  def stop_containers(target_server, port_bindings, timeout = 30)
     public_port    = public_port_for(port_bindings)
     old_containers = target_server.find_containers_by_public_port(public_port)
     info "Stopping container(s): #{old_containers.inspect}"
 
     old_containers.each do |old_container|
       info "Stopping old container #{old_container['Id'][0..7]} (#{old_container['Names'].join(',')})"
-      target_server.stop_container(old_container['Id'])
+      target_server.stop_container(old_container['Id'], timeout)
     end
   end
 
@@ -67,7 +67,7 @@ module Centurion::Deploy
     return false unless response
     return true if response.status >= 200 && response.status < 300
 
-    warn "Got HTTP status: #{response.status}"
+    warn "Got HTTP status: #{response.status}" 
     false
   end
 
@@ -119,39 +119,34 @@ module Centurion::Deploy
     container_config
   end
 
-  def start_new_container(target_server, image_id, port_bindings, volumes, env_vars=nil, command=nil, cidfile=nil)
+  def start_new_container(target_server, image_id, port_bindings, volumes, env_vars=nil, command=nil)
     container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes, command)
-    start_container_with_config(target_server, volumes, port_bindings, container_config, cidfile)
+    start_container_with_config(target_server, volumes, port_bindings, container_config)
   end
 
-  def launch_console(target_server, image_id, port_bindings, volumes, env_vars=nil, cidfile=nil)
+  def launch_console(target_server, image_id, port_bindings, volumes, env_vars=nil)
     container_config = container_config_for(target_server, image_id, port_bindings, env_vars, volumes, ['/bin/bash']).merge(
       'AttachStdin' => true,
       'Tty'         => true,
       'OpenStdin'   => true,
     )
 
-    container = start_container_with_config(target_server, volumes, port_bindings, container_config, cidfile)
+    container = start_container_with_config(target_server, volumes, port_bindings, container_config)
 
     target_server.attach(container['Id'])
   end
 
   private
-
-  def start_container_with_config(target_server, volumes, port_bindings, container_config, cidfile)
+  
+  def start_container_with_config(target_server, volumes, port_bindings, container_config)
     info "Creating new container for #{container_config['Image'][0..7]}"
     new_container = target_server.create_container(container_config)
 
     host_config = {}
-
     # Map some host volumes if needed
     host_config['Binds'] = volumes if volumes && !volumes.empty?
-
     # Bind the ports
-    host_config['PortBindings'] = port_bindings
-
-    # Assign cidfile
-    host_config['ContainerIDFile'] = cidfile if cidfile
+    host_config['PortBindings'] = port_bindings 
 
     info "Starting new container #{new_container['Id'][0..7]}"
     target_server.start_container(new_container['Id'], host_config)

data/lib/centurion/deploy_dsl.rb

@@ -11,7 +11,7 @@ module Centurion::DeployDSL
   def env_vars(new_vars)
     current = fetch(:env_vars, {})
     new_vars.each_pair do |new_key, new_value|
-      current[new_key.to_s] = new_value
+      current[new_key.to_s] = new_value.to_s
     end
     set(:env_vars, current)
   end

data/lib/centurion/docker_via_api.rb

@@ -51,8 +51,8 @@ class Centurion::DockerViaApi
     true
   end
 
-  def stop_container(container_id)
-    path = "/v1.7/containers/#{container_id}/stop?t=30"
+  def stop_container(container_id, timeout = 30)
+    path = "/v1.7/containers/#{container_id}/stop?t=#{timeout}"
     response = Excon.post(
       @base_uri + path,
     )

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/tasks/deploy.rake

@@ -37,7 +37,9 @@ namespace :deploy do
   # - remote: list
   # - remote: stop
   task :stop do
-    on_each_docker_host { |server| stop_containers(server, fetch(:port_bindings)) }
+    on_each_docker_host do |server|
+      stop_containers(server, fetch(:port_bindings), fetch(:stop_timeout, 30))
+    end
   end
 
   # start
@@ -51,8 +53,7 @@ namespace :deploy do
         fetch(:image_id),
         fetch(:port_bindings),
         fetch(:binds),
-        fetch(:env_vars),
-        fetch(:cidfile, '/etc/cidfile')
+        fetch(:env_vars)
       )
     end
   end
@@ -64,23 +65,21 @@ namespace :deploy do
         fetch(:image_id),
         fetch(:port_bindings),
         fetch(:binds),
-        fetch(:env_vars),
-        fetch(:cidfile, '/etc/cidfile')
+        fetch(:env_vars)
       )
     end
   end
 
   task :rolling_deploy do
     on_each_docker_host do |server|
-      stop_containers(server, fetch(:port_bindings))
+      stop_containers(server, fetch(:port_bindings), fetch(:stop_timeout, 30))
 
       start_new_container(
         server,
         fetch(:image_id),
         fetch(:port_bindings),
         fetch(:binds),
-        fetch(:env_vars),
-        fetch(:cidfile, '/etc/cidfile')
+        fetch(:env_vars)
       )
 
       fetch(:port_bindings).each_pair do |container_port, host_ports|

data/spec/deploy_dsl_spec.rb

@@ -28,13 +28,15 @@ describe Centurion::DeployDSL do
     expect(DeployDSLTest.fetch(:command)).to equal(command)
   end
 
-  it 'adds new env_vars to the existing ones' do
+  it 'adds new env_vars to the existing ones, as strings' do
     DeployDSLTest.set(:env_vars, { 'SHAKESPEARE' => 'Hamlet' })
-    DeployDSLTest.env_vars('DICKENS' => 'David Copperfield')
+    DeployDSLTest.env_vars('DICKENS' => 'David Copperfield',
+                           :DICKENS_BIRTH_YEAR => 1812)
 
     expect(DeployDSLTest.fetch(:env_vars)).to include(
-      'SHAKESPEARE' => 'Hamlet',
-      'DICKENS'     => 'David Copperfield'
+      'SHAKESPEARE'        => 'Hamlet',
+      'DICKENS'            => 'David Copperfield',
+      'DICKENS_BIRTH_YEAR' => '1812'
     )
   end
 

data/spec/deploy_spec.rb

@@ -9,8 +9,8 @@ describe Centurion::Deploy do
   let(:port)            { 8484 }
   let(:container)       { { 'Ports' => [{ 'PublicPort' => port }, 'Created' => Time.now.to_i ], 'Id' => '21adfd2ef2ef2349494a', 'Names' => [ 'name1' ] } }
   let(:endpoint)        { '/status/check' }
-  let(:test_deploy) do
-    Object.new.tap do |o|
+  let(:test_deploy) do 
+    Object.new.tap do |o| 
       o.send(:extend, Centurion::Deploy)
       o.send(:extend, Centurion::DeployDSL)
       o.send(:extend, Centurion::Logging)
@@ -84,7 +84,7 @@ describe Centurion::Deploy do
       test_deploy.stub(:warn)
       expect(test_deploy).to receive(:exit)
       expect(test_deploy).to receive(:sleep).with(0)
-
+       
       test_deploy.wait_for_http_status_ok(server, port, '/foo', 'image_id', 'chaucer', 0, 1)
       expect(test_deploy).to have_received(:info).with(/Waiting for the port/)
     end
@@ -95,7 +95,7 @@ describe Centurion::Deploy do
       test_deploy.stub(:error)
       test_deploy.stub(:warn)
       expect(test_deploy).to receive(:exit)
-
+       
       test_deploy.wait_for_http_status_ok(server, port, '/foo', 'image_id', 'chaucer', 1, 0)
       expect(test_deploy).to have_received(:info).with(/Waiting for the port/)
     end
@@ -126,8 +126,8 @@ describe Centurion::Deploy do
 
       expect(server).to receive(:find_containers_by_public_port).and_return(containers)
       expect(test_deploy).to receive(:public_port_for).with(bindings).and_return('80')
-      expect(server).to receive(:stop_container).with(container['Id']).once
-      expect(server).to receive(:stop_container).with(second_container['Id']).once
+      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, bindings)
     end
@@ -229,12 +229,11 @@ describe Centurion::Deploy do
       expect(server).to receive(:start_container).with(
         'abc123456',
         {
-          'PortBindings' => bindings,
-          'ContainerIDFile' => '/etc/cidfile'
+          'PortBindings' => bindings
         }
       ).once
 
-      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil, '/etc/cidfile')
+      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil)
     end
   end
 
@@ -252,16 +251,8 @@ describe Centurion::Deploy do
       test_deploy.start_new_container(server, 'image_id', bindings, {}, nil)
     end
 
-    it 'pass cidfile to start_container_with_config method' do
-      test_deploy.stub(:container_config_for)
-
-      expect(test_deploy).to receive(:start_container_with_config).with(server, anything(), bindings, nil, '/etc/cidfile').once
-
-      test_deploy.start_new_container(server, 'image_id', bindings, {}, nil, nil, '/etc/cidfile')
-    end
-
     it 'starts the container' do
-      expect(test_deploy).to receive(:start_container_with_config).with(server, {}, anything(), anything(), anything())
+      expect(test_deploy).to receive(:start_container_with_config).with(server, {}, anything(), anything())
 
       test_deploy.start_new_container(server, 'image_id', bindings, {})
     end
@@ -291,20 +282,18 @@ describe Centurion::Deploy do
     let(:volumes)  { nil }
     let(:env)      { nil }
     let(:command)  { nil }
-    let(:cidfile)  { nil }
 
     it 'configures the container' do
       expect(test_deploy).to receive(:container_config_for).with(server, 'image_id', bindings, env, volumes, command).once
       test_deploy.stub(:start_container_with_config)
 
-      test_deploy.start_new_container(server, 'image_id', bindings, volumes, env, command, cidfile)
+      test_deploy.start_new_container(server, 'image_id', bindings, volumes, env, command)
     end
 
     it 'augments the container_config' do
       expect(test_deploy).to receive(:start_container_with_config).with(server, volumes,
         anything(),
-        hash_including('Cmd' => [ '/bin/bash' ], 'AttachStdin' => true , 'Tty' => true , 'OpenStdin' => true),
-        anything()
+        hash_including('Cmd' => [ '/bin/bash' ], 'AttachStdin' => true , 'Tty' => true , 'OpenStdin' => true)
       ).and_return({'Id' => 'shakespeare'})
 
       test_deploy.launch_console(server, 'image_id', bindings, volumes, env)
@@ -312,7 +301,7 @@ describe Centurion::Deploy do
 
     it 'starts the console' do
       expect(test_deploy).to receive(:start_container_with_config).with(
-        server, nil, anything(), anything(), anything()
+        server, nil, anything(), anything()
       ).and_return({'Id' => 'shakespeare'})
 
       test_deploy.launch_console(server, 'image_id', bindings, volumes, env)

data/spec/docker_via_api_spec.rb

@@ -61,6 +61,13 @@ describe Centurion::DockerViaApi do
   end
 
   it 'stops a container' do
+    expect(Excon).to receive(:post).
+                     with(excon_uri + "v1.7" + "/containers/12345/stop?t=300").
+                     and_return(double(status: 204))
+    api.stop_container('12345', 300)
+  end
+
+  it 'stops a container with a custom timeout' do
     expect(Excon).to receive(:post).
                      with(excon_uri + "v1.7" + "/containers/12345/stop?t=30").
                      and_return(double(status: 204))

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
+  prerelease: 
 platform: ruby
 authors:
 - Nic Benders
@@ -20,118 +21,134 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.33'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.33'
 - !ruby/object:Gem::Dependency
   name: logger-colors
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -155,7 +172,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CONTRIBUTORS.md
 - Gemfile
 - LICENSE
@@ -192,26 +209,27 @@ files:
 homepage: https://github.com/newrelic/centurion
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A deployment tool for Docker. Takes containers from a Docker registry and
   runs them on a fleet of hosts with the correct environment variables, host mappings,
   and port mappings. Supports rolling deployments out of the box, and makes it easy

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3eb7f396991461f2a7e0db2fe83ff6209313233e
-  data.tar.gz: ee9f4bc48a899190fa48439353f5803523bbe2ec
-SHA512:
-  metadata.gz: e0f35cd1e2626d5fd1c582ae2397c07b9daa7f53ace494094eea423f02865cba1d2852202e90cba8d7e82357002613db2ae48ee9e7280b11a6d53b329905b1f4
-  data.tar.gz: 01577cabe24211a9e65df8d0e4a140fd18042fab6742d5e65ed567becea161bc2582179b8c86df11055a69234b21f43e5b536c9f36a088bf79af0f139ad39905