centurion 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6a3ace96ff33ba0c059c1c0147e33f20120569
-  data.tar.gz: ae5f4c1b8f87f86ccdf0a2535772c27f3511677e
+  metadata.gz: e8966e2e693a5e6dd465d8c656622937e5844aca
+  data.tar.gz: b7d314a3c53734bf240f1662c91ce8a69044faf0
 SHA512:
-  metadata.gz: 9d3e9aedb002d7d000fecd8ba45a8ade798752f3da06c1cfe3522caf1ab7c891ee33e83686470e90878d8b24ec83a612fc313b233b0622dcfadacfddcc7a08b6
-  data.tar.gz: 6eaa259d3cd1b9a5ad45e12bc2991905e870085dc09d66649ba8e5d4a7dca8ee5526da721c2978b10dcccbc450dc8a1fe0786e503656dad747b7c96e3e793873
+  metadata.gz: d3b49c8b73ef7206922b8ccb700a14a43d53fa2a3b0a7f3d8706fc59a22041bbcbdad44d7af83a9fdf6372743ea558fdc919404d5d1f6ac94e08beae22bd2c6c
+  data.tar.gz: 9972af6f0db91ea3ecfb9eb977090822109fd78faf285d48d2d64b680f0edf757f97e004bd38c12048a2d13cf554fac83f88e1d379c55199d874e2e9f5fcba52

data/centurion.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'logger-colors'
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rake', '~> 10.5'
   spec.add_development_dependency 'rspec', '~> 3.1.0'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'simplecov'

data/lib/centurion/docker_via_api.rb

@@ -50,7 +50,9 @@ class Centurion::DockerViaApi
     response = Excon.post(
       @base_uri + path,
       tls_excon_arguments.merge(
-        read_timeout: timeout
+        # Wait for both the docker stop timeout AND the kill AND
+        # potentially a very slow HTTP server.
+        read_timeout: timeout + 120
       )
     )
     raise response.inspect unless response.status == 204
@@ -94,7 +96,11 @@ class Centurion::DockerViaApi
     path = @docker_api_version + "/containers/#{container_id}/restart?t=#{timeout}"
     response = Excon.post(
       @base_uri + path,
-      tls_excon_arguments
+      tls_excon_arguments.merge(
+        # Wait for both the docker stop timeout AND the kill AND
+        # potentially a very slow HTTP server.
+        read_timeout: timeout + 120
+      )
     )
     case response.status
     when 204

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.8'
+  VERSION = '1.8.9'
 end

data/spec/docker_via_api_spec.rb

@@ -63,28 +63,29 @@ describe Centurion::DockerViaApi do
 
     it 'stops a container' do
       expect(Excon).to receive(:post).
-                       with(excon_uri + "v1.12" + "/containers/12345/stop?t=300", {read_timeout: 300}).
+                       with(excon_uri + "v1.12" + "/containers/12345/stop?t=300", {read_timeout: 420}).
                        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.12" + "/containers/12345/stop?t=30", {read_timeout: 30}).
+                       with(excon_uri + "v1.12" + "/containers/12345/stop?t=30", {read_timeout: 150}).
                        and_return(double(status: 204))
       api.stop_container('12345')
     end
 
     it 'restarts a container' do
       expect(Excon).to receive(:post).
-                          with(excon_uri + "v1.12" + "/containers/12345/restart?t=30", {}).
+                          with(excon_uri + "v1.12" + "/containers/12345/restart?t=30", 
+                            {read_timeout: 150}).
                           and_return(double(body: json_string, status: 204))
       api.restart_container('12345')
     end
 
     it 'restarts a container with a custom timeout' do
       expect(Excon).to receive(:post).
-                          with(excon_uri + "v1.12" + "/containers/12345/restart?t=300", {}).
+                          with(excon_uri + "v1.12" + "/containers/12345/restart?t=300", {:read_timeout=>420}).
                           and_return(double(body: json_string, status: 204))
       api.restart_container('12345', 300)
     end
@@ -179,7 +180,7 @@ describe Centurion::DockerViaApi do
                        with(excon_uri + "v1.12" + "/containers/12345/stop?t=300",
                             client_cert: '/certs/cert.pem',
                             client_key: '/certs/key.pem',
-                            read_timeout: 300).
+                            read_timeout: 420).
                        and_return(double(status: 204))
       api.stop_container('12345', 300)
     end
@@ -189,7 +190,7 @@ describe Centurion::DockerViaApi do
                        with(excon_uri + "v1.12" + "/containers/12345/stop?t=30",
                             client_cert: '/certs/cert.pem',
                             client_key: '/certs/key.pem',
-                            read_timeout: 30).
+                            read_timeout: 150).
                        and_return(double(status: 204))
       api.stop_container('12345')
     end
@@ -198,7 +199,8 @@ describe Centurion::DockerViaApi do
       expect(Excon).to receive(:post).
                         with(excon_uri + "v1.12" + "/containers/12345/restart?t=30",
                             client_cert: '/certs/cert.pem',
-                            client_key: '/certs/key.pem').
+                            client_key: '/certs/key.pem',
+                            read_timeout: 150).
                         and_return(double(body: json_string, status: 204))
       api.restart_container('12345')
     end
@@ -207,7 +209,8 @@ describe Centurion::DockerViaApi do
       expect(Excon).to receive(:post).
                         with(excon_uri + "v1.12" + "/containers/12345/restart?t=300",
                             client_cert: '/certs/cert.pem',
-                            client_key: '/certs/key.pem').
+                            client_key: '/certs/key.pem',
+                            read_timeout: 420).
                         and_return(double(body: json_string, status: 204))
       api.restart_container('12345', 300)
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.9
 platform: ruby
 authors:
 - Nic Benders
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -82,16 +82,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement