indocker 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d7b649d56c064195abd6e157f81fde131feaf2f05b238381555d44af3451e52
-  data.tar.gz: e209879510e20425f21f158c6b898d2f08b23115d9c37cc1b67263ec2dc6b00c
+  metadata.gz: e93eba781605cba8bdb795ed40a03b16d3602508ca427639b42ead50c25b7ec6
+  data.tar.gz: 3e5dc1f5582c8ee45fa4e3583cfea13abf3121e52341eecdc98b8660db700d94
 SHA512:
-  metadata.gz: 3708365b48a1f074ab18ceb68f45063132f43252981771b94c41c25a2ab3e6929be52e62add6135bce03e574d7134eed70434c3991a8b2073adac4056be20e1a
-  data.tar.gz: fc8513c52b6a39062214294fa708159db908ed105d06d848ae186474ea9ca03868dd82e36ab42a2440d49a957e90cb3a8214cfa97537fe2edac10466ba756c9f
+  metadata.gz: 4da7e1049911e4d0c12d89d977cfb568687f61568866ec82f737694c1023984ad97d205d25eaa35e19ebc46843d0743d1df07c833c48d293a5c10ca5de0fd792
+  data.tar.gz: 1a8205455ebf5da34c8039a87c45772807920e362e8814bee275ef578647a15edf9970a9c53196b5805aeba8d4b3b047e30e329b0637d393a390c9d32c68353f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    indocker (0.1.15)
+    indocker (0.1.16)
       net-ssh
 
 GEM

data/lib/indocker.rb

@@ -369,7 +369,7 @@ module Indocker
         )
     end
 
-    def launched?(contaner_name, servers: [])
+    def launched?(contaner_name, servers: nil)
       silent_logger = Logger.new(File.open(File::NULL, "w"))
       Indocker::DeploymentChecker
         .new(silent_logger, silent_logger)

data/lib/indocker/container_deployer.rb

@@ -49,6 +49,7 @@ class Indocker::ContainerDeployer
         
         @logger.info("Container deployment to #{server.user}@#{server.host} finished: #{container.name.to_s.green}")
 
+        deploy_server.close_session
         progress.finish_deploying_container(container, server)
       end
     end

data/lib/indocker/deployment_checker.rb

@@ -109,13 +109,15 @@ class Indocker::DeploymentChecker
     { missing_containers: total_missing_containers, invalid_containers: total_invalid_containers }
   end
 
-  def launched?(container_name, configuration:, servers:)
+  def launched?(container_name, configuration:, servers: nil)
     container = Indocker.containers.detect { |c| c.name == container_name.to_sym }
     hostnames = (container.get_start_option(:scale) || 1).times.map do |number|
       Indocker::ContainerHelper.hostname(configuration.name, container, number)
     end
 
-    result = run(configuration: configuration, servers: servers, only_containers: [container.name])
+    servers ||= container.servers.map(&:name)
+
+    result = run(configuration: configuration, servers: container.servers.map(&:name), only_containers: [container.name])
     result[:missing_containers].empty?
   end
 end

data/lib/indocker/launchers/configuration_deployer.rb

@@ -258,15 +258,17 @@ class Indocker::Launchers::ConfigurationDeployer
   def collect_soft_dependent_containers(containers, configuration)
     result = containers
 
-    result += containers.map do |container|
-      container.soft_dependent_containers.reject do |soft_dependent_container|
-        configuration.enabled_containers.include?(soft_dependent_container.name) &&
-        Indocker.launched?(soft_dependent_container.name)
-      end
-    end.flatten
+    soft_dependent_containers = containers
+      .map(&:soft_dependent_containers)
+      .flatten
+      .uniq(&:name)
 
+    result +=  soft_dependent_containers.select do |container|
+      configuration.enabled_containers.include?(container.name) &&
+        !Indocker.launched?(container.name)
+    end
 
-    result.uniq
+    result
   end
 
   def compile_image(configuration, image, build_server)

data/lib/indocker/server_pools/deploy_server_pool.rb

@@ -7,35 +7,35 @@ class Indocker::ServerPools::DeployServerPool
   end
 
   def create_connection!(server)
-    @semaphore.synchronize do
-      create_connection_unsafe!(server)
-    end
-  end
-
-  def each(&proc)
-    @connections.each(&proc)
-  end
-
-  def close_sessions
-    @connections.each(&:close_session)
+    connection = Indocker::ServerPools::DeployServerConnection.new(
+      logger: @logger,
+      configuration: @configuration,
+      server: server,
+    )
+    connection.create_session!
+    connection
   end
 
-  private
-    def create_connection_unsafe!(server)
+  def find_or_create_connection!(server)
+    @semaphore.synchronize do
       connection = @connections.detect do |connection|
         connection.server.host == server.host &&
         connection.server.port == server.port &&
         connection.server.user == server.user
       end
       if connection.nil?
-        connection = Indocker::ServerPools::DeployServerConnection.new(
-          logger: @logger,
-          configuration: @configuration,
-          server: server,
-        )
-        connection.create_session!
+        connection = create_connection!(server)
         @connections.push(connection)
       end
       connection
     end
+  end
+
+  def each(&proc)
+    @connections.each(&proc)
+  end
+
+  def close_sessions
+    @connections.each(&:close_session)
+  end
 end

data/lib/indocker/server_pools/server_connection.rb

@@ -24,6 +24,7 @@ class Indocker::ServerPools::ServerConnection
 
   def close_session
     @session.close if @session
+    @session = nil
   end
 
   def set_busy(flag)

data/lib/indocker/version.rb

@@ -1,3 +1,3 @@
 module Indocker
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indocker
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Ruslan Gatiyatov