centurion 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 424cd7daf9560388d8fb53f54c2c98510657d0b6
-  data.tar.gz: a01f26b380938f5f9f006ee00a1994666d9f2956
+  metadata.gz: b1dc375b0634eab02f89f0a78cd5eb7b4dbc3133
+  data.tar.gz: 342b3afcaac56fff384fab3d80b32d04ce87e09b
 SHA512:
-  metadata.gz: c670495c7f4ab9c3f079efb7990edc482f941352ccaf43ed922abe9d816b788332c72579b4e45139aa32f9ae8c1d85c3e65c13613ff2490e248f6884a22fcfc0
-  data.tar.gz: 4be2c2bd8c82e97585f75cb1a9e6761d3b1501414c45456c330d2a91c40f99017e554c6d53d7f0225d87708aeae305328a86726cb005b9c27e7668d15051d00f
+  metadata.gz: bcde80896ea6ed8e3bd5154d70c01360fae286810ecb38957b751a13a16cedd7cc01930e90087d4d400cebaddb299f843b086855336ad40ed141d2d5da67735c
+  data.tar.gz: 25de72a8c3f6511cd4b09336efe91311f347564d6d5d238393f34b436e75af40bccf9ab8f4978bf246460e9a75dd4bc1377521e3c32c8430b8522d94b8b26ba5

data/lib/centurion/deploy.rb

@@ -31,7 +31,7 @@ module Centurion::Deploy
     end
 
     unless health_check_method.call(target_server, port, endpoint)
-      error "Failed to validate started container on #{target_server}:#{port}"
+      error "Failed to validate started container on #{target_server.hostname}:#{port}"
       exit(FAILED_CONTAINER_VALIDATION)
     end
   end
@@ -53,7 +53,7 @@ module Centurion::Deploy
   def http_status_ok?(target_server, port, endpoint)
     url      = "http://#{target_server.hostname}:#{port}#{endpoint}"
     response = begin
-      Excon.get(url, :headers => {'Accept' => '*/*'})
+      Excon.get(url, headers: {'Accept' => '*/*'})
     rescue Excon::Errors::SocketError
       warn "Failed to connect to #{url}, no socket open."
       nil

data/lib/centurion/docker_registry.rb

@@ -17,7 +17,7 @@ class Centurion::DockerRegistry
     path = "/v1/repositories/#{repository}/tags/#{tag}"
     uri = uri_for_repository_path(repository, path)
     $stderr.puts "GET: #{uri}"
-    options = { :headers => { "Content-Type" => "application/json" } }
+    options = { headers: { "Content-Type" => "application/json" } }
     if @user
       options[:user] = @user
       options[:password] = @password

data/lib/centurion/docker_via_api.rb

@@ -28,7 +28,7 @@ class Centurion::DockerViaApi
 
     response = Excon.get(
       @base_uri + path,
-      tls_excon_arguments.merge(:headers => {'Accept' => 'application/json'})
+      tls_excon_arguments.merge(headers: {'Accept' => 'application/json'})
     )
     raise response.inspect unless response.status == 200
     JSON.load(response.body)
@@ -59,9 +59,9 @@ class Centurion::DockerViaApi
     response = Excon.post(
       @base_uri + path,
       tls_excon_arguments.merge(
-        :query   => name ? {:name => "#{name}-#{SecureRandom.hex(7)}"} : nil,
-        :body    => configuration.to_json,
-        :headers => { "Content-Type" => "application/json" }
+        query: name ? {name: "#{name}-#{SecureRandom.hex(7)}"} : nil,
+        body: configuration.to_json,
+        headers: { "Content-Type" => "application/json" }
       )
     )
     raise response.inspect unless response.status == 201
@@ -73,8 +73,8 @@ class Centurion::DockerViaApi
     response = Excon.post(
       @base_uri + path,
       tls_excon_arguments.merge(
-        :body => configuration.to_json,
-        :headers => { "Content-Type" => "application/json" }
+        body: configuration.to_json,
+        headers: { "Content-Type" => "application/json" }
       )
     )
     case response.status

data/lib/centurion/version.rb

@@ -1,3 +1,3 @@
 module Centurion
-  VERSION = '1.8.1'
+  VERSION = '1.8.2'
 end

data/lib/tasks/deploy.rake

@@ -127,6 +127,8 @@ namespace :deploy do
           container['Id'],
           port,
           fetch(:status_endpoint, '/'),
+          fetch(:image),
+          fetch(:tag),
           fetch(:rolling_deploy_wait_time, 5),
           fetch(:rolling_deploy_retries, 24)
         )

data/spec/deploy_dsl_spec.rb

@@ -31,7 +31,7 @@ describe Centurion::DeployDSL do
   it 'adds new env_vars to the existing ones, as strings' do
     DeployDSLTest.env_vars('SHAKESPEARE' => 'Hamlet')
     DeployDSLTest.env_vars('DICKENS' => 'David Copperfield',
-                           :DICKENS_BIRTH_YEAR => 1812)
+                           DICKENS_BIRTH_YEAR: 1812)
 
     expect(DeployDSLTest.defined_service.env_vars).to eq(
       'SHAKESPEARE'        => 'Hamlet',

data/spec/deploy_spec.rb

@@ -127,7 +127,7 @@ describe Centurion::Deploy do
       second_container = container.dup
       containers = [ container, second_container ]
 
-      expect(server).to receive(:find_containers_by_public_port).with(80).and_return(containers)
+      expect(server).to receive(:find_containers_by_name).with(:centurion).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
 

data/spec/docker_registry_spec.rb

@@ -93,7 +93,7 @@ describe Centurion::DockerRegistry do
       JSON
 
       before do
-        expect(Excon).to receive(:get).with(kind_of(String), hash_including(:user => user, :password => password)).and_return(
+        expect(Excon).to receive(:get).with(kind_of(String), hash_including(user: user, password: password)).and_return(
           double(status: 200, body: response)
         )
       end

data/spec/docker_via_api_spec.rb

@@ -27,7 +27,7 @@ describe Centurion::DockerViaApi do
 
     it 'creates a container' do
       configuration_as_json = double
-      configuration = double(:to_json => configuration_as_json)
+      configuration = double(to_json: configuration_as_json)
       expect(Excon).to receive(:post).
                            with(excon_uri + "v1.10" + "/containers/create",
                                 query: nil,
@@ -39,10 +39,10 @@ describe Centurion::DockerViaApi do
 
     it 'creates a container with a name' do
       configuration_as_json = double
-      configuration = double(:to_json => configuration_as_json)
+      configuration = double(to_json: configuration_as_json)
       expect(Excon).to receive(:post).
                            with(excon_uri + "v1.10" + "/containers/create",
-                                query: { :name => match(/^app1-[a-f0-9]+$/) },
+                                query: { name: match(/^app1-[a-f0-9]+$/) },
                                 body: configuration_as_json,
                                 headers: {'Content-Type' => 'application/json'}).
                            and_return(double(body: json_string, status: 201))
@@ -51,7 +51,7 @@ describe Centurion::DockerViaApi do
 
     it 'starts a container' do
       configuration_as_json = double
-      configuration = double(:to_json => configuration_as_json)
+      configuration = double(to_json: configuration_as_json)
       expect(Excon).to receive(:post).
                            with(excon_uri + "v1.10" + "/containers/12345/start",
                                 body: configuration_as_json,
@@ -148,7 +148,7 @@ describe Centurion::DockerViaApi do
 
     it 'creates a container' do
       configuration_as_json = double
-      configuration = double(:to_json => configuration_as_json)
+      configuration = double(to_json: configuration_as_json)
       expect(Excon).to receive(:post).
                            with(excon_uri + 'v1.10/containers/create',
                                 client_cert: '/certs/cert.pem',
@@ -162,7 +162,7 @@ describe Centurion::DockerViaApi do
 
     it 'starts a container' do
       configuration_as_json = double
-      configuration = double(:to_json => configuration_as_json)
+      configuration = double(to_json: configuration_as_json)
       expect(Excon).to receive(:post).
                            with(excon_uri + 'v1.10/containers/12345/start',
                                 client_cert: '/certs/cert.pem',

data/spec/docker_via_cli_spec.rb

@@ -28,7 +28,7 @@ describe Centurion::DockerViaCli do
     it 'should print all chars when one thread is running' do
       expect(Centurion::Shell).to receive(:run_with_echo)
 
-      allow(Thread).to receive(:list) {[double(:status => 'run')]}
+      allow(Thread).to receive(:list) {[double(status: 'run')]}
 
       docker_via_cli.pull('foo')
     end
@@ -36,7 +36,7 @@ describe Centurion::DockerViaCli do
     it 'should only print lines when multiple threads are running' do
       expect(Centurion::Shell).to receive(:run_without_echo)
 
-      allow(Thread).to receive(:list) {[double(:status => 'run'), double(:status => 'run')]}
+      allow(Thread).to receive(:list) {[double(status: 'run'), double(status: 'run')]}
 
       docker_via_cli.pull('foo')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: centurion
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
 platform: ruby
 authors:
 - Nic Benders
@@ -20,7 +20,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop